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 14afd21079f34..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.*",
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 4fa012f4acee8..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.*",
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 4adbb236ab952..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
@@ -40,6 +40,15 @@ protected function setUp()
             ->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 3e0307c9d86e1..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
@@ -54,6 +54,15 @@ protected function setUp()
             ->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 8ca562385236a..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
@@ -39,6 +39,15 @@ protected function setUp()
             ->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 11acfec76ca24..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.*",
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 1af2a1f672762..f982088934010 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index d397f5cfae81e..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.*",
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/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/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/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/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/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/composer.json b/app/code/Magento/Backend/composer.json
index d3b766da0006f..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.*",
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/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 6e741ae29cab5..d9a950ab13eb7 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -2,7 +2,7 @@
     "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.*",
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/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/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
index 8c8ea2ea69691..cb3d5e4c3ac37 100644
--- a/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
+++ b/app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php
@@ -8,6 +8,7 @@
 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;
@@ -118,6 +119,10 @@ private function setVaultPayment(OrderPaymentInterface $orderPayment, PaymentTok
             PaymentTokenInterface::CUSTOMER_ID,
             $customerId
         );
+        $orderPayment->setAdditionalInformation(
+            'is_multishipping',
+            1
+        );
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
index ae2b1b1423640..197b398380f74 100644
--- a/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
+++ b/app/code/Magento/Braintree/Model/Paypal/Helper/QuoteUpdater.php
@@ -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
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/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Paypal/Helper/QuoteUpdaterTest.php
index b67f7d09941ca..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',
+                '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',
             ],
         ];
     }
@@ -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 0b9d76bc2ee9e..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.*",
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 fe4cfab9c0e30..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>
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index 901b30cb41d2c..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>
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/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
index bf8aa8dd09c2c..fc3030b6a4b36 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/multishipping/form.phtml
@@ -15,7 +15,7 @@
             };
             layout([
                 {
-                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/hosted-fields',
+                    component: 'Magento_Braintree/js/view/payment/method-renderer/multishipping/cc-form',
                     name: 'payment_method_braintree',
                     method: paymentMethodData.method,
                     item: paymentMethodData
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 73a7b10d5d30f..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,89 +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'));
-                        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'));
+                    });
             },
 
             /**
@@ -103,8 +110,6 @@ define(
                 validator.setConfig(window.checkoutConfig.payment[this.getCode()]);
                 this._super()
                     .observe(['active']);
-                this.validatorManager.initialize();
-                this.initClientConfig();
 
                 return this;
             },
@@ -132,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 cb9110ee8afa1..0000000000000
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
+++ /dev/null
@@ -1,170 +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.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/hosted-fields.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
similarity index 59%
rename from app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
rename to app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
index 1ceebc8e66282..868fe174ae482 100644
--- a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/hosted-fields.js
+++ b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js
@@ -7,13 +7,14 @@
 
 define([
     'jquery',
-    'Magento_Braintree/js/view/payment/method-renderer/hosted-fields',
+    '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',
-    'Magento_Checkout/js/model/payment/additional-validators'
+    'Magento_Checkout/js/action/set-payment-information-extended',
+    'Magento_Checkout/js/model/payment/additional-validators',
+    'Magento_Braintree/js/view/payment/validator-handler'
 ], function (
     $,
     Component,
@@ -21,8 +22,9 @@ define([
     messageList,
     $t,
     fullScreenLoader,
-    setPaymentInformationAction,
-    additionalValidators
+    setPaymentInformationExtended,
+    additionalValidators,
+    validatorManager
 ) {
     'use strict';
 
@@ -31,33 +33,13 @@ define([
             template: 'Magento_Braintree/payment/multishipping/form'
         },
 
-        /**
-         * Get list of available CC types
-         *
-         * @returns {Object}
-         */
-        getCcAvailableTypes: function () {
-            var availableTypes = validator.getAvailableCardTypes(),
-                billingCountryId;
-
-            billingCountryId = $('#multishipping_billing_country_id').val();
-
-            if (billingCountryId && validator.getCountrySpecificCardTypes(billingCountryId)) {
-                return validator.collectTypes(
-                    availableTypes, validator.getCountrySpecificCardTypes(billingCountryId)
-                );
-            }
-
-            return availableTypes;
-        },
-
         /**
          * @override
          */
         placeOrder: function () {
             var self = this;
 
-            this.validatorManager.validate(self, function () {
+            validatorManager.validate(self, function () {
                 return self.setPaymentInformation();
             });
         },
@@ -67,13 +49,12 @@ define([
          */
         setPaymentInformation: function () {
             if (additionalValidators.validate()) {
-
                 fullScreenLoader.startLoader();
-
                 $.when(
-                    setPaymentInformationAction(
+                    setPaymentInformationExtended(
                         this.messageContainer,
-                        this.getData()
+                        this.getData(),
+                        true
                     )
                 ).done(this.done.bind(this))
                     .fail(this.fail.bind(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
index 6702e58d1214b..b3837103148cc 100644
--- 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
@@ -8,34 +8,58 @@ define([
     'jquery',
     'underscore',
     'Magento_Braintree/js/view/payment/method-renderer/paypal',
-    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/action/set-payment-information-extended',
     'Magento_Checkout/js/model/payment/additional-validators',
-    'Magento_Checkout/js/model/full-screen-loader',
-    'mage/translate'
+    'Magento_Checkout/js/model/full-screen-loader'
 ], function (
     $,
     _,
     Component,
-    setPaymentInformationAction,
+    setPaymentInformationExtended,
     additionalValidators,
-    fullScreenLoader,
-    $t
+    fullScreenLoader
 ) {
     'use strict';
 
     return Component.extend({
         defaults: {
             template: 'Magento_Braintree/payment/multishipping/paypal',
-            submitButtonSelector: '#payment-continue span'
+            submitButtonSelector: '#payment-continue span',
+            paypalButtonSelector: '[id="parent-payment-continue"]',
+            reviewButtonHtml: ''
         },
 
         /**
          * @override
          */
-        onActiveChange: function (isActive) {
-            this.updateSubmitButtonTitle(isActive);
+        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);
         },
 
         /**
@@ -44,7 +68,7 @@ define([
         beforePlaceOrder: function (data) {
             this._super(data);
 
-            this.updateSubmitButtonTitle(true);
+            this.updateSubmitButton(true);
         },
 
         /**
@@ -87,38 +111,33 @@ define([
          * @returns {Boolean}
          */
         isPaymentMethodNonceReceived: function () {
-            return this.paymentMethodNonce !== null;
+            return this.paymentPayload.nonce !== null;
         },
 
         /**
-         * Updates submit button title on multi-addresses checkout billing form.
+         * Updates submit button on multi-addresses checkout billing form.
          *
          * @param {Boolean} isActive
          */
-        updateSubmitButtonTitle: function (isActive) {
-            var title = this.isPaymentMethodNonceReceived() || !isActive ?
-                $t('Go to Review Your Order') : $t('Continue to PayPal');
-
-            $(this.submitButtonSelector).html(title);
+        updateSubmitButton: function (isActive) {
+            if (this.isPaymentMethodNonceReceived() || !isActive) {
+                $(this.paypalButtonSelector).html(this.reviewButtonHtml);
+            }
         },
 
         /**
          * @override
          */
         placeOrder: function () {
-            if (!this.isPaymentMethodNonceReceived()) {
-                this.payWithPayPal();
-            } else {
-                fullScreenLoader.startLoader();
-
-                $.when(
-                    setPaymentInformationAction(
-                        this.messageContainer,
-                        this.getData()
-                    )
-                ).done(this.done.bind(this))
-                    .fail(this.fail.bind(this));
-            }
+            fullScreenLoader.startLoader();
+            $.when(
+                setPaymentInformationExtended(
+                    this.messageContainer,
+                    this.getData(),
+                    true
+                )
+            ).done(this.done.bind(this))
+                .fail(this.fail.bind(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
index 964e15df166d3..b72ef24b81b63 100644
--- 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
@@ -41,7 +41,7 @@
                     </div>
                 </div>
                 <div class="field number required">
-                    <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
+                    <label data-bind="afterRender: initHostedFields, attr: {for: getCode() + '_cc_number'}" class="label">
                         <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
                     </label>
                     <div class="control">
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
index 722989e41f98f..fcd5320351938 100644
--- 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
@@ -20,6 +20,7 @@
         <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>
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/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index fd024fa87109e..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();
@@ -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/composer.json b/app/code/Magento/Bundle/composer.json
index d82e4201bbda4..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.*",
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 e65269559a3a9..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
@@ -68,30 +68,30 @@
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Refunded')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Canceled')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -99,12 +99,12 @@
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -133,9 +133,9 @@
                     <input type="text"
                            class="input-text admin__control-text qty-input"
                            name="creditmemo[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>][qty]"
-                           value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
+                           value="<?= (float)$_item->getQty() * 1 ?>" />
                 <?php else : ?>
-                    <?= $block->escapeHtml($_item->getQty()*1) ?>
+                    <?= (float)$_item->getQty() * 1 ?>
                 <?php endif; ?>
             <?php else : ?>
                 &nbsp;
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 18dc5db23d562..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
@@ -63,7 +63,7 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)) : ?>
-                <?= $block->escapeHtml($_item->getQty()*1) ?>
+                <?= (float)$_item->getQty() * 1 ?>
             <?php else : ?>
                 &nbsp;
             <?php endif; ?>
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 de2dde87403af..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
@@ -69,30 +69,30 @@
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-                        <td><span><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></span></td>
+                        <td><span><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></span></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyInvoiced()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Refunded')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyRefunded()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Canceled')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyCanceled()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -100,12 +100,12 @@
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyOrdered()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyOrdered() * 1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getOrderItem()->getQtyShipped()*1) ?></td>
+                        <td><?= (float)$_item->getOrderItem()->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -119,9 +119,9 @@
                     <input type="text"
                            class="input-text admin__control-text qty-input"
                            name="invoice[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
-                           value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
+                           value="<?= (float)$_item->getQty() * 1 ?>" />
                 <?php else : ?>
-                    <?= $block->escapeHtml($_item->getQty()*1) ?>
+                    <?= (float)$_item->getQty() * 1 ?>
                 <?php endif; ?>
             <?php else : ?>
                 &nbsp;
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 b8a2c0db82d4b..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
@@ -64,7 +64,7 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)) : ?>
-                <?= $block->escapeHtml($_item->getQty()*1) ?>
+                <?= (float)$_item->getQty() * 1 ?>
             <?php else : ?>
                 &nbsp;
             <?php endif; ?>
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 332230fb188fb..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
@@ -87,30 +87,30 @@
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyOrdered()*1) ?></td>
+                        <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyInvoiced()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Invoiced')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyInvoiced()*1) ?></td>
+                        <td><?= (float)$_item->getQtyInvoiced() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyShipped()*1) ?></td>
+                        <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyRefunded()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Refunded')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyRefunded()*1) ?></td>
+                        <td><?= (float)$_item->getQtyRefunded() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyCanceled()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Canceled')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyCanceled()*1) ?></td>
+                        <td><?= (float)$_item->getQtyCanceled() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -118,12 +118,12 @@
                 <table class="qty-table">
                     <tr>
                         <th><?= $block->escapeHtml(__('Ordered')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyOrdered()*1) ?></td>
+                        <td><?= (float)$_item->getQtyOrdered() * 1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyShipped()) : ?>
                     <tr>
                         <th><?= $block->escapeHtml(__('Shipped')) ?></th>
-                        <td><?= $block->escapeHtml($_item->getQtyShipped()*1) ?></td>
+                        <td><?= (float)$_item->getQtyShipped() * 1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
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 fe446ec095719..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
@@ -58,7 +58,7 @@
                 <input type="text"
                        class="input-text admin__control-text"
                        name="shipment[items][<?= $block->escapeHtmlAttr($_item->getOrderItemId()) ?>]"
-                       value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>" />
+                       value="<?= (float)$_item->getQty() * 1 ?>" />
             <?php else : ?>
                 &nbsp;
             <?php endif; ?>
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 d99cabe41420b..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
@@ -48,7 +48,7 @@
         <td class="col-qty last">
             <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
                 <?php if (isset($shipItems[$_item->getId()])) : ?>
-                    <?= $block->escapeHtml($shipItems[$_item->getId()]->getQty()*1) ?>
+                    <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
                 <?php elseif ($_item->getIsVirtual()) : ?>
                     <?= $block->escapeHtml(__('N/A')) ?>
                 <?php else : ?>
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 c935cc62e7ca7..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
@@ -52,14 +52,14 @@
     <?php endif; ?>
             <td class="item-qty">
                 <?php if ($block->canShowPriceInfo($_item)) : ?>
-                    <?= $block->escapeHtml($_item->getQty() * 1) ?>
+                    <?= (float)$_item->getQty() * 1 ?>
                 <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
             <td class="item-price">
                 <?php if ($block->canShowPriceInfo($_item)) : ?>
-                    <?= $block->escapeHtml($block->getItemPrice($_item)) ?>
+                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
                 <?php else : ?>
                     &nbsp;
                 <?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 f3084c5f19287..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
@@ -53,14 +53,14 @@
     <?php endif; ?>
             <td class="item-qty">
                 <?php if ($block->canShowPriceInfo($_item)) : ?>
-                    <?= $block->escapeHtml($_item->getQty() * 1) ?>
+                    <?= (float)$_item->getQty() * 1 ?>
                 <?php else : ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
             <td class="item-price">
                 <?php if ($block->canShowPriceInfo($_item)) : ?>
-                    <?= $block->escapeHtml($block->getItemPrice($_item)) ?>
+                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
                 <?php else : ?>
                     &nbsp;
                 <?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 01f6586603863..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
@@ -39,10 +39,10 @@
                 <p class="sku"><?= $block->escapeHtml(__('SKU')) ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
             <td class="item-qty">
-                <?= $block->escapeHtml($_item->getQtyOrdered() * 1) ?>
+                <?= (float)$_item->getQtyOrdered() * 1 ?>
             </td>
             <td class="item-price">
-                <?= $block->escapeHtml($block->getItemPrice($_item)) ?>
+                <?= /* @noEscape */ $block->getItemPrice($_item) ?>
             </td>
         </tr>
     <?php else : ?>
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 3128b895888f1..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
@@ -47,7 +47,7 @@
             <td class="item-qty">
                 <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())) : ?>
                     <?php if (isset($shipItems[$_item->getId()])) : ?>
-                        <?= $block->escapeHtml($shipItems[$_item->getId()]->getQty() * 1) ?>
+                        <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
                     <?php elseif ($_item->getIsVirtual()) : ?>
                         <?= $block->escapeHtml(__('N/A')) ?>
                     <?php else : ?>
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 eebcf42f3bd0f..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
@@ -35,42 +35,42 @@
     <?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->escapeHtml(__('Product Name')) ?>">
+        <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>
+        <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')) ?>">
+    <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 : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Quantity')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
-            <?= $block->escapeHtml($_item->getQty()*1) ?>
+            <?= (float)$_item->getQty() * 1 ?>
         <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemRowTotalHtml($_item) ?>
         <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
+    <td class="col discount" data-th="<?= $block->escapeHtmlAttr(__('Discount Amount')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
-            <?= $block->escapeHtml($block->getOrder()->formatPrice(-$_item->getDiscountAmount())) ?>
+            <?= $block->escapeHtml($block->getOrder()->formatPrice(-$_item->getDiscountAmount()), ['span']) ?>
         <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col rowtotal" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
+    <td class="col rowtotal" data-th="<?= $block->escapeHtmlAttr(__('Row Total')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemRowTotalAfterDiscountHtml($_item) ?>
         <?php else : ?>
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 65845bead142d..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
@@ -34,28 +34,28 @@
         <?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->escapeHtml(__('Product Name')) ?>">
+        <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>
+        <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')) ?>">
+    <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 : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtmlAttr(__('Qty Invoiced')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
-            <?= $block->escapeHtml($_item->getQty()*1) ?>
+            <?= (float)$_item->getQty() * 1 ?>
         <?php else : ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
         <?php if ($block->canShowPriceInfo($_item)) : ?>
             <?= $block->getItemRowTotalHtml($_item) ?>
             <?php else : ?>
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 3c42334992a9f..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
@@ -37,28 +37,28 @@ $prevOptionId = '';
         item-parent
     <?php endif; ?>"
     <?php if ($item->getParentItem()) : ?>
-        data-th="<?= $block->escapeHtml($attributes['option_label']); ?>"
+        data-th="<?= $block->escapeHtmlAttr($attributes['option_label']); ?>"
     <?php endif; ?>>
     <?php if (!$item->getParentItem()) : ?>
-        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')); ?>">
+        <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')); ?>">
+        <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')); ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtmlAttr(__('SKU')); ?>">
         <?= /* @noEscape */ $block->prepareSku($item->getSku()); ?>
     </td>
-    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')); ?>">
+    <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')); ?>">
+    <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())) : ?>
@@ -104,7 +104,7 @@ $prevOptionId = '';
             </ul>
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtmlAttr(__('Subtotal')) ?>">
         <?php if (!$item->getParentItem()) : ?>
             <?= /* @noEscape */ $block->getItemRowTotalHtml(); ?>
         <?php else : ?>
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 befd4bbe462f3..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
@@ -35,17 +35,17 @@
         <?php if ($_item->getParentItem()) : ?>
             data-th="<?= $block->escapeHtmlAttr($attributes['option_label']) ?>"<?php endif; ?>>
         <?php if (!$_item->getParentItem()) : ?>
-            <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+            <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>
+            <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')) ?>">
+        <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()])) : ?>
-                    <?= $block->escapeHtml($shipItems[$_item->getId()]->getQty()*1) ?>
+                    <?= (float)$shipItems[$_item->getId()]->getQty() * 1 ?>
                 <?php elseif ($_item->getIsVirtual()) : ?>
                     <?= $block->escapeHtml(__('N/A')) ?>
                 <?php else : ?>
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index 985b83a197369..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.*",
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 4b9ef4e140f35..c03443310d594 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 471c4f976a300..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.*",
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/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/View.php b/app/code/Magento/Catalog/Block/Product/View.php
index 3c12cbbf31450..2a364bcadf6ef 100644
--- a/app/code/Magento/Catalog/Block/Product/View.php
+++ b/app/code/Magento/Catalog/Block/Product/View.php
@@ -187,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' => []
                 ]
             ],
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/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/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index 7f622dcb54e48..5fda0f6f7c05c 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -80,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).'));
             }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
index 1e55bd35553ab..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());
     }
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/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/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/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index f043b82f2d44f..ef6970b9d8368 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -80,10 +80,14 @@
             <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"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index f620b3c042a86..d10c10827f4cd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -92,7 +92,7 @@
 
         <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"/>
@@ -103,4 +103,38 @@
         <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/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/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 e46bfc7ee8b02..00b2788af2d70 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -34,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">
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/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index b2483c3d2d080..dfe6bfdf681e1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -77,4 +77,25 @@
     <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/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index f6fb47c731790..9d02fbd848345 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -311,4 +311,17 @@
         <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/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/WidgetsData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
index 83f0a56c21545..316bb5313a29d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/WidgetsData.xml
@@ -12,4 +12,26 @@
         <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_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/Page/AdminNewWidgetPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
index e23a503266e33..dd5d5aef08a7c 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminNewWidgetPage.xml
@@ -10,5 +10,6 @@
        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/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/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/AdminProductFormSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
index 2255f3fbbb3fb..b458b05da43c6 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml
@@ -42,6 +42,14 @@
         <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"/>
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 3c769f9dbc0ce..42b03cd14701b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -23,5 +23,7 @@
         <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/StorefrontCategoryProductSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
index 26c9035d6b136..166c2b3f7311a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml
@@ -24,6 +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/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/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/AdminCheckingAttributeValueOnProductEditPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckingAttributeValueOnProductEditPageTest.xml
index bd49f643148d9..1ba30ae80818a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckingAttributeValueOnProductEditPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckingAttributeValueOnProductEditPageTest.xml
@@ -52,13 +52,28 @@
 
         <!--Go to Product edit page-->
         <amOnPage url="{{AdminProductEditPage.url($$createSimpleProduct.id$$)}}" stepKey="goToProductEditPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <!--Click on attribute dropdown-->
-        <click selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown"/>
+        <scrollToTopOfPage stepKey="scrollToShowAttribute"/>
+
+        <!-- Grab attribute dropdown options -->
+        <grabMultiple selector="{{AdminProductFormSection.customAttributeSelectOptions($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" stepKey="clickOnAttributeDropdown" />
+
         <!--Check attribute dropdown options-->
-        <see selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="admin_option_1" stepKey="seeFirstAdminOption"/>
-        <see selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="admin_option_2" stepKey="seeSecondAdminOption"/>
-        <dontSee selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="option1" stepKey="dontSeeFirstStoreOption"/>
-        <dontSee selector="{{AdminProductFormSection.customAttributeDropdownField($$createDropdownProductAttribute.attribute[attribute_code]$$)}}" userInput="option2" stepKey="dontSeeSecondStoreOption"/>
+        <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/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/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/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/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/composer.json b/app/code/Magento/Catalog/composer.json
index 893f8d7190700..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.*",
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 ee67acd0ebd46..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
  */
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 ba386f89d6ccd..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,7 +295,7 @@
                 if (scopeParams) {
                     url = url + scopeParams;
                 }
-                <?php if ($block->isClearEdit()): ?>
+                <?php if ($block->isClearEdit()) :?>
                 if (selectedNode) {
                     url = url + 'id/' + config.parameters.category_id;
                 }
@@ -307,7 +306,7 @@
 
             jQuery(function () {
                 categoryLoader = new Ext.tree.TreeLoader({
-                    dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
+                    dataUrl: '<?= $block->escapeJs($block->escapeUrl($block->getLoadTreeUrl())) ?>'
                 });
 
                 categoryLoader.processResponse = function (response, parent, callback) {
@@ -389,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();
@@ -486,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 69737b8a37c1c..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,11 +148,11 @@ 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,
@@ -167,9 +164,9 @@ jQuery(function()
     });
 
     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
@@ -181,7 +178,7 @@ jQuery(function()
         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 07a801f42a786..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([
@@ -197,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 78f74459838ac..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
@@ -86,7 +85,7 @@
                             });
 
                             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);
@@ -187,7 +186,6 @@
                             if( config[i].children ) {
                                 for( j in config[i].children ) {
                                     if(config[i].children[j].id) {
-
                                         newNode = new Ext.tree.TreeNode(config[i].children[j]);
 
                                         if (typeof newNode.ui.onTextChange === 'function') {
@@ -198,27 +196,27 @@
                                             }
                                         }
                                     }
-                                        node.appendChild(newNode);
-                                        newNode.addListener('click', editSet.unregister);
-                                    }
+                                    node.appendChild(newNode);
+                                    newNode.addListener('click', editSet.unregister);
                                 }
                             }
                         }
                     }
+                }
 
 
-                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;
+                    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;
@@ -281,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'],
@@ -348,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)
                                     });
@@ -376,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) {
@@ -451,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 9f83d42392e03..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,84 +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">
-      <span>
-          <?= $block->escapeHtml($_option->getTitle()) ?>
-          <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
-      </span>
-  </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 dd40cc68ac1ed..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,44 +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">
         <span>
             <?= $block->escapeHtml($_option->getTitle()) ?>
-            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+            <?= /* @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 1580cec60b3fa..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,28 +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">
         <span>
             <?= $block->escapeHtml($_option->getTitle()) ?>
-            <?= /* @escapeNotVerified */ $block->getFormattedPrice() ?>
+            <?= /* @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 64c8ba7dcf49f..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>
@@ -40,326 +39,363 @@ if (!is_numeric($defaultMinSaleQty)) {
 <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 */ $defaultMinSaleQty ?>"
+                               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/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/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
index 0e2635f27c4b9..55c8a8fcb4edd 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/composite/fieldset/options/view/checkable.phtml
@@ -4,11 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
 use Magento\Catalog\Model\Product\Option;
 
 /**
- * @var \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable $block
+ * @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable
  */
 $option = $block->getOption();
 if ($option) : ?>
@@ -19,82 +18,64 @@ if ($option) : ?>
     $count = 1;
     ?>
 
-    <div class="options-list nested" id="options-<?php echo /* @noEscape */
-    $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_<?php echo /* @noEscape */
-                       $option->getId() ?>"
-                       class="radio admin__control-radio product-custom-option"
-                       name="options[<?php echo /* @noEscape */
-                       $option->getId() ?>]"
-                       data-selector="options[<?php echo /* @noEscape */
-                       $option->getId() ?>]"
-                       onclick="<?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
-                       value=""
-                       checked="checked"
-                />
-                <label class="label admin__field-label" for="options_<?php echo /* @noEscape */
-                $option->getId() ?>">
-                        <span>
-                            <?php echo /* @noEscape */
-                            __('None') ?>
-                        </span>
-                </label>
-            </div>
-        <?php endif; ?>
+<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() . ']';
-            }
-            ?>
+    <?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 <?php echo /* @noEscape */
-            $option->getIsRequire() ? 'required': '' ?>">
-                <input type="<?php echo /* @noEscape */
-                $optionType ?>"
-                       class="<?php /** @noinspection DisconnectedForeachInstructionInspection */
-                       echo /* @noEscape */
-                       $optionType === Option::OPTION_TYPE_RADIO ?
-                           'radio admin__control-radio' :
-                           'checkbox admin__control-checkbox' ?> <?php echo /* @noEscape */
-                       $option->getIsRequire() ? 'required': '' ?>
+        <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
-                        <?php echo $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
-                       name="options[<?php echo $option->getId() ?>]<?php echo /* @noEscape */
-                       $arraySign ?>"
-                       id="options_<?php echo /* @noEscape */
-                           $option->getId() . '_' . $count ?>"
-                       value="<?php echo /* @noEscape */
-                       $value->getOptionTypeId() ?>"
-                    <?php echo /* @noEscape */
-                    $checked ?>
-                       data-selector="<?php echo /* @noEscape */
-                       $dataSelector ?>"
-                       price="<?php echo /* @noEscape */
-                       $block->getCurrencyByStore($value) ?>"
-                />
-                <label class="label admin__field-label"
-                       for="options_<?php echo /* @noEscape */
-                           $option->getId() . '_' . $count ?>">
+                        <?= $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>
-                    <?php echo $block->escapeHtml($value->getTitle()) ?>
+                    <?= $block->escapeHtml($value->getTitle()) ?>
                 </span>
-                    <?php echo /* @noEscape */
-                    $block->formatPrice($value) ?>
-                </label>
-            </div>
-        <?php endforeach; ?>
+                <?= /* @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 c2b7fb4e60855..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,
-                            $block->formatPercent($price['percentage_value'] ?? $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/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 71452a2d65e97..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,25 +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"
                        min="0"
-                       value="<?= /* @escapeNotVerified */ $block->getProductDefaultQty() * 1 ?>"
-                       title="<?= /* @escapeNotVerified */ __('Qty') ?>"
+                       value="<?= /* @noEscape */ $block->getProductDefaultQty() * 1 ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
                        class="input-text qty"
                        data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
                        />
@@ -31,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" disabled>
-                <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
+                <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 1c4a37fedebe3..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>
+                    <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 22860418b157d..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"
-                     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="trigger"
-                       href="#<?= /* @escapeNotVerified */ $alias ?>"
-                       id="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title">
-                        <?= /* @escapeNotVerified */ $label ?>
+                       href="#<?= $block->escapeUrl($alias) ?>"
+                       id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title">
+                        <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
-                <div class="data item content" 
-                     aria-labelledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title" 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/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 40f86c7e68d6c..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()->getPriceInfo()->getPrice(\Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE)->getAmount()):?>
-    <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/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index c2f5a050d0a9b..09df8e3329403 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index d37b755e8c57a..9f3f3d6ce5fb8 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2525,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]
@@ -2842,7 +2848,8 @@ protected function getUrlKey($rowData)
             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]);
         }
 
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 180fdb95a4d9b..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.*",
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/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/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/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 3086b50168aed..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.*",
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/composer.json b/app/code/Magento/CatalogRule/composer.json
index ef4dece889f6b..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.*",
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 16d5f2955d5d2..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.*",
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/composer.json b/app/code/Magento/CatalogSearch/composer.json
index a5f1e5f6fc4f2..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.*",
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/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/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/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index 9aaa384776855..aeb57561e67fd 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -232,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'];
@@ -268,6 +265,27 @@ protected function _populateForUrlGeneration($rowData)
         return $this;
     }
 
+    /**
+     * 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.
      *
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
index b4a35f323e1bc..3bbbcd4052c4a 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php
@@ -280,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/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index a486b7bb3f6b8..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.*",
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 510026b008f4e..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.*",
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/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
index d6fe3ece473df..a7c1b62f8a03d 100644
--- a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -178,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)
             );
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 09197a90542ee..0122303510a5f 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml
@@ -128,4 +128,14 @@
         <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/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/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/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/CheckoutCartProductSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartProductSection.xml
index f0b58f4263899..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"
@@ -35,5 +35,6 @@
         <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 938d46367e634..614855be46061 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -49,5 +49,8 @@
         <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 115eb92c48268..0bc31c7287e67 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingGuestInfoSection.xml
@@ -13,9 +13,13 @@
         <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 b735abc665022..42c92cbe20c3a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingSection.xml
@@ -34,8 +34,10 @@
         <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="text" selector="select[name=prefix] option[value='{{optionValue}}']" parameterized="true"/>
-        <element name="nameSuffix" type="selector" selector="[name='suffix']"/>
+        <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/StorefrontCheckoutCartSummarySection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutCartSummarySection.xml
index 7c68ecf543874..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"/>
@@ -23,5 +24,9 @@
         <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/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/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/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/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/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
index 49018d6d9df4c..ab04763a448bd 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml
@@ -48,7 +48,7 @@
         <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" type="string"/>
+            <argument name="shippingMethod" value="Flat Rate"/>
         </actionGroup>
 
         <waitForElementVisible selector="{{CheckoutPaymentSection.noPaymentMethods}}" stepKey="waitMessage"/>
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/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/composer.json b/app/code/Magento/Checkout/composer.json
index c46aaa9cb612c..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.*",
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 f8e692fc6f71c..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
@@ -13,7 +13,8 @@
     <span class="price-label"><?= $block->escapeHtml(__('Price')) ?></span>
     <span class="price-wrapper">
         <?= $block->escapeHtml(
-            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice())
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+            ['span']
         ) ?>
     </span>
 </div>
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 8928bbabcb718..28275e0223936 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -12,7 +12,7 @@
        data-bind="scope: 'minicart_content'">
         <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') -->
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 25124d91b6ea7..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
@@ -13,7 +13,8 @@ $_item = $block->getItem();
 <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
         <?= $block->escapeHtml(
-            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getRowTotal())
+            $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 c6ee4beb00c5a..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
@@ -13,7 +13,8 @@ $_item = $block->getItem();
 <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
         <?= $block->escapeHtml(
-            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice())
+            $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice()),
+            ['span']
         ) ?>
     </span>
 </span>
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 3888ec6504982..ace2b0464171c 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
@@ -13,7 +13,7 @@
     <p><?= $block->escapeHtml($error) ?></p>
 <?php endif ?>
 <p><?= $block->escapeHtml(
-    _('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())),
+    __('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/review/item/price/row_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
index 909631d06e68a..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
@@ -11,5 +11,8 @@
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?= $block->escapeHtml($this->helper(Magento\Checkout\Helper\Data::class)->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 9f87ab7ef2ded..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
@@ -12,5 +12,8 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getSubtotalInclTax($_item); ?>
 <span class="cart-price">
-    <?= $block->escapeHtml($this->helper(Magento\Checkout\Helper\Data::class)->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 9da1cfe85e56b..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
@@ -12,6 +12,7 @@ $_item = $block->getItem();
 ?>
 <span class="cart-price">
     <?= $block->escapeHtml(
-        $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($_item->getCalculationPrice())
+        $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 8de3176e0b963..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
@@ -12,5 +12,8 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper(Magento\Checkout\Helper\Data::class)->getPriceInclTax($_item); ?>
 <span class="cart-price">
-    <?= $block->escapeHtml($this->helper(Magento\Checkout\Helper\Data::class)->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/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index eeee3e4bf0be9..0d9da171c11a8 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -32,7 +32,8 @@
         <?php endif; ?>
             <span>
                 <?= $block->escapeHtml(
-                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue())
+                    $this->helper(Magento\Checkout\Helper\Data::class)->formatPrice($block->getTotal()->getValue()),
+                    ['span']
                 ) ?>
             </span>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()) :?>
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/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 93ecb3bf836ae..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.*",
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/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/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/Section/StorefrontCmsPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCmsPageSection.xml
index 2a2a80098b92e..3795af36fc004 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCmsPageSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/StorefrontCmsPageSection.xml
@@ -10,5 +10,6 @@
         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/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/composer.json b/app/code/Magento/Cms/composer.json
index d463cedd8dcd2..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.*",
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/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index abd8ad9fe2916..572e95c0f0c03 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -2,7 +2,7 @@
     "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.*",
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index 86ae1f96749df..a3c7c7d079cbb 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -91,8 +91,10 @@ public function process($path, $value, $scope, $scopeCode)
 
         try {
             $config = $this->configFactory->create([
-                'scope' => $scope,
-                'scope_code' => $scopeCode,
+                'data' => [
+                    'scope' => $scope,
+                    'scope_code' => $scopeCode,
+                ],
             ]);
             $config->setDataByPath($path, $value);
             $config->save();
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 6bf191c20a844..e562b637fac23 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -535,6 +535,8 @@ public function setDataByPath($path, $value)
         }
 
         $section = array_shift($pathParts);
+        $this->setData('section', $section);
+
         $data = [
             'fields' => [
                 array_pop($pathParts) => ['value' => $value],
@@ -547,8 +549,8 @@ public function setDataByPath($path, $value)
                 ],
             ];
         }
-        $data['section'] = $section;
-        $this->addData($data);
+        $groups = array_replace_recursive((array) $this->getData('groups'), $data['groups']);
+        $this->setData('groups', $groups);
     }
 
     /**
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/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/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/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 3fb7d9ad21cd4..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
@@ -99,10 +99,11 @@ protected function setUp()
     public function testProcess($path, $value, $scope, $scopeCode)
     {
         $this->configMockForProcessTest($path, $scope, $scopeCode);
+        $scopeData = ['scope' => $scope, 'scope_code' => $scopeCode];
 
         $config = $this->createMock(Config::class);
         $this->configFactory->method('create')
-            ->with(['scope' => $scope, 'scope_code' => $scopeCode])
+            ->with(['data' => $scopeData])
             ->willReturn($config);
         $config->method('setDataByPath')
             ->with($path, $value);
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index f36c29d387c9b..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.*",
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/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index cf0e0e819a89c..aefc558733dd6 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -2,7 +2,7 @@
     "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.*",
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 fcbd0075b4cd0..7e11fd02793ea 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -131,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();
@@ -203,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) {
@@ -229,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/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/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/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index c774dad1ed607..cf50c383075f5 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -24,5 +24,8 @@
         <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/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/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/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 90b1ce26a920b..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.*",
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index dd39bcb477699..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">
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/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index 5baa9bef17e11..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.*",
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index bb95e20c1172a..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.*",
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index ba4427e9681b5..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.*"
     },
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/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 a1f1e107a3c57..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.*"
     },
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 378b0df398ef5..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.*",
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 8a16eb71e0853..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:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></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:') ?> <strong><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></strong></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/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/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/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/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/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 9c9f04185477e..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)
@@ -568,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/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/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/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 959af9f70db29..031e1c679933e 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/CustomerActionGroup.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="CustomerLoginOnStorefront">
         <arguments>
             <argument name="customer" defaultValue="customer"/>
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/RemoveCustomerFromAdminActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml
index 3ec06d8353a45..f4d73157eb0b3 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/RemoveCustomerFromAdminActionGroup.xml
@@ -6,7 +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">
+              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>
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/StorefrontCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
index fc5c1b881752e..1199d0f80948f 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -15,4 +15,10 @@
                           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/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 573767a12361a..ebce94a10f9e5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -113,4 +113,17 @@
         <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
index 0ec9f79ecee52..8a25815c06dfd 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml
@@ -21,4 +21,11 @@
     <entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
         <data key="value">0</data>
     </entity>
-</entities>
\ No newline at end of file
+
+    <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 c3efa0fbc880c..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>
@@ -97,4 +97,27 @@
         <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/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
index 53f5ddea27cbd..b52eda0c4cfdd 100644
--- 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
@@ -13,9 +13,10 @@
                 <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>
\ No newline at end of file
+</operations>
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/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index d651d56504c76..6b988b067043a 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -17,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/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/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/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/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 fb5edd35a484d..575eabe68bd5c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontPanelHeaderSection.xml
@@ -15,5 +15,6 @@
         <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/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 f6a3ecb810aa5..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)
@@ -1470,7 +1537,25 @@ private function getExpectationForVisibleAttributes()
                                 ],
                             ],
                         ],
-                    ]
+                    ],
+                    '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/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
index 8421320dc7322..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
 {
     /**
@@ -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/composer.json b/app/code/Magento/Customer/composer.json
index e8d5fe2aaff48..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.*",
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/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/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index 901989b9d2550..9f0a1953eef99 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index e0571ba1247ea..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.*",
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/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/composer.json b/app/code/Magento/Deploy/composer.json
index b33313081b0f0..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.*",
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index 776d565bf5efa..8c5063f111f66 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -2,7 +2,7 @@
     "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.*"
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index 93926d6e1e28b..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.*",
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/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/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/composer.json b/app/code/Magento/Directory/composer.json
index 9681a951d9d06..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.*",
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 3ea7f69c2fad5..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.*",
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 d040714aa9aef..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
@@ -26,21 +26,21 @@
             <tbody>
             <?php foreach ($_items as $_item) : ?>
                 <tr>
-                    <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Order #')) ?>" class="col id">
                         <a href="<?= $block->escapeUrl($block->getOrderViewUrl($_item->getPurchased()->getOrderId())) ?>"
                             title="<?= $block->escapeHtml(__('View Order')) ?>">
                             <?= $block->escapeHtml($_item->getPurchased()->getOrderIncrementId()) ?>
                         </a>
                     </td>
-                    <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= $block->escapeHtml($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="<?= $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"><?= $block->escapeHtml(__(ucfirst($_item->getStatus()))) ?></td>
-                    <td data-th="<?= $block->escapeHtml(__('Remaining Downloads')) ?>" class="col remaining"><?= $block->escapeHtml($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>
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 78c9f712dfaab..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
@@ -31,8 +31,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $block->escapeHtml($_item->getQty() * 1) ?></td>
+    <td class="item-qty"><?= (float)$_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= $block->escapeHtml($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 727bf156f368a..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
@@ -32,8 +32,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $block->escapeHtml($_item->getQty() * 1) ?></td>
+    <td class="item-qty"><?= (float)$_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= $block->escapeHtml($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 9f9de6bf7d051..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
@@ -46,8 +46,8 @@
             </table>
         <?php endif; ?>
     </td>
-    <td class="item-qty"><?= $block->escapeHtml($_item->getQtyOrdered() * 1) ?></td>
+    <td class="item-qty"><?= (float)$_item->getQtyOrdered() * 1 ?></td>
     <td class="item-price">
-        <?= $block->escapeHtml($block->getItemPrice($_item)) ?>
+        <?= /* @noEscape */ $block->getItemPrice($_item) ?>
     </td>
 </tr>
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 2d263635718da..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
@@ -9,7 +9,7 @@
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
 <tr class="border" id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+    <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 links">
@@ -51,16 +51,16 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </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')) ?>">
+    <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')) ?>"><?= $block->escapeHtml($_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')) ?>"><?= /* @noEscape */ $_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 6e86dc5bf8785..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
@@ -9,7 +9,7 @@
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
 <tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+    <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 links">
@@ -50,14 +50,14 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </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')) ?>">
+    <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')) ?>"><?= $block->escapeHtml($_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 4caedd3e2d231..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
@@ -8,7 +8,7 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <tr id="order-item-row-<?= $block->escapeHtmlAttr($_item->getId()) ?>">
-    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+    <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 links">
@@ -51,39 +51,39 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </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')) ?>">
+    <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) : ?>
                 <li class="item">
                     <span class="title"><?= $block->escapeHtml(__('Ordered')) ?></span>
-                    <span class="content"><?= $block->escapeHtml($block->getItem()->getQtyOrdered()*1) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyOrdered() * 1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyShipped() > 0) : ?>
                 <li class="item">
                     <span class="title"><?= $block->escapeHtml(__('Shipped')) ?></span>
-                    <span class="content"><?= $block->escapeHtml($block->getItem()->getQtyShipped() * 1) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyShipped() * 1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyCanceled() > 0) : ?>
                 <li class="item">
                     <span class="title"><?= $block->escapeHtml(__('Canceled')) ?></span>
-                    <span class="content"><?= $block->escapeHtml($block->getItem()->getQtyCanceled()*1) ?></span>
+                    <span class="content"><?= (float)$block->getItem()->getQtyCanceled() * 1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyRefunded() > 0) : ?>
                 <li class="item">
                     <span class="title"><?= $block->escapeHtml(__('Refunded')) ?></span>
-                    <span class="content"><?= $block->escapeHtml($block->getItem()->getQtyRefunded()*1) ?></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 07336fa5c9957..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.*",
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/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/Test/Unit/Model/Attribute/Data/TextTest.php b/app/code/Magento/Eav/Test/Unit/Model/Attribute/Data/TextTest.php
index 8b16d286471b4..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
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Stdlib\StringUtils;
 
+/**
+ * Eav text attribute model test
+ */
 class TextTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -136,6 +139,7 @@ public function alphanumDataProvider(): array
                 'QazWsx12345',
                 [__('"%1" length must be equal or less than %2 characters.', 'Test', 10)],
             ],
+            [' 12345 ', true],
         ];
     }
 
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/composer.json b/app/code/Magento/Eav/composer.json
index b5f3c86947a0f..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.*",
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/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/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 6fda406b73483..4f2c13bfe023b 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -2,13 +2,14 @@
     "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": {
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 1044173d8921d..1f1594e036617 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -2,7 +2,7 @@
     "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.*"
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 9211bcffb0f71..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.*",
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 7ad147a15989a..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.*",
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index dec1440ecf174..514c600294906 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -2,7 +2,7 @@
     "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.*"
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 7c6a511f8b5e4..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.*",
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 5d84613c0e13c..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.*",
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 4e7573761f3a1..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.*",
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/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php b/app/code/Magento/GroupedProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/GroupedTest.php
index 327b47d4a75d8..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
@@ -82,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);
@@ -135,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();
@@ -155,7 +173,7 @@ protected function setUp()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function createModel()
     {
@@ -169,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);
@@ -189,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()
     {
@@ -226,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 57d9bc78aaf28..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,6 +148,9 @@ 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);
     }
 
     /**
@@ -143,18 +164,15 @@ public function modifyData(array $data)
         if ($modelId) {
             $storeId = $this->locator->getStore()->getId();
             $data[$product->getId()]['links'][self::LINK_TYPE] = [];
-            $linkedItems = $this->productLinkRepository->getList($product);
+            $linkedItems = $this->groupedProducts->getLinkedProducts($product);
             usort($linkedItems, function ($a, $b) {
                 return $a->getPosition() <=> $b->getPosition();
             });
+            $productLink = $this->productLinkFactory->create();
             foreach ($linkedItems as $index => $linkItem) {
-                if ($linkItem->getLinkType() !== self::LINK_TYPE) {
-                    continue;
-                }
                 /** @var \Magento\Catalog\Api\Data\ProductInterface $linkedProduct */
-                $linkedProduct = $this->productRepository->get($linkItem->getLinkedProductSku(), false, $storeId);
                 $linkItem->setPosition($index);
-                $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkedProduct, $linkItem);
+                $data[$modelId]['links'][self::LINK_TYPE][] = $this->fillData($linkItem, $productLink);
             }
             $data[$modelId][self::DATA_SOURCE_DEFAULT]['current_store_id'] = $storeId;
         }
@@ -167,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)
     {
@@ -176,12 +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(),
-            'positionCalculated' => $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
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 508b424b2c022..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.*",
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 9e9f1babad4a3..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.*",
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/Section/AdminIndexManagementSection.xml b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
index 07d93ff850221..dad163107eb3e 100644
--- a/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
+++ b/app/code/Magento/Indexer/Test/Mftf/Section/AdminIndexManagementSection.xml
@@ -12,5 +12,6 @@
         <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/composer.json b/app/code/Magento/Indexer/composer.json
index 6b8ee0825fc14..448a81b432a38 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 1643692addbec..e1bfd440ba96d 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -8,7 +8,7 @@
         "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/composer.json b/app/code/Magento/Integration/composer.json
index 5d457d76cb94e..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.*",
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index 328549074f9b8..c198c0635b164 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -2,7 +2,7 @@
     "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.*"
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 02824a6796fc7..b8b4c8384af09 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index a891dce37624d..18d55c4d68231 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -2,7 +2,7 @@
     "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.*",
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 405c11dfe8195..ef16e069e7d2f 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -2,7 +2,7 @@
     "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.*",
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 ee282ebb82eb9..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,20 +4,18 @@
  * 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;
@@ -46,23 +44,24 @@ $msrpPrice = $block->renderAmount(
 $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElementIdPrefix() : 'product-price-';
 ?>
 
-<?php if ($amount): ?>
-    <span class="old-price map-old-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
-    <span class="map-fallback-price normal-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
 
     $addToCartUrl = '';
     if ($product->isSaleable()) {
         /** @var Magento\Catalog\Block\Product\AbstractProduct $addToCartUrlGenerator */
-        $addToCartUrlGenerator = $block->getLayout()->getBlockSingleton('Magento\Catalog\Block\Product\AbstractProduct');
+        $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')->getEncodedUrl(
+                    $this->helper(\Magento\Framework\Url\Helper\Data::class)->getEncodedUrl(
                         $addToCartUrlGenerator->getAddToCartUrl($product)
                     ),
             ]]
@@ -90,30 +89,33 @@ $priceElementIdPrefix = $block->getPriceElementIdPrefix() ? $block->getPriceElem
     } else {
         $data['addToCart']['addToCartButton'] = sprintf(
             'form:has(input[type="hidden"][name="product"][value="%s"]) button[type="submit"]',
-            (int) $productId
+            (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/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/composer.json b/app/code/Magento/Multishipping/composer.json
index 48095da856e02..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.*",
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 4354cfb7c1c3e..761c1f1a78423 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -55,10 +55,6 @@
                 <div class="box-content">
                     <address>
                         <?= /* @noEscape */ $block->getCheckoutData()->getAddressHtml($block->getAddress()); ?>
-                        <input type="hidden"
-                               id="multishipping_billing_country_id"
-                               value="<?= /* @noEscape */ $block->getAddress()->getCountryId(); ?>"
-                               name="multishipping_billing_country_id"/>
                     </address>
                 </div>
             </div>
@@ -132,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">
@@ -165,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/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
index 51d964957c4d5..187f13417e0f4 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
@@ -12,7 +12,7 @@
         <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
-            <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>
+            <dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
                 <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
                 <?php if (isset($_formatedOptionValue['full_view'])) : ?>
                     <dl class="item options tooltip content">
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index b256b25716c87..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.*",
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/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/composer.json b/app/code/Magento/Newsletter/composer.json
index 9e02676e2488c..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.*",
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 747db3d70602e..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.*"
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/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 416181733dc07..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.*",
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/composer.json b/app/code/Magento/PageCache/composer.json
index e83801344dae7..e2c323bb9e84c 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -2,7 +2,7 @@
     "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.*",
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index 97dac29b4918b..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,14 +267,12 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            if (!empty($data['active'])) {
-                $storedTitle = $this->getMethodInstance($code)->getConfigData('title', $store);
-                if (!empty($storedTitle)) {
-                    $methods[$code] = $storedTitle;
-                } elseif (!empty($data['title'])) {
-                    $methods[$code] = $data['title'];
-                }
+            $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'];
             }
@@ -356,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/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 1df07f87a3054..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
 {
@@ -37,6 +37,9 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     private $appEmulation;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -57,6 +60,9 @@ protected function setUp()
         $this->helper = $objectManagerHelper->getObject($className, $arguments);
     }
 
+    /**
+     * @return void
+     */
     public function testGetMethodInstance()
     {
         list($code, $class, $methodInstance) = ['method_code', 'method_class', 'method_instance'];
@@ -170,6 +176,9 @@ public function testSortMethods(array $methodA, array $methodB)
         );
     }
 
+    /**
+     * @return void
+     */
     public function testGetMethodFormBlock()
     {
         list($blockType, $methodCode) = ['method_block_type', 'method_code'];
@@ -195,6 +204,9 @@ public function testGetMethodFormBlock()
         $this->assertSame($blockMock, $this->helper->getMethodFormBlock($methodMock, $layoutMock));
     }
 
+    /**
+     * @return void`
+     */
     public function testGetInfoBlock()
     {
         $blockType = 'method_block_type';
@@ -220,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'];
@@ -257,6 +272,23 @@ public function testGetInfoBlockHtml()
         $this->assertEquals($blockHtml, $this->helper->getInfoBlockHtml($infoMock, $storeId));
     }
 
+    /**
+     * @return array
+     */
+    public function getSortMethodsDataProvider()
+    {
+        return [
+            [
+                ['code' => 'methodA', 'data' => ['sort_order' => 0]],
+                ['code' => 'methodB', 'data' => ['sort_order' => 1]]
+            ],
+            [
+                ['code' => 'methodA', 'data' => ['sort_order' => 2]],
+                ['code' => 'methodB', 'data' => ['sort_order' => 1]],
+            ]
+        ];
+    }
+
     /**
      * @param bool $sorted
      * @param bool $asLabelValue
@@ -288,17 +320,10 @@ public function testGetPaymentMethodList(
                 ]
             );
 
+        $titlePath = sprintf('%s/%s/title', Data::XML_PATH_PAYMENT_METHODS, $paymentMethod['code']);
         $this->scopeConfig->method('getValue')
-            ->with(sprintf('%s/%s/model', Data::XML_PATH_PAYMENT_METHODS, $paymentMethod['code']))
-            ->willReturn(\Magento\Payment\Model\Method\AbstractMethod::class);
-
-        $methodInstanceMock = $this->getMockBuilder(\Magento\Payment\Model\MethodInterface::class)
-            ->getMockForAbstractClass();
-        $methodInstanceMock->method('getConfigData')
-            ->with('title', null)
+            ->with($titlePath, ScopeInterface::SCOPE_STORE, null)
             ->willReturn($configTitle);
-        $this->methodFactory->method('create')
-            ->willReturn($methodInstanceMock);
 
         $this->paymentConfig->method('getGroups')
             ->willReturn($groups);
@@ -307,23 +332,6 @@ public function testGetPaymentMethodList(
         $this->assertEquals($expectedPaymentMethodList, $paymentMethodList);
     }
 
-    /**
-     * @return array
-     */
-    public function getSortMethodsDataProvider()
-    {
-        return [
-            [
-                ['code' => 'methodA', 'data' => ['sort_order' => 0]],
-                ['code' => 'methodB', 'data' => ['sort_order' => 1]]
-            ],
-            [
-                ['code' => 'methodA', 'data' => ['sort_order' => 2]],
-                ['code' => 'methodB', 'data' => ['sort_order' => 1]],
-            ]
-        ];
-    }
-
     /**
      * @return array
      */
@@ -345,27 +353,12 @@ public function paymentMethodListDataProvider(): array
                     ],
                     ['payment_method' => 'Config Payment Title'],
                 ],
-            'Payment method with default title' =>
-                [
-                    true,
-                    false,
-                    false,
-                    null,
-                    [
-                        'code' => 'payment_method',
-                        'data' => [
-                            'active' => 1,
-                            'title' => 'Payment Title',
-                        ],
-                    ],
-                    ['payment_method' => 'Payment Title'],
-                ],
             'Payment method as value => label' =>
                 [
                     true,
                     true,
                     false,
-                    null,
+                    'Payment Title',
                     [
                         'code' => 'payment_method',
                         'data' => [
@@ -385,7 +378,7 @@ public function paymentMethodListDataProvider(): array
                     true,
                     true,
                     true,
-                    null,
+                    'Payment Title',
                     [
                         'code' => 'payment_method',
                         'data' => [
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 2f00b878417bd..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.*",
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 1e352e4297131..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
@@ -125,12 +125,7 @@ define([
                 this.isPlaceOrderActionAllowed(false);
 
                 $.when(
-                    setPaymentInformationAction(
-                        this.messageContainer,
-                        {
-                            method: this.getCode()
-                        }
-                    )
+                    this.setPaymentInformation()
                 ).done(
                     this.done.bind(this)
                 ).fail(
@@ -145,6 +140,18 @@ define([
             }
         },
 
+        /**
+         * {Function}
+         */
+        setPaymentInformation: function () {
+            setPaymentInformationAction(
+                this.messageContainer,
+                {
+                    method: this.getCode()
+                }
+            );
+        },
+
         /**
          * {Function}
          */
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/Payflow/Transparent.php b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
index 68b3389ac858e..3676e54624e0a 100644
--- a/app/code/Magento/Paypal/Model/Payflow/Transparent.php
+++ b/app/code/Magento/Paypal/Model/Payflow/Transparent.php
@@ -61,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
@@ -78,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
@@ -100,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 = []
@@ -125,6 +132,7 @@ public function __construct(
         $this->responseValidator = $responseValidator;
         $this->paymentTokenFactory = $paymentTokenFactory;
         $this->paymentExtensionFactory = $paymentExtensionFactory;
+        $this->payPalCartFactory = $payPalCartFactory;
     }
 
     /**
@@ -166,15 +174,18 @@ 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('itemamt', $this->formatPrice($order->getBaseSubtotal()));
-        $request->setData('taxamt', $this->calculateTaxAmount($order));
-        $request->setData('freightamt', $this->formatPrice($order->getBaseShippingAmount()));
-        $request->setData('discount', $this->formatPrice(abs($order->getBaseDiscountAmount())));
+        $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);
@@ -291,20 +302,4 @@ public function capture(InfoInterface $payment, $amount)
 
         return $this;
     }
-
-    /**
-     * Calculates tax amount including discount compensation for product/shipping price included tax.
-     *
-     * @param OrderInterface $order
-     * @return string
-     */
-    private function calculateTaxAmount(
-        OrderInterface $order
-    ): string {
-        return $this->formatPrice(
-            $order->getBaseTaxAmount()
-            + $order->getBaseDiscountTaxCompensationAmount()
-            + $order->getBaseShippingDiscountTaxCompensationAmnt()
-        );
-    }
 }
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 dd113562783aa..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,8 +33,6 @@ 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(
                 [
@@ -44,8 +44,19 @@ protected function setUp()
             )->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/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/Payflow/TransparentTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php
index aa321a27e7617..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,463 +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',
-                'getBaseSubtotal',
-                'getBaseTaxAmount',
-                'getBaseDiscountTaxCompensationAmount',
-                'getBaseShippingDiscountTaxCompensationAmnt',
-                'getBaseShippingAmount',
-                'getBaseDiscountAmount',
-            ])
-            ->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();
 
-        $this->paymentMock->expects($this->once())
-            ->method('getAdditionalInformation')
-            ->with(Payflowpro::PNREF)
-            ->willReturn('test-pnref');
+        $storeManager->method('getStore')->willReturn($store);
+
+        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();
-
-        $this->orderMock->expects($this->once())->method('getBaseSubtotal');
-        $this->orderMock->expects($this->once())->method('getBaseTaxAmount');
-        $this->orderMock->expects($this->once())->method('getBaseDiscountTaxCompensationAmount');
-        $this->orderMock->expects($this->once())->method('getBaseShippingDiscountTaxCompensationAmnt');
-        $this->orderMock->expects($this->once())->method('getBaseShippingAmount');
-        $this->orderMock->expects($this->once())->method('getBaseDiscountAmount');
-
-        $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 5ee1739253ced..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.*",
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
index c2c7032ae8060..9d6fd95cf8dcb 100644
--- a/app/code/Magento/PaypalCaptcha/composer.json
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-paypal-captcha",
     "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-captcha": "100.2.*",
         "magento/module-checkout": "100.2.*",
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
index 2d8c1a174b013..9e4551cabeb8e 100644
--- a/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/ActionGroup/StorefrontCustomerActionGroup.xml
@@ -19,4 +19,18 @@
                      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 df8fb91bdabc6..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>
@@ -34,4 +34,60 @@
     <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 dc9d0eddc09c3..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,16 +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/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
index 785fc66a4929a..963e453e9a460 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml
@@ -54,7 +54,7 @@
              stepKey="seeLoggedInCustomerWelcomeMessage"/>
         <!--Logout and check default welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
-        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
+        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" stepKey="seeCustomerSignOutPageUrl"/>
         <see userInput="Default welcome msg!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeDefaultWelcomeMessage"/>
@@ -71,7 +71,7 @@
 
         <!--Logout and check persistent customer welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
-        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
+        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" stepKey="seeCustomerSignOutPageUrl1"/>
         <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seePersistentWelcomeMessage"/>
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/composer.json b/app/code/Magento/Persistent/composer.json
index 0bfbc30e28f69..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.*",
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index d2b7a8014d9a6..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.*",
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
index 621caea0cfc6d..4e14285c8ee56 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/ActionGroup/AdminProductVideoActionGroup.xml
@@ -24,7 +24,7 @@
         <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}}" wait="30" stepKey="waitForSaveButtonVisible"/>
+        <waitForElementNotVisible selector="{{AdminProductNewVideoSection.saveButtonDisabled}}" time="30" stepKey="waitForSaveButtonVisible"/>
         <click selector="{{AdminProductNewVideoSection.saveButton}}" stepKey="saveVideo"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 1ce56ff4996ab..f33f9d8f23244 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -10,9 +10,9 @@
         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="video" selector=".fotorama__stage__shaft"/>
-        <element name="videoPausedMode" type="video" selector="[class*='paused-mode']"/>
-        <element name="videoPlayedMode" type="video" selector="[class*='playing-mode']"/>
-        <element name="frameVideo" type="video" selector="widget2"/>
+        <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/composer.json b/app/code/Magento/ProductVideo/composer.json
index d92ab26d39fe5..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.*",
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/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/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/composer.json b/app/code/Magento/Quote/composer.json
index 202a5b601ceab..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.*",
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index bc43c38421650..e3bff4f35a91c 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index d16734d45f048..8c61d21882a07 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -2,7 +2,7 @@
     "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.*"
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/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/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/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/Section/AdminOrderReportMainActionsSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.xml
index c4a96537740ee..3b05c19cd59e9 100644
--- a/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Section/AdminOrderReportMainActionsSection.xml
@@ -9,7 +9,7 @@
 <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" time="30" selector="#filter_form_submit"/>
-        <element name="refreshStatistics" type="text" time="30" selector="//a[contains(text(), 'here')]"/>
+        <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/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 f9c0c3568b077..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.*",
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 5c947c8d8e85d..d04f8695e881a 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -2,7 +2,7 @@
     "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",
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index d4079bbed3e3c..5efead952280e 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -7,7 +7,7 @@
 namespace Magento\Review\Block\Adminhtml;
 
 /**
- * Review edit form
+ * Review edit form.
  */
 class Edit extends \Magento\Backend\Block\Widget\Form\Container
 {
@@ -79,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
@@ -95,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'),
+                                ]]],
                             ],
                         ],
                     ]
@@ -115,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'),
+                                ]]],
                             ],
                         ],
                     ]
@@ -128,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
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/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 68f178911dc7c..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()
@@ -20,7 +31,7 @@ public function execute()
         $reviewId = $this->getRequest()->getParam('id', false);
         if ($this->getRequest()->isPost()) {
             try {
-                $this->reviewFactory->create()->setId($reviewId)->aggregate()->delete();
+                $this->getModel()->aggregate()->delete();
 
                 $this->messageManager->addSuccess(__('The review has been deleted.'));
                 if ($this->getRequest()->getParam('ret') == 'pending') {
@@ -39,4 +50,46 @@ public function execute()
 
         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 954c393276c14..c9d0f5f0259b1 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassDelete.php
@@ -5,13 +5,53 @@
  */
 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
      */
@@ -26,8 +66,7 @@ public function execute()
             $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(
@@ -44,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 a5850a6896321..edcef8c8d6653 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/MassUpdateStatus.php
@@ -5,13 +5,53 @@
  */
 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
      */
@@ -27,8 +67,7 @@ public function execute()
         } 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(
@@ -48,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/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 857f36b19a19c..44a6aba172b15 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Save.php
@@ -8,12 +8,18 @@
 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.
      *
@@ -25,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 {
@@ -66,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('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/composer.json b/app/code/Magento/Review/composer.json
index 4cc5cfc8d3f03..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.*",
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/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index b95b473c0af70..2b75ef9681ee3 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index 9cf847e152ae7..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.*"
     },
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 0a8acfe4981e1..1f5051995ae22 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -2,7 +2,7 @@
     "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.*",
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 32bcc015e2121..a2b9d869f364e 100644
--- a/app/code/Magento/Rule/Block/Editable.php
+++ b/app/code/Magento/Rule/Block/Editable.php
@@ -62,7 +62,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
                 '" data-form-part="' .
                 $element->getData('data-form-part') .
                 '"/> ' .
-                htmlspecialchars(
+                $this->escapeHtml(
                     $valueName
                 ) . '&nbsp;';
         } else {
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 33341dcf1e778..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.*",
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/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/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/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 3cdc8f4bca210..818acb2e5953f 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -164,7 +164,7 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                 //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);
@@ -187,6 +187,7 @@ 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') {
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 99393f77397c1..1b3462cfdaac4 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -399,6 +399,7 @@ protected function _getQuoteItem($item)
      */
     public function initRuleData()
     {
+        $this->_coreRegistry->unregister('rule_data');
         $this->_coreRegistry->register(
             'rule_data',
             new \Magento\Framework\DataObject(
@@ -416,7 +417,8 @@ public function initRuleData()
     /**
      * Set collect totals flag for quote
      *
-     * @param   bool $flag
+     * @param bool $flag
+     *
      * @return $this
      */
     public function setRecollect($flag)
@@ -515,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();
@@ -771,7 +776,7 @@ public function getCustomerCompareList()
     public function getCustomerGroupId()
     {
         $groupId = $this->getQuote()->getCustomerGroupId();
-        if (!$groupId) {
+        if (!isset($groupId)) {
             $groupId = $this->getSession()->getCustomerGroupId();
         }
 
@@ -1127,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);
         }
@@ -1782,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())
@@ -1854,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. */
             }
@@ -1995,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/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/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
index ed63da75df9e1..033b6e512f63a 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminInvoiceActionGroup.xml
@@ -64,4 +64,21 @@
         <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/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/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/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/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/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
index 2332ea3723a42..9808782f39f9b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateOrderWithBundleProductTest.xml
@@ -19,7 +19,7 @@
 
         <before>
             <!--Set default flat rate shipping method settings-->
-            <createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
 
             <!--Create simple customer-->
             <createData entity="Simple_US_CA_Customer" stepKey="simpleCustomer"/>
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/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/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/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/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/composer.json b/app/code/Magento/Sales/composer.json
index a2730b255639f..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.*",
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 98cc0d1d0ad07..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']): ?>
-                    <?= /* @escapeNotVerified */ $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 1fd466c096663..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,7 +4,7 @@
  * 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
@@ -12,9 +12,9 @@
 $addressCollection = $block->getData('customerAddressCollection');
 
 $addressArray = [];
-if ($block->getCustomerId()) {
+if ($block->getCustomerId()) :
     $addressArray = $addressCollection->setCustomerFilter([$block->getCustomerId()])->toArray();
-}
+endif;
 
 /**
  * @var \Magento\Sales\ViewModel\Customer\AddressFormatter $customerAddressFormatter
@@ -24,60 +24,57 @@ $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.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 ($addressArray as $addressId => $address): ?>
+                    <option value=""><?= $block->escapeHtml(__('Add New Address')) ?></option>
+                    <?php foreach ($addressArray as $addressId => $address) : ?>
                         <option
-                            value="<?= /* @escapeNotVerified */ $addressId ?>"<?php if ($addressId == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
-                            <?= /* @escapeNotVerified */ $block->escapeHtml($customerAddressFormatter->getAddressAsString($address)) ?>
+                            value="<?= $block->escapeHtmlAttr($addressId) ?>"<?php if ($addressId == $block->getAddressId()) : ?> selected="selected"<?php endif; ?>>
+                            <?= $block->escapeHtml($customerAddressFormatter->getAddressAsString($address)) ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
@@ -85,31 +82,27 @@ endif; ?>
         </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 643146f7bb5cb..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,52 +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 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>
-                    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount">
-                        <?= /* @escapeNotVerified */ $block->formatPrice(($amount*(float)$rate['percent'])/$percent) ?>
+                    <td style="<?= $block->escapeHtmlAttr($block->getTotal()->getStyle()) ?>" class="admin__total-amount">
+                        <?= /* @noEscape */ $block->formatPrice(($amount*(float)$rate['percent'])/$percent) ?>
                     </td>
                 </tr>
                 <?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 b0b52b199978a..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; ?>
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 0d873645bce86..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="3">&nbsp;</td>
-                        <td><?= $block->getUpdateButtonHtml() ?></td>
-                        <td colspan="4">&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') ?>
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 bbd6394097f9e..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,45 +60,45 @@ $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>
                         <td><?= $block->escapeHtml($order->getBaseToOrderRate()) ?></td>
@@ -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 a262178a63cb1..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
@@ -569,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){
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 6de8e42dea583..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,30 +4,30 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 ?>
 <?php $_shipment = $block->getShipment() ?>
-<?php $_order = $block->getOrder() ?>
-<?php if ($_shipment && $_order): ?>
-<?php $trackCollection = $_order->getTracksCollection($_shipment->getId()) ?>
-<?php if ($trackCollection): ?>
-    <br />
-    <table class="shipment-track">
-        <thead>
-        <tr>
-            <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
-            <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php foreach ($trackCollection as $_item): ?>
+<?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>
-                <td><?= $block->escapeHtml($_item->getTitle()) ?>:</td>
-                <td><?= $block->escapeHtml($_item->getNumber()) ?></td>
+                <th><?= $block->escapeHtml(__('Shipped By')) ?></th>
+                <th><?= $block->escapeHtml(__('Tracking Number')) ?></th>
             </tr>
-        <?php endforeach ?>
-        </tbody>
-    </table>
-<?php endif; ?>
+            </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 89be190588677..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="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 a2ab3d02b13ea..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') ?>#my-orders-table">
-                        <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 f6f2eaf29a70f..6d19d885114b2 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index 28064cf97305e..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.*",
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/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
index 423cd1543117b..637828c993fa0 100644
--- a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
+++ b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -231,11 +231,6 @@ private function getCouponCodeSelect($couponCode)
 
         $this->joinCouponTable($couponCode, $couponSelect);
 
-        $notExpired = $this->getConnection()->quoteInto(
-            '(rule_coupons.expiration_date IS NULL OR rule_coupons.expiration_date >= ?)',
-            $this->_date->date()->format('Y-m-d')
-        );
-
         $isAutogenerated =
             $this->getConnection()->quoteInto('main_table.coupon_type = ?', Rule::COUPON_TYPE_AUTO)
             . ' AND ' .
@@ -250,7 +245,7 @@ private function getCouponCodeSelect($couponCode)
             . ')';
 
         $couponSelect->where(
-            "$notExpired AND ($isAutogenerated OR $isValidSpecific)",
+            "$isAutogenerated OR $isValidSpecific",
             null,
             Select::TYPE_CONDITION
         );
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/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/Data/SalesCouponData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
index 99d02998fac23..2e56367fe9d56 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesCouponData.xml
@@ -15,4 +15,10 @@
         <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/SalesRuleData.xml b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
index e85eea62d473e..8637b79421fde 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
@@ -236,4 +236,33 @@
         <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/Section/AdminCartPriceRuleDiscountSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml
index 257452d6cd27a..d388cc4b61628 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRuleDiscountSection.xml
@@ -12,6 +12,6 @@
         <element name="couponInput" type="input" selector="#coupon_code"/>
         <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-coupon-form button[class*='cancel']" timeout="30"/>
+        <element name="cancelButton" type="text" selector="#discount-form .action-cancel" timeout="30"/>
     </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 582e50cc766e0..108b845008d1a 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontDiscountSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/StorefrontDiscountSection.xml
@@ -14,5 +14,7 @@
         <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/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/composer.json b/app/code/Magento/SalesRule/composer.json
index bf19520c7b552..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.*",
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index a0c93b6310910..40a04df8f0530 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -2,7 +2,7 @@
     "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",
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 31358c933acd3..3dadf9d2183e4 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -2,7 +2,7 @@
     "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": {
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/composer.json b/app/code/Magento/Search/composer.json
index 0ade5ca67b6ee..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.*",
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 a7635b7dc3fbe..888d5b678569f 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -35,7 +35,8 @@ $helper = $this->helper(\Magento\Search\Helper\Data::class);
                            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>
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/composer.json b/app/code/Magento/Security/composer.json
index c3e632a8216a4..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.*"
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/Model/SendFriend.php b/app/code/Magento/SendFriend/Model/SendFriend.php
index 38525a9f83a12..2502db9891241 100644
--- a/app/code/Magento/SendFriend/Model/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/SendFriend.php
@@ -178,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()),
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/composer.json b/app/code/Magento/SendFriend/composer.json
index de252db3f3969..d0da89fdba3fb 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -2,7 +2,7 @@
     "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.*",
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/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/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/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 a8bb256cdd305..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.*",
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 e74ebca61264f..fa9fe7a84221b 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -14,14 +14,16 @@
         </thead>
         <?php $_items = $block->getShipment()->getAllItems() ?>
         <?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>
+            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/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json
index 62ecc442c3138..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.*",
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 7279f6eda85d7..de2ba3963c61f 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -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/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 acc5c9d8f33a0..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.*",
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/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/composer.json b/app/code/Magento/Store/composer.json
index 6059432d66038..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.*",
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index 67278bfd2b4a9..c3a5d174a0d8e 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -2,7 +2,7 @@
     "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",
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
index f2b5cb08948a4..803233d434401 100644
--- a/app/code/Magento/SwaggerWebapi/composer.json
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index 2c00224083bfc..06e47496e172d 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -299,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'] => [
@@ -307,7 +308,9 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
      *      ...,
      *      ]
      * ]
+     *
      * @param ModelProduct $product
+     *
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -545,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/composer.json b/app/code/Magento/Swatches/composer.json
index 609fe43345d19..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.*",
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 e00c41d371c9e..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-swatch-min-width 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-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="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/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/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index 61fee9b5279a6..35b3ebe9bf61a 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -2,7 +2,7 @@
     "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": "*"
     },
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/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/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 be194636c1ec4..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.*",
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/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/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/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 72a442e29caca..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.*",
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/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index baf2f3878ad9b..1a25550d93937 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -178,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);
         }
@@ -245,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>';
             }
 
@@ -262,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>';
         }
 
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/composer.json b/app/code/Magento/Theme/composer.json
index e83b49bbbee03..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.*",
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/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 ef46f4bfed825..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: {
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/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/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
index 6529b360efc3c..96d0ba6c94715 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -30,7 +30,7 @@ $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"
                      data-role="collapsible">
                     <a class="<?= $block->escapeHtmlAttr($groupCss) ?>-item-switch"
                        data-toggle="switch" href="#<?= $block->escapeHtmlAttr($alias) ?>">
-                        <?= $block->escapeHtml($label) ?>
+                        <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
                 <div class="section-item-content <?= $block->escapeHtmlAttr($groupCss) ?>-item-content"
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 6df2b10ac34b3..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,12 +21,12 @@ require([
 //<![CDATA[
     $.extend(true, $, {
         calendarConfig: {
-            dayNames: <?= $block->escapeJs($days['wide']) ?>,
-            dayNamesMin: <?= $block->escapeJs($days['abbreviated']) ?>,
-            monthNames: <?= $block->escapeJs($months['wide']) ?>,
-            monthNamesShort: <?= $block->escapeJs($months['abbreviated']) ?>,
+            dayNames: <?= /* @noEscape */ $days['wide'] ?>,
+            dayNamesMin: <?= /* @noEscape */ $days['abbreviated'] ?>,
+            monthNames: <?= /* @noEscape */ $months['wide'] ?>,
+            monthNamesShort: <?= /* @noEscape */ $months['abbreviated'] ?>,
             infoTitle: "<?= $block->escapeJs(__('About the calendar')) ?>",
-            firstDay: <?= $block->escapeJs($firstDay) ?>,
+            firstDay: <?= (int)$firstDay ?>,
             closeText: "<?= $block->escapeJs(__('Close')) ?>",
             currentText: "<?= $block->escapeJs(__('Go Today')) ?>",
             prevText: "<?= $block->escapeJs(__('Previous')) ?>",
@@ -51,7 +51,7 @@ require([
         }
     });
 
-    enUS = <?= $block->escapeJs($enUS) ?>; // en_US locale reference
+    enUS = <?= /* @noEscape */ $enUS ?>; // en_US locale reference
 //]]>
 
 });
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/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 dd9e78d16614d..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.*",
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/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/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/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/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 cbe5d9e158bb3..5dc5798c2c06b 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml
@@ -22,5 +22,6 @@
         <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/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/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/composer.json b/app/code/Magento/Ui/composer.json
index 4ad83870331a4..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.*",
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/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/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/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/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 8a124a7c10f80..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.*",
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/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/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 82d0ce9cd8365..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.*",
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/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 baea1b497fc58..96e2f92dfece0 100644
--- a/app/code/Magento/User/Test/Mftf/Data/UserData.xml
+++ b/app/code/Magento/User/Test/Mftf/Data/UserData.xml
@@ -41,4 +41,21 @@
             <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/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 513a34639b0a5..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.*",
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 93456fb9a0a94..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.*",
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index bfa87d1d5c935..c1c577934b23f 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -2,7 +2,7 @@
     "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.*",
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index fa6ffe8f1d884..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.*",
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index d8bfd8061aad1..8af6cbc770af2 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -2,7 +2,7 @@
     "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",
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 d13034eddd5ac..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.*",
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 6a2c3469f670a..7a8005f702e5e 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
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 efb6bddb9289c..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.*",
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/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/composer.json b/app/code/Magento/Widget/composer.json
index fc63ae00bdb7a..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.*",
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 7ca94b1f284f5..044a5e2907e8b 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -28,6 +28,11 @@
  */
 class Send extends \Magento\Wishlist\Controller\AbstractIndex
 {
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @var \Magento\Customer\Helper\View
      */
@@ -102,6 +107,7 @@ class Send extends \Magento\Wishlist\Controller\AbstractIndex
      * @param StoreManagerInterface $storeManager
      * @param CaptchaHelper|null $captchaHelper
      * @param CaptchaStringResolver|null $captchaStringResolver
+     * @param \Magento\Framework\Escaper|null $escaper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -117,7 +123,8 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         StoreManagerInterface $storeManager,
         CaptchaHelper $captchaHelper = null,
-        CaptchaStringResolver $captchaStringResolver = null
+        CaptchaStringResolver $captchaStringResolver = null,
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->_formKeyValidator = $formKeyValidator;
         $this->_customerSession = $customerSession;
@@ -132,7 +139,9 @@ public function __construct(
         $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);
     }
 
@@ -185,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 {
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/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 7a88d6db79200..b40f26f2b1a1a 100644
--- a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml
@@ -90,7 +90,7 @@
 
     <actionGroup name="StorefrontValidateQtyAfterEditProductInWishlist" extends="StorefrontCustomerEditProductInWishlist">
         <arguments>
-            <argument name="maxQtyAllowed" type="string" default="10000"/>
+            <argument name="maxQtyAllowed" type="string" defaultValue="10000"/>
         </arguments>
         <remove keyForRemoval="successMessage"/>
         <waitForAjaxLoad after="submitUpdateWishlist" stepKey="waitForAjaxLoad"/>
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index e99e0488284b9..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.*",
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 6acee91b65ff2..f24bba445c102 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
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/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
index 248c7d2947174..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 {
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 fb11aa2dc159f..752f8a588e438 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -2,7 +2,7 @@
     "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",
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 9a5f9af5bfd68..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
@@ -206,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/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 951ca89a07988..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
@@ -94,7 +94,6 @@
                 .reviews-actions {
                     font-size: @font-size__s;
                     margin-top: 5px;
-                    text-transform: lowercase;
                 }
             }
 
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index f691cc8e9eb5f..0660b46cfa11f 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -2,7 +2,7 @@
     "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",
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/_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/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
index 6bf766b7400a7..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
@@ -99,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_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_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/composer.json b/app/design/frontend/Magento/luma/composer.json
index f5ba64ad9ed57..e5a5ab147fb99 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -2,7 +2,7 @@
     "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.*"
     },
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/etc/di.xml b/app/etc/di.xml
index 5e7d4f67b8b23..4309d84773e03 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -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>
diff --git a/composer.json b/composer.json
index 5aee77e9b7f0d..1ab53d8a10a87 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "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": "*",
@@ -75,7 +76,7 @@
     },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
-        "magento/magento2-functional-testing-framework": "2.4.0",
+        "magento/magento2-functional-testing-framework": "2.4.1",
         "phpunit/phpunit": "~6.2.0",
         "squizlabs/php_codesniffer": "3.2.2",
         "phpmd/phpmd": "@stable",
@@ -271,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 cfb522e93182c..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": "dd391f1f6e3f43c8dfca7382fdff369c",
+    "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,7 +197,7 @@
             ],
             "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",
@@ -556,21 +553,21 @@
         },
         {
             "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": {
@@ -582,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",
@@ -671,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": {
@@ -714,7 +714,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2017-06-21T14:56:23+00:00"
+            "time": "2018-08-09T15:03:40+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -979,18 +979,67 @@
             ],
             "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.15",
+            "version": "2.0.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0"
+                "reference": "d6819a55b05e123db1e881d8b230d57f912126be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
-                "reference": "11cf67cf78dc4acb18dc9149a57be4aee5036ce0",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d6819a55b05e123db1e881d8b230d57f912126be",
+                "reference": "d6819a55b05e123db1e881d8b230d57f912126be",
                 "shasum": ""
             },
             "require": {
@@ -1069,7 +1118,7 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2019-03-10T16:53:45+00:00"
+            "time": "2019-06-23T16:33:11+00:00"
         },
         {
             "name": "psr/container",
@@ -1440,7 +1489,7 @@
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.49",
+            "version": "v2.8.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
@@ -1501,7 +1550,7 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -1611,7 +1660,7 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.49",
+            "version": "v2.8.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
@@ -1671,16 +1720,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb"
+                "reference": "70adda061ef83bb7def63a17953dc41f203308a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/acf99758b1df8e9295e6b85aa69f294565c9fedb",
-                "reference": "acf99758b1df8e9295e6b85aa69f294565c9fedb",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/70adda061ef83bb7def63a17953dc41f203308a7",
+                "reference": "70adda061ef83bb7def63a17953dc41f203308a7",
                 "shasum": ""
             },
             "require": {
@@ -1717,20 +1766,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-04T21:34:32+00:00"
+            "time": "2019-06-23T09:29:17+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "fcdde4aa38f48190ce70d782c166f23930084f9b"
+                "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/fcdde4aa38f48190ce70d782c166f23930084f9b",
-                "reference": "fcdde4aa38f48190ce70d782c166f23930084f9b",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/5f80266a729e30bbcc37f8bf0e62c3d5a38c8208",
+                "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208",
                 "shasum": ""
             },
             "require": {
@@ -1766,7 +1815,7 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-22T14:44:53+00:00"
+            "time": "2019-05-30T15:47:52+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -1887,7 +1936,7 @@
         },
         {
             "name": "symfony/process",
-            "version": "v2.8.49",
+            "version": "v2.8.50",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
@@ -1936,16 +1985,16 @@
         },
         {
             "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": {
@@ -1978,7 +2027,7 @@
                 "javascript",
                 "minifier"
             ],
-            "time": "2018-09-16T00:02:51+00:00"
+            "time": "2019-06-15T23:11:19+00:00"
         },
         {
             "name": "true/punycode",
@@ -2610,6 +2659,67 @@
             ],
             "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.9.1",
@@ -3754,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": {
@@ -3803,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",
@@ -4502,16 +4612,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.3.2",
+            "version": "1.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "d17708133b6c276d6e42ef887a877866b909d892"
+                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/d17708133b6c276d6e42ef887a877866b909d892",
-                "reference": "d17708133b6c276d6e42ef887a877866b909d892",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
+                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
                 "shasum": ""
             },
             "require": {
@@ -4542,7 +4652,7 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2019-01-28T20:25:53+00:00"
+            "time": "2019-05-27T17:52:04+00:00"
         },
         {
             "name": "consolidation/annotated-command",
@@ -4813,16 +4923,16 @@
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "3.4.1",
+            "version": "3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "0881112642ad9059071f13f397f571035b527cb9"
+                "reference": "99ec998ffb697e0eada5aacf81feebfb13023605"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/0881112642ad9059071f13f397f571035b527cb9",
-                "reference": "0881112642ad9059071f13f397f571035b527cb9",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605",
+                "reference": "99ec998ffb697e0eada5aacf81feebfb13023605",
                 "shasum": ""
             },
             "require": {
@@ -4910,7 +5020,7 @@
                 }
             ],
             "description": "Format text by applying transformations provided by plug-in formatters.",
-            "time": "2019-03-14T03:45:44+00:00"
+            "time": "2019-05-30T23:16:01+00:00"
         },
         {
             "name": "consolidation/robo",
@@ -5320,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": {
@@ -5342,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/",
@@ -5364,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",
@@ -5420,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": {
@@ -5476,7 +5592,7 @@
                 "selenium",
                 "webdriver"
             ],
-            "time": "2018-05-16T17:37:13+00:00"
+            "time": "2019-06-13T08:02:18+00:00"
         },
         {
             "name": "flow/jsonpath",
@@ -6069,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": {
@@ -6118,7 +6234,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-1.x": "1.13-dev"
+                    "dev-1.x": "1.14-dev"
                 }
             },
             "autoload": {
@@ -6149,7 +6265,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2018-07-25T13:58:54+00:00"
+            "time": "2019-04-17T08:12:16+00:00"
         },
         {
             "name": "league/container",
@@ -6285,16 +6401,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "ef534dbcb3aeea68f9254dfd018165c546ad2edb"
+                "reference": "9b5de03fe069d4a36c911112c30b824ff4e80c3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/ef534dbcb3aeea68f9254dfd018165c546ad2edb",
-                "reference": "ef534dbcb3aeea68f9254dfd018165c546ad2edb",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/9b5de03fe069d4a36c911112c30b824ff4e80c3a",
+                "reference": "9b5de03fe069d4a36c911112c30b824ff4e80c3a",
                 "shasum": ""
             },
             "require": {
@@ -6354,7 +6470,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2019-04-29T20:56:26+00:00"
+            "time": "2019-06-10T17:57:40+00:00"
         },
         {
             "name": "mikey179/vfsStream",
@@ -6788,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": {
@@ -6835,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",
@@ -7002,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": {
@@ -7032,8 +7148,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
+                "psr-4": {
+                    "Prophecy\\": "src/Prophecy"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -7061,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",
@@ -8198,16 +8314,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "c0fadd368c1031109e996316e53ffeb886d37ea1"
+                "reference": "53266c9a1536e2dc673eb1efb6a6142ef84c6282"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/c0fadd368c1031109e996316e53ffeb886d37ea1",
-                "reference": "c0fadd368c1031109e996316e53ffeb886d37ea1",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/53266c9a1536e2dc673eb1efb6a6142ef84c6282",
+                "reference": "53266c9a1536e2dc673eb1efb6a6142ef84c6282",
                 "shasum": ""
             },
             "require": {
@@ -8251,20 +8367,20 @@
             ],
             "description": "Symfony BrowserKit Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-23T15:06:07+00:00"
+            "time": "2019-06-09T14:27:26+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "177a276c01575253c95cefe0866e3d1b57637fe0"
+                "reference": "29a33f66194fbe2ed4555981810f15fd8440e4a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/177a276c01575253c95cefe0866e3d1b57637fe0",
-                "reference": "177a276c01575253c95cefe0866e3d1b57637fe0",
+                "url": "https://api.github.com/repos/symfony/config/zipball/29a33f66194fbe2ed4555981810f15fd8440e4a8",
+                "reference": "29a33f66194fbe2ed4555981810f15fd8440e4a8",
                 "shasum": ""
             },
             "require": {
@@ -8315,7 +8431,7 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-23T15:06:07+00:00"
+            "time": "2019-05-30T15:47:52+00:00"
         },
         {
             "name": "symfony/dependency-injection",
@@ -8389,16 +8505,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "d40023c057393fb25f7ca80af2a56ed948c45a09"
+                "reference": "adb96e63af6fb0cc721cc69861001d60d0133d0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/d40023c057393fb25f7ca80af2a56ed948c45a09",
-                "reference": "d40023c057393fb25f7ca80af2a56ed948c45a09",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/adb96e63af6fb0cc721cc69861001d60d0133d0c",
+                "reference": "adb96e63af6fb0cc721cc69861001d60d0133d0c",
                 "shasum": ""
             },
             "require": {
@@ -8442,20 +8558,20 @@
             ],
             "description": "Symfony DomCrawler Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-23T15:06:07+00:00"
+            "time": "2019-05-30T15:47:52+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "9a96d77ceb1fd913c9d4a89e8a7e1be87604be8a"
+                "reference": "8cfbf75bb3a72963b12c513a73e9247891df24f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9a96d77ceb1fd913c9d4a89e8a7e1be87604be8a",
-                "reference": "9a96d77ceb1fd913c9d4a89e8a7e1be87604be8a",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8cfbf75bb3a72963b12c513a73e9247891df24f8",
+                "reference": "8cfbf75bb3a72963b12c513a73e9247891df24f8",
                 "shasum": ""
             },
             "require": {
@@ -8496,20 +8612,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2019-02-23T15:06:07+00:00"
+            "time": "2019-06-22T20:10:25+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "926e3b797e6bb66c0e4d7da7eff3a174f7378bcf"
+                "reference": "ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/926e3b797e6bb66c0e4d7da7eff3a174f7378bcf",
-                "reference": "926e3b797e6bb66c0e4d7da7eff3a174f7378bcf",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44",
+                "reference": "ed3b397f9c07c8ca388b2a1ef744403b4d4ecc44",
                 "shasum": ""
             },
             "require": {
@@ -8550,7 +8666,7 @@
                 "configuration",
                 "options"
             ],
-            "time": "2019-02-23T15:06:07+00:00"
+            "time": "2019-04-10T16:00:48+00:00"
         },
         {
             "name": "symfony/polyfill-php54",
@@ -8782,7 +8898,7 @@
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v3.4.23",
+            "version": "v3.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -8926,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": {
@@ -8962,7 +9078,7 @@
                 }
             ],
             "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",
@@ -9067,22 +9183,29 @@
             "time": "2018-12-25T11:19:39+00:00"
         }
     ],
-    "aliases": [],
-    "minimum-stability": "stable",
+    "aliases": [
+        {
+            "alias": "1.2.1",
+            "alias_normalized": "1.2.1.0",
+            "version": "1.2.9999999.9999999-dev",
+            "package": "magento/composer"
+        }
+    ],
+    "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/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/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/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/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/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/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/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/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/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 02bfacae43730..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
@@ -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\Reports\Test\TestCase\SalesOrderReportEntityTest" summary="Sales Order Report" ticketId="MAGETWO-29136">
         <variation name="SalesOrderReportEntityTestVariation1" summary="Create sales order report, check report data and date" ticketId="MAGETWO-45399">
-            <data name="issue" xsi:type="string">MAGETWO-97404: 2019-01-02: Tests fail Magento\Reports\Test\TestCase\SalesOrderReportEntityTest</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>
@@ -23,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>
@@ -37,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>
@@ -51,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 3142eec7079ba..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
@@ -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\Reports\Test\TestCase\SalesRefundsReportEntityTest" summary="Sales Refunds Report" ticketId="MAGETWO-29348">
         <variation name="SalesRefundsReportEntityTestVariation1">
-            <data name="issue" xsi:type="string">MAGETWO-97404: 2019-01-02: Tests fail Magento\Reports\Test\TestCase\SalesOrderReportEntityTest</data>
             <data name="description" xsi:type="string">assert refunds year report</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
@@ -21,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>
@@ -34,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/AbstractForm.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
index bc7ee4372d61b..5572c06816a39 100644
--- a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
+++ b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/AbstractForm.php
@@ -6,9 +6,7 @@
 
 namespace Magento\Sales\Test\Block\Adminhtml\Order;
 
-use function GuzzleHttp\Psr7\str;
 use Magento\Mtf\Block\Form;
-use Magento\Mtf\Client\Locator;
 
 /**
  * Abstract Form block.
@@ -44,27 +42,6 @@ function () {
         );
     }
 
-    /**
-     * Wait for element is enabled.
-     *
-     * @param string $selector
-     * @param string $strategy
-     * @return bool|null
-     */
-    protected function waitForElementEnabled(string $selector, string $strategy = Locator::SELECTOR_CSS)
-    {
-        $browser = $this->browser;
-
-        return $browser->waitUntil(
-            function () use ($browser, $selector, $strategy) {
-                $element = $browser->find($selector, $strategy);
-                $class = $element->getAttribute('class');
-
-                return (!$element->isDisabled() && !strpos($class, 'disabled')) ? true : null;
-            }
-        );
-    }
-
     /**
      * Fill form data.
      *
@@ -136,7 +113,7 @@ abstract protected function getItemsBlock();
      */
     public function submit()
     {
-        $this->waitForElementEnabled($this->send);
+        $this->waitLoader();
 
         $this->_rootElement->find($this->send)->click();
     }
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/Shipping/Test/TestCase/SalesShippingReportEntityTest.xml b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/SalesShippingReportEntityTest.xml
index 6b4c14ff3142a..069bf23f5f25f 100644
--- a/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/SalesShippingReportEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Shipping/Test/TestCase/SalesShippingReportEntityTest.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\Shipping\Test\TestCase\SalesShippingReportEntityTest" summary="Sales Shipping Report" ticketId="MAGETWO-40914">
         <variation name="SalesShippingReportEntityTestVariation1">
-            <data name="issue" xsi:type="string">MAGETWO-97404: 2019-01-02: Tests fail Magento\Reports\Test\TestCase\SalesOrderReportEntityTest</data>
             <data name="order/dataset" xsi:type="string">default</data>
             <data name="order/data/price/dataset" xsi:type="string">full_shipment</data>
             <data name="shippingReport/report_type" xsi:type="string">Order Created</data>
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/utils/authenticate.php b/dev/tests/functional/utils/authenticate.php
deleted file mode 100644
index 15851f6e8000a..0000000000000
--- a/dev/tests/functional/utils/authenticate.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Check if token passed in is a valid auth token.
- *
- * @param string $token
- * @return bool
- */
-function authenticate($token)
-{
-    require_once __DIR__ . '/../../../../app/bootstrap.php';
-
-    $magentoObjectManagerFactory = \Magento\Framework\App\Bootstrap::createObjectManagerFactory(BP, $_SERVER);
-    $magentoObjectManager = $magentoObjectManagerFactory->create($_SERVER);
-    $tokenModel = $magentoObjectManager->get(\Magento\Integration\Model\Oauth\Token::class);
-
-    $tokenPassedIn = $token;
-    // Token returned will be null if the token we passed in is invalid
-    $tokenFromMagento = $tokenModel->loadByToken($tokenPassedIn)->getToken();
-    if (!empty($tokenFromMagento) && ($tokenFromMagento == $tokenPassedIn)) {
-        return true;
-    } else {
-        return false;
-    }
-}
diff --git a/dev/tests/functional/utils/command.php b/dev/tests/functional/utils/command.php
deleted file mode 100644
index e7b336464682d..0000000000000
--- a/dev/tests/functional/utils/command.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-require_once __DIR__ . '/../../../../app/bootstrap.php';
-
-use Symfony\Component\Console\Input\StringInput;
-use Symfony\Component\Console\Output\NullOutput;
-
-if (!empty($_POST['token']) && !empty($_POST['command'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        $command = urldecode($_POST['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 {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' or 'command' parameter is not set.";
-}
diff --git a/dev/tests/functional/utils/deleteMagentoGeneratedCode.php b/dev/tests/functional/utils/deleteMagentoGeneratedCode.php
deleted file mode 100644
index 17e3575c87686..0000000000000
--- a/dev/tests/functional/utils/deleteMagentoGeneratedCode.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-
-if (!empty($_POST['token']) && !empty($_POST['path'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        exec('rm -rf ../../../../generated/*');
-    } else {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' 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 9357bfa459be0..0000000000000
--- a/dev/tests/functional/utils/export.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-
-if (!empty($_POST['token']) && !empty($_POST['template'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        $varDir = '../../../../var/';
-        $template = urldecode($_POST['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);
-    } else {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' or 'template' parameter is not set.";
-}
diff --git a/dev/tests/functional/utils/locales.php b/dev/tests/functional/utils/locales.php
deleted file mode 100644
index a3b4ec05eed65..0000000000000
--- a/dev/tests/functional/utils/locales.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-
-if (!empty($_POST['token'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        if ($_POST['type'] == 'deployed') {
-            $themePath = isset($_POST['theme_path']) ? $_POST['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);
-    } else {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' parameter is not set.";
-}
diff --git a/dev/tests/functional/utils/log.php b/dev/tests/functional/utils/log.php
deleted file mode 100644
index 0d6f1fa2ac5cf..0000000000000
--- a/dev/tests/functional/utils/log.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-
-if (!empty($_POST['token']) && !empty($_POST['name'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        $name = urldecode($_POST['name']);
-        if (preg_match('/\.\.(\\\|\/)/', $name)) {
-            throw new \InvalidArgumentException('Invalid log file name');
-        }
-
-        echo serialize(file_get_contents('../../../../var/log' . '/' . $name));
-    } else {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' or 'name' parameter is not set.";
-}
diff --git a/dev/tests/functional/utils/pathChecker.php b/dev/tests/functional/utils/pathChecker.php
deleted file mode 100644
index b5a2ddb405bde..0000000000000
--- a/dev/tests/functional/utils/pathChecker.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-
-if (!empty($_POST['token']) && !empty($_POST['path'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        $path = urldecode($_POST['path']);
-
-        if (file_exists('../../../../' . $path)) {
-            echo 'path exists: true';
-        } else {
-            echo 'path exists: false';
-        }
-    } else {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' or 'path' parameter is not set.";
-}
diff --git a/dev/tests/functional/utils/website.php b/dev/tests/functional/utils/website.php
deleted file mode 100644
index ab8e3742f55ae..0000000000000
--- a/dev/tests/functional/utils/website.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-include __DIR__ . '/authenticate.php';
-
-if (!empty($_POST['token']) && !empty($_POST['website_code'])) {
-    if (authenticate(urldecode($_POST['token']))) {
-        $websiteCode = urldecode($_POST['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);
-    } else {
-        echo "Command not unauthorized.";
-    }
-} else {
-    echo "'token' or 'website_code' parameter is not set.";
-}
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/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/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/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index cb96910ec86e1..829576ce8c193 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -29,6 +29,7 @@
 use Magento\Store\Model\Store;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\ImportExport\Model\Import\Source\Csv;
 
 /**
  * Class ProductTest
@@ -1584,6 +1585,35 @@ public function testExistingProductWithUrlKeys()
         }
     }
 
+    /**
+     * @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
@@ -2137,7 +2167,6 @@ 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()
     {
@@ -2154,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(
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/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/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/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/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/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/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/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/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 d10befc3a811c..7cae512207b36 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
@@ -235,6 +235,8 @@ public function testReturnAction()
      */
     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');
@@ -254,10 +256,9 @@ public function testPlaceOrderZeroGrandTotal()
         $this->assertSessionMessages(
             $this->equalTo(
                 [
-                    htmlspecialchars(
+                    $escaper->escapeHtml(
                         (string)__('PayPal can\'t process orders with a zero balance due. '
-                        . 'To finish your purchase, please go through the standard checkout process.'),
-                        ENT_QUOTES
+                        . 'To finish your purchase, please go through the standard checkout process.')
                     )
                 ]
             ),
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/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/_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/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/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/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/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/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/_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/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/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 817553c30d0f9..0000000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/cc-form.test.js
+++ /dev/null
@@ -1,89 +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/checkout-data-resolver': {
-
-                    /** Stub */
-                    applyBillingAddress: function () {
-                        return true;
-                    },
-
-                    /** Stub */
-                    resolveBillingAddress: function () {
-                        return true;
-                    }
-                },
-                '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);
-        });
-    });
-});
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 d58c301e5d934..0000000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js
+++ /dev/null
@@ -1,113 +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/checkout-data-resolver': {
-
-                    /** Stub */
-                    applyBillingAddress: function () {
-                        return true;
-                    },
-
-                    /** Stub */
-                    resolveBillingAddress: function () {
-                        return true;
-                    }
-                },
-                '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/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/_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/Php/_files/whitelist/exempt_modules/ce.php b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/exempt_modules/ce.php
index 5bcf5ee9f29df..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,7 +9,6 @@
     'Magento_Backend',
     'Magento_Backup',
     'Magento_Bundle',
-    'Magento_Catalog',
     'Magento_CatalogInventory',
     'Magento_CatalogRule',
     'Magento_CatalogSearch',
@@ -27,17 +26,12 @@
     'Magento_Msrp',
     'Magento_PageCache',
     'Magento_Paypal',
-    'Magento_ProductVideo',
     'Magento_Reports',
-    'Magento_Sales',
     'Magento_Search',
     'Magento_Store',
     'Magento_Swagger',
-    'Magento_Swatches',
-    'Magento_Tax',
     'Magento_Theme',
     'Magento_Translation',
     'Magento_Ui',
     'Magento_User',
-    'Magento_Weee',
 ];
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/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 fa468a6df2909..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);
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 c41ccccab0cf0..3c5c6aca87b69 100644
--- a/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Data/Collection/AbstractDb.php
@@ -238,7 +238,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;
         }
@@ -605,6 +606,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 1b7e9ad990ce4..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)
@@ -289,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/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/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
index a207f45cb805a..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,15 +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);
-        $this->_escaperMock->method('escapeHtml')->willReturnArgument(0);
+        $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
             ]
         );
     }
@@ -242,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()
         );
     }
@@ -254,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())
@@ -303,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)
@@ -520,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/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/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 f3eefaed50d18..7eb7a8f11ba99 100644
--- a/lib/internal/Magento/Framework/Escaper.php
+++ b/lib/internal/Magento/Framework/Escaper.php
@@ -13,6 +13,11 @@
  */
 class Escaper
 {
+    /**
+     * HTML special characters flag
+     */
+    private $htmlSpecialCharsFlag = ENT_QUOTES | ENT_SUBSTITUTE;
+
     /**
      * @var \Magento\Framework\ZendEscaper
      */
@@ -74,6 +79,7 @@ public function escapeHtml($data, $allowedTags = null)
                 $domDocument = new \DOMDocument('1.0', 'UTF-8');
                 set_error_handler(
                     function ($errorNumber, $errorString) {
+                        // phpcs:ignore Magento2.Exceptions.DirectThrow
                         throw new \Exception($errorString, $errorNumber);
                     }
                 );
@@ -83,6 +89,7 @@ function ($errorNumber, $errorString) {
                     $domDocument->loadHTML(
                         '<html><body id="' . $wrapperElementId . '">' . $string . '</body></html>'
                     );
+                    // phpcs:disable Magento2.Exceptions.ThrowCatch
                 } catch (\Exception $e) {
                     restore_error_handler();
                     $this->getLogger()->critical($e);
@@ -98,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;
@@ -217,7 +224,7 @@ public function escapeHtmlAttr($string, $escapeSingleQuote = true)
         if ($escapeSingleQuote) {
             return $this->getEscaper()->escapeHtmlAttr((string) $string);
         }
-        return htmlspecialchars((string)$string, ENT_COMPAT, 'UTF-8', false);
+        return htmlspecialchars((string)$string, $this->htmlSpecialCharsFlag, 'UTF-8', false);
     }
 
     /**
@@ -314,7 +321,7 @@ public function escapeXssInUrl($data)
     {
         return htmlspecialchars(
             $this->escapeScriptIdentifiers((string)$data),
-            ENT_COMPAT | ENT_HTML5 | ENT_HTML401,
+            $this->htmlSpecialCharsFlag | ENT_HTML5 | ENT_HTML401,
             'UTF-8',
             false
         );
@@ -351,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);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index b53887cc0836a..28f04f54649d5 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -549,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;
 
@@ -562,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/Driver/File.php b/lib/internal/Magento/Framework/Filesystem/Driver/File.php
index 03fb0dc9f0c4d..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) {
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/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/Mail/Message.php b/lib/internal/Magento/Framework/Mail/Message.php
index 96566ad82b8eb..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;
@@ -158,7 +158,7 @@ public function getRawMessage()
      */
     public function setBodyHtml($html)
     {
-        $this->setMessageType(self::TYPE_HTML);
+        $this->setMessageType(Mime::TYPE_HTML);
         return $this->setBody($html);
     }
 
@@ -167,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/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/Search/Adapter/Mysql/Query/Builder/Match.php b/lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php
index ffd5b41f7933d..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
@@ -26,7 +26,7 @@ class Match implements QueryInterface
      */
     const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%&^';
 
-    const MINIMAL_CHARACTER_LENGTH = 3;
+    const MINIMAL_CHARACTER_LENGTH = 1;
 
     /**
      * @var string[]
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 11393674012f3..edd4e3da6969c 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -138,8 +138,6 @@ public function __construct(
             SessionStartChecker::class
         );
 
-        // Enable session.use_only_cookies
-        ini_set('session.use_only_cookies', '1');
         $this->start();
     }
 
@@ -573,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);
@@ -613,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/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/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/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/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/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index 901c0e59b1949..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)) . '" ';
     }
 
     /**
@@ -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
      */
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/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 15762dc2f0ae6..51acc5789a4f8 100644
--- a/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
+++ b/lib/internal/Magento/Framework/View/Layout/etc/head.xsd
@@ -67,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 da7bcb128f4b8..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);
     }
 
     /**
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/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/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/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/composer.json b/lib/internal/Magento/Framework/composer.json
index c674010af1a1f..f1c6497b70631 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -8,11 +8,10 @@
         "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/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.min.js b/lib/web/fotorama/fotorama.min.js
deleted file mode 100644
index f416d57488925..0000000000000
--- a/lib/web/fotorama/fotorama.min.js
+++ /dev/null
@@ -1 +0,0 @@
-fotoramaVersion="4.6.4",function(t,e,n,o,a){"use strict";var i="fotorama",r="fotorama__fullscreen",s=i+"__wrap",u=s+"--css2",l=s+"--css3",c=s+"--video",d=s+"--fade",h=s+"--slide",f=s+"--no-controls",m=s+"--no-shadows",v=s+"--pan-y",p=s+"--rtl",g=s+"--no-captions",w=s+"--toggle-arrows",b=i+"__stage",y=b+"__frame",x=y+"--video",_=b+"__shaft",C=i+"__grab",k=i+"__pointer",P=i+"__arr",S=P+"--disabled",T=P+"--prev",F=P+"--next",E=i+"__nav",M=E+"-wrap",j=E+"__shaft",$=M+"--vertical",z=M+"--list",q=M+"--horizontal",N=E+"--dots",A=E+"--thumbs",L=E+"__frame",O=i+"__fade",D=O+"-front",I=O+"-rear",W=i+"__shadow"+"s",R=W+"--left",H=W+"--right",K=W+"--top",Q=W+"--bottom",V=i+"__active",X=i+"__select",B=i+"--hidden",Y=i+"--fullscreen",U=i+"__fullscreen-icon",G=i+"__error",J=i+"__loading",Z=i+"__loaded",tt=Z+"--full",et=Z+"--img",nt=i+"__grabbing",ot=i+"__img",at=ot+"--full",it=i+"__thumb",rt=it+"__arr--left",st=it+"__arr--right",ut=it+"-border",lt=i+"__html",ct=i+"-video-container",dt=i+"__video",ht=dt+"-play",ft=dt+"-close",mt=i+"_horizontal_ratio",vt=i+"_vertical_ratio",pt=i+"__spinner",gt=pt+"--show",wt=o&&o.fn.jquery.split(".");if(!wt||wt[0]<1||1==wt[0]&&wt[1]<8)throw"Fotorama requires jQuery 1.8 or later and will not run without it.";var bt=function(t,e,n){var o,a,i={},r=e.documentElement,s="modernizr",u=e.createElement(s),l=u.style,c=" -webkit- -moz- -o- -ms- ".split(" "),d="Webkit Moz O ms",h=d.split(" "),f=d.toLowerCase().split(" "),m={},v=[],p=v.slice,g=function(t,n,o,a){var i,u,l,c,d=e.createElement("div"),h=e.body,f=h||e.createElement("body");if(parseInt(o,10))for(;o--;)(l=e.createElement("div")).id=a?a[o]:s+(o+1),d.appendChild(l);return i=["&#173;",'<style id="s',s,'">',t,"</style>"].join(""),d.id=s,(h?d:f).innerHTML+=i,f.appendChild(d),h||(f.style.background="",f.style.overflow="hidden",c=r.style.overflow,r.style.overflow="hidden",r.appendChild(f)),u=n(d,t),h?d.parentNode.removeChild(d):(f.parentNode.removeChild(f),r.style.overflow=c),!!u},w={}.hasOwnProperty;function b(t){l.cssText=t}function y(t,e){return typeof t===e}function x(t,e){for(var o in t){var a=t[o];if(!~(""+a).indexOf("-")&&l[a]!==n)return"pfx"!=e||a}return!1}function _(t,e,o){var a=t.charAt(0).toUpperCase()+t.slice(1),i=(t+" "+h.join(a+" ")+a).split(" ");return y(e,"string")||y(e,"undefined")?x(i,e):function(t,e,o){for(var a in t){var i=e[t[a]];if(i!==n)return!1===o?t[a]:y(i,"function")?i.bind(o||e):i}return!1}(i=(t+" "+f.join(a+" ")+a).split(" "),e,o)}for(var C in a=y(w,"undefined")||y(w.call,"undefined")?function(t,e){return e in t&&y(t.constructor.prototype[e],"undefined")}:function(t,e){return w.call(t,e)},Function.prototype.bind||(Function.prototype.bind=function(t){var e=this;if("function"!=typeof e)throw new TypeError;var n=p.call(arguments,1),o=function(){if(this instanceof o){var a=function(){};a.prototype=e.prototype;var i=new a,r=e.apply(i,n.concat(p.call(arguments)));return Object(r)===r?r:i}return e.apply(t,n.concat(p.call(arguments)))};return o}),m.touch=function(){var n;return"ontouchstart"in t||t.DocumentTouch&&e instanceof DocumentTouch?n=!0:g(["@media (",c.join("touch-enabled),("),s,")","{#modernizr{top:9px;position:absolute}}"].join(""),function(t){n=9===t.offsetTop}),n},m.csstransforms3d=function(){var t=!!_("perspective");return t&&"webkitPerspective"in r.style&&g("@media (transform-3d),(-webkit-transform-3d){#modernizr{left:9px;position:absolute;height:3px;}}",function(e,n){t=9===e.offsetLeft&&3===e.offsetHeight}),t},m.csstransitions=function(){return _("transition")},m)a(m,C)&&(o=C.toLowerCase(),i[o]=m[C](),v.push((i[o]?"":"no-")+o));return i.addTest=function(t,e){if("object"==typeof t)for(var o in t)a(t,o)&&i.addTest(o,t[o]);else{if(t=t.toLowerCase(),i[t]!==n)return i;e="function"==typeof e?e():e,"undefined"!=typeof enableClasses&&enableClasses&&(r.className+=" "+(e?"":"no-")+t),i[t]=e}return i},b(""),u=null,i._version="2.8.3",i._prefixes=c,i._domPrefixes=f,i._cssomPrefixes=h,i.testProp=function(t){return x([t])},i.testAllProps=_,i.testStyles=g,i.prefixed=function(t,e,n){return e?_(t,e,n):_(t,"pfx")},i}(t,e),yt={ok:!1,is:function(){return!1},request:function(){},cancel:function(){},event:"",prefix:""},xt="webkit moz o ms khtml".split(" ");if(void 0!==e.cancelFullScreen)yt.ok=!0;else for(var _t=0,Ct=xt.length;_t<Ct;_t++)if(yt.prefix=xt[_t],void 0!==e[yt.prefix+"CancelFullScreen"]){yt.ok=!0;break}yt.ok&&(yt.event=yt.prefix+"fullscreenchange",yt.is=function(){switch(this.prefix){case"":return e.fullScreen;case"webkit":return e.webkitIsFullScreen;default:return e[this.prefix+"FullScreen"]}},yt.request=function(t){return""===this.prefix?t.requestFullScreen():t[this.prefix+"RequestFullScreen"]()},yt.cancel=function(t){return""===this.prefix?e.cancelFullScreen():e[this.prefix+"CancelFullScreen"]()});var kt,Pt,St=o(t),Tt=o(e),Ft="quirks"===n.hash.replace("#",""),Et=bt.csstransforms3d,Mt=Et&&!Ft,jt=Et||"CSS1Compat"===e.compatMode,$t=yt.ok,zt=navigator.userAgent.match(/Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i),qt=!Mt||zt,Nt=navigator.msPointerEnabled,At="onwheel"in e.createElement("div")?"wheel":e.onmousewheel!==a?"mousewheel":"DOMMouseScroll",Lt=250,Ot=300,Dt=1400,It=5e3,Wt=64,Rt=500,Ht=333,Kt="$stageFrame",Qt="$navDotFrame",Vt="$navThumbFrame",Xt="auto",Bt=function(t){var e="bez_"+o.makeArray(arguments).join("_").replace(".","p");if("function"!=typeof o.easing[e]){var n=function(t,e){var n=[null,null],o=[null,null],a=[null,null],i=function(i,r){return a[r]=3*t[r],o[r]=3*(e[r]-t[r])-a[r],n[r]=1-a[r]-o[r],i*(a[r]+i*(o[r]+i*n[r]))};return function(t){return i(function(t){for(var e,r,s=t,u=0;++u<14&&(e=i(s,0)-t,!(Math.abs(e)<.001));)s-=e/(r=s,a[0]+r*(2*o[0]+3*n[0]*r));return s}(t),1)}};o.easing[e]=function(e,o,a,i,r){return i*n([t[0],t[1]],[t[2],t[3]])(o/r)+a}}return e}([.1,0,.25,1]),Yt=1,Ut={width:null,minwidth:null,maxwidth:"100%",height:null,minheight:null,maxheight:null,ratio:null,margin:2,nav:"dots",navposition:"bottom",navwidth:null,thumbwidth:Wt,thumbheight:Wt,thumbmargin:2,thumbborderwidth:2,allowfullscreen:!1,transition:"slide",clicktransition:null,transitionduration:Ot,captions:!0,startindex:0,loop:!1,autoplay:!1,stopautoplayontouch:!0,keyboard:!1,arrows:!0,click:!0,swipe:!1,trackpad:!1,shuffle:!1,direction:"ltr",shadows:!0,showcaption:!0,navdir:"horizontal",navarrows:!0,navtype:"thumbs"},Gt={left:!0,right:!0,down:!0,up:!0,space:!1,home:!1,end:!1};function Jt(){}function Zt(t,e,n){return Math.max(isNaN(e)?-1/0:e,Math.min(isNaN(n)?1/0:n,t))}function te(t,e){return Mt?(n=t.css("transform"),o=e,+(n.match(/ma/)&&n.match(/-?\d+(?!d)/g)[n.match(/3d/)?"vertical"===o?13:12:"vertical"===o?5:4])):+t.css("vertical"===e?"top":"left").replace("px","");var n,o}function ee(t,e){var n={};if(Mt)switch(e){case"vertical":n.transform="translate3d(0, "+t+"px,0)";break;case"list":break;default:n.transform="translate3d("+t+"px,0,0)"}else"vertical"===e?n.top=t:n.left=t;return n}function ne(t){return{"transition-duration":t+"ms"}}function oe(t,e){return isNaN(t)?e:t}function ae(t,e){return oe(+String(t).replace(e||"px",""))}function ie(t,e){return oe((/%$/.test(n=t)?ae(n,"%"):a)/100*e,ae(t));var n}function re(t){return(!isNaN(ae(t))||!isNaN(ae(t,"%")))&&t}function se(t,e,n,o){return(t-(o||0))*(e+(n||0))}function ue(t,e,n,o){var a,i,r,s=t.data();s&&(s.onEndFn=function(){a||(a=!0,clearTimeout(s.tT),n())},s.tProp=e,clearTimeout(s.tT),s.tT=setTimeout(function(){s.onEndFn()},1.5*o),(r=(i=t).data()).tEnd||(Te(i[0],{WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",msTransition:"MSTransitionEnd",transition:"transitionend"}[bt.prefixed("transition")],function(t){r.tProp&&t.propertyName.match(r.tProp)&&r.onEndFn()}),r.tEnd=!0))}function le(t,e){var n=t.navdir||"horizontal";if(t.length){var o=t.data();Mt?(t.css(ne(0)),o.onEndFn=Jt,clearTimeout(o.tT)):t.stop();var a=ce(e,function(){return te(t,n)});return t.css(ee(a,n)),a}}function ce(){for(var t,e=0,n=arguments.length;e<n&&"number"!=typeof(t=e?arguments[e]():arguments[e]);e++);return t}function de(t,e){return Math.round(t+(e-t)/1.5)}function he(){return he.p=he.p||("https:"===n.protocol?"https://":"http://"),he.p}function fe(t,n){if("string"!=typeof t)return t;var o,a,i,r;if(o=t,(a=e.createElement("a")).href=o,(t=a).host.match(/youtube\.com/)&&t.search){if(i=t.search.split("v=")[1]){var s=i.indexOf("&");-1!==s&&(i=i.substring(0,s)),r="youtube"}}else t.host.match(/youtube\.com|youtu\.be/)?(i=t.pathname.replace(/^\/(embed\/|v\/)?/,"").replace(/\/.*/,""),r="youtube"):t.host.match(/vimeo\.com/)&&(r="vimeo",i=t.pathname.replace(/^\/(video\/)?/,"").replace(/\/.*/,""));return i&&r||!n||(i=t.href,r="custom"),!!i&&{id:i,type:r,s:t.search.replace(/^\?/,""),p:he()}}function me(t,e,n,a){for(var i=0,r=t.length;i<r;i++){var s=t[i];if(s.i===n&&s.thumbsReady){var u={videoReady:!0};u[Kt]=u[Vt]=u[Qt]=!1,a.splice(i,1,o.extend({},s,u,e));break}}}function ve(t){var e=[];function n(t,e,n){var a=n.thumb&&n.img!==n.thumb,i=ae(n.width||t.attr("width")),r=ae(n.height||t.attr("height"));o.extend(n,{width:i,height:r,thumbratio:Se(n.thumbratio||ae(n.thumbwidth||e&&e.attr("width")||a||i)/ae(n.thumbheight||e&&e.attr("height")||a||r))})}return t.children().each(function(){var t,a,i,r,s,u,l,c,d,h=o(this),f=Pe(o.extend(h.data(),{id:h.attr("id")}));if(h.is("a, img"))a=f,i=!0,r=(t=h).children("img").eq(0),s=t.attr("href"),u=t.attr("src"),l=r.attr("src"),c=a.video,(d=!!i&&fe(s,!0===c))?s=!1:d=c,n(t,r,o.extend(a,{video:d,img:a.img||s||u||l,thumb:a.thumb||l||u||s}));else{if(h.is(":empty"))return;n(h,null,o.extend(f,{html:this,_html:h.html()}))}e.push(f)}),e}function pe(t,e,n,o){return pe.i||(pe.i=1,pe.ii=[!0]),o=o||pe.i,void 0===pe.ii[o]&&(pe.ii[o]=!0),t()?e():pe.ii[o]&&setTimeout(function(){pe.ii[o]&&pe(t,e,n,o)},n||100),pe.i++}function ge(t,e){var n=t.data(),o=n.measures;if(o&&(!n.l||n.l.W!==o.width||n.l.H!==o.height||n.l.r!==o.ratio||n.l.w!==e.w||n.l.h!==e.h)){var a=Zt(e.h,0,o.height),i=a*o.ratio;De.setRatio(t,i,a),n.l={W:o.width,H:o.height,r:o.ratio,w:e.w,h:e.h}}return!0}function we(t,e,n,o){return e!==n&&("vertical"===o?t<=e?"top":t>=n?"bottom":"top bottom":t<=e?"left":t>=n?"right":"left right")}function be(t,e,n){n=n||{},t.each(function(){var t,a=o(this),i=a.data();i.clickOn||(i.clickOn=!0,o.extend(Re(a,{onStart:function(e){t=e,(n.onStart||Jt).call(this,e)},onMove:n.onMove||Jt,onTouchEnd:n.onTouchEnd||Jt,onEnd:function(n){n.moved||e.call(this,t)}}),{noMove:!0}))})}function ye(t,e){return'<div class="'+t+'">'+(e||"")+"</div>"}function xe(t){return"."+t}function _e(t){for(var e=t.length;e;){var n=Math.floor(Math.random()*e--),o=t[e];t[e]=t[n],t[n]=o}return t}function Ce(t){return"[object Array]"==Object.prototype.toString.call(t)&&o.map(t,function(t){return o.extend({},t)})}function ke(t,e,n){t.scrollLeft(e||0).scrollTop(n||0)}function Pe(t){if(t){var e={};return o.each(t,function(t,n){e[t.toLowerCase()]=n}),e}}function Se(t){if(t){var e=+t;return isNaN(e)?+(e=t.split("/"))[0]/+e[1]||a:e}}function Te(t,e,n,o){e&&(t.addEventListener?t.addEventListener(e,n,!!o):t.attachEvent("on"+e,n))}function Fe(t,e){return t>e.max?t=e.max:t<e.min&&(t=e.min),t}function Ee(t,e){return e?{disabled:t}:{tabindex:-1*t+"",disabled:t}}function Me(t,e){Te(t,"keyup",function(n){t.getAttribute("disabled")||13==n.keyCode&&e.call(t,n)})}function je(t,e){Te(t,"focus",t.onfocusin=function(n){e.call(t,n)},!0)}function $e(t,e){t.preventDefault?t.preventDefault():t.returnValue=!1,e&&t.stopPropagation&&t.stopPropagation()}function ze(t){return t?">":"<"}pe.stop=function(t){pe.ii[t]=!1};var qe,Ne,Ae,Le,Oe,De=function(){return{setRatio:function(t,e,n){e/n<=1?(t.parent().removeClass(mt),t.parent().addClass(vt)):(t.parent().removeClass(vt),t.parent().addClass(mt))},setThumbAttr:function(t,e,n){var i=n;t.attr(i)||t.attr(i)===a||t.attr(i,e),t.find("["+i+"]").length&&t.find("["+i+"]").each(function(){o(this).attr(i,e)})},isExpectedCaption:function(t,e,n){var o,a=!1;return o=t.showCaption===n||!0===t.showCaption,!!e&&(t.caption&&o&&(a=!0),a)}}}(jQuery);function Ie(t,e){var n=t.data(),a=Math.round(e.pos),i=function(){n&&n.sliding&&(n.sliding=!1),(e.onEnd||Jt)()};void 0!==e.overPos&&e.overPos!==e.pos&&(a=e.overPos);var r=o.extend(ee(a,e.direction),e.width&&{width:e.width},e.height&&{height:e.height});n&&n.sliding&&(n.sliding=!0),Mt?(t.css(o.extend(ne(e.time),r)),e.time>10?ue(t,"transform",i,e.time):i()):t.stop().animate(r,e.time,Bt,i)}function We(t){var e=(t.touches||[])[0]||t;t._x=e.pageX||e.originalEvent.pageX,t._y=e.clientY||e.originalEvent.clientY,t._now=o.now()}function Re(t,n){var a,i,r,s,u,l,c,d,h,f=t[0],m={};function v(t){if(r=o(t.target),m.checked=l=c=h=!1,a||m.flow||t.touches&&t.touches.length>1||t.which>1||qe&&qe.type!==t.type&&Ae||(l=n.select&&r.is(n.select,f)))return l;u="touchstart"===t.type,c=r.is("a, a *",f),s=m.control,d=m.noMove||m.noSwipe||s?16:m.snap?0:4,We(t),i=qe=t,Ne=t.type.replace(/down|start/,"move").replace(/Down/,"Move"),(n.onStart||Jt).call(f,t,{control:s,$target:r}),a=m.flow=!0,u&&!m.go||$e(t)}function p(t){if(t.touches&&t.touches.length>1||Nt&&!t.isPrimary||Ne!==t.type||!a)return a&&w(),void(n.onTouchEnd||Jt)();We(t);var e=Math.abs(t._x-i._x),o=Math.abs(t._y-i._y),r=e-o,s=(m.go||m.x||r>=0)&&!m.noSwipe,l=r<0;u&&!m.checked?(a=s)&&$e(t):($e(t),g(e,o)&&(n.onMove||Jt).call(f,t,{touch:u})),!h&&g(e,o)&&Math.sqrt(Math.pow(e,2)+Math.pow(o,2))>d&&(h=!0),m.checked=m.checked||s||l}function g(t,e){return t>e&&t>1.5}function w(t){(n.onTouchEnd||Jt)();var e=a;m.control=a=!1,e&&(m.flow=!1),!e||c&&!m.checked||(t&&$e(t),Ae=!0,clearTimeout(Le),Le=setTimeout(function(){Ae=!1},1e3),(n.onEnd||Jt).call(f,{moved:h,$target:r,control:s,touch:u,startEvent:i,aborted:!t||"MSPointerCancel"===t.type}))}function b(){m.flow&&(m.flow=!1)}return Nt?(Te(f,"MSPointerDown",v),Te(e,"MSPointerMove",p),Te(e,"MSPointerCancel",w),Te(e,"MSPointerUp",w)):(Te(f,"touchstart",v),Te(f,"touchmove",p),Te(f,"touchend",w),Te(e,"touchstart",function(){m.flow||(m.flow=!0)}),Te(e,"touchend",b),Te(e,"touchcancel",b),St.on("scroll",b),t.on("mousedown pointerdown",v),Tt.on("mousemove pointermove",p).on("mouseup pointerup",w)),Oe=bt.touch?"a":"div",t.on("click",Oe,function(t){m.checked&&$e(t)}),m}function He(t,e){var n,a,i,r,s,u,l,c,d,h,f,m,v,p,g,w=t[0],b=t.data(),y={};function x(o,s){g=!0,n=a="vertical"===m?o._y:o._x,l=o._now,u=[[l,n]],i=r=y.noMove||s?0:le(t,(e.getPos||Jt)()),(e.onStart||Jt).call(w,o)}return y=o.extend(Re(e.$wrap,o.extend({},e,{onStart:function(e,n){d=y.min,h=y.max,f=y.snap,m=y.direction||"horizontal",t.navdir=m,v=e.altKey,g=p=!1,n.control||b.sliding||x(e)},onMove:function(o,l){y.noSwipe||(g||x(o),a="vertical"===m?o._y:o._x,u.push([o._now,a]),s=we(r=i-(n-a),d,h,m),r<=d?r=de(r,d):r>=h&&(r=de(r,h)),y.noMove||(t.css(ee(r,m)),p||(p=!0,l.touch||Nt||t.addClass(nt)),(e.onMove||Jt).call(w,o,{pos:r,edge:s})))},onEnd:function(n){if(!y.noSwipe||!n.moved){g||x(n.startEvent,!0),n.touch||Nt||t.removeClass(nt);for(var s,l,p,b,_,C,k,P,S,T=(c=o.now())-Lt,F=null,E=Ot,M=e.friction,j=u.length-1;j>=0;j--){if(s=u[j][0],l=Math.abs(s-T),null===F||l<p)F=s,b=u[j][1];else if(F===T||l>p)break;p=l}k=Zt(r,d,h);var $=b-a,z=$>=0,q=c-F,N=q>Lt,A=!N&&r!==i&&k===r;f&&(k=Zt(Math[A?z?"floor":"ceil":"round"](r/f)*f,d,h),d=h=k),A&&(f||k===r)&&(S=-$/q,E*=Zt(Math.abs(S),e.timeLow,e.timeHigh),_=Math.round(r+S*E/M),f||(k=_),(!z&&_>h||z&&_<d)&&(C=z?d:h,f||(k=C),P=Zt(k+.03*(P=_-C),C-50,C+50),E=Math.abs((r-P)/(S/M)))),E*=v?10:1,(e.onEnd||Jt).call(w,o.extend(n,{moved:n.moved||N&&f,pos:r,newPos:k,overPos:P,time:E,dir:m}))}}})),y)}function Ke(t,e){var n,a,i,r=t[0],s={prevent:{}};return Te(r,At,function(t){var r=t.wheelDeltaY||-1*t.deltaY||0,u=t.wheelDeltaX||-1*t.deltaX||0,l=Math.abs(u)&&!Math.abs(r),c=ze(u<0),d=a===c,h=o.now(),f=h-i<Lt;a=c,i=h,l&&s.ok&&(!s.prevent[c]||n)&&($e(t,!0),n&&d&&f||(e.shift&&(n=!0,clearTimeout(s.t),s.t=setTimeout(function(){n=!1},Dt)),(e.onEnd||Jt)(t,e.shift?c:u)))}),s}function Qe(){o.each(o.Fotorama.instances,function(t,e){e.index=t})}jQuery.Fotorama=function(n,O){kt=o("html"),Pt=o("body");var nt,it,mt,vt,wt,bt,xt,_t,Ct,Ft,Et,zt,At,Dt,Bt,Ut,oe,ue,de,Te,qe,Ne,Ae,Le,Oe,We,Re,Ve,Xe,Be,Ye,Ue,Ge,Je,Ze,tn,en=this,nn=o.now(),on=i+nn,an=n[0],rn=1,sn=n.data(),un=o("<style></style>"),ln=o(ye(B)),cn=n.find(xe(s)),dn=cn.find(xe(b)),hn=(dn[0],n.find(xe(_))),fn=o(),mn=n.find(xe(T)),vn=n.find(xe(F)),pn=n.find(xe(P)),gn=n.find(xe(M)),wn=gn.find(xe(E)),bn=wn.find(xe(j)),yn=o(),xn=o(),_n=(hn.data(),bn.data(),n.find(xe(ut))),Cn=n.find(xe(rt)),kn=n.find(xe(st)),Pn=n.find(xe(U)),Sn=Pn[0],Tn=o(ye(ht)),Fn=n.find(xe(ft))[0],En=n.find(xe(pt)),Mn=!1,jn={},$n={},zn={},qn={},Nn={},An={},Ln={},On=0,Dn=[];function In(){o.each(nt,function(t,e){if(!e.i){e.i=rn++;var n=fe(e.video,!0);if(n){var a={};e.video=n,e.img||e.thumb?e.thumbsReady=!0:(r=nt,s=en,"youtube"===(c=(i=e).video).type?(u=(l=he()+"img.youtube.com/vi/"+c.id+"/default.jpg").replace(/\/default.jpg$/,"/hqdefault.jpg"),i.thumbsReady=!0):"vimeo"===c.type?o.ajax({url:he()+"vimeo.com/api/v2/video/"+c.id+".json",dataType:"jsonp",success:function(t){i.thumbsReady=!0,me(r,{img:t[0].thumbnail_large,thumb:t[0].thumbnail_small},i.i,s)}}):i.thumbsReady=!0,a={img:u,thumb:l}),me(nt,{img:a.img,thumb:a.thumb},e.i,en)}}var i,r,s,u,l,c})}function Wn(t){return Re[t]}function Rn(){if(dn!==a)if("vertical"==O.navdir){var t=O.thumbwidth+O.thumbmargin;dn.css("left",t),vn.css("right",t),Pn.css("right",t),cn.css("width",cn.css("width")+t),hn.css("max-width",cn.width()-t)}else dn.css("left",""),vn.css("right",""),Pn.css("right",""),cn.css("width",cn.css("width")+t),hn.css("max-width","")}function Hn(t){var e,a,s,u,l,c,d,h,f;t!==Hn.f&&(t?(n.addClass(i+" "+on).before(ln).before(un),a=en,o.Fotorama.instances.push(a),Qe()):(ln.detach(),un.detach(),n.html(sn.urtext).removeClass(on),e=en,o.Fotorama.instances.splice(e.index,1),Qe()),l="keydown."+i,d="keydown."+(c=i+nn),h="keyup."+c,f="resize."+c+" orientationchange."+c,(s=t)?(Tt.on(d,function(t){var e,n;vt&&27===t.keyCode?(e=!0,Mo(vt,!0,!0)):(en.fullScreen||O.keyboard&&!en.index)&&(27===t.keyCode?(e=!0,en.cancelFullScreen()):t.shiftKey&&32===t.keyCode&&Wn("space")||37===t.keyCode&&Wn("left")||38===t.keyCode&&Wn("up")&&o(":focus").attr("data-gallery-role")?(en.longPress.progress(),n="<"):32===t.keyCode&&Wn("space")||39===t.keyCode&&Wn("right")||40===t.keyCode&&Wn("down")&&o(":focus").attr("data-gallery-role")?(en.longPress.progress(),n=">"):36===t.keyCode&&Wn("home")?(en.longPress.progress(),n="<<"):35===t.keyCode&&Wn("end")&&(en.longPress.progress(),n=">>")),(e||n)&&$e(t),u={index:n,slow:t.altKey,user:!0},n&&(en.longPress.inProgress?en.showWhileLongPress(u):en.show(u))}),s&&Tt.on(h,function(t){en.longPress.inProgress&&en.showEndLongPress({user:!0}),en.longPress.reset()}),en.index||Tt.off(l).on(l,"textarea, input, select",function(t){!Pt.hasClass(r)&&t.stopPropagation()}),St.on(f,en.resize)):(Tt.off(d),St.off(f)),Hn.f=t)}function Kn(){var t=it<2||vt;$n.noMove=t||Te,$n.noSwipe=t||!O.swipe,!Le&&hn.toggleClass(C,!O.click&&!$n.noMove&&!$n.noSwipe),Nt&&cn.toggleClass(v,!$n.noSwipe)}function Qn(t){!0===t&&(t=""),O.autoplay=Math.max(+t||It,1.5*Ae)}function Vn(t,e){return Math.floor(cn.width()/(e.thumbwidth+e.thumbmargin))}function Xn(){var t;O.nav&&"dots"!==O.nav||(O.navdir="horizontal"),en.options=O=Pe(O),Yt=Vn(0,O),Te="crossfade"===O.transition||"dissolve"===O.transition,Dt=O.loop&&(it>2||Te&&(!Le||"slide"!==Le)),Ae=+O.transitionduration||Ot,We="rtl"===O.direction,Re=o.extend({},O.keyboard&&Gt,O.keyboard),(t=O).navarrows&&"thumbs"===t.nav?(Cn.show(),kn.show()):(Cn.hide(),kn.hide());var e,n,a,i,r={add:[],remove:[]};function s(t,e){r[t?"add":"remove"].push(e)}it>1?(Bt=O.nav,oe="top"===O.navposition,r.remove.push(X),pn.toggle(O.arrows)):(Bt=!1,pn.hide()),co(),fo(),ho(),O.autoplay&&Qn(O.autoplay),qe=ae(O.thumbwidth)||Wt,Ne=ae(O.thumbheight)||Wt,zn.ok=Nn.ok=O.trackpad&&!qt,Kn(),yo(O,[jn]),Ut="thumbs"===Bt,gn.filter(":hidden")&&Bt&&gn.show(),Ut?(ao(it,"navThumb"),mt=xn,tn=Vt,e=un,n=o.Fotorama.jst.style({w:qe,h:Ne,b:O.thumbborderwidth,m:O.thumbmargin,s:nn,q:!jt}),(a=e[0]).styleSheet?a.styleSheet.cssText=n:e.html(n),wn.addClass(A).removeClass(N)):"dots"===Bt?(ao(it,"navDot"),mt=yn,tn=Qt,wn.addClass(N).removeClass(A)):(gn.hide(),Bt=!1,wn.removeClass(A+" "+N)),Bt&&(oe?gn.insertBefore(dn):gn.insertAfter(dn),uo.nav=!1,uo(mt,bn,"nav")),(ue=O.allowfullscreen)?(Pn.prependTo(dn),de=$t&&"native"===ue,i="touchend",Pn.on(i,function(t){return $e(t,!0),!1})):(Pn.detach(),de=!1),s(Te,d),s(!Te,h),s(!O.captions,g),s(We,p),s(O.arrows,w),s(!(Oe=O.shadows&&!qt),m),cn.addClass(r.add.join(" ")).removeClass(r.remove.join(" ")),o.extend({},O),Rn()}function Bn(t){return t<0?(it+t%it)%it:t>=it?t%it:t}function Yn(t){return Zt(t,0,it-1)}function Un(t){return Dt?Bn(t):Yn(t)}function Gn(t){return!!(t>0||Dt)&&t-1}function Jn(t){return!!(t<it-1||Dt)&&t+1}function Zn(t,e,n){if("number"==typeof t){t=new Array(t);var a=!0}return o.each(t,function(t,o){if(a&&(o=t),"number"==typeof o){var i=nt[Bn(o)];if(i){var r="$"+e+"Frame",s=i[r];n.call(this,t,o,i,s,r,s&&s.data())}}})}function to(t,e,n,o){(!Ve||"*"===Ve&&o===At)&&(t=re(O.width)||re(t)||Rt,e=re(O.height)||re(e)||Ht,en.resize({width:t,ratio:O.ratio||n||t/e},0,o!==At&&"*"))}function eo(t,e,n,a){Zn(t,e,function(t,i,r,s,u,l){if(s){var c=en.fullScreen&&!l.$full&&"stage"===e;if(!l.$img||a||c){var d=new Image,h=o(d),f=h.data();l[c?"$full":"$img"]=h;var m="stage"===e?c?"full":"img":"thumb",v=r[m],p=c?r.img:r["stage"===e?"thumb":"img"];"navThumb"===e&&(s=l.$wrap),v?(o.Fotorama.cache[v]?function t(){"error"===o.Fotorama.cache[v]?w():"loaded"===o.Fotorama.cache[v]?setTimeout(b,0):setTimeout(t,100)}():(o.Fotorama.cache[v]="*",h.on("load",b).on("error",w)),l.state="",d.src=v,l.data.caption&&(d.alt=l.data.caption||""),l.data.full&&o(d).data("original",l.data.full),De.isExpectedCaption(r,O.showcaption)&&o(d).attr("aria-labelledby",r.labelledby)):w()}}function g(t){var e=Bn(i);xo(t,{index:e,src:v,frame:nt[e]})}function w(){h.remove(),o.Fotorama.cache[v]="error",r.html&&"stage"===e||!p||p===v?(!v||r.html||c?"stage"===e&&(s.trigger("f:load").removeClass(J+" "+G).addClass(Z),g("load"),to()):(s.trigger("f:error").removeClass(J).addClass(G),g("error")),l.state="error",!(it>1&&nt[i]===r)||r.html||r.deleted||r.video||c||(r.deleted=!0,en.splice(i,1))):(r[m]=v=p,l.$full=null,eo([i],e,n,!0))}function b(){var t=10;pe(function(){return!Je||!t--&&!qt},function(){o.Fotorama.measures[v]=f.measures=o.Fotorama.measures[v]||{width:d.width,height:d.height,ratio:d.width/d.height},to(f.measures.width,f.measures.height,f.measures.ratio,i),h.off("load error").addClass(""+(c?at:ot)).attr("aria-hidden","false").prependTo(s),s.hasClass(y)&&!s.hasClass(ct)&&s.attr("href",h.attr("src")),ge(h,(o.isFunction(n)?n():n)||jn),o.Fotorama.cache[v]=l.state="loaded",setTimeout(function(){s.trigger("f:load").removeClass(J+" "+G).addClass(Z+" "+(c?tt:et)),"stage"===e?g("load"):(r.thumbratio===Xt||!r.thumbratio&&O.thumbratio===Xt)&&(r.thumbratio=f.measures.ratio,Oo())},0)})}})}function no(){var t=wt[Kt];t&&!t.data().state&&(En.addClass(gt),t.on("f:load f:error",function(){t.off("f:load f:error"),En.removeClass(gt)}))}function oo(t){Me(t,No),je(t,function(){setTimeout(function(){ke(wn)},0),po({time:Ae,guessIndex:o(this).data().eq,minMax:qn})})}function ao(t,e){Zn(t,e,function(t,n,a,i,r,s){if(!i){i=a[r]=cn[r].clone(),(s=i.data()).data=a;var u=i[0],l="labelledby"+o.now();"stage"===e?(a.html&&o('<div class="'+lt+'"></div>').append(a._html?o(a.html).removeAttr("id").html(a._html):a.html).appendTo(i),a.id&&(l=a.id||l),a.labelledby=l,De.isExpectedCaption(a,O.showcaption)&&o(o.Fotorama.jst.frameCaption({caption:a.caption,labelledby:l})).appendTo(i),a.video&&i.addClass(x).append(Tn.clone()),je(u,function(){setTimeout(function(){ke(dn)},0),zo({index:s.eq,user:!0})}),fn=fn.add(i)):"navDot"===e?(oo(u),yn=yn.add(i)):"navThumb"===e&&(oo(u),s.$wrap=i.children(":first"),xn=xn.add(i),a.video&&s.$wrap.append(Tn.clone()))}})}function io(t,e){return t&&t.length&&ge(t,e)}function ro(t){Zn(t,"stage",function(t,n,a,i,r,s){if(i){var u,l=Bn(n);s.eq=l,Ln[Kt][l]=i.css(o.extend({left:Te?0:se(n,jn.w,O.margin,xt)},Te&&ne(0))),u=i[0],o.contains(e.documentElement,u)||(i.appendTo(hn),Mo(a.$video)),io(s.$img,jn),io(s.$full,jn),!i.hasClass(y)||"false"===i.attr("aria-hidden")&&i.hasClass(V)||i.attr("aria-hidden","true")}})}function so(t,e){var n,a;"thumbs"!==Bt||isNaN(t)||(n=-t,a=-t+jn.nw,"vertical"===O.navdir&&(t-=O.thumbheight,a=-t+jn.h),xn.each(function(){var t=o(this).data(),i=t.eq,r=function(){return{h:Ne,w:t.w}},s=r(),u="vertical"===O.navdir?t.t>a:t.l>a;s.w=t.w,t.l+t.w<n||u||io(t.$img,s)||e&&eo([i],"navThumb",r)}))}function uo(t,e,n){if(!uo[n]){var a="nav"===n&&Ut,i=0,r=0;e.append(t.filter(function(){for(var t,e=o(this),n=e.data(),a=0,i=nt.length;a<i;a++)if(n.data===nt[a]){t=!0,n.eq=a;break}return t||e.remove()&&!1}).sort(function(t,e){return o(t).data().eq-o(e).data().eq}).each(function(){var t=o(this),e=t.data();De.setThumbAttr(t,e.data.caption,"aria-label")}).each(function(){if(a){var t=o(this),e=t.data(),n=Math.round(Ne*e.data.thumbratio)||qe,s=Math.round(qe/e.data.thumbratio)||Ne;e.t=r,e.h=s,e.l=i,e.w=n,t.css({width:n}),r+=s+O.thumbmargin,i+=n+O.thumbmargin}})),uo[n]=!0}}function lo(t){return!(Dt||Mn+t&&Mn-it+t||vt)}function co(){var t=lo(0),e=lo(1);mn.toggleClass(S,t).attr(Ee(t,!1)),vn.toggleClass(S,e).attr(Ee(e,!1))}function ho(){var t=!1,e=!1;if("thumbs"!==O.navtype||O.loop||(t=0==Mn,e=Mn==O.data.length-1),"slides"===O.navtype){var n=te(bn,O.navdir);t=n>=qn.max,e=n<=qn.min}Cn.toggleClass(S,t).attr(Ee(t,!0)),kn.toggleClass(S,e).attr(Ee(e,!0))}function fo(){zn.ok&&(zn.prevent={"<":lo(0),">":lo(1)})}function mo(t){var e,n,o,a,i=t.data();Ut?(e=i.l,n=i.t,o=i.w,a=i.h):(e=t.position().left,o=t.width());var r={c:e+o/2,min:-e+10*O.thumbmargin,max:-e+jn.w-o-10*O.thumbmargin},s={c:n+a/2,min:-n+10*O.thumbmargin,max:-n+jn.h-a-10*O.thumbmargin};return"vertical"===O.navdir?s:r}function vo(t){var e=wt[tn].data();Ie(_n,{time:1.2*t,pos:"vertical"===O.navdir?e.t:e.l,width:e.w,height:e.h,direction:O.navdir})}function po(t){var e,n,o,a,i,r,s,u,l,c,d,h,f,m,v,p,g,w=nt[t.guessIndex][tn],b=O.navtype;w&&("thumbs"===b?(e=qn.min!==qn.max,o=t.minMax||e&&mo(wt[tn]),a=e&&(t.keep&&po.t?po.l:Zt((t.coo||jn.nw/2)-mo(w).c,o.min,o.max)),i=e&&(t.keep&&po.l?po.l:Zt((t.coo||jn.nw/2)-mo(w).c,o.min,o.max)),r="vertical"===O.navdir?a:i,s=e&&Zt(r,qn.min,qn.max)||0,n=1.1*t.time,Ie(bn,{time:n,pos:s,direction:O.navdir,onEnd:function(){so(s,!0),ho()}}),Eo(wn,we(s,qn.min,qn.max,O.navdir)),po.l=r):(u=te(bn,O.navdir),n=1.11*t.time,l=O,c=qn,d=t.guessIndex,h=u,f=w,m=gn,"horizontal"===(v=O.navdir)?(p=l.thumbwidth,g=m.width()):(p=l.thumbheight,g=m.height()),s=Fe((p+l.margin)*(d+1)>=g-h?"horizontal"===v?-f.position().left:-f.position().top:(p+l.margin)*d<=Math.abs(h)?"horizontal"===v?-f.position().left+g-(p+l.margin):-f.position().top+g-(p+l.margin):h,c)||0,Ie(bn,{time:n,pos:s,direction:O.navdir,onEnd:function(){so(s,!0),ho()}}),Eo(wn,we(s,qn.min,qn.max,O.navdir))))}function go(t){for(var e=An[t];e.length;)e.shift().removeClass(V).attr("data-active",!1)}function wo(t){var e=Ln[t];o.each(bt,function(t,n){delete e[Bn(n)]}),o.each(e,function(t,n){delete e[t],n.detach()})}function bo(t){xt=_t=Mn;var e,o,a,i=wt[Kt];i&&(go(Kt),An[Kt].push(i.addClass(V).attr("data-active",!0)),i.hasClass(y)&&i.attr("aria-hidden","false"),t||en.showStage.onEnd(!0),le(hn,0),wo(Kt),ro(bt),$n.min=Dt?-1/0:-se(it-1,jn.w,O.margin,xt),$n.max=Dt?1/0:-se(0,jn.w,O.margin,xt),$n.snap=jn.w+O.margin,e="vertical"===O.navdir,o=e?bn.height():bn.width(),a=e?jn.h:jn.nw,qn.min=Math.min(0,a-o),qn.max=0,qn.direction=O.navdir,bn.toggleClass(C,!(qn.noMove=qn.min===qn.max)),Me(hn[0],function(){n.hasClass(Y)||(en.requestFullScreen(),Pn.focus())}))}function yo(t,e){t&&o.each(e,function(e,n){n&&o.extend(n,{width:t.width||n.width,height:t.height,minwidth:t.minwidth,maxwidth:t.maxwidth,minheight:t.minheight,maxheight:t.maxheight,ratio:Se(t.ratio)})})}function xo(t,e){n.trigger(i+":"+t,[en,e])}function _o(){clearTimeout(Co.t),Je=1,O.stopautoplayontouch?en.stopAutoplay():Ye=!0}function Co(){Je&&(O.stopautoplayontouch||(ko(),Po()),Co.t=setTimeout(function(){Je=0},Ot+Lt))}function ko(){Ye=!(!vt&&!Ue)}function Po(){if(clearTimeout(Po.t),pe.stop(Po.w),O.autoplay&&!Ye){en.autoplay||(en.autoplay=!0,xo("startautoplay"));var t=Mn,e=wt[Kt].data();Po.w=pe(function(){return e.state||t!==Mn},function(){Po.t=setTimeout(function(){if(!Ye&&t===Mn){var e=zt,n=nt[e][Kt].data();Po.w=pe(function(){return n.state||e!==zt},function(){Ye||e!==zt||en.show(Dt?ze(!We):zt)})}},O.autoplay)})}else en.autoplay&&(en.autoplay=!1,xo("stopautoplay"))}function So(t){var e;return"object"!=typeof t?(e=t,t={}):e=t.index,e=">"===e?_t+1:"<"===e?_t-1:"<<"===e?0:">>"===e?it-1:e,e=void 0===(e=isNaN(e)?a:e)?Mn||0:e}function To(t){en.activeIndex=Mn=Un(t),Ft=Gn(Mn),Et=Jn(Mn),zt=Bn(Mn+(We?-1:1)),bt=[Mn,Ft,Et],_t=Dt?t:Mn}function Fo(t){var e=Math.abs(Ct-_t),n=ce(t.time,function(){return Math.min(Ae*(1+(e-1)/12),2*Ae)});return t.slow&&(n*=10),n}function Eo(t,e){Oe&&(t.removeClass(R+" "+H),t.removeClass(K+" "+Q),e&&!vt&&t.addClass(e.replace(/^|\s/g," "+W+"--")))}function Mo(t,e,n){e&&(cn.removeClass(c),vt=!1,Kn()),t&&t!==vt&&(t.remove(),xo("unloadvideo")),n&&(ko(),Po())}function jo(t){cn.toggleClass(f,t)}function $o(t){if(!$n.flow){var e,n=t?t.pageX:$o.x,o=n&&!lo((e=n,e-On>jn.w/3))&&O.click;$o.p!==o&&dn.toggleClass(k,o)&&($o.p=o,$o.x=n)}}function zo(t){clearTimeout(zo.t),O.clicktransition&&O.clicktransition!==O.transition?setTimeout(function(){var e=O.transition;en.setOptions({transition:O.clicktransition}),Le=e,zo.t=setTimeout(function(){en.show(t)},10)},0):en.show(t)}function qo(t,e){$n[t]=qn[t]=e}function No(t){var e=o(this).data().eq;"thumbs"===O.navtype?zo({index:e,slow:t.altKey,user:!0,coo:t._x-wn.offset().left}):zo({index:e,slow:t.altKey,user:!0})}function Ao(t){zo({index:pn.index(this)?">":"<",slow:t.altKey,user:!0})}function Lo(t){je(t,function(){setTimeout(function(){ke(dn)},0),jo(!1)})}function Oo(){if(nt=en.data=nt||Ce(O.data)||ve(n),it=en.size=nt.length,Do.ok&&O.shuffle&&_e(nt),In(),Mn=Yn(Mn),it&&Hn(!0),Xn(),!Oo.i){Oo.i=!0;var t=O.startindex;Mn=xt=_t=Ct=At=Un(t)||0}if(it){if(function t(){if(!t.f===We)return t.f=We,Mn=it-1-Mn,en.reverse(),!0}())return;vt&&Mo(vt,!0),bt=[],wo(Kt),Oo.ok=!0,en.show({index:Mn,time:0}),en.resize()}else en.destroy()}function Do(){Do.ok&&(Do.ok=!1,xo("ready"))}cn[Kt]=o('<div class="'+y+'"></div>'),cn[Vt]=o(o.Fotorama.jst.thumb()),cn[Qt]=o(o.Fotorama.jst.dots()),An[Kt]=[],An[Vt]=[],An[Qt]=[],Ln[Kt]={},cn.addClass(Mt?l:u),sn.fotorama=this,en.startAutoplay=function(t){return en.autoplay?this:(Ye=Ue=!1,Qn(t||O.autoplay),Po(),this)},en.stopAutoplay=function(){return en.autoplay&&(Ye=Ue=!0,Po()),this},en.showSlide=function(t){var e,n=te(bn,O.navdir),o="horizontal"===O.navdir?O.thumbwidth:O.thumbheight;"next"===t&&(e=n-(o+O.margin)*Yt),"prev"===t&&(e=n+(o+O.margin)*Yt),so(e=Fe(e,qn),!0),Ie(bn,{time:550,pos:e,direction:O.navdir,onEnd:function(){ho()}})},en.showWhileLongPress=function(t){if(!en.longPress.singlePressInProgress){To(So(t));var e=Fo(t)/50,n=wt;en.activeFrame=wt=nt[Mn];var o=n===wt&&!t.user;return en.showNav(o,t,e),this}},en.showEndLongPress=function(t){if(!en.longPress.singlePressInProgress){To(So(t));var e=Fo(t)/50,n=wt;en.activeFrame=wt=nt[Mn];var o=n===wt&&!t.user;return en.showStage(o,t,e),void 0!==Ct&&Ct!==Mn,Ct=Mn,this}},en.showStage=function(t,e,n){Mo(vt,wt.i!==nt[Bn(xt)].i),ao(bt,"stage"),ro(qt?[_t]:[_t,Gn(_t),Jn(_t)]),qo("go",!0),t||xo("show",{user:e.user,time:n}),Ye=!0;var a=e.overPos,i=en.showStage.onEnd=function(n){if(!i.ok){if(i.ok=!0,n||bo(!0),t||xo("showend",{user:e.user}),!n&&Le&&Le!==O.transition)return en.setOptions({transition:Le}),void(Le=!1);no(),eo(bt,"stage"),qo("go",!1),fo(),$o(),ko(),Po(),en.fullScreen?(wt[Kt].find("."+at).attr("aria-hidden",!1),wt[Kt].find("."+ot).attr("aria-hidden",!0)):(wt[Kt].find("."+at).attr("aria-hidden",!0),wt[Kt].find("."+ot).attr("aria-hidden",!1))}};Te?function t(e,n,a,i,r,s){var u=void 0!==s;if(u||(r.push(arguments),Array.prototype.push.call(arguments,r.length),!(r.length>1))){e=e||o(e),n=n||o(n);var l=e[0],c=n[0],d="crossfade"===i.method,h=function(){if(!h.done){h.done=!0;var e=(u||r.shift())&&r.shift();e&&t.apply(this,e),(i.onEnd||Jt)(!!e)}},f=i.time/(s||1);a.removeClass(I+" "+D),e.stop().addClass(I),n.stop().addClass(D),d&&c&&e.fadeTo(0,0),e.fadeTo(d?f:0,1,d&&h),n.fadeTo(f,0,h),l&&d||c||h()}}(wt[Kt],nt[Ct]&&Mn!==Ct?nt[Ct][Kt]:null,fn,{time:n,method:O.transition,onEnd:i},Dn):Ie(hn,{pos:-se(_t,jn.w,O.margin,xt),overPos:a,time:n,onEnd:i});co()},en.showNav=function(t,e,n){if(ho(),Bt){go(tn),An[tn].push(wt[tn].addClass(V).attr("data-active",!0));var o=Yn(Mn+Zt(_t-Ct,-1,1));po({time:n,coo:o!==Mn&&e.coo,guessIndex:void 0!==e.coo?o:Mn,keep:t}),Ut&&vo(n)}},en.show=function(t){en.longPress.singlePressInProgress=!0,To(So(t));var e=Fo(t),n=wt;en.activeFrame=wt=nt[Mn];var o=n===wt&&!t.user;return en.showStage(o,t,e),en.showNav(o,t,e),void 0!==Ct&&Ct!==Mn,Ct=Mn,en.longPress.singlePressInProgress=!1,this},en.requestFullScreen=function(){if(ue&&!en.fullScreen){if(o((en.activeFrame||{}).$stageFrame||{}).hasClass("fotorama-video-container"))return;Xe=St.scrollTop(),Be=St.scrollLeft(),ke(St),qo("x",!0),Ge=o.extend({},jn),n.addClass(Y).appendTo(Pt.addClass(r)),kt.addClass(r),Mo(vt,!0,!0),en.fullScreen=!0,de&&yt.request(an),en.resize(),eo(bt,"stage"),no(),xo("fullscreenenter"),"ontouchstart"in t||Pn.focus()}return this},en.cancelFullScreen=function(){return de&&yt.is()?yt.cancel(e):en.fullScreen&&(en.fullScreen=!1,$t&&yt.cancel(an),Pt.removeClass(r),kt.removeClass(r),n.removeClass(Y).insertAfter(ln),jn=o.extend({},Ge),Mo(vt,!0,!0),qo("x",!1),en.resize(),eo(bt,"stage"),ke(St,Be,Xe),xo("fullscreenexit")),this},en.toggleFullScreen=function(){return en[(en.fullScreen?"cancel":"request")+"FullScreen"]()},en.resize=function(e){if(!nt)return this;var n=arguments[1]||0,a=arguments[2];Yt=Vn(0,O),yo(en.fullScreen?{width:o(t).width(),maxwidth:null,minwidth:null,height:o(t).height(),maxheight:null,minheight:null}:Pe(e),[jn,a||en.fullScreen||O]);var i=jn.width,r=jn.height,s=jn.ratio,u=St.height()-(Bt?wn.height():0);if(re(i)&&(cn.css({width:""}),cn.css({height:""}),dn.css({width:""}),dn.css({height:""}),hn.css({width:""}),hn.css({height:""}),wn.css({width:""}),wn.css({height:""}),cn.css({minWidth:jn.minwidth||0,maxWidth:jn.maxwidth||1200}),"dots"===Bt&&gn.hide(),i=jn.W=jn.w=cn.width(),jn.nw=Bt&&ie(O.navwidth,i)||i,hn.css({width:jn.w,marginLeft:(jn.W-jn.w)/2}),r=(r=ie(r,u))||s&&i/s)){if(i=Math.round(i),r=jn.h=Math.round(Zt(r,ie(jn.minheight,u),ie(jn.maxheight,u))),dn.css({width:i,height:r}),"vertical"!==O.navdir||en.fullscreen||wn.width(O.thumbwidth+2*O.thumbmargin),"horizontal"!==O.navdir||en.fullscreen||wn.height(O.thumbheight+2*O.thumbmargin),"dots"===Bt&&(wn.width(i).height("auto"),gn.show()),"vertical"===O.navdir&&en.fullScreen&&dn.css("height",St.height()),"horizontal"===O.navdir&&en.fullScreen&&dn.css("height",St.height()-wn.height()),Bt){switch(O.navdir){case"vertical":gn.removeClass(q),gn.removeClass(z),gn.addClass($),wn.stop().animate({height:jn.h,width:O.thumbwidth},n);break;case"list":gn.removeClass($),gn.removeClass(q),gn.addClass(z);break;default:gn.removeClass($),gn.removeClass(z),gn.addClass(q),wn.stop().animate({width:jn.nw},n)}bo(),po({guessIndex:Mn,time:n,keep:!0}),Ut&&uo.nav&&vo(n)}Ve=a||!0,Do.ok=!0,Do()}return On=dn.offset().left,Rn(),this},en.setOptions=function(t){return o.extend(O,t),Oo(),this},en.shuffle=function(){return nt&&_e(nt)&&Oo(),this},en.longPress={threshold:1,count:0,thumbSlideTime:20,progress:function(){this.inProgress||(this.count++,this.inProgress=this.count>this.threshold)},end:function(){this.inProgress&&(this.isEnded=!0)},reset:function(){this.count=0,this.inProgress=!1,this.isEnded=!1}},en.destroy=function(){return en.cancelFullScreen(),en.stopAutoplay(),nt=en.data=null,Hn(),bt=[],wo(Kt),Oo.ok=!1,this},en.playVideo=function(){var t=wt,e=t.video,n=Mn;return"object"==typeof e&&t.videoReady&&(de&&en.fullScreen&&en.cancelFullScreen(),pe(function(){return!yt.is()||n!==Mn},function(){var a;n===Mn&&(t.$video=t.$video||o(ye(dt)).append('<iframe src="'+(a=e).p+a.type+".com/embed/"+a.id+'" frameborder="0" allowfullscreen></iframe>'),t.$video.appendTo(t[Kt]),cn.addClass(c),vt=t.$video,Kn(),pn.blur(),Pn.blur(),xo("loadvideo"))})),this},en.stopVideo=function(){return Mo(vt,!0,!0),this},en.spliceByIndex=function(t,e){e.i=t+1,e.img&&o.ajax({url:e.img,type:"HEAD",success:function(){nt.splice(t,1,e),Oo()}})},dn.on("mousemove",$o),$n=He(hn,{onStart:_o,onMove:function(t,e){Eo(dn,e.edge)},onTouchEnd:Co,onEnd:function(t){var e,a,i,r,s,u,l;if(Eo(dn),e=(Nt&&!Ze||t.touch)&&O.arrows,(t.moved||e&&t.pos!==t.newPos&&!t.control)&&t.$target[0]!==Pn[0]){var c=(r=t.newPos,s=jn.w,u=O.margin,l=xt,-Math.round(r/(s+(u||0))-(l||0)));en.show({index:c,time:Te?Ae:t.time,overPos:t.overPos,user:!0})}else t.aborted||t.control||(a=t.startEvent,i=a.target,o(i).hasClass(ht)?en.playVideo():i===Sn?en.toggleFullScreen():vt?i===Fn&&Mo(vt,!0,!0):n.hasClass(Y)||en.requestFullScreen())},timeLow:1,timeHigh:1,friction:2,select:"."+X+", ."+X+" *",$wrap:dn,direction:"horizontal"}),qn=He(bn,{onStart:_o,onMove:function(t,e){Eo(wn,e.edge)},onTouchEnd:Co,onEnd:function(t){function e(){po.l=t.newPos,ko(),Po(),so(t.newPos,!0),ho()}if(t.moved)t.pos!==t.newPos?(Ye=!0,Ie(bn,{time:t.time,pos:t.newPos,overPos:t.overPos,direction:O.navdir,onEnd:e}),so(t.newPos),Oe&&Eo(wn,we(t.newPos,qn.min,qn.max,t.dir))):e();else{var n=t.$target.closest("."+L,bn)[0];n&&No.call(n,t.startEvent)}},timeLow:.5,timeHigh:2,friction:5,$wrap:wn,direction:O.navdir}),zn=Ke(dn,{shift:!0,onEnd:function(t,e){_o(),Co(),en.show({index:e,slow:t.altKey})}}),Nn=Ke(wn,{onEnd:function(t,e){_o(),Co();var n=le(bn)+.25*e;bn.css(ee(Zt(n,qn.min,qn.max),O.navdir)),Oe&&Eo(wn,we(n,qn.min,qn.max,O.navdir)),Nn.prevent={"<":n>=qn.max,">":n<=qn.min},clearTimeout(Nn.t),Nn.t=setTimeout(function(){po.l=n,so(n,!0)},Lt),so(n)}}),cn.hover(function(){setTimeout(function(){Je||jo(!(Ze=!0))},0)},function(){Ze&&jo(!(Ze=!1))}),be(pn,function(t){$e(t),Ao.call(this,t)},{onStart:function(){_o(),$n.control=!0},onTouchEnd:Co}),be(Cn,function(t){$e(t),"thumbs"===O.navtype?en.show("<"):en.showSlide("prev")}),be(kn,function(t){$e(t),"thumbs"===O.navtype?en.show(">"):en.showSlide("next")}),pn.each(function(){Me(this,function(t){Ao.call(this,t)}),Lo(this)}),Me(Sn,function(){n.hasClass(Y)?(en.cancelFullScreen(),hn.focus()):(en.requestFullScreen(),Pn.focus())}),Lo(Sn),o.each("load push pop shift unshift reverse sort splice".split(" "),function(t,e){en[e]=function(){return nt=nt||[],"load"!==e?Array.prototype[e].apply(nt,arguments):arguments[0]&&"object"==typeof arguments[0]&&arguments[0].length&&(nt=Ce(arguments[0])),Oo(),en}}),Oo()},o.fn.fotorama=function(e){return this.each(function(){var n=this,a=o(this),i=a.data(),r=i.fotorama;r?r.setOptions(e,!0):pe(function(){return!(0===(t=n).offsetWidth&&0===t.offsetHeight);var t},function(){i.urtext=a.html(),new o.Fotorama(a,o.extend({},Ut,t.fotoramaDefaults,e,i))})})},o.Fotorama.instances=[],o.Fotorama.cache={},o.Fotorama.measures={},(o=o||{}).Fotorama=o.Fotorama||{},o.Fotorama.jst=o.Fotorama.jst||{},o.Fotorama.jst.dots=function(t){return'<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>','<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>'},o.Fotorama.jst.frameCaption=function(t){var e,n="";return n+='<div class="fotorama__caption" aria-hidden="true">\r\n    <div class="fotorama__caption__wrap" id="'+(null==(e=t.labelledby)?"":e)+'">'+(null==(e=t.caption)?"":e)+"</div>\r\n</div>\r\n"},o.Fotorama.jst.style=function(t){var e,n="";return n+=".fotorama"+(null==(e=t.s)?"":e)+" .fotorama__nav--thumbs .fotorama__nav__frame{\r\npadding:"+(null==(e=t.m)?"":e)+"px;\r\nheight:"+(null==(e=t.h)?"":e)+"px}\r\n.fotorama"+(null==(e=t.s)?"":e)+" .fotorama__thumb-border{\r\nheight:"+(null==(e=t.h)?"":e)+"px;\r\nborder-width:"+(null==(e=t.b)?"":e)+"px;\r\nmargin-top:"+(null==(e=t.m)?"":e)+"px}"},o.Fotorama.jst.thumb=function(t){return'<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>','<div class="fotorama__nav__frame fotorama__nav__frame--thumb" tabindex="0" role="button" data-gallery-role="nav-frame" data-nav-type="thumb" aria-label>\r\n    <div class="fotorama__thumb">\r\n    </div>\r\n</div>'}}(window,document,location,"undefined"!=typeof jQuery&&jQuery);
\ No newline at end of file
diff --git a/lib/web/mage/menu.js b/lib/web/mage/menu.js
index 7533edd57b4a6..839730c9ea600 100644
--- a/lib/web/mage/menu.js
+++ b/lib/web/mage/menu.js
@@ -22,7 +22,7 @@ define([
             showDelay: 42,
             hideDelay: 300,
             delay: 0,
-            mediaBreakpoint: '(max-width: 768px)'
+            mediaBreakpoint: '(max-width: 767px)'
         },
 
         /**
@@ -464,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/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 8c19669699b9d..68b0c0f9f02fd 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}
@@ -990,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);
                     }
                 }
 
@@ -1109,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.')
         ],
@@ -1608,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;
 
@@ -1922,15 +1937,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
                 });
@@ -1948,8 +1963,8 @@
             }
 
             if (firstActive.length) {
-                $('html, body').stop().animate({
-                    scrollTop: firstActive.offset().top
+                $('body').stop().animate({
+                    scrollTop: firstActive.offset().top - windowHeight / 2
                 });
                 firstActive.focus();
             }
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/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/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.');
         }