diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
index 1e0015d2be2c6..8373c3fcb18ac 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Checkboxes/Tree.php
@@ -83,7 +83,7 @@ protected function setExpandedPath($path)
     protected function _getNodeJson($node, $level = 1)
     {
         $item = [];
-        $item['text'] = $this->escapeHtml($node->getName());
+        $item['text'] = $this->_escaper->escapeHtml($node->getName());
         if ($this->_withProductCount) {
             $item['text'] .= ' (' . $node->getProductCount() . ')';
         }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index a66dcece2bef0..32c4fe5ba255e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -418,7 +418,7 @@ protected function _getNodeJson($node, $level = 0)
      */
     public function buildNodeName($node)
     {
-        $result = $this->escapeHtml($node->getName());
+        $result = $this->_escaper->escapeHtml($node->getName());
         $result .= ' (ID: ' . $node->getId() . ')';
         if ($this->_withProductCount) {
             $result .= ' (' . $node->getProductCount() . ')';
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
index 9c83d4aea61c7..b76fdc73780ed 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -121,7 +121,7 @@ function (node, e) {
                 }
             ';
         } else {
-            $chooserJsObject = $this->escapeJs($this->getId());
+            $chooserJsObject = $this->_escaper->escapeJs($this->getId());
             $js = '
                 function (node, e) {
                     ' .
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index efb7d6dbbeff3..65c8243e3a320 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -122,7 +122,7 @@ public function getHeaderText()
             if (is_array($frontendLabel)) {
                 $frontendLabel = $frontendLabel[0];
             }
-            return __('Edit Product Attribute "%1"', $this->escapeHtml($frontendLabel));
+            return __('Edit Product Attribute "%1"', $this->_escaper->escapeHtml($frontendLabel));
         }
         return __('New Product Attribute');
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 3b9036c1fbbc0..5f8e86e84c15f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -132,7 +132,7 @@ protected function _prepareLayout()
                 \Magento\Backend\Block\Widget\Button::class,
                 [
                     'label' => __('Delete'),
-                    'onclick' => 'deleteConfirm(\'' . $this->escapeJs(
+                    'onclick' => 'deleteConfirm(\'' . $this->_escaper->escapeJs(
                         __(
                             'You are about to delete all products in this attribute set. '
                             . 'Are you sure you want to do that?'
@@ -233,7 +233,7 @@ public function getGroupTreeJson()
         /* @var $node \Magento\Eav\Model\Entity\Attribute\Group */
         foreach ($groups as $node) {
             $item = [];
-            $item['text'] = $this->escapeHtml($node->getAttributeGroupName());
+            $item['text'] = $this->_escaper->escapeHtml($node->getAttributeGroupName());
             $item['id'] = $node->getAttributeGroupId();
             $item['cls'] = 'folder';
             $item['allowDrop'] = true;
@@ -280,7 +280,7 @@ public function getAttributeTreeJson()
 
         foreach ($attributes as $child) {
             $attr = [
-                'text' => $this->escapeHtml($child->getAttributeCode()),
+                'text' => $this->_escaper->escapeHtml($child->getAttributeCode()),
                 'id' => $child->getAttributeId(),
                 'cls' => 'leaf',
                 'allowDrop' => false,
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index 822580801c4e4..a3e313e374c5e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -299,7 +299,7 @@ public function getDuplicateUrl()
     public function getHeader()
     {
         if ($this->getProduct()->getId()) {
-            $header = $this->escapeHtml($this->getProduct()->getName());
+            $header = $this->_escaper->escapeHtml($this->getProduct()->getName());
         } else {
             $header = __('New Product');
         }
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 6419ae2d70588..e025a204e43ba 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/AttributeSet.php
@@ -56,7 +56,7 @@ public function getSelectorOptions()
             'showRecent' => true,
             'storageKey' => 'product-template-key',
             'minLength' => 0,
-            'currentlySelected' => $this->escapeHtml(
+            'currentlySelected' => $this->_escaper->escapeHtml(
                 $this->_coreRegistry->registry('product')->getAttributeSetId()
             )
         ];
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
index 6189a97dbe761..83050d51fa0a2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
@@ -140,14 +140,14 @@ public function getChooseFromStoreHtml($storeTo)
                 if (!$this->hasWebsite($_website->getId())) {
                     continue;
                 }
-                $optGroupLabel = $this->escapeHtml($_website->getName());
+                $optGroupLabel = $this->_escaper->escapeHtml($_website->getName());
                 $this->_storeFromHtml .= '<optgroup label="' . $optGroupLabel . '"></optgroup>';
                 foreach ($this->getGroupCollection($_website) as $_group) {
-                    $optGroupName = $this->escapeHtml($_group->getName());
+                    $optGroupName = $this->_escaper->escapeHtml($_group->getName());
                     $this->_storeFromHtml .= '<optgroup label="&nbsp;&nbsp;&nbsp;&nbsp;' . $optGroupName . '">';
                     foreach ($this->getStoreCollection($_group) as $_store) {
                         $this->_storeFromHtml .= '<option value="' . $_store->getId() . '">&nbsp;&nbsp;&nbsp;&nbsp;';
-                        $this->_storeFromHtml .= $this->escapeHtml($_store->getName()) . '</option>';
+                        $this->_storeFromHtml .= $this->_escaper->escapeHtml($_store->getName()) . '</option>';
                     }
                 }
                 $this->_storeFromHtml .= '</optgroup>';
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
index 22a56ec0a210d..0c2fc69100454 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser.php
@@ -202,7 +202,7 @@ function (node, e) {
                 {jsObject}.categoryName = node.attributes.id != "none" ? node.text : false;
             }
         ';
-        $js = str_replace('{jsObject}', $this->escapeJs($this->getJsObjectName()), $js);
+        $js = str_replace('{jsObject}', $this->_escaper->escapeJs($this->getJsObjectName()), $js);
         return $js;
     }
 
diff --git a/app/code/Magento/Catalog/Block/Product/Price.php b/app/code/Magento/Catalog/Block/Product/Price.php
index 8bed7451cd555..9f3a9152ca007 100644
--- a/app/code/Magento/Catalog/Block/Product/Price.php
+++ b/app/code/Magento/Catalog/Block/Product/Price.php
@@ -169,7 +169,7 @@ public function getRealPriceJs($product)
      */
     public function prepareSku($sku)
     {
-        return $this->escapeHtml($this->string->splitInjection($sku));
+        return $this->_escaper->escapeHtml($this->string->splitInjection($sku));
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
index 0384c9cd9acce..df385e07ea4bb 100644
--- a/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
+++ b/app/code/Magento/Catalog/Block/Product/View/GalleryOptions.php
@@ -60,7 +60,7 @@ public function getOptionsJson()
         if (is_bool($this->getVar("gallery/nav"))) {
             $optionItems['nav'] = $this->getVar("gallery/nav") ? 'true' : 'false';
         } else {
-            $optionItems['nav'] = $this->escapeHtml($this->getVar("gallery/nav"));
+            $optionItems['nav'] = $this->_escaper->escapeHtml($this->getVar("gallery/nav"));
         }
 
         $optionItems['loop'] = $this->getVar("gallery/loop");
@@ -68,16 +68,16 @@ public function getOptionsJson()
         $optionItems['arrows'] = $this->getVar("gallery/arrows");
         $optionItems['allowfullscreen'] = $this->getVar("gallery/allowfullscreen");
         $optionItems['showCaption'] = $this->getVar("gallery/caption");
-        $optionItems['width'] = (int)$this->escapeHtml(
+        $optionItems['width'] = (int)$this->_escaper->escapeHtml(
             $this->gallery->getImageAttribute('product_page_image_medium', 'width')
         );
-        $optionItems['thumbwidth'] = (int)$this->escapeHtml(
+        $optionItems['thumbwidth'] = (int)$this->_escaper->escapeHtml(
             $this->gallery->getImageAttribute('product_page_image_small', 'width')
         );
 
         if ($this->gallery->getImageAttribute('product_page_image_small', 'height') ||
             $this->gallery->getImageAttribute('product_page_image_small', 'width')) {
-            $optionItems['thumbheight'] = (int)$this->escapeHtml(
+            $optionItems['thumbheight'] = (int)$this->_escaper->escapeHtml(
                 $this->gallery->getImageAttribute('product_page_image_small', 'height') ?:
                     $this->gallery->getImageAttribute('product_page_image_small', 'width')
             );
@@ -85,7 +85,7 @@ public function getOptionsJson()
 
         if ($this->gallery->getImageAttribute('product_page_image_medium', 'height') ||
             $this->gallery->getImageAttribute('product_page_image_medium', 'width')) {
-            $optionItems['height'] = (int)$this->escapeHtml(
+            $optionItems['height'] = (int)$this->_escaper->escapeHtml(
                 $this->gallery->getImageAttribute('product_page_image_medium', 'height') ?:
                     $this->gallery->getImageAttribute('product_page_image_medium', 'width')
             );
@@ -93,16 +93,16 @@ public function getOptionsJson()
 
         if ($this->getVar("gallery/transition/duration")) {
             $optionItems['transitionduration'] =
-                (int)$this->escapeHtml($this->getVar("gallery/transition/duration"));
+                (int)$this->_escaper->escapeHtml($this->getVar("gallery/transition/duration"));
         }
 
-        $optionItems['transition'] = $this->escapeHtml($this->getVar("gallery/transition/effect"));
+        $optionItems['transition'] = $this->_escaper->escapeHtml($this->getVar("gallery/transition/effect"));
         $optionItems['navarrows'] = $this->getVar("gallery/navarrows");
-        $optionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/navtype"));
-        $optionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/navdir"));
+        $optionItems['navtype'] = $this->_escaper->escapeHtml($this->getVar("gallery/navtype"));
+        $optionItems['navdir'] = $this->_escaper->escapeHtml($this->getVar("gallery/navdir"));
 
         if ($this->getVar("gallery/thumbmargin")) {
-            $optionItems['thumbmargin'] = (int)$this->escapeHtml($this->getVar("gallery/thumbmargin"));
+            $optionItems['thumbmargin'] = (int)$this->_escaper->escapeHtml($this->getVar("gallery/thumbmargin"));
         }
 
         return $this->jsonSerializer->serialize($optionItems);
@@ -124,23 +124,23 @@ public function getFSOptionsJson()
         if (is_bool($this->getVar("gallery/fullscreen/nav"))) {
             $fsOptionItems['nav'] = $this->getVar("gallery/fullscreen/nav") ? 'true' : 'false';
         } else {
-            $fsOptionItems['nav'] = $this->escapeHtml($this->getVar("gallery/fullscreen/nav"));
+            $fsOptionItems['nav'] = $this->_escaper->escapeHtml($this->getVar("gallery/fullscreen/nav"));
         }
 
         $fsOptionItems['loop'] = $this->getVar("gallery/fullscreen/loop");
-        $fsOptionItems['navdir'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navdir"));
+        $fsOptionItems['navdir'] = $this->_escaper->escapeHtml($this->getVar("gallery/fullscreen/navdir"));
         $fsOptionItems['navarrows'] = $this->getVar("gallery/fullscreen/navarrows");
-        $fsOptionItems['navtype'] = $this->escapeHtml($this->getVar("gallery/fullscreen/navtype"));
+        $fsOptionItems['navtype'] = $this->_escaper->escapeHtml($this->getVar("gallery/fullscreen/navtype"));
         $fsOptionItems['arrows'] = $this->getVar("gallery/fullscreen/arrows");
         $fsOptionItems['showCaption'] = $this->getVar("gallery/fullscreen/caption");
 
         if ($this->getVar("gallery/fullscreen/transition/duration")) {
-            $fsOptionItems['transitionduration'] = (int)$this->escapeHtml(
+            $fsOptionItems['transitionduration'] = (int)$this->_escaper->escapeHtml(
                 $this->getVar("gallery/fullscreen/transition/duration")
             );
         }
 
-        $fsOptionItems['transition'] = $this->escapeHtml($this->getVar("gallery/fullscreen/transition/effect"));
+        $fsOptionItems['transition'] = $this->_escaper->escapeHtml($this->getVar("gallery/fullscreen/transition/effect"));
 
         if ($this->getVar("gallery/fullscreen/keyboard")) {
             $fsOptionItems['keyboard'] = $this->getVar("gallery/fullscreen/keyboard");
@@ -148,7 +148,7 @@ public function getFSOptionsJson()
 
         if ($this->getVar("gallery/fullscreen/thumbmargin")) {
             $fsOptionItems['thumbmargin'] =
-                (int)$this->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
+                (int)$this->_escaper->escapeHtml($this->getVar("gallery/fullscreen/thumbmargin"));
         }
 
         return $this->jsonSerializer->serialize($fsOptionItems);
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 cea54e883d2aa..91b1707888730 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml
@@ -5,11 +5,11 @@
  */
 
 /**
- * @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree
+ * @var \Magento\Catalog\Block\Adminhtml\Category\Tree $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
-
-<?php $divId = $block->escapeHtml('tree-div_' . time()) ?>
+<?php $divId = $escaper->escapeHtml('tree-div_' . time()) ?>
 <div id="<?= /* @noEscape */ $divId ?>" class="tree"></div>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 
@@ -17,14 +17,14 @@
     {
         "*": {
             "categoryCheckboxTree": {
-                "dataUrl":       "<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>",
+                "dataUrl":       "<?= $escaper->escapeUrl($block->getLoadTreeUrl()) ?>",
                 "divId":         "<?= /* @noEscape */ $divId ?>",
                 "rootVisible":   false,
-                "useAjax":       <?= $block->escapeHtml($block->getUseAjax()) ?>,
+                "useAjax":       <?= $escaper->escapeHtml($block->getUseAjax()) ?>,
                 "currentNodeId": <?= (int)$block->getCategoryId() ?>,
                 "jsFormObject":  "<?= /* @noEscape */ $block->getJsFormObject() ?>",
-                "name":          "<?= $block->escapeHtml($block->getRoot()->getName()) ?>",
-                "checked":       "<?= $block->escapeHtml($block->getRoot()->getChecked()) ?>",
+                "name":          "<?= $escaper->escapeHtml($block->getRoot()->getName()) ?>",
+                "checked":       "<?= $escaper->escapeHtml($block->getRoot()->getChecked()) ?>",
                 "allowdDrop":    <?= /* @noEscape */ $block->getRoot()->getIsVisible() ? 'true' : 'false' ?>,
                 "rootId":        <?= (int)$block->getRoot()->getId() ?>,
                 "expanded":      true,
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 c19f140687bbc..f78c38946c352 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,13 +5,14 @@
  */
 
 /**
- * @var $block \Magento\Catalog\Block\Adminhtml\Category\Edit
+ * @var \Magento\Catalog\Block\Adminhtml\Category\Edit $block
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
 <div data-id="information-dialog-category" class="messages">
     <div class="message message-notice">
-        <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
+        <div><?= $escaper->escapeHtml(__('This operation can take a long time')) ?></div>
     </div>
 </div>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display: none;', 'div[data-id="information-dialog-category"]') ?>
@@ -19,7 +20,7 @@
 <script type="text/x-magento-init">
     {
         "*": {
-            "categoryForm": {"refreshUrl": "<?= $block->escapeJs($block->escapeUrl($block->getRefreshPathUrl())) ?>"}
+            "categoryForm": {"refreshUrl": "<?= $escaper->escapeJs($escaper->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 e52b43b1c3d24..fafe592bc0968 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
@@ -4,9 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Catalog\Block\Adminhtml\Category\AssignProducts $block */
-/** @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product $blockGrid */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Category\AssignProducts $block
+ * @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product $blockGrid
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 $blockGrid = $block->getBlockGrid();
 $gridJsObjectName = $blockGrid->getJsObjectName();
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 0cd00e88f4350..21575fca75e9a 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,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Category\Tree */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Category\Tree $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div class="categories-side-col">
     <div class="sidebar-actions">
@@ -16,9 +19,9 @@
     </div>
     <div class="tree-actions">
         <?php if ($block->getRoot()):?>
-            <a id="colapseAll" href="#"><?= $block->escapeHtml(__('Collapse All')) ?></a>
+            <a id="colapseAll" href="#"><?= $escaper->escapeHtml(__('Collapse All')) ?></a>
             <span class="separator">|</span>
-            <a id="expandAll" href="#"><?= $block->escapeHtml(__('Expand All')) ?></a>
+            <a id="expandAll" href="#"><?= $escaper->escapeHtml(__('Expand All')) ?></a>
         <?php endif; ?>
     </div>
     <?php if ($block->getRoot()):?>
@@ -39,7 +42,7 @@
 
     <div data-id="information-dialog-tree" class="messages">
         <div class="message message-notice">
-            <div><?= $block->escapeHtml(__('This operation can take a long time')) ?></div>
+            <div><?= $escaper->escapeHtml(__('This operation can take a long time')) ?></div>
         </div>
     </div>
         <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
@@ -183,7 +186,7 @@
 
                     if (!this.collapsed) {
                         this.collapsed = true;
-                        this.loader.dataUrl = '{$block->escapeJs($block->getLoadTreeUrl(false))}';
+                        this.loader.dataUrl = '{$escaper->escapeJs($block->getLoadTreeUrl(false))}';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -192,7 +195,7 @@
                     this.expandAll();
                     if (this.collapsed) {
                         this.collapsed = false;
-                        this.loader.dataUrl = '{$block->escapeJs($block->getLoadTreeUrl(true))}';
+                        this.loader.dataUrl = '{$escaper->escapeJs($block->getLoadTreeUrl(true))}';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -227,7 +230,7 @@
                 if (tree && switcherParams) {
                     var url;
                     if (switcherParams.useConfirm) {
-                        if (!confirm("{$block->escapeJs(__(
+                        if (!confirm("{$escaper->escapeJs(__(
     'Please confirm site switching. All data that hasn\'t been saved will be lost.'
 ))}")) {
                             return false;
@@ -272,7 +275,7 @@
                             }
                         });
                     } else {
-                        var baseUrl = '{$block->escapeJs($block->getEditUrl())}';
+                        var baseUrl = '{$escaper->escapeJs($block->getEditUrl())}';
                         var urlExt = switcherParams.scopeParams + 'id/' + tree.currentNodeId + '/';
                         url = parseSidUrl(baseUrl, urlExt);
                         setLocation(url);
@@ -324,7 +327,7 @@ endif;
 
             jQuery(function () {
                 categoryLoader = new Ext.tree.TreeLoader({
-                    dataUrl: '{$block->escapeJs($block->getLoadTreeUrl())}'
+                    dataUrl: '{$escaper->escapeJs($block->getLoadTreeUrl())}'
                 });
 
                 categoryLoader.processResponse = function (response, parent, callback) {
@@ -409,11 +412,11 @@ endif;
 script;
         $scriptString .= '
                     rootVisible: \'' . ($block->getRoot()->getIsVisible() ? 'true' : 'false') . '\',
-                    useAjax: ' . $block->escapeJs($block->getUseAjax()) . ',
-                    switchTreeUrl: \'' . $block->escapeJs($block->escapeUrl($block->getSwitchTreeUrl())) .'\',
-                    editUrl: \'' . $block->escapeJs($block->escapeUrl($block->getEditUrl())) .'\',
+                    useAjax: ' . $escaper->escapeJs($block->getUseAjax()) . ',
+                    switchTreeUrl: \'' . $escaper->escapeJs($escaper->escapeUrl($block->getSwitchTreeUrl())) .'\',
+                    editUrl: \'' . $escaper->escapeJs($escaper->escapeUrl($block->getEditUrl())) .'\',
                     currentNodeId: ' . (int)$block->getCategoryId() . ',
-                    baseUrl: \'' . $block->escapeJs($block->escapeUrl($block->getEditUrl())) . '\'
+                    baseUrl: \'' . $escaper->escapeJs($escaper->escapeUrl($block->getEditUrl())) . '\'
                 };
 
                 defaultLoadTreeParams = {
@@ -504,7 +507,7 @@ script;
                         click: function () {
                             (function ($) {
                                 $.ajax({
-                                    url: '{$block->escapeJs($block->getMoveUrl())}',
+                                    url: '{$escaper->escapeJs($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 cf64c57c720b7..044fe8fbff447 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
@@ -4,11 +4,13 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-
 <?php $_divId = 'tree' . $block->getId() ?>
-<div id="<?= $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
+<div id="<?= $escaper->escapeHtmlAttr($_divId) ?>" class="tree"></div>
 <!--[if IE]>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <![endif]-->
@@ -21,7 +23,7 @@ $scriptString = <<<script
 
 require(['jquery', 'prototype', 'extjs/ext-tree-checkbox'], function(jQuery){
 
-var tree{$block->escapeJs($block->getId())};
+var tree{$escaper->escapeJs($block->getId())};
 
 var useMassaction = {$isUseMassaction};
 
@@ -74,7 +76,7 @@ script;
 $scriptString .= <<<script
 
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '{$block->escapeJs($block->escapeUrl($block->getLoadTreeUrl()))}'
+       dataUrl: '{$escaper->escapeJs($escaper->escapeUrl($block->getLoadTreeUrl()))}'
     });
 
     categoryLoader.processResponse = function (response, parent, callback) {
@@ -103,7 +105,7 @@ $scriptString .= <<<script
                 // Add empty node to reset category filter
                 if(!emptyNodeAdded) {
                     var empty = Object.clone(_node);
-                    empty.text = '{$block->escapeJs(__('None'))}';
+                    empty.text = '{$escaper->escapeJs(__('None'))}';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -177,10 +179,10 @@ $scriptString .= <<<script
         treeLoader.baseParams.id = node.attributes.id;
         treeLoader.baseParams.store = node.attributes.store;
         treeLoader.baseParams.form_key = FORM_KEY;
-        $('{$block->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('{$escaper->escapeJs($_divId)}').fire('category:beforeLoad', {treeLoader:treeLoader});
     });
 
-    tree{$block->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$block->escapeJs($_divId)}', {
+    tree{$escaper->escapeJs($block->getId())} = new Ext.tree.TreePanel.Enhanced('{$escaper->escapeJs($_divId)}', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
@@ -192,9 +194,9 @@ $scriptString .= <<<script
     });
 
     if (useMassaction) {
-        tree{$block->escapeJs($block->getId())}.on('check', function(node) {
-            $('{$block->escapeJs($_divId)}').fire('node:changed', {node:node});
-        }, tree{$block->escapeJs($block->getId())});
+        tree{$escaper->escapeJs($block->getId())}.on('check', function(node) {
+            $('{$escaper->escapeJs($_divId)}').fire('node:changed', {node:node});
+        }, tree{$escaper->escapeJs($block->getId())});
     }
 
     // set the root node
@@ -206,7 +208,7 @@ $scriptString .= <<<script
         category_id: {$intCategoryId}
     };
 
-    tree{$block->escapeJs($block->getId())}.loadTree({parameters:parameters, data:{$block->getTreeJson()}},true);
+    tree{$escaper->escapeJs($block->getId())}.loadTree({parameters:parameters, data:{$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 4e70bff5a4884..5cf4ba5fa2bb7 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,16 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-/** @var $block \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-?>
-<?php
-/* @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element */
+
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Form\Renderer\Fieldset\Element $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
+
 $element = $block->getElement();
 $note = $element->getNote() ?
-    '<div class="note admin__field-note">' . $block->escapeHtml($element->getNote()) . '</div>' : '';
+    '<div class="note admin__field-note">' . $escaper->escapeHtml($element->getNote()) . '</div>' : '';
 $elementBeforeLabel = $element->getExtType() == 'checkbox' || $element->getExtType() == 'radio';
 $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml();
 $fieldId = ($element->getHtmlId()) ? ' id="attribute-' . $element->getHtmlId() . '-container"' : '';
@@ -24,8 +24,8 @@ $fieldClass .= ($element->getRequired()) ? ' required' : '';
 $fieldClass .= ($note) ? ' with-note' : '';
 $fieldClass .= ($entity && $entity->getIsUserDefined()) ? ' user-defined type-' . $entity->getFrontendInput() : '';
 
-$fieldAttributes = $fieldId . ' class="' . $block->escapeHtmlAttr($fieldClass) . '" '
-    . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId()));
+$fieldAttributes = $fieldId . ' class="' . $escaper->escapeHtmlAttr($fieldClass) . '" '
+    . $block->getUiId('form-field', $escaper->escapeHtmlAttr($element->getId()));
 
 /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
@@ -64,13 +64,13 @@ $jsonHelper = $block->getData('jsonHelper');
                             class="use-default-control"
                             id="<?= $element->getHtmlId() ?>_default"
                             <?php if ($block->usedDefault()):?> checked="checked"<?php endif; ?>
-                            value="<?= $block->escapeHtmlAttr($block->getAttributeCode()) ?>"/>
+                            value="<?= $escaper->escapeHtmlAttr($block->getAttributeCode()) ?>"/>
                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                         'onclick',
                         $elementToggleCode,
                         "#" . $element->getHtmlId() . "_default"
                     ) ?>
-                    <span class="use-default-label"><?= $block->escapeHtml(__('Use Default Value')) ?></span>
+                    <span class="use-default-label"><?= $escaper->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 9b9fff2cfc344..111e8ee6d304a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
@@ -3,11 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
- * @see \Magento\Catalog\Block\Adminhtml\Product
+ * @var \Magento\Catalog\Block\Adminhtml\Product $block
  */
 ?>
-
 <?= $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 e30b981ff36a6..d6728de39e8ab 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,10 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-?>
-<?php
 /**
- * @var $block \Magento\Backend\Block\Widget\Form\Container
+ * @var \Magento\Backend\Block\Widget\Form\Container $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?= /* @noEscape */ $block->getFormInitScripts() ?>
@@ -15,15 +14,15 @@
     <?= $block->getButtonsHtml('header') ?>
 </div>
 
-<form id="edit_form" class="admin__scope-old edit-form" action="<?= $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
-    <input name="form_key" type="hidden" value="<?= $block->escapeHtml($block->getFormKey()) ?>" />
+<form id="edit_form" class="admin__scope-old edit-form" action="<?= $escaper->escapeHtml($block->getSaveUrl()) ?>" method="post">
+    <input name="form_key" type="hidden" value="<?= $escaper->escapeHtml($block->getFormKey()) ?>" />
     <?= $block->getChildHtml('form') ?>
 </form>
 <script type="text/x-magento-init">
     {
         "#edit_form": {
             "Magento_Catalog/catalog/product/edit/attribute": {
-                "validationUrl": "<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>"
+                "validationUrl": "<?= $escaper->escapeJs($escaper->escapeUrl($block->getValidationUrl())) ?>"
             }
         }
     }
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 8dde7013763dc..92f824fb4eeb7 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Catalog\Helper\Data;
 
-/** @var \Magento\Backend\Block\Template $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-?>
+/**
+ * @var \Magento\Backend\Block\Template $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Json\Helper\Data $jsonHelper
+ */
 
-<?php
-/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
 $jsonHelper = $block->getData('jsonHelper');
 $scriptString = <<<script
 require([
@@ -215,7 +215,7 @@ function switchDefaultValueField()
 script;
 foreach ($jsonHelper->getAttributeHiddenFields() as $type => $fields):
             $scriptString .= <<<script
-            case '{$block->escapeJs($type)}':
+            case '{$escaper->escapeJs($type)}':
                 var isFrontTabHidden = false;
 script;
     foreach ($fields as $one):
@@ -234,7 +234,7 @@ script;
         elseif ($one == '_scope'):
             $scriptString .= 'scopeVisibility = false;';
         else:
-            $scriptString .= "setRowVisibility('" . $block->escapeJs($one) . "', false);";
+            $scriptString .= "setRowVisibility('" . $escaper->escapeJs($one) . "', false);";
         endif;
     endforeach;
     $scriptString .= <<<script
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 85a6b347f2feb..d8ea09214c87c 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,13 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels  */
+/**
+ * @var \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Labels $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-
 <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><?= $block->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Manage Titles (Size, Color, etc.)')) ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
@@ -20,7 +22,7 @@
                     <thead>
                     <tr>
                         <?php foreach ($block->getStores() as $_store): ?>
-                            <th class="col-store-view"><?= $block->escapeHtml($_store->getName()) ?></th>
+                            <th class="col-store-view"><?= $escaper->escapeHtml($_store->getName()) ?></th>
                         <?php endforeach; ?>
                     </tr>
                     </thead>
@@ -33,8 +35,8 @@
                                 <?php $isRequiredClass = $isRequired ? 'required-option' : ''; ?>
                                 <input class="input-text validate-no-html-tags <?= /* @noEscape */ $isRequiredClass ?>"
                                        type="text"
-                                       name="frontend_label[<?= $block->escapeHtmlAttr($_store->getId()) ?>]"
-                                       value="<?= $block->escapeHtmlAttr($_labels[$_store->getId()]) ?>"
+                                       name="frontend_label[<?= $escaper->escapeHtmlAttr($_store->getId()) ?>]"
+                                       value="<?= $escaper->escapeHtmlAttr($_labels[$_store->getId()]) ?>"
                                     <?php if ($block->getReadOnly()): ?>
                                         disabled="disabled"
                                     <?php endif;?>/>
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 e5f8a360c334c..fe8c17b7ae0fa 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,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
+/**
+ * @var \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="admin__fieldset fieldset">
     <legend class="legend">
-        <span><?= $block->escapeHtml(__('Manage Options (Values of Your Attribute)')) ?></span>
+        <span><?= $escaper->escapeHtml(__('Manage Options (Values of Your Attribute)')) ?></span>
     </legend><br />
     <div class="admin__control-table-wrapper" id="manage-options-panel" data-index="attribute_options_select_container">
         <table class="admin__control-table" data-index="attribute_options_select">
@@ -18,12 +21,12 @@ $stores = $block->getStoresSortedBySortOrder();
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
                     <th class="col-default control-table-actions-th">
-                        <span><?= $block->escapeHtml(__('Is Default')) ?></span>
+                        <span><?= $escaper->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; ?>>
-                            <span><?= $block->escapeHtml(__($_store->getName())) ?></span>
+                            <span><?= $escaper->escapeHtml(__($_store->getName())) ?></span>
                         </th>
                     <?php endforeach;
                     $storetotal = count($stores) + 3;
@@ -43,9 +46,9 @@ $stores = $block->getStoresSortedBySortOrder();
                 <th colspan="<?= (int) $storetotal ?>" class="col-actions-add">
                     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
                         <button id="add_new_option_button" data-action="add_new_row"
-                                title="<?= $block->escapeHtml(__('Add Option')) ?>"
+                                title="<?= $escaper->escapeHtml(__('Add Option')) ?>"
                                 type="button" class="action- scalable add">
-                            <span><?= $block->escapeHtml(__('Add Option')) ?></span>
+                            <span><?= $escaper->escapeHtml(__('Add Option')) ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -59,7 +62,7 @@ $stores = $block->getStoresSortedBySortOrder();
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) :?>
                     <div data-role="draggable-handle" class="draggable-handle"
-                         title="<?= $block->escapeHtml(__('Sort Option')) ?>">
+                         title="<?= $escaper->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; ?>/>
@@ -73,10 +76,10 @@ $stores = $block->getStoresSortedBySortOrder();
             <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()) :?>
-                    <button id="delete_button_<%- data.id %>" title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
+                    <button id="delete_button_<%- data.id %>" title="<?= $escaper->escapeHtml(__('Delete')) ?>" type="button"
                         class="action- scalable delete delete-option"
                         >
-                        <span><?= $block->escapeHtml(__('Delete')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Delete')) ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -101,7 +104,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 },
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-dropdown-attribute-unique",
-                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
+                    "message": "<?= $escaper->escapeHtml(__("The value of Admin must be unique.")) ?>"
                 }
             }
         }
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 447a9c4149bfa..3740b70302d7a 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,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Attribute\Set\Main $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <div class="attribute-set">
 
@@ -33,12 +36,12 @@ script;
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?= $block->escapeHtml(__('Groups')) ?></span>
+            <span class="title"><?= $escaper->escapeHtml(__('Groups')) ?></span>
         </div>
         <?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>
+            <p class="note-block"><?= $escaper->escapeHtml(__('Double click on a group to rename it.')) ?></p>
         <?php endif; ?>
 
         <?= $block->getSetsFilterHtml() ?>
@@ -46,7 +49,7 @@ script;
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?= $block->escapeHtml(__('Unassigned Attributes')) ?></span>
+            <span class="title"><?= $escaper->escapeHtml(__('Unassigned Attributes')) ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
         <?= /* @noEscape */ $secureRenderer->renderTag(
@@ -58,7 +61,7 @@ script;
         <?php $readOnly = ($block->getIsReadOnly() ? 'false' : 'true');
         $groupTree = /* @noEscape */ $block->getGroupTreeJson();
         $attributeTreeJson = /* @noEscape */ $block->getAttributeTreeJson();
-        $systemAttributeWarning = $block->escapeJs(
+        $systemAttributeWarning = $escaper->escapeJs(
             __('This group contains system attributes. Please move system attributes to another group and try again.')
         );
         $scriptString = <<<script
@@ -108,7 +111,7 @@ script;
 
                             this.ge = new Ext.tree.TreeEditor(tree, {
                                 allowBlank:false,
-                                blankText:'{$block->escapeJs(__('A name is required.'))}',
+                                blankText:'{$escaper->escapeJs(__('A name is required.'))}',
                                 selectOnFocus:true,
                                 cls:'folder'
                             });
@@ -277,7 +280,7 @@ script;
                         SystemNodesExists : function(currentNode) {
                             if (!currentNode) {
                                 alert({
-                                    content: '{$block->escapeJs(__('Please select a node.'))}'
+                                    content: '{$escaper->escapeJs(__('Please select a node.'))}'
                                 });
                                 return;
                             }
@@ -298,8 +301,8 @@ script;
 
                         addGroup : function() {
                             prompt({
-                                title: "{$block->escapeJs($block->escapeHtml(__('Add New Group')))}",
-                                content: "{$block->escapeJs($block->escapeHtml(__('Please enter a new group name.')))}",
+                                title: "{$escaper->escapeJs($escaper->escapeHtml(__('Add New Group')))}",
+                                content: "{$escaper->escapeJs($escaper->escapeHtml(__('Please enter a new group name.')))}",
                                 value: "",
                                 validation: true,
                                 validationRules: ['required-entry'],
@@ -365,7 +368,7 @@ script;
                             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 = '{$block->escapeJs(
+                                    errorText = '{$escaper->escapeJs(
                                         __('An attribute group named "/name/" already exists.')
                                     )}';
                                     alert({
@@ -395,7 +398,7 @@ script;
                                 editSet.req.form_key = FORM_KEY;
                             }
                             var req = {data : Ext.util.JSON.encode(editSet.req)};
-                            var con = new Ext.lib.Ajax.request('POST', '{$block->escapeJs($block->getMoveUrl())}',
+                            var con = new Ext.lib.Ajax.request('POST', '{$escaper->escapeJs($block->getMoveUrl())}',
                              {success:editSet.success,failure:editSet.failure}, req);
                         },
 
@@ -414,7 +417,7 @@ script;
 
                         failure : function(o) {
                             alert({
-                                content: '{$block->escapeJs(__('Sorry, we\'re unable to complete this request.'))}'
+                                content: '{$escaper->escapeJs(__('Sorry, we\'re unable to complete this request.'))}'
                             });
                         },
 
@@ -431,7 +434,7 @@ script;
                         rightBeforeAppend : function(tree, nodeThis, node, newParent) {
                             if (node.attributes.is_user_defined == 0) {
                                 alert({
-                                    content: '{$block->escapeJs(
+                                    content: '{$escaper->escapeJs(
                                         __('You can\'t remove attributes from this attribute set.')
                                     )}'
                                 });
@@ -449,7 +452,7 @@ script;
 
                             if (node.attributes.is_unassignable == 0) {
                                 alert({
-                                    content: '{$block->escapeJs(
+                                    content: '{$escaper->escapeJs(
                                         __('You can\'t remove attributes from this attribute set.')
                                     )}'
                                 });
@@ -475,7 +478,7 @@ script;
                         rightRemove : function(tree, nodeThis, node) {
                             if( nodeThis.firstChild == null && node.id != 'empty' ) {
                                 var newNode = new Ext.tree.TreeNode({
-                                    text : '{$block->escapeJs(__('Empty'))}',
+                                    text : '{$escaper->escapeJs(__('Empty'))}',
                                     id : 'empty',
                                     cls : 'folder',
                                     is_user_defined : 1,
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
index c3d8d5bc0f44e..276446b308a5b 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main/tree/group.phtml
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('div', ['id' => "tree-div1"], '&nbsp;', false) ?>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag("height:400px;margin-top:5px;overflow:auto", '#tree-div1') ?>
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 8f58d357f83e4..69e206a13bce5 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
@@ -4,14 +4,17 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?= $block->getFormHtml() ?>
 
 <?php $scriptString = <<<script
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#{$block->escapeJs($block->getFormId())}').mage('form').mage('validation');
+    jQuery('#{$escaper->escapeJs($block->getFormId())}').mage('form').mage('validation');
 
 });
 script;
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 d786f843e052f..7616d4254ab62 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
@@ -4,11 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 $blockId = $block->getId();
 ?>
 <div id="product_composite_configure"
-     class="product-configure-popup product-configure-popup-<?= $block->escapeHtmlAttr($blockId) ?>">
+     class="product-configure-popup product-configure-popup-<?= $escaper->escapeHtmlAttr($blockId) ?>">
     <iframe name="product_composite_configure_iframe" id="product_composite_configure_iframe"></iframe>
 
     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data"
@@ -24,7 +27,7 @@ $blockId = $block->getId();
             </div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
-        <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
+        <input type="hidden" name="form_key" value="<?= $escaper->escapeHtmlAttr($block->getFormKey()) ?>" />
     </form>
     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
         'onsubmit',
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 6a83ece330441..49a191cd4389b 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,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
 <?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if (count($options)) :?>
 
@@ -14,7 +17,7 @@
     <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>
+            <span><?= $escaper->escapeHtml(__('Custom Options')) ?></span>
         </legend><br>
         <?php foreach ($options as $option) :?>
             <?= $block->getOptionHtml($option) ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml
index f5dfc3ae79fbe..c7ca7a48a3805 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/js.phtml
@@ -4,9 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-
 <?php $scriptString = <<<script
 require([
     "prototype",
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 fde7a9351756c..95f2914a999c1 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
@@ -4,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Date $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 
 <?php $_option = $block->getOption(); ?>
@@ -13,7 +16,7 @@
 <?php $optionId = /* @noEscape */ $_optionId ?>
 <div class="admin__field field<?= $_option->getIsRequire() ? ' required' : '' ?>">
     <label class="label admin__field-label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
+        <?= $escaper->escapeHtml($_option->getTitle()) ?>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
     <div class="admin__field-control control">
@@ -66,7 +69,7 @@ script;
                         if (dateTimeParts[i].value == "") return false;
                     }
                     return true;
-                }, '{$block->escapeJs(__('This is a required option.'))}');
+                }, '{$escaper->escapeJs(__('This is a required option.'))}');
 script;
         else:
             $scriptString .= <<<script
@@ -84,7 +87,7 @@ script;
                         }
                     }
                     return hasWithValue ^ hasWithNoValue;
-                }, '{$block->escapeJs(__('The field isn\'t complete.'))}');
+                }, '{$escaper->escapeJs(__('The field isn\'t complete.'))}');
 script;
         endif;
         $scriptString .= <<<script
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
index f6094c8e558a2..77037f9333bab 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/default.phtml
@@ -3,13 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Options */ ?>
 <?php $option = $block->getOption(); ?>
 <div class="admin__field field">
     <label class="admin__field-label label">
         <span>
-            <?= $block->escapeHtml($option->getTitle()) ?>
+            <?= $escaper->escapeHtml($option->getTitle()) ?>
         </span>
     </label>
 </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 a181ed8d67120..df9c3ad474a09 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
@@ -4,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\File $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
@@ -70,14 +73,14 @@ script;
 
 <div class="admin__field <?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="admin__field-label label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
+        <?= $escaper->escapeHtml($_option->getTitle()) ?>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
     <div class="admin__field-control control" id="<?= /* @noEscape */ $_fileName ?>">
         <?php if ($_fileExists):?>
-            <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
+            <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $escaper->escapeHtml($_fileInfo->getTitle()) ?></span>
             <a href="#" class="label">
-                <?= $block->escapeHtml(__('Change')) ?>
+                <?= $escaper->escapeHtml(__('Change')) ?>
             </a>&nbsp;
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'onclick',
@@ -87,44 +90,44 @@ script;
             ); ?>
             <?php if (!$_option->getIsRequire()):?>
                 <input type="checkbox"
-                       price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"/>
+                       price="<?= $escaper->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"/>
                 <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                     'onclick',
                     "opFile" . /* @noEscape */ $_rand . ".toggleFileDelete($(this), $(this).next('.input-box'))",
                     '#' . /* @noEscape */ $_fileName . ' input[type="checkbox"]'
                 ) ?>
-                <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
+                <span class="label"><?= $escaper->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="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"
+                   price="<?= $escaper->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"
                 <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
             <input type="hidden" name="<?= /* @noEscape */ $_fieldNameAction ?>"
                    value="<?= /* @noEscape */ $_fieldValueAction ?>" />
 
             <?php if ($_option->getFileExtension()):?>
                 <div class="admin__field-note">
-                    <span><?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>:
-                        <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
+                    <span><?= $escaper->escapeHtml(__('Compatible file extensions to upload')) ?>:
+                        <strong><?= $escaper->escapeHtml($_option->getFileExtension()) ?></strong>
                     </span>
                 </div>
             <?php endif; ?>
 
             <?php if ($_option->getImageSizeX() > 0):?>
                 <div class="admin__field-note">
-                    <span><?= $block->escapeHtml(__('Maximum image width')) ?>:
-                        <strong><?= (int)$_option->getImageSizeX() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                    <span><?= $escaper->escapeHtml(__('Maximum image width')) ?>:
+                        <strong><?= (int)$_option->getImageSizeX() ?> <?= $escaper->escapeHtml(__('px.')) ?></strong>
                     </span>
                 </div>
             <?php endif; ?>
 
             <?php if ($_option->getImageSizeY() > 0):?>
                 <div class="admin__field-note">
-                    <span><?= $block->escapeHtml(__('Maximum image height')) ?>:
-                        <strong><?= (int)$_option->getImageSizeY() ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                    <span><?= $escaper->escapeHtml(__('Maximum image height')) ?>:
+                        <strong><?= (int)$_option->getImageSizeY() ?> <?= $escaper->escapeHtml(__('px.')) ?></strong>
                     </span>
                 </div>
             <?php endif; ?>
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 243fdb6e603a0..1ef6a8c0e22c2 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,18 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Select $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
 <?php $_option = $block->getOption(); ?>
 <div class="admin__field field<?= $_option->getIsRequire() ? ' _required' : '' ?>">
     <label class="label admin__field-label">
-        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+        <span><?= $escaper->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-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></span>
+                <span id="options-<?= $escaper->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 d1a019911d581..8afcd2e5bbc69 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,33 +3,37 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Text $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
 <?php $_option = $block->getOption(); ?>
 <div class="field admin__field<?= $_option->getIsRequire() ? ' required _required' : '' ?>">
     <label class="admin__field-label label">
-        <?= $block->escapeHtml($_option->getTitle()) ?>
+        <?= $escaper->escapeHtml($_option->getTitle()) ?>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
     <div class="control admin__field-control">
         <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD) :?>
             <input type="text"
-                   id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
+                   id="options_<?= $escaper->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))) ?>" />
+                   name="options[<?= $escaper->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $escaper->escapeHtmlAttr($block->getDefaultValue()) ?>"
+                   price="<?= $escaper->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"
+            <textarea id="options_<?= $escaper->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()) ?>]"
+                      name="options[<?= $escaper->escapeHtmlAttr($_option->getId()) ?>]"
                       rows="5"
                       cols="25"
-                      price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+                      price="<?= $escaper->escapeHtmlAttr($block->getCurrencyPrice($_option->getPrice(true))) ?>"><?= $escaper->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif;?>
 
         <?php if ($_option->getMaxCharacters()) :?>
-            <p class="note"><?= $block->escapeHtml(__('Maximum number of characters:')) ?> <strong><?= (int) $_option->getMaxCharacters() ?></strong></p>
+            <p class="note"><?= $escaper->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 4726bdc0930fd..2935e706a21d7 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,14 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-
-<?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
 
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
 <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><?= $block->escapeHtml(__('Quantity')) ?></span></label>
+        <label class="label admin__field-label"><span><?= $escaper->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="<?= $block->getQtyValue() * 1 ?>">
         </div>
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 eaaee91d7226c..c1df52f740763 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
@@ -5,7 +5,8 @@
  */
 
 /**
- * @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit $block
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 ?>
@@ -14,11 +15,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><?= $block->escapeHtml($block->getAttributeSetName()) ?></span>
+                    <span><?= $escaper->escapeHtml($block->getAttributeSetName()) ?></span>
                 </button>
                 <ul class="dropdown-menu">
                     <li><input type="text" id="product-template-suggest" class="search"
-                           placeholder="<?= $block->escapeHtmlAttr(__('start typing to search template')) ?>"/></li>
+                           placeholder="<?= $escaper->escapeHtmlAttr(__('start typing to search template')) ?>"/></li>
                 </ul>
             </div>
         </div>
@@ -27,9 +28,9 @@
             <input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
             <label class="switcher-label"
                    for="product-online-switcher"
-                   data-text-on="<?= $block->escapeHtmlAttr(__('Product online')) ?>"
-                   data-text-off="<?= $block->escapeHtmlAttr(__('Product offline')) ?>"
-                   title="<?= $block->escapeHtmlAttr(__('Product online status')) ?>"></label>
+                   data-text-on="<?= $escaper->escapeHtmlAttr(__('Product online')) ?>"
+                   data-text-off="<?= $escaper->escapeHtmlAttr(__('Product offline')) ?>"
+                   title="<?= $escaper->escapeHtmlAttr(__('Product online status')) ?>"></label>
         </div>
 
         <?php if ($block->getProductId()):?>
@@ -43,17 +44,17 @@
     </div>
 </div>
 <?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()) ?>">
+<form action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>" method="post" enctype="multipart/form-data"
+      data-form="edit-product" data-product-id="<?= $escaper->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="<?= $block->escapeHtmlAttr($block->getProduct()->getTypeId()) ?>"/>
+           value="<?= $escaper->escapeHtmlAttr($block->getProduct()->getTypeId()) ?>"/>
     <input type="hidden" id="attribute_set_id"
-           value="<?= $block->escapeHtmlAttr($block->getProduct()->getAttributeSetId()) ?>"/>
+           value="<?= $escaper->escapeHtmlAttr($block->getProduct()->getAttributeSetId()) ?>"/>
     <button type="submit" class="hidden"></button>
 <?php if ($block->getUseContainer()):?>
 </form>
@@ -137,7 +138,7 @@ require([
             }
         }
     });
-    \$form.mage('validation', {validationUrl: '{$block->escapeJs($block->getValidationUrl())}'});
+    \$form.mage('validation', {validationUrl: '{$escaper->escapeJs($block->getValidationUrl())}'});
 
     var masks = {$jsonFieldsAutogenerationMasks};
     var availablePlaceholders = {$jsonAttributesAllowedForAutogeneration};
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 1eb3f9a03d3f9..a22a6c214f4c6 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,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute */
+/**
+ * @var Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-
-<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
+<form action="<?= $escaper->escapeUrl($block->getSaveUrl()) ?>"
       method="post"
       id="attributes-edit-form"
       class="attributes-edit-form"
@@ -19,7 +21,7 @@
         "#attributes-edit-form": {
             "Magento_Catalog/js/product/weight-handler": {},
             "Magento_Catalog/catalog/product/edit/attribute": {
-                "validationUrl": "<?= $block->escapeJs($block->escapeUrl($block->getValidationUrl())) ?>"
+                "validationUrl": "<?= $escaper->escapeJs($escaper->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 646512d98582e..b230add6ea028 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,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-
 <?php $scriptString = <<<script
     require(['jquery'], function($){
         $('[data-role=toggle-editability-all]').change(function(e) {
@@ -43,14 +45,14 @@ if (!is_numeric($defaultMinSaleQty)) {
 <div class="fieldset-wrapper form-inline advanced-inventory-edit">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?= $block->escapeHtml(__('Advanced Inventory')) ?></span>
+            <span><?= $escaper->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><?= $block->escapeHtml(__('Manage Stock')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Manage Stock')) ?></span>
             </label>
 
             <div class="control">
@@ -59,11 +61,11 @@ if (!is_numeric($defaultMinSaleQty)) {
                         <select id="inventory_manage_stock"
                                 name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
                                 class="select" disabled="disabled">
-                            <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
+                            <option value="1"><?= $escaper->escapeHtml(__('Yes')) ?></option>
                             <option value="0"
                                 <?php if ($block->getFieldValue('manage_stock') == 0):?>
                                     selected="selected"
-                                <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
+                                <?php endif; ?>><?= $escaper->escapeHtml(__('No')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
@@ -72,21 +74,21 @@ if (!is_numeric($defaultMinSaleQty)) {
                                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><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field required">
             <label class="label" for="inventory_qty">
-                <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Qty')) ?></span>
             </label>
 
             <div class="control">
@@ -99,16 +101,16 @@ if (!is_numeric($defaultMinSaleQty)) {
                     <div class="field choice">
                         <input type="checkbox" id="inventory_qty_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_qty_checkbox"
-                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field with-addon">
             <label class="label" for="inventory_min_qty">
-                <span><?= $block->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
             </label>
 
             <div class="control">
@@ -123,22 +125,22 @@ if (!is_numeric($defaultMinSaleQty)) {
                                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><?= $block->escapeHtml(__('Use Config Settings')) ?></span>
+                            <span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_min_sale_qty">
-                <span><?= $block->escapeHtml(__('Minimum Qty Allowed in Shopping Cart')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Minimum Qty Allowed in Shopping Cart')) ?></span>
             </label>
 
             <div class="control">
@@ -157,21 +159,21 @@ if (!is_numeric($defaultMinSaleQty)) {
                                checked="checked"
                                disabled="disabled"/>
                         <label for="inventory_use_config_min_sale_qty"
-                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_max_sale_qty">
-                <span><?= $block->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
             </label>
 
             <div class="control">
@@ -191,21 +193,21 @@ if (!is_numeric($defaultMinSaleQty)) {
                                checked="checked"
                                disabled="disabled"/>
                         <label for="inventory_use_config_max_sale_qty"
-                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_is_qty_decimal">
-                <span><?= $block->escapeHtml(__('Qty Uses Decimals')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Qty Uses Decimals')) ?></span>
             </label>
 
             <div class="control">
@@ -215,11 +217,11 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_qty_decimal]"
                                 class="select"
                                 disabled="disabled">
-                            <option value="0"><?= $block->escapeHtml(__('No')) ?></option>
+                            <option value="0"><?= $escaper->escapeHtml(__('No')) ?></option>
                             <option value="1"
                                 <?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1):?>
                                     selected="selected"
-                                <?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
+                                <?php endif; ?>><?= $escaper->escapeHtml(__('Yes')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
@@ -227,16 +229,16 @@ if (!is_numeric($defaultMinSaleQty)) {
                                id="inventory_is_qty_decimal_checkbox"
                                data-role="toggle-editability-all"/>
                         <label for="inventory_is_qty_decimal_checkbox"
-                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_backorders">
-                <span><?= $block->escapeHtml(__('Backorders')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Backorders')) ?></span>
             </label>
 
             <div class="control">
@@ -250,8 +252,8 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 <?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ?
                                     ' selected="selected"' : '' ?>
                                 <option
-                                    value="<?= $block->escapeHtmlAttr($option['value']) ?>"
-                                    <?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?>
+                                    value="<?= $escaper->escapeHtmlAttr($option['value']) ?>"
+                                    <?= /* @noEscape */ $_selected ?>><?= $escaper->escapeHtml($option['label']) ?>
                                 </option>
                             <?php endforeach; ?>
                         </select>
@@ -264,22 +266,22 @@ if (!is_numeric($defaultMinSaleQty)) {
                                checked="checked"
                                disabled="disabled"/>
                         <label for="inventory_use_config_backorders"
-                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
 
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_notify_stock_qty">
-                <span><?= $block->escapeHtml(__('Notify for Quantity Below')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Notify for Quantity Below')) ?></span>
             </label>
 
             <div class="control">
@@ -299,23 +301,23 @@ if (!is_numeric($defaultMinSaleQty)) {
                                checked="checked"
                                disabled="disabled"/>
                         <label for="inventory_use_config_notify_stock_qty"
-                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_enable_qty_increments">
-                <span><?= $block->escapeHtml(__('Enable Qty Increments')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Enable Qty Increments')) ?></span>
             </label>
 
             <div class="control">
@@ -325,11 +327,11 @@ if (!is_numeric($defaultMinSaleQty)) {
                                 name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[enable_qty_increments]"
                                 class="select"
                                 disabled="disabled">
-                            <option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
+                            <option value="1"><?= $escaper->escapeHtml(__('Yes')) ?></option>
                             <option value="0"
                                 <?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0):?>
                                     selected="selected"
-                                <?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
+                                <?php endif; ?>><?= $escaper->escapeHtml(__('No')) ?></option>
                         </select>
                     </div>
                     <div class="field choice">
@@ -340,23 +342,23 @@ if (!is_numeric($defaultMinSaleQty)) {
                                checked="checked"
                                disabled="disabled"/>
                         <label for="inventory_use_config_enable_qty_increments"
-                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_qty_increments">
-                <span><?= $block->escapeHtml(__('Qty Increments')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Qty Increments')) ?></span>
             </label>
 
             <div class="control">
@@ -376,23 +378,23 @@ if (!is_numeric($defaultMinSaleQty)) {
                                checked="checked"
                                disabled="disabled"/>
                         <label for="inventory_use_config_qty_increments"
-                               class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
+                               class="label"><span><?= $escaper->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><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_stock_availability">
-                <span><?= $block->escapeHtml(__('Stock Availability')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Stock Availability')) ?></span>
             </label>
 
             <div class="control">
@@ -401,10 +403,10 @@ if (!is_numeric($defaultMinSaleQty)) {
                         <select id="inventory_stock_availability"
                                 name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
                                 disabled="disabled">
-                            <option value="1"><?= $block->escapeHtml(__('In Stock')) ?></option>
+                            <option value="1"><?= $escaper->escapeHtml(__('In Stock')) ?></option>
                             <option value="0"
                                 <?php if ($block->getDefaultConfigValue('is_in_stock') == 0):?> selected<?php endif; ?>>
-                                <?= $block->escapeHtml(__('Out of Stock')) ?>
+                                <?= $escaper->escapeHtml(__('Out of Stock')) ?>
                             </option>
                         </select>
                     </div>
@@ -413,11 +415,11 @@ if (!is_numeric($defaultMinSaleQty)) {
                                id="inventory_stock_availability_checkbox"
                                data-role="toggle-editability-all"/>
                         <label for="inventory_stock_availability_checkbox"
-                               class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
+                               class="label"><span><?= $escaper->escapeHtml(__('Change')) ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?= $block->escapeHtmlAttr(__('[GLOBAL]')) ?>"></div>
+            <div class="field-service" value-scope="<?= $escaper->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 d5859240875cd..bbebe5f3c4672 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,14 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var Magento\Catalog\Block\Adminhtml\Product\Edit\Action\Attribute\Tab\Websites $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-
 <div class="fieldset-wrapper" id="add-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?= $block->escapeHtml(__('Add Product To Websites')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Add Product To Websites')) ?></span>
         </legend>
         <br>
         <div class="store-scope">
@@ -19,26 +21,26 @@
                 <?php foreach ($block->getWebsiteCollection() as $_website):?>
                     <div class="website-name">
                         <input name="add_website_ids[]"
-                               value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                               value="<?= $escaper->escapeHtmlAttr($_website->getId()) ?>"
                             <?php if ($block->getWebsitesReadonly()):?>
                                 disabled="disabled"
                             <?php endif;?>
                                class="checkbox website-checkbox"
-                               id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                               id="add_product_website_<?= $escaper->escapeHtmlAttr($_website->getId()) ?>"
                                type="checkbox" />
-                        <label for="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>">
-                            <?= $block->escapeHtml($_website->getName()) ?>
+                        <label for="add_product_website_<?= $escaper->escapeHtmlAttr($_website->getId()) ?>">
+                            <?= $escaper->escapeHtml($_website->getName()) ?>
                         </label>
                     </div>
                     <dl class="webiste-groups"
-                        id="add_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
+                        id="add_product_website_<?= $escaper->escapeHtmlAttr($_website->getId()) ?>_data">
                         <?php foreach ($block->getGroupCollection($_website) as $_group):?>
-                            <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
+                            <dt><?= $escaper->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
                                 <?php foreach ($block->getStoreCollection($_group) as $_store):?>
                                     <li>
-                                        <?= $block->escapeHtml($_store->getName()) ?>
+                                        <?= $escaper->escapeHtml($_store->getName()) ?>
                                     </li>
                                 <?php endforeach; ?>
                                 </ul>
@@ -54,12 +56,12 @@
 <div class="fieldset-wrapper" id="remove-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?= $block->escapeHtml(__('Remove Product From Websites')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Remove Product From Websites')) ?></span>
         </legend>
         <br>
         <div class="messages">
             <div class="message message-notice">
-                <div><?= $block->escapeHtml(
+                <div><?= $escaper->escapeHtml(
                     __('To hide an item in catalog or search results, set the status to "Disabled".')
                 ) ?>
                 </div>
@@ -70,26 +72,26 @@
                 <?php foreach ($block->getWebsiteCollection() as $_website):?>
                     <div class="website-name">
                         <input name="remove_website_ids[]"
-                               value="<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                               value="<?= $escaper->escapeHtmlAttr($_website->getId()) ?>"
                             <?php if ($block->getWebsitesReadonly()):?>
                                 disabled="disabled"
                             <?php endif;?>
                                class="checkbox website-checkbox"
-                               id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>"
+                               id="remove_product_website_<?= $escaper->escapeHtmlAttr($_website->getId()) ?>"
                                type="checkbox" />
-                        <label for="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>">
-                            <?= $block->escapeHtml($_website->getName()) ?>
+                        <label for="remove_product_website_<?= $escaper->escapeHtmlAttr($_website->getId()) ?>">
+                            <?= $escaper->escapeHtml($_website->getName()) ?>
                         </label>
                     </div>
                     <dl class="webiste-groups"
-                        id="remove_product_website_<?= $block->escapeHtmlAttr($_website->getId()) ?>_data">
+                        id="remove_product_website_<?= $escaper->escapeHtmlAttr($_website->getId()) ?>_data">
                         <?php foreach ($block->getGroupCollection($_website) as $_group):?>
-                            <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
+                            <dt><?= $escaper->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
                                 <?php foreach ($block->getStoreCollection($_group) as $_store):?>
                                     <li>
-                                        <?= $block->escapeHtml($_store->getName()) ?>
+                                        <?= $escaper->escapeHtml($_store->getName()) ?>
                                     </li>
                                 <?php endforeach; ?>
                                 </ul>
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 261de795f7199..687c8e7528277 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
@@ -6,8 +6,10 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\AttributeSet $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <script id="product-template-selector-template" type="text/x-magento-template">
 <% if (!data.term && data.items.length && !data.allShown()) { %>
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 22dd5de45a073..7748b155e5409 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
@@ -3,14 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<div id="<?= $block->escapeHtmlAttr($block->getNameInLayout()) ?>">
+<div id="<?= $escaper->escapeHtmlAttr($block->getNameInLayout()) ?>">
     <?= $block->getFormHtml() ?>
     <?= $block->getAfterElementHtml() ?>
 </div>
 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
     'display:none',
-    $block->escapeJs($block->getNameInLayout())
+    $escaper->escapeJs($block->getNameInLayout())
 ) ?>
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 7129190d47fb5..eb7fea22a2ba7 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
@@ -4,14 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-
 <div class="fieldset-wrapper" id="product-custom-options-wrapper" data-block="product-custom-options">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?= $block->escapeHtml(__('Custom Options')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Custom Options')) ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content" id="product-custom-options-content"
@@ -21,7 +23,7 @@
                 <div class="message message-error" id="dynamic-price-warning">
                     <div class="message-inner">
                         <div class="message-content">
-                            <?= $block->escapeHtml(__(
+                            <?= $escaper->escapeHtml(__(
                                 'We can\'t save custom-defined options for bundles with dynamic pricing.'
                             )) ?></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 ce7dac70010b1..823edc64baa9c 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
@@ -6,8 +6,11 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?= $block->getTemplatesHtml() ?>
 <script id="custom-option-base-template" type="text/x-magento-template">
@@ -21,16 +24,16 @@
             </strong>
             <div class="actions">
                 <button type="button"
-                        title="<?= $block->escapeHtmlAttr(__('Delete Custom Option')) ?>"
+                        title="<?= $escaper->escapeHtmlAttr(__('Delete Custom Option')) ?>"
                         class="action-delete"
                         id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_delete">
-                    <span><?= $block->escapeHtml(__('Delete Custom Option')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Delete Custom Option')) ?></span>
                 </button>
             </div>
             <div id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_move"
                  data-role="draggable-handle"
                  class="draggable-handle"
-                 title="<?= $block->escapeHtmlAttr(__('Sort Custom Options')) ?>"></div>
+                 title="<?= $escaper->escapeHtmlAttr(__('Sort Custom Options')) ?>"></div>
         </div>
         <div class="fieldset-wrapper-content in collapse" id="<%- data.id %>-content">
             <fieldset class="fieldset">
@@ -61,7 +64,7 @@
 
                     <div class="field field-option-title required">
                         <label class="label" for="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?= $block->escapeHtml(__('Option Title')) ?>
+                            <?= $escaper->escapeHtml(__('Option Title')) ?>
                         </label>
                         <div class="control">
                             <input id="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title"
@@ -79,7 +82,7 @@
 
                     <div class="field field-option-input-type required">
                         <label class="label" for="<?= /* @noEscape */ $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?= $block->escapeHtml(__('Input Type')) ?>
+                            <?= $escaper->escapeHtml(__('Input Type')) ?>
                         </label>
                         <div class="control opt-type">
                             <?= $block->getTypeSelectHtml() ?>
@@ -93,7 +96,7 @@
                                    type="checkbox"
                                    checked="checked"/>
                             <label for="field-option-req">
-                                <?= $block->escapeHtml(__('Required')) ?>
+                                <?= $escaper->escapeHtml(__('Required')) ?>
                             </label>
                             <span id="span_<?= /* @noEscape */ $block->getFieldId() ?>">
                                 <?= $block->getRequireSelectHtml() ?>
@@ -122,9 +125,9 @@ $jsonHelper = $block->getData('jsonHelper');
 $customOptions = /* @noEscape */ $jsonHelper->jsonEncode(
     [
         'fieldId' => $block->getFieldId(),
-        'productGridUrl' => $block->escapeJs($block->getProductGridUrl()),
+        'productGridUrl' => $escaper->escapeJs($block->getProductGridUrl()),
         'formKey' => $block->getFormKey(),
-        'customOptionsUrl' => $block->escapeJs($block->getCustomOptionsUrl()),
+        'customOptionsUrl' => $escaper->escapeJs($block->getCustomOptionsUrl()),
         'isReadonly' => (bool) $block->isReadonly(),
         'itemCount' => (int) $block->getItemCount(),
         'currentProductId' => (int) $block->getCurrentProductId(),
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 2063609bf0568..26e3502d7757f 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,18 +4,21 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Date $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?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">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
             <thead>
             <tr class="headings">
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th><?= $block->escapeHtml(__('Price')) ?></th>
-                <th><?= $block->escapeHtml(__('Price Type')) ?></th>
+                <th><?= $escaper->escapeHtml(__('Price')) ?></th>
+                <th><?= $escaper->escapeHtml(__('Price Type')) ?></th>
                 <?php endif; ?>
-                <th><?= $block->escapeHtml(__('SKU')) ?></th>
+                <th><?= $escaper->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 c0e61c5de9988..b48e33aaf2578 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,20 +4,23 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\File $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?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">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                    <th><?= $block->escapeHtml(__('Price')) ?></th>
-                    <th><?= $block->escapeHtml(__('Price Type')) ?></th>
+                    <th><?= $escaper->escapeHtml(__('Price')) ?></th>
+                    <th><?= $escaper->escapeHtml(__('Price Type')) ?></th>
                 <?php endif; ?>
-                <th><?= $block->escapeHtml(__('SKU')) ?></th>
-                <th><?= $block->escapeHtml(__('Compatible File Extensions')) ?></th>
-                <th><?= $block->escapeHtml(__('Maximum Image Size')) ?></th>
+                <th><?= $escaper->escapeHtml(__('SKU')) ?></th>
+                <th><?= $escaper->escapeHtml(__('Compatible File Extensions')) ?></th>
+                <th><?= $escaper->escapeHtml(__('Maximum Image Size')) ?></th>
             </tr>
             </thead>
             <tr>
@@ -40,7 +43,7 @@
                 <td>
                     <input name="product[options][<%- data.option_id %>][file_extension]" class="input-text" type="text" value="<%- data.file_extension %>">
                 </td>
-                <td class="col-file"><?= $block->escapeHtml(
+                <td class="col-file"><?= $escaper->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 %>">',
@@ -48,7 +51,7 @@
                     ),
                     ['span', 'input']
                 ) ?>
-                    <div class="note"><?= $block->escapeHtml(__('Please leave blank if it is not an image.')) ?></div>
+                    <div class="note"><?= $escaper->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 c7ff03a08d954..f7d463bbe474b 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,20 +4,23 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Select $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?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">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
             <thead>
                 <tr>
                     <th class="col-draggable">&nbsp;</th>
-                    <th class="col-name required"><?= $block->escapeHtml(__('Title')) ?><span class="required">*</span></th>
+                    <th class="col-name required"><?= $escaper->escapeHtml(__('Title')) ?><span class="required">*</span></th>
                     <?php if ($block->getCanReadPrice() !== false) : ?>
-                    <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
-                    <th class="col-price-type"><?= $block->escapeHtml(__('Price Type')) ?></th>
+                    <th class="col-price"><?= $escaper->escapeHtml(__('Price')) ?></th>
+                    <th class="col-price-type"><?= $escaper->escapeHtml(__('Price Type')) ?></th>
                     <?php endif; ?>
-                    <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
+                    <th class="col-sku"><?= $escaper->escapeHtml(__('SKU')) ?></th>
                     <th class="col-actions">&nbsp;</th>
                 </tr>
             </thead>
@@ -36,7 +39,7 @@
     <tr id="product_option_<%- data.id %>_select_<%- data.select_id %>">
         <td class="col-draggable">
             <div data-role="draggable-handle" class="draggable-handle"
-                 title="<?= $block->escapeHtmlAttr(__('Sort Custom Option')) ?>"></div>
+                 title="<?= $escaper->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">
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 89da5d633ef4d..f23683b481950 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,19 +4,22 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Type\Text $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?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">
     <div id="product_option_<%- data.option_id %>_type_<%- data.group %>" class="fieldset">
         <table class="data-table">
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th class="type-price"><?= $block->escapeHtml(__('Price')) ?></th>
-                <th class="type-type"><?= $block->escapeHtml(__('Price Type')) ?></th>
+                <th class="type-price"><?= $escaper->escapeHtml(__('Price')) ?></th>
+                <th class="type-type"><?= $escaper->escapeHtml(__('Price Type')) ?></th>
                 <?php endif; ?>
-                <th class="type-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-                <th class="type-last last"><?= $block->escapeHtml(__('Max Characters')) ?></th>
+                <th class="type-sku"><?= $escaper->escapeHtml(__('SKU')) ?></th>
+                <th class="type-last last"><?= $escaper->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 7e1c48d535dc1..9fc1e690c48a1 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
@@ -6,8 +6,11 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Price\Tier $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 $element = $block->getElement();
 ?>
 <?php $_htmlId      = $block->getElement()->getHtmlId() ?>
@@ -25,21 +28,21 @@ $element = $block->getElement();
 $jsonHelper = $block->getData('jsonHelper'); ?>
 <div class="field" id="attribute-<?= /* @noEscape */ $_htmlId ?>-container"
      data-attribute-code="<?= /* @noEscape */ $_htmlId ?>"
-     data-apply-to="<?= $block->escapeHtml(
+     data-apply-to="<?= $escaper->escapeHtml(
          $jsonHelper->jsonEncode($element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : [])
      )?>">
-    <label class="label"><span><?= $block->escapeHtml($block->getElement()->getLabel()) ?></span></label>
+    <label class="label"><span><?= $escaper->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"><?= $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-websites"><?= $escaper->escapeHtml(__('Web Site')) ?></th>
+                    <th class="col-customer-group"><?= $escaper->escapeHtml(__('Customer Group')) ?></th>
+                    <th class="col-qty required"><?= $escaper->escapeHtml(__('Quantity')) ?></th>
                     <th class="col-price required">
-                        <?= $block->escapeHtml($block->getPriceColumnHeader(__('Item Price'))) ?>
+                        <?= $escaper->escapeHtml($block->getPriceColumnHeader(__('Item Price'))) ?>
                     </th>
-                    <th class="col-delete"><?= $block->escapeHtml(__('Action')) ?></th>
+                    <th class="col-delete"><?= $escaper->escapeHtml(__('Action')) ?></th>
                 </tr>
                 <?php if (!$_showWebsite): ?>
                     <?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', 'th.col-websites'); ?>
@@ -66,16 +69,16 @@ require([
 //<![CDATA[
 var tierPriceRowTemplate = '<tr>'
     + '<td class="col-websites">'
-    + '<select class="{$block->escapeHtmlAttr($_htmlClass)} required-entry"
+    + '<select class="{$escaper->escapeHtmlAttr($_htmlClass)} required-entry"
      name="{$htmlName}[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
 script;
 foreach ($block->getWebsites() as $_websiteId => $_info):
     $scriptString .= <<<script
-    + '<option value="{$block->escapeHtmlAttr($_websiteId)}">{$block->escapeHtml($_info['name'])}
+    + '<option value="{$escaper->escapeHtmlAttr($_websiteId)}">{$escaper->escapeHtml($_info['name'])}
 script;
     if (!empty($_info['currency'])):
         $scriptString .= <<<script
-            [{$block->escapeHtml($_info['currency'])}]
+            [{$escaper->escapeHtml($_info['currency'])}]
 script;
     endif;
     $scriptString .= <<<script
@@ -84,31 +87,31 @@ script;
     endforeach;
     $scriptString .= <<<script
     + '</select></td>'
-    + '<td class="col-customer-group"><select class="{$block->escapeJs($_htmlClass)} custgroup required-entry"
+    + '<td class="col-customer-group"><select class="{$escaper->escapeJs($_htmlClass)} custgroup required-entry"
      name="{$htmlName}[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
 script;
 foreach ($block->getCustomerGroups() as $_groupId => $_groupName):
     $scriptString .= <<<script
-    + '<option value="{$block->escapeJs($_groupId)}">{$block->escapeJs($_groupName)}</option>'
+    + '<option value="{$escaper->escapeJs($_groupId)}">{$escaper->escapeJs($_groupName)}</option>'
 script;
     endforeach;
     $scriptString .= <<<script
     + '</select></td>'
     + '<td class="col-qty">'
-        + '<input class="{$block->escapeJs($_htmlClass)} qty required-entry validate-greater-than-zero"
+        + '<input class="{$escaper->escapeJs($_htmlClass)} qty required-entry validate-greater-than-zero"
          type="text" name="{$htmlName}[<%- data.index %>][price_qty]" value="<%- data.qty %>"
           id="tier_price_row_<%- data.index %>_qty" />'
-        + '<span>{$block->escapeHtml(__("and above"))}</span>'
+        + '<span>{$escaper->escapeHtml(__("and above"))}</span>'
     + '</td>'
-    + '<td class="col-price"><input class="{$block->escapeJs($_htmlClass)} required-entry
-     {$block->escapeJs($_priceValueValidation)}" type="text" name="{$htmlName}[<%- data.index %>][price]"
+    + '<td class="col-price"><input class="{$escaper->escapeJs($_htmlClass)} required-entry
+     {$escaper->escapeJs($_priceValueValidation)}" type="text" name="{$htmlName}[<%- data.index %>][price]"
       value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
     + '<td class="col-delete"><input type="hidden" name="{$htmlName}[<%- data.index %>][delete]" class="delete"
      value="" id="tier_price_row_<%- data.index %>_delete" />'
-    + '<button title="{$block->escapeJs(__('Delete Tier'))}" type="button"
+    + '<button title="{$escaper->escapeJs(__('Delete Tier'))}" type="button"
      class="action- scalable delete icon-btn delete-product-option"
       id="tier_price_row_<%- data.index %>_delete_button">'
-    + '<span>{$block->escapeJs(__("Delete"))}</span></button></td>'
+    + '<span>{$escaper->escapeJs(__("Delete"))}</span></button></td>'
     + '</tr>';
 script;
 
@@ -156,7 +159,7 @@ script;
             data.readOnly = arguments[4];
         }
 
-        Element.insert($('{$block->escapeJs($_htmlId)}_container'), {
+        Element.insert($('{$escaper->escapeJs($_htmlId)}_container'), {
             bottom : this.template({
                 data: data
             })
@@ -186,12 +189,12 @@ script;
 script;
     if ($_readonly):
         $scriptString .= <<<script
-        $('{$block->escapeJs($_htmlId)}_container').select('input', 'select').each(this.disableElement);
-        $('{$block->escapeJs($_htmlId)}_container').up('table').select('button').each(this.disableElement);
+        $('{$escaper->escapeJs($_htmlId)}_container').select('input', 'select').each(this.disableElement);
+        $('{$escaper->escapeJs($_htmlId)}_container').up('table').select('button').each(this.disableElement);
 script;
     else:
         $scriptString .= <<<script
-        $('{$block->escapeJs($_htmlId)}_container').select('input', 'select').each(function(el) {
+        $('{$escaper->escapeJs($_htmlId)}_container').select('input', 'select').each(function(el) {
             Event.observe(el, 'change', el.setHasChanges.bind(el));
         });
 script;
@@ -219,14 +222,14 @@ script;
     <?php $readonly = (int)!empty($_item['readonly']);
     $price_qty = $_item['price_qty']*1;
      $scriptString .= <<<script
-tierPriceControl.addItem('{$block->escapeJs($_item['website_id'])}', '{$block->escapeJs($_item['cust_group'])}',
- '{$price_qty}', '{$block->escapeJs($_item['price'])}', {$readonly});
+tierPriceControl.addItem('{$escaper->escapeJs($_item['website_id'])}', '{$escaper->escapeJs($_item['cust_group'])}',
+ '{$price_qty}', '{$escaper->escapeJs($_item['price'])}', {$readonly});
 script;
     ?>
 <?php endforeach; ?>
 <?php if ($_readonly):?>
     <?php $scriptString .= <<<script
-$('{$block->escapeJs($_htmlId)}_container').up('table').select('button').each(tierPriceControl.disableElement);
+$('{$escaper->escapeJs($_htmlId)}_container').up('table').select('button').each(tierPriceControl.disableElement);
 script;
     ?>
 <?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 0c1da98c7d85a..645bfc0525398 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,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer */
-?>
-
 // phpcs:disable Magento2.Security.InsecureFunction.DiscouragedWithAlternative
+
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Ajax\Serializer $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
 <?php $_id = 'id_' . md5(microtime()) ?>
 <input type="hidden"
-       name="<?= $block->escapeHtmlAttr($block->getInputElementName()) ?>"
+       name="<?= $escaper->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 59b5eb7f523c1..3ada001b444fb 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,19 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Websites $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <fieldset id="grop_fields" class="fieldset">
-    <legend class="legend"><span><?= $block->escapeHtml(__('Product In Websites')) ?></span></legend>
+    <legend class="legend"><span><?= $escaper->escapeHtml(__('Product In Websites')) ?></span></legend>
     <br>
     <?php if ($block->getProductId()):?>
     <div class="messages">
         <div class="message message-notice">
-            <?= $block->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?>
+            <?= $escaper->escapeHtml(__('To hide an item in catalog or search results, set the status to "Disabled".')) ?>
         </div>
     </div>
     <?php endif; ?>
@@ -37,20 +40,20 @@
                     <?php endif; ?>
                 />
                 <label for="product_website_<?= (int) $_website->getId() ?>">
-                    <?= $block->escapeHtml($_website->getName()) ?>
+                    <?= $escaper->escapeHtml($_website->getName()) ?>
                 </label>
             </div>
             <dl class="webiste-groups" id="product_website_<?= (int) $_website->getId() ?>_data">
                 <?php foreach ($block->getGroupCollection($_website) as $_group):?>
-                <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
+                <dt><?= $escaper->escapeHtml($_group->getName()) ?></dt>
                 <dd>
                     <ul>
                         <?php foreach ($block->getStoreCollection($_group) as $_store):?>
                         <li>
-                            <?= $block->escapeHtml($_store->getName()) ?>
+                            <?= $escaper->escapeHtml($_store->getName()) ?>
                             <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())):?>
                                 <span class="website-<?= (int) $_website->getId() ?>-select">
-                                <?= $block->escapeHtml(
+                                <?= $escaper->escapeHtml(
                                     __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)),
                                     ['select', 'option', 'optgroup']
                                 ) ?>
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 94d71dbb5ab28..f84ec9cac1c8a 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,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Gallery\Content $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 $elementName = $block->getElement()->getName() . '[images]';
 $formName = $block->getFormName();
 /** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
@@ -14,27 +17,27 @@ $jsonHelper = $block->getData('jsonHelper');
 <div id="<?= $block->getHtmlId() ?>"
      class="gallery"
      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($jsonHelper->jsonEncode($block->getImageTypes())) ?>"
+     data-parent-component="<?= $escaper->escapeHtml($block->getData('config/parentComponent')) ?>"
+     data-images="<?= $escaper->escapeHtml($block->getImagesJson()) ?>"
+     data-types="<?= $escaper->escapeHtml($jsonHelper->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">
-                    <?= $block->escapeHtml(__('Browse to find or drag image here')) ?>
+                    <?= $escaper->escapeHtml(__('Browse to find or drag image here')) ?>
                 </p>
             </div>
         </div>
     <?php } ?>
     <?php foreach ($block->getImageTypes() as $typeData) {
         ?>
-        <input name="<?= $block->escapeHtmlAttr($typeData['name']) ?>"
-               data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
-               class="image-<?= $block->escapeHtmlAttr($typeData['code']) ?>"
+        <input name="<?= $escaper->escapeHtmlAttr($typeData['name']) ?>"
+               data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
+               class="image-<?= $escaper->escapeHtmlAttr($typeData['code']) ?>"
                type="hidden"
-               value="<?= $block->escapeHtmlAttr($typeData['value']) ?>"/>
+               value="<?= $escaper->escapeHtmlAttr($typeData['value']) ?>"/>
         <?php
     } ?>
 
@@ -42,33 +45,33 @@ $jsonHelper = $block->getData('jsonHelper');
         <div class="image item<% if (data.disabled == 1) { %> hidden-for-front<% } %>"
              data-role="image">
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][position]"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][position]"
                    value="<%- data.position %>"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    class="position"/>
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][file]"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][file]"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    value="<%- data.file %>"/>
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][value_id]"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][value_id]"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    value="<%- data.value_id %>"/>
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][label]"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    value="<%- data.label %>"/>
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    value="<%- data.disabled %>"/>
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][media_type]"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][media_type]"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    value="image"/>
             <input type="hidden"
-                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][removed]"
-                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                   name="<?= $escaper->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][removed]"
+                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                    value=""
                    class="is-removed"/>
 
@@ -82,14 +85,14 @@ $jsonHelper = $block->getData('jsonHelper');
                     <button type="button"
                             class="action-remove"
                             data-role="delete-button"
-                            title="<?= $block->escapeHtmlAttr(__('Delete image')) ?>">
+                            title="<?= $escaper->escapeHtmlAttr(__('Delete image')) ?>">
                     <span>
-                        <?= $block->escapeHtml(__('Delete image')) ?>
+                        <?= $escaper->escapeHtml(__('Delete image')) ?>
                     </span>
                     </button>
                     <div class="draggable-handle"></div>
                 </div>
-                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
+                <div class="image-fade"><span><?= $escaper->escapeHtml(__('Hidden')) ?></span></div>
             </div>
 
 
@@ -104,9 +107,9 @@ $jsonHelper = $block->getData('jsonHelper');
                 <?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 data-role-code="<?= $escaper->escapeHtmlAttr($typeData['code']) ?>"
+                        class="item-role item-role-<?= $escaper->escapeHtmlAttr($typeData['code']) ?>">
+                        <?= $escaper->escapeHtml($typeData['label']) ?>
                     </li>
                     <?php
                 }
@@ -130,14 +133,14 @@ $jsonHelper = $block->getData('jsonHelper');
             <fieldset class="admin__fieldset fieldset-image-panel">
                 <div class="admin__field field-image-description">
                     <label class="admin__field-label" for="image-description">
-                        <span><?= $block->escapeHtml(__('Alt Text')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Alt Text')) ?></span>
                     </label>
 
                     <div class="admin__field-control">
                             <textarea data-role="image-description"
                                       rows="3"
                                       class="admin__control-textarea"
-                                      name="<?= $block->escapeHtmlAttr($elementName)
+                                      name="<?= $escaper->escapeHtmlAttr($elementName)
                                         ?>[<%- data.file_id %>][label]"><%- data.label %>
                             </textarea>
                       </div>
@@ -145,7 +148,7 @@ $jsonHelper = $block->getData('jsonHelper');
 
                 <div class="admin__field field-image-role">
                     <label class="admin__field-label">
-                        <span><?= $block->escapeHtml(__('Role')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Role')) ?></span>
                     </label>
                     <div class="admin__field-control">
                         <ul class="multiselect-alt">
@@ -156,11 +159,11 @@ $jsonHelper = $block->getData('jsonHelper');
                                     <label>
                                         <input class="image-type"
                                                data-role="type-selector"
-                                               data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                                               data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                                                type="checkbox"
-                                               value="<?= $block->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
+                                               value="<?= $escaper->escapeHtmlAttr($attribute->getAttributeCode()) ?>"
                                                />
-                                        <?= $block->escapeHtml(
+                                        <?= $escaper->escapeHtml(
                                             $attribute->getFrontendLabel()
                                         ) ?>
                                     </label>
@@ -174,17 +177,17 @@ $jsonHelper = $block->getData('jsonHelper');
 
                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
                     <label class="admin__field-label">
-                        <span><?= $block->escapeHtml(__('Image Size')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Image Size')) ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?= $block->escapeHtmlAttr(__('{size}')) ?>"></div>
+                    <div class="admin__field-value" data-message="<?= $escaper->escapeHtmlAttr(__('{size}')) ?>"></div>
                 </div>
 
                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                     <label class="admin__field-label">
-                        <span><?= $block->escapeHtml(__('Image Resolution')) ?></span>
+                        <span><?= $escaper->escapeHtml(__('Image Resolution')) ?></span>
                     </label>
                     <div class="admin__field-value"
-                         data-message="<?= $block->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
+                         data-message="<?= $escaper->escapeHtmlAttr(__('{width}^{height} px')) ?>"></div>
                 </div>
 
                 <div class="admin__field field-image-hide">
@@ -193,14 +196,14 @@ $jsonHelper = $block->getData('jsonHelper');
                             <input type="checkbox"
                                    id="hide-from-product-page"
                                    data-role="visibility-trigger"
-                                   data-form-part="<?= $block->escapeHtmlAttr($formName) ?>"
+                                   data-form-part="<?= $escaper->escapeHtmlAttr($formName) ?>"
                                    value="1"
                                    class="admin__control-checkbox"
-                                   name="<?= $block->escapeHtmlAttr($elementName) ?>[<%- data.file_id %>][disabled]"
+                                   name="<?= $escaper->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')) ?>
+                                <?= $escaper->escapeHtml(__('Hide from Product Page')) ?>
                             </label>
                         </div>
                     </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 4a0a37147dd13..c35c804e739c0 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,11 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-?>
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Js $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-<?php
 /** @var TaxHelper $taxHelper */
 $taxHelper = $block->getData('taxHelper');
 $priceFormat = /* @noEscape */ $taxHelper->getPriceFormat($block->getStore());
@@ -84,9 +85,9 @@ script;
 if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')):
     $scriptString .= <<<script
 jQuery(function () {
-    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 (jQuery('#{$escaper->escapeJs($tabsBlock->getId())}').length &&
+        jQuery('#{$escaper->escapeJs($tabsBlock->getId())}').is(':mage-tabs')) {
+        var activeAnchor = jQuery('#{$escaper->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 7c3bee3d4d2fc..b859b7952f0eb 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,15 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-?>
-<?php
 /**
- * Template for block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
 <div>
-    <h4 class="icon-head head-edit-form"><?= $block->escapeHtml(__('Product Alerts')) ?></h4>
+    <h4 class="icon-head head-edit-form"><?= $escaper->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 2cf5a78a8138a..95825a009220a 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,8 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Inventory $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?php if ($block->isReadonly()):?>
     <?php $_readonly = ' disabled="disabled" '; ?>
@@ -13,25 +15,25 @@
     <?php $_readonly = ''; ?>
 <?php endif; ?>
 <fieldset class="fieldset form-inline">
-    <legend class="legend"><span><?= $block->escapeHtml(__('Advanced Inventory')) ?></span></legend>
+    <legend class="legend"><span><?= $escaper->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>
+                <span><?= $escaper->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="1"><?= $escaper->escapeHtml(__('Yes')) ?></option>
                     <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0):?>
-                        selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('No')) ?>
+                        selected="selected"<?php endif; ?>><?= $escaper->escapeHtml(__('No')) ?>
                     </option>
                 </select>
                 <input type="hidden"
                        id="inventory_manage_stock_default"
-                       value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('manage_stock')) ?>">
+                       value="<?= $escaper->escapeHtmlAttr($block->getDefaultConfigValue('manage_stock')) ?>">
                 <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->isNew()) ?
                     'checked="checked"' : '' ?>
                 <input type="checkbox"
@@ -43,7 +45,7 @@
                     "toggleValueElements(this, this.parentNode);",
                     "#inventory_use_config_manage_stock"
                 ) ?>
-                <label for="inventory_use_config_manage_stock"><?= $block->escapeHtml(__('Use Config Settings')) ?>
+                <label for="inventory_use_config_manage_stock"><?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                 </label>
                 <?php if (!$block->isReadonly()):?>
                     <?php $scriptString = <<<script
@@ -57,14 +59,14 @@ script;
                 <?php endif; ?>
             </div>
             <?php if (!$block->isSingleStoreMode()): ?>
-                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
 
         <?php if (!$block->getProduct()->isComposite()): ?>
             <div class="field">
                 <label class="label" for="inventory_qty">
-                    <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Qty')) ?></span>
                 </label>
                 <div class="control">
                     <?php if (!$_readonly): ?>
@@ -81,13 +83,13 @@ script;
                            value="<?= $block->getFieldValue('qty') * 1 ?>" <?= /* @noEscape */ $_readonly ?>>
                 </div>
                 <?php if (!$block->isSingleStoreMode()): ?>
-                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
 
             <div class="field">
                 <label class="label" for="inventory_min_qty">
-                    <span><?= $block->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Out-of-Stock Threshold')) ?></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -109,7 +111,7 @@ script;
                             "#inventory_use_config_min_qty"
                         ) ?>
 
-                        <label for="inventory_use_config_min_qty"><?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        <label for="inventory_use_config_min_qty"><?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                         </label>
                     </div>
 
@@ -125,13 +127,13 @@ script;
                     <?php endif; ?>
                 </div>
                 <?php if (!$block->isSingleStoreMode()):?>
-                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <div class="field-service"><?= $escaper->escapeHtml(__('[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>
+                    <span><?= $escaper->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"
@@ -152,7 +154,7 @@ script;
                             "#inventory_use_config_min_sale_qty"
                         ) ?>
                         <label for="inventory_use_config_min_sale_qty">
-                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                            <?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                         </label>
                     </div>
                     <?php if (!$block->isReadonly()):?>
@@ -167,13 +169,13 @@ script;
                     <?php endif; ?>
                 </div>
                 <?php if (!$block->isSingleStoreMode()): ?>
-                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <div class="field-service"><?= $escaper->escapeHtml(__('[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>
+                    <span><?= $escaper->escapeHtml(__('Maximum Qty Allowed in Shopping Cart')) ?></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -196,7 +198,7 @@ script;
                             "#inventory_use_config_max_sale_qty"
                         ) ?>
                         <label for="inventory_use_config_max_sale_qty">
-                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                            <?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                         </label>
                     </div>
                     <?php if (!$block->isReadonly()):?>
@@ -211,46 +213,46 @@ script;
                     <?php endif; ?>
                 </div>
                 <?php if (!$block->isSingleStoreMode()):?>
-                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <div class="field-service"><?= $escaper->escapeHtml(__('[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>
+                        <span><?= $escaper->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="0"><?= $escaper->escapeHtml(__('No')) ?></option>
                             <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1):?>
-                                selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?>
+                                selected="selected"<?php endif; ?>><?= $escaper->escapeHtml(__('Yes')) ?>
                             </option>
                         </select>
                     </div>
                     <?php if (!$block->isSingleStoreMode()): ?>
-                        <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                        <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
                     <?php endif; ?>
                 </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>
+                            <span><?= $escaper->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="0"><?= $escaper->escapeHtml(__('No')) ?></option>
                                 <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?>
-                                    selected="selected"<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
+                                    selected="selected"<?php endif; ?>><?= $escaper->escapeHtml(__('Yes')) ?></option>
                             </select>
                         </div>
                         <?php if (!$block->isSingleStoreMode()):?>
-                            <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                            <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
                         <?php endif; ?>
                     </div>
                 <?php endif; ?>
@@ -258,7 +260,7 @@ script;
 
             <div class="field">
                 <label class="label" for="inventory_backorders">
-                    <span><?= $block->escapeHtml(__('Backorders')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Backorders')) ?></span>
                 </label>
                 <div class="control">
                     <select id="inventory_backorders"
@@ -267,8 +269,8 @@ script;
                         <?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 value="<?= $escaper->escapeHtmlAttr($option['value']) ?>"
+                                <?= /* @noEscape */ $_selected ?>><?= $escaper->escapeHtml($option['label']) ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -286,7 +288,7 @@ script;
                             "#inventory_use_config_backorders"
                         ) ?>
                         <label for="inventory_use_config_backorders">
-                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                            <?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                         </label>
                     </div>
                     <?php if (!$block->isReadonly()): ?>
@@ -301,13 +303,13 @@ script;
                     <?php endif; ?>
                 </div>
                 <?php if (!$block->isSingleStoreMode()): ?>
-                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
 
             <div class="field">
                 <label class="label" for="inventory_notify_stock_qty">
-                    <span><?= $block->escapeHtml(__('Notify for Quantity Below')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Notify for Quantity Below')) ?></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -331,7 +333,7 @@ script;
                             "#inventory_use_config_notify_stock_qty"
                         ) ?>
                         <label for="inventory_use_config_notify_stock_qty">
-                            <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                            <?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                         </label>
                     </div>
                     <?php if (!$block->isReadonly()): ?>
@@ -346,14 +348,14 @@ script;
                     <?php endif; ?>
                 </div>
                 <?php if (!$block->isSingleStoreMode()):?>
-                    <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                    <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
                 <?php endif; ?>
             </div>
 
         <?php endif; ?>
         <div class="field">
             <label class="label" for="inventory_enable_qty_increments">
-                <span><?= $block->escapeHtml(__('Enable Qty Increments')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Enable Qty Increments')) ?></span>
             </label>
             <div class="control">
                 <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
@@ -361,15 +363,15 @@ script;
                         name="<?= /* @noEscape */ $block->getFieldSuffix()
                         ?>[stock_data][enable_qty_increments]" <?= /* @noEscape */ $_readonly ?>>
                     <option value="1"<?php if ($qtyIncrementsEnabled):?> selected="selected"<?php endif; ?>>
-                        <?= $block->escapeHtml(__('Yes')) ?>
+                        <?= $escaper->escapeHtml(__('Yes')) ?>
                     </option>
                     <option value="0"<?php if (!$qtyIncrementsEnabled):?> selected="selected"<?php endif; ?>>
-                        <?= $block->escapeHtml(__('No')) ?>
+                        <?= $escaper->escapeHtml(__('No')) ?>
                     </option>
                 </select>
                 <input type="hidden"
                        id="inventory_enable_qty_increments_default"
-                       value="<?= $block->escapeHtmlAttr($block->getDefaultConfigValue('enable_qty_increments')) ?>">
+                       value="<?= $escaper->escapeHtmlAttr($block->getDefaultConfigValue('enable_qty_increments')) ?>">
 
                 <div class="control-inner-wrap">
                     <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->isNew()) ?
@@ -385,7 +387,7 @@ script;
                         "#inventory_use_config_enable_qty_increments"
                     ) ?>
                     <label for="inventory_use_config_enable_qty_increments">
-                        <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        <?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                     </label>
                 </div>
                 <?php if (!$block->isReadonly()): ?>
@@ -400,13 +402,13 @@ script;
                 <?php endif; ?>
             </div>
             <?php if (!$block->isSingleStoreMode()): ?>
-                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_qty_increments">
-                <span><?= $block->escapeHtml(__('Qty Increments')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Qty Increments')) ?></span>
             </label>
             <div class="control">
                 <input type="text"
@@ -427,7 +429,7 @@ script;
                         "#inventory_use_config_qty_increments"
                     ) ?>
                     <label for="inventory_use_config_qty_increments">
-                        <?= $block->escapeHtml(__('Use Config Settings')) ?>
+                        <?= $escaper->escapeHtml(__('Use Config Settings')) ?>
                     </label>
                 </div>
                 <?php if (!$block->isReadonly()): ?>
@@ -442,13 +444,13 @@ script;
                 <?php endif; ?>
             </div>
             <?php if (!$block->isSingleStoreMode()): ?>
-                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_stock_availability">
-                <span><?= $block->escapeHtml(__('Stock Availability')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Stock Availability')) ?></span>
             </label>
             <div class="control">
                 <select id="inventory_stock_availability"
@@ -457,14 +459,14 @@ script;
                     <?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 value="<?= $escaper->escapeHtmlAttr($option['value']) ?>"
+                            <?= /* @noEscape */ $_selected ?>><?= $escaper->escapeHtml($option['label']) ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
             </div>
             <?php if (!$block->isSingleStoreMode()):?>
-                <div class="field-service"><?= $block->escapeHtml(__('[GLOBAL]')) ?></div>
+                <div class="field-service"><?= $escaper->escapeHtml(__('[GLOBAL]')) ?></div>
             <?php endif; ?>
         </div>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/widget/chooser/container.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/widget/chooser/container.phtml
index 3ea964467a35d..04f388734b595 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/widget/chooser/container.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/widget/chooser/container.phtml
@@ -3,12 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Container for product link widget chooser
  *
- * @see \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser\Container
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Widget\Chooser\Container $block
  */
 ?>
 <div class="columns">
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 f58e213b60772..e8689fb055543 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,27 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Attributes\Search $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <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><?= $block->escapeHtml(__('Add Attribute')) ?></span>
+            <span><?= $escaper->escapeHtml(__('Add Attribute')) ?></span>
         </button>
         <div class="dropdown-menu">
             <input data-role="product-attribute-search"
-                   data-group="<?= $block->escapeHtmlAttr($block->getGroupCode()) ?>"
+                   data-group="<?= $escaper->escapeHtmlAttr($block->getGroupCode()) ?>"
                    class="search" type="text"
-                   placeholder="<?= $block->escapeHtmlAttr(__('start typing to search attribute')) ?>" />
+                   placeholder="<?= $escaper->escapeHtmlAttr(__('start typing to search attribute')) ?>" />
         </div>
     </div>
 
-<script data-template-for="product-attribute-search-<?= $block->escapeHtmlAttr($block->getGroupId()) ?>"
+<script data-template-for="product-attribute-search-<?= $escaper->escapeHtmlAttr($block->getGroupId()) ?>"
         type="text/x-magento-template">
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
@@ -30,7 +33,7 @@
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
-    <div class="actions"><?= $block->escapeHtml($block->getAttributeCreate()) ?></div>
+    <div class="actions"><?= $escaper->escapeHtml($block->getAttributeCreate()) ?></div>
 </script>
 
 <?php
@@ -39,7 +42,7 @@ $jsonHelper = $block->getData('jsonHelper');
 $selectorOptions = /* @noEscape */ $jsonHelper->jsonEncode($block->getSelectorOptions());
 $scriptString = <<<script
     require(["jquery","mage/mage","mage/backend/suggest"], function($) {
-        var $suggest = $('[data-role="product-attribute-search"][data-group="{$block->escapeHtml(
+        var $suggest = $('[data-role="product-attribute-search"][data-group="{$escaper->escapeHtml(
             $block->getGroupCode()
         )}"]');
 
@@ -64,7 +67,7 @@ $scriptString = <<<script
                 var templateId = $('#attribute_set_id').val();
                 if (ui.item.id) {
                     $.ajax({
-                        url: '{$block->escapeJs($block->getAddAttributeUrl())}',
+                        url: '{$escaper->escapeJs($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 360694fceb241..632f825a119e8 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,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if (!empty($tabs)) :?>
     <?php $tabGroups = [
@@ -12,15 +15,15 @@
         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE,
     ];?>
 
-    <div id="<?= $block->escapeHtmlAttr($block->getId()) ?>"
+    <div id="<?= $escaper->escapeHtmlAttr($block->getId()) ?>"
          data-mage-init='{"tabs":{
-        "active": "<?= $block->escapeHtmlAttr($block->getActiveTabId()) ?>",
-        "destination": "#<?= $block->escapeHtmlAttr($block->getDestElementId()) ?>",
+        "active": "<?= $escaper->escapeHtmlAttr($block->getActiveTabId()) ?>",
+        "destination": "#<?= $escaper->escapeHtmlAttr($block->getDestElementId()) ?>",
         "shadowTabs": "<?= /* @noEscape */ $block->getAllShadowTabs() ?>",
-        "tabsBlockPrefix": "<?= $block->escapeHtmlAttr($block->getId()) ?>_",
+        "tabsBlockPrefix": "<?= $escaper->escapeHtmlAttr($block->getId()) ?>_",
         "tabIdArgument": "active_tab",
-        "tabPanelClass": "<?= $block->escapeHtmlAttr($block->getPanelsClass()) ?>",
-        "excludedPanel": "<?= $block->escapeHtmlAttr($block->getExcludedPanel()) ?>",
+        "tabPanelClass": "<?= $escaper->escapeHtmlAttr($block->getPanelsClass()) ?>",
+        "excludedPanel": "<?= $escaper->escapeHtmlAttr($block->getExcludedPanel()) ?>",
         "groups": "ul.tabs"
     }}'>
         <?php foreach ($tabGroups as $tabGroupCode) :?>
@@ -32,7 +35,7 @@
 
             <div class="admin__page-nav <?php if (!$isBasic) :?> <?= '_collapsed' ?> <?php endif;?>"
                 data-role="container"
-                id="<?= $block->escapeHtmlAttr($tabGroupId) ?>"
+                id="<?= $escaper->escapeHtmlAttr($tabGroupId) ?>"
                 <?php if (!$isBasic) :?>
                     data-mage-init='{"collapsible":{
                     "active": "<?= /* @noEscape */ $activeCollapsible ?>",
@@ -47,7 +50,7 @@
                     <div class="admin__page-nav-title <?php if (!$isBasic) :?> <?= '_collapsible' ?><?php endif;?>"
                         data-role="trigger">
                         <strong>
-                            <?= $block->escapeHtml($isBasic ? __('Basic Settings') : __('Advanced Settings')) ?>
+                            <?= $escaper->escapeHtml($isBasic ? __('Basic Settings') : __('Advanced Settings')) ?>
                         </strong>
                         <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
                     </div>
@@ -64,24 +67,24 @@
                         <?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; ?> " <?= /* @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) ?>"
+                            <a href="<?= $escaper->escapeUrl($_tabHref) ?>" id="<?= $escaper->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+                               name="<?= $escaper->escapeHtmlAttr($block->getTabId($_tab, false)) ?>"
+                               title="<?= $escaper->escapeHtmlAttr($block->getTabTitle($_tab)) ?>"
+                               class="admin__page-nav-link <?= $escaper->escapeHtmlAttr($_tabClass) ?>"
                                data-tab-type="<?= /* @noEscape */ $_tabType ?>" <?= /* @noEscape */ $block->getUiId('tab', 'link', $_tab->getId()) ?>
                             >
-                                <span><?= $block->escapeHtml($block->getTabLabel($_tab)) ?></span>
+                                <span><?= $escaper->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">
-                                           <?= $block->escapeHtml(__('Changes have been made to this section that have not been saved.')) ?>
+                                           <?= $escaper->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">
-                                           <?= $block->escapeHtml(__('This tab contains invalid data. Please resolve this before saving.')) ?>
+                                           <?= $escaper->escapeHtml(__('This tab contains invalid data. Please resolve this before saving.')) ?>
                                        </span>
                                    </span>
                                     <span class="admin__page-nav-item-message-loader">
@@ -92,8 +95,8 @@
                                    </span>
                                 </span>
                             </a>
-                            <div id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" class="no-display"
-                                 data-tab-panel="<?= $block->escapeHtmlAttr($_tab->getTabId()) ?>"
+                            <div id="<?= $escaper->escapeHtmlAttr($block->getTabId($_tab)) ?>_content" class="no-display"
+                                 data-tab-panel="<?= $escaper->escapeHtmlAttr($_tab->getTabId()) ?>"
                                 <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>
                             >
                                 <?= /* @noEscape */ $block->getTabContent($_tab) ?>
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 c4dc1ddc0b02b..b3df6e838a929 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,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab $block
+ */
 ?>
 <div class="fieldset-wrapper admin__collapsible-block-wrapper" data-tab="<?= /* @noEscape */ $block->getTabId() ?>"
      id="<?= /* @noEscape */ $block->getTabId() ?>-wrapper" data-mage-init='{"collapsible":{
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 3ba507d2b3ebb..21c5b6af938e6 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,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Product\Grid */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Product\Grid $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
     <?php if ($block->getHideFormElement() !== true):?>
@@ -17,12 +20,12 @@
                 id="<?= $block->getHtmlId() ?>-select"
                 class="local-validation admin__control-select">
                 <option class="admin__control-select-placeholder" value=""
-                        selected><?= $block->escapeHtml(__('Actions')) ?>
+                        selected><?= $escaper->escapeHtml(__('Actions')) ?>
                 </option>
                 <?php foreach ($block->getItems() as $_item):?>
-                    <option value="<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+                    <option value="<?= $escaper->escapeHtmlAttr($_item->getId()) ?>"
                         <?= ($_item->getSelected() ? ' selected="selected"' : '') ?>>
-                        <?= $block->escapeHtml($_item->getLabel()) ?>
+                        <?= $escaper->escapeHtml($_item->getLabel()) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
@@ -35,29 +38,29 @@
     <?php endif ?>
     <div class="no-display">
     <?php foreach ($block->getItems() as $_item):?>
-        <div id="<?= $block->getHtmlId() ?>-item-<?= $block->escapeHtmlAttr($_item->getId()) ?>-block">
+        <div id="<?= $block->getHtmlId() ?>-item-<?= $escaper->escapeHtmlAttr($_item->getId()) ?>-block">
             <?= $_item->getAdditionalActionBlockHtml() ?>
         </div>
     <?php endforeach; ?>
     </div>
 
     <div class="mass-select-wrap">
-        <select id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>-mass-select" data-menu="grid-mass-select">
-            <optgroup label="<?= $block->escapeHtmlAttr(__('Mass Actions')) ?>">
+        <select id="<?= $escaper->escapeHtmlAttr($block->getHtmlId()) ?>-mass-select" data-menu="grid-mass-select">
+            <optgroup label="<?= $escaper->escapeHtmlAttr(__('Mass Actions')) ?>">
                 <option disabled selected></option>
                 <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
-                        <?= $block->escapeHtml(__('Select All')) ?>
+                        <?= $escaper->escapeHtml(__('Select All')) ?>
                     </option>
                     <option value="unselectAll">
-                        <?= $block->escapeHtml(__('Unselect All')) ?>
+                        <?= $escaper->escapeHtml(__('Unselect All')) ?>
                     </option>
                 <?php endif; ?>
                 <option value="selectVisible">
-                    <?= $block->escapeHtml(__('Select Visible')) ?>
+                    <?= $escaper->escapeHtml(__('Select Visible')) ?>
                 </option>
                 <option value="unselectVisible">
-                    <?= $block->escapeHtml(__('Unselect Visible')) ?>
+                    <?= $escaper->escapeHtml(__('Unselect Visible')) ?>
                 </option>
             </optgroup>
         </select>
@@ -74,19 +77,19 @@ script;
     if ($block->getUseSelectAll()):
         $scriptString .= <<<script
                 case 'selectAll':
-                    return {$block->escapeJs($block->getJsObjectName())}.selectAll();
+                    return {$escaper->escapeJs($block->getJsObjectName())}.selectAll();
                     break
                 case 'unselectAll':
-                    return {$block->escapeJs($block->getJsObjectName())}.unselectAll();
+                    return {$escaper->escapeJs($block->getJsObjectName())}.unselectAll();
                     break
 script;
     endif;
     $scriptString .= <<<script
                 case 'selectVisible':
-                    return {$block->escapeJs($block->getJsObjectName())}.selectVisible();
+                    return {$escaper->escapeJs($block->getJsObjectName())}.selectVisible();
                     break
                 case 'unselectVisible':
-                    return {$block->escapeJs($block->getJsObjectName())}.unselectVisible();
+                    return {$escaper->escapeJs($block->getJsObjectName())}.unselectVisible();
                     break
             }
             this.blur();
@@ -95,7 +98,7 @@ script;
     });
 script;
     if (!$block->getParentBlock()->canDisplayContainer()):
-        $scriptString .= $block->escapeJs($block->getJsObjectName()) . ".setGridIds('" .
+        $scriptString .= $escaper->escapeJs($block->getJsObjectName()) . ".setGridIds('" .
             /* @noEscape */ $block->getGridIdsJson() . "');";
     endif;
     ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
index 3e00503a882db..74341fc6ae303 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/product/grid/url_filter_applier.phtml
@@ -4,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Backend\Block\Template */
+/**
+ * @var \Magento\Backend\Block\Template $block
+ */
 ?>
 <script type="text/x-magento-init">
     {
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 668dc4a28a6d9..3c78fb718bf4b 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,8 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link */
+/**
+ * @var \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()) :?>
-<a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
+<a href="<?= $escaper->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $escaper->escapeHtml($block->getLabel()) ?></a>
 <?php endif; ?>
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 950eb16fb5019..b06847eb25e42 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
@@ -7,7 +7,8 @@
 use Magento\Catalog\Model\Product\Option;
 
 /**
- * @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Select\Checkable $block
+ * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
 $option = $block->getOption();
@@ -19,14 +20,14 @@ if ($option): ?>
     $count = 1;
     ?>
 
-<div class="options-list nested" id="options-<?= $block->escapeHtmlAttr($option->getId()) ?>-list">
+<div class="options-list nested" id="options-<?= $escaper->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()) ?>"
+               id="options_<?= $escaper->escapeHtmlAttr($option->getId()) ?>"
                class="radio admin__control-radio product-custom-option"
-               name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
-               data-selector="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]"
+               name="options[<?= $escaper->escapeHtmlAttr($option->getId()) ?>]"
+               data-selector="options[<?= $escaper->escapeHtmlAttr($option->getId()) ?>]"
                value=""
                checked="checked"
         />
@@ -34,12 +35,12 @@ if ($option): ?>
             <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                 'onclick',
                 'opConfig.reloadPrice()',
-                "options_" . $block->escapeJs($option->getId())
+                "options_" . $escaper->escapeJs($option->getId())
             ) ?>
         <?php endif; ?>
-        <label class="label admin__field-label" for="options_<?= $block->escapeHtmlAttr($option->getId()) ?>">
+        <label class="label admin__field-label" for="options_<?= $escaper->escapeHtmlAttr($option->getId()) ?>">
                         <span>
-                            <?= $block->escapeHtml(__('None'))  ?>
+                            <?= $escaper->escapeHtml(__('None'))  ?>
                         </span>
         </label>
     </div>
@@ -61,24 +62,24 @@ if ($option): ?>
         ?>
 
         <div class="field choice admin__field admin__field-option">
-            <input type="<?= $block->escapeHtmlAttr($optionType) ?>"
+            <input type="<?= $escaper->escapeHtmlAttr($optionType) ?>"
                    class="<?= $optionType === Option::OPTION_TYPE_RADIO
                        ? 'radio admin__control-radio'
                        : 'checkbox admin__control-checkbox' ?> <?= $option->getIsRequire()
                        ? 'required': '' ?>
                        product-custom-option
                         <?= $block->getSkipJsReloadPrice() ? '' : 'opConfig.reloadPrice()' ?>"
-                   name="options[<?= $block->escapeHtmlAttr($option->getId()) ?>]<?= /* @noEscape */ $arraySign ?>"
-                   id="options_<?= $block->escapeHtmlAttr($option->getId() . '_' . $count) ?>"
-                   value="<?= $block->escapeHtmlAttr($value->getOptionTypeId()) ?>"
-                <?= $block->escapeHtml($checked) ?>
-                   data-selector="<?= $block->escapeHtmlAttr($dataSelector) ?>"
-                   price="<?= $block->escapeHtmlAttr($block->getCurrencyByStore($value)) ?>"
+                   name="options[<?= $escaper->escapeHtmlAttr($option->getId()) ?>]<?= /* @noEscape */ $arraySign ?>"
+                   id="options_<?= $escaper->escapeHtmlAttr($option->getId() . '_' . $count) ?>"
+                   value="<?= $escaper->escapeHtmlAttr($value->getOptionTypeId()) ?>"
+                <?= $escaper->escapeHtml($checked) ?>
+                   data-selector="<?= $escaper->escapeHtmlAttr($dataSelector) ?>"
+                   price="<?= $escaper->escapeHtmlAttr($block->getCurrencyByStore($value)) ?>"
             />
             <label class="label admin__field-label"
-                   for="options_<?= $block->escapeHtmlAttr($option->getId() . '_' . $count) ?>">
+                   for="options_<?= $escaper->escapeHtmlAttr($option->getId() . '_' . $count) ?>">
                 <span>
-                    <?= $block->escapeHtml($value->getTitle()) ?>
+                    <?= $escaper->escapeHtml($value->getTitle()) ?>
                 </span>
                 <?= /* @noEscape */ $block->formatPrice($value) ?>
             </label>
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 b2c2acb7419bd..cff92f275cf1e 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,26 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-
-<?php /** @var $block \Magento\Framework\Pricing\Render\Amount */ ?>
 
-<span class="price-container <?= $block->escapeHtmlAttr($block->getAdjustmentCssClasses()) ?>"
+/**
+ * @var \Magento\Framework\Pricing\Render\Amount $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
+<span class="price-container <?= $escaper->escapeHtmlAttr($block->getAdjustmentCssClasses()) ?>"
         <?= $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
     <?php if ($block->getDisplayLabel()) :?>
-        <span class="price-label"><?= $block->escapeHtml($block->getDisplayLabel()) ?></span>
+        <span class="price-label"><?= $escaper->escapeHtml($block->getDisplayLabel()) ?></span>
     <?php endif; ?>
-    <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>
+    <span <?php if ($block->getPriceId()) :?> id="<?= $escaper->escapeHtmlAttr($block->getPriceId()) ?>"<?php endif;?>
+        <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $escaper->escapeHtmlAttr($block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes()) . '"' : '' ?>
+        data-price-amount="<?= $escaper->escapeHtmlAttr($block->getDisplayValue()) ?>"
+        data-price-type="<?= $escaper->escapeHtmlAttr($block->getPriceType()) ?>"
+        class="price-wrapper <?= $escaper->escapeHtmlAttr($block->getPriceWrapperCss()) ?>"
+    ><?= $escaper->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="<?= $block->escapeHtmlAttr($block->getDisplayValue()) ?>" />
-        <meta itemprop="priceCurrency" content="<?= $block->escapeHtmlAttr($block->getDisplayCurrencyCode()) ?>" />
+        <meta itemprop="price" content="<?= $escaper->escapeHtmlAttr($block->getDisplayValue()) ?>" />
+        <meta itemprop="priceCurrency" content="<?= $escaper->escapeHtmlAttr($block->getDisplayCurrencyCode()) ?>" />
     <?php endif; ?>
 </span>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
index c7c6c82986213..668f003ca0d0a 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/configured_price.phtml
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
+
+/**
+ * @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 $schema = ($block->getZone() == 'item_view') ? true : false;
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 /** @var \Magento\Catalog\Pricing\Price\ConfiguredPrice $configuredPrice */
@@ -21,8 +23,8 @@ $configuredRegularPrice = $block->getPriceType(
             <?= /* @noEscape */ $block->renderAmount(
                 $configuredPrice->getAmount(),
                 [
-                    'display_label'     => $block->escapeHtml(__('Special Price')),
-                    'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                    'display_label'     => $escaper->escapeHtml(__('Special Price')),
+                    'price_id'          => $escaper->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
                     'price_type'        => 'finalPrice',
                     'include_container' => true,
                     'schema' => $schema,
@@ -33,8 +35,8 @@ $configuredRegularPrice = $block->getPriceType(
             <?= /* @noEscape */ $block->renderAmount(
                 $configuredRegularPrice->getAmount(),
                 [
-                    'display_label'     => $block->escapeHtml(__('Regular Price')),
-                    'price_id'          => $block->escapeHtml($block->getPriceId('old-price-' . $idSuffix)),
+                    'display_label'     => $escaper->escapeHtml(__('Regular Price')),
+                    'price_id'          => $escaper->escapeHtml($block->getPriceId('old-price-' . $idSuffix)),
                     'price_type'        => 'oldPrice',
                     'include_container' => true,
                     'skip_adjustments'  => true,
@@ -52,8 +54,8 @@ $configuredRegularPrice = $block->getPriceType(
         <?= /* @noEscape */ $block->renderAmount(
             $configuredPrice->getAmount(),
             [
-                'display_label'     => $block->escapeHtml($priceLabel),
-                'price_id'          => $block->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
+                'display_label'     => $escaper->escapeHtml($priceLabel),
+                'price_id'          => $escaper->escapeHtml($block->getPriceId('product-price-' . $idSuffix)),
                 'price_type'        => 'finalPrice',
                 'include_container' => true,
                 'schema' => $schema,
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 7005e65bcca80..ecd9402d93f5d 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,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php
-/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
+/**
+ * @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block
+ */
 
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
@@ -16,4 +16,3 @@ $priceModel = $block->getPriceType('regular_price');
     '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 e56804a06de22..78f95257554f3 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,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php
-/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
+/**
+ * @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 /** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
@@ -48,7 +49,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 
 <?php if ($block->showMinimalPrice()) :?>
     <?php if ($block->getUseLinkForAsLowAs()) :?>
-        <a href="<?= $block->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
+        <a href="<?= $escaper->escapeUrl($block->getSaleableItem()->getProductUrl()) ?>" class="minimal-price-link">
             <?= /* @noEscape */ $block->renderAmountMinimal() ?>
         </a>
     <?php else :?>
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 9e740e693fbf2..bc73c0de6b0e9 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,14 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php
 // phpcs:disable Magento2.Templates.ThisInTemplate
 // phpcs:disable Generic.WhiteSpace.ScopeIndent
 
-/** @var \Magento\Catalog\Pricing\Render\PriceBox $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Pricing\Render\PriceBox $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 /** @var \Magento\Catalog\Pricing\Price\TierPrice $tierPriceModel */
 $tierPriceModel = $block->getPrice();
@@ -19,7 +20,7 @@ $msrpShowOnGesture = $block->getPriceType('msrp_price')->isShowPriceOnGesture();
 $product = $block->getSaleableItem();
 ?>
 <?php if (count($tierPrices)): ?>
-    <ul class="<?= $block->escapeHtmlAttr(($block->hasListClass() ? $block->getListClass() : 'prices-tier items')) ?>">
+    <ul class="<?= $escaper->escapeHtmlAttr(($block->hasListClass() ? $block->getListClass() : 'prices-tier items')) ?>">
         <?php foreach ($tierPrices as $index => $price): ?>
             <li class="item">
                 <?php
@@ -56,16 +57,16 @@ $product = $block->getSaleableItem();
                         $tierPriceData['qty'] = $price['price_qty'];
                     }
                     ?>
-                    <?= $block->escapeHtml(__('Buy %1 for: ', $price['price_qty'])) ?>
+                    <?= $escaper->escapeHtml(__('Buy %1 for: ', $price['price_qty'])) ?>
                     <a href="#"
-                       id="<?= $block->escapeHtmlAttr($popupId) ?>"
-                       data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
-                        <?= $block->escapeHtml(__('Click for price')) ?>
+                       id="<?= $escaper->escapeHtmlAttr($popupId) ?>"
+                       data-tier-price="<?= $escaper->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
+                        <?= $escaper->escapeHtml(__('Click for price')) ?>
                     </a>
                     <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
                         'onclick',
                         'event.preventDefault()',
-                        'a#' . $block->escapeHtmlAttr($popupId)
+                        'a#' . $escaper->escapeHtmlAttr($popupId)
                     ) ?>
                 <?php else:
                     $priceAmountBlock = $block->renderAmount(
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 b50095e91d999..70a7fe0e63a27 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
@@ -3,8 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Category view template
  *
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 2f5b852575c78..0fffef419aecf 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
@@ -3,14 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
 /**
  * Category view template
  *
- * @var $block \Magento\Catalog\Block\Category\View
+ * @var \Magento\Catalog\Block\Category\View $block
  */
 ?>
 <?php if ($_description = $block->getCurrentCategory()->getDescription()) :?>
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 8f72e4713d22b..da7fb140c60ff 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
@@ -3,28 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-/**
- * Category view template
- *
- * @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
+
+/**
+ * Category view template
+ *
+ * @var \Magento\Catalog\Block\Category\View $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php
     $_category  = $block->getCurrentCategory();
     $_imgHtml   = '';
     if ($_imgUrl = $block->getImage()->getUrl($_category)) {
         $_imgHtml = '<div class="category-image"><img src="'
-            . $block->escapeUrl($_imgUrl)
+            . $escaper->escapeUrl($_imgUrl)
             . '" alt="'
-            . $block->escapeHtmlAttr($_category->getName())
+            . $escaper->escapeHtmlAttr($_category->getName())
             . '" title="'
-            . $block->escapeHtmlAttr($_category->getName())
+            . $escaper->escapeHtmlAttr($_category->getName())
             . '" class="image" /></div>';
         $_imgHtml = $block->getOutput()->categoryAttribute($_category, $_imgHtml, 'image');
         /* @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 80a9ae0a03e66..4eb2469858292 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
@@ -3,12 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Category view template
  *
- * @var $block \Magento\Catalog\Block\Category\View
+ * @var \Magento\Catalog\Block\Category\View $block
  */
 ?>
 <?php if (!$block->isContentMode() || $block->isMixedMode()) :?>
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 65ee7ea789e46..6682ccc807de1 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,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Category\Rss\Link */
+/**
+ * @var \Magento\Catalog\Block\Category\Rss\Link $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?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>
+    <a href="<?= $escaper->escapeUrl($block->getLink()) ?>"
+       class="action link rss"><span><?= $escaper->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 15fdd30c2d93f..68ec25ccff30c 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,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <div class="widget block block-category-link">
-    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $escaper->escapeHtml($block->getLabel()) ?></span></a>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
index 18ffee4b5f701..71aca456322b0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_href.phtml
@@ -4,6 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var Magento\Catalog\Block\Widget\Link $block */
+/**
+ * @var Magento\Catalog\Block\Widget\Link $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?= $block->escapeHtml($block->getHref()) ?>
+<?= $escaper->escapeHtml($block->getHref()) ?>
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 8f3b2ae613731..1de663c3407ef 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,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <span class="widget block block-category-link-inline">
-    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $escaper->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 52bec7858a919..39fd680468244 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
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Catalog\Block\FrontendStorageManager */
+/**
+ * @var Magento\Catalog\Block\FrontendStorageManager $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <script type="text/x-magento-init">
         {
@@ -13,7 +16,7 @@
                     "components": {
                         "storage-manager": {
                             "component": "Magento_Catalog/js/storage-manager",
-                            "appendTo": "<?= $block->escapeJs($block->getParentComponentName()) ?>",
+                            "appendTo": "<?= $escaper->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 f5dca566abfed..f28db1e24fa56 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/messages/addCompareSuccessMessage.phtml
@@ -4,9 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Framework\View\Element\Template $block */
+/**
+ * @var \Magento\Framework\View\Element\Template $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?= $block->escapeHtml(
+<?= $escaper->escapeHtml(
     __(
         'You added product %1 to the <a href="%2">comparison list</a>.',
         $block->getData('product_name'),
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 6d5ddb95ab178..49fa445383235 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
@@ -7,7 +7,8 @@
 /**
  * Category left navigation
  *
- * @var $block \Magento\Catalog\Block\Navigation
+ * @var \Magento\Catalog\Block\Navigation $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php if (!$block->getCategory()) {
@@ -18,24 +19,24 @@
 <?php if ($_count) :?>
     <div class="block filter">
         <div class="title">
-            <strong><?= $block->escapeHtml(__('Shop By')) ?></strong>
+            <strong><?= $escaper->escapeHtml(__('Shop By')) ?></strong>
         </div>
         <div class="content">
-            <strong class="subtitle"><?= $block->escapeHtml(__('Shopping Options')) ?></strong>
+            <strong class="subtitle"><?= $escaper->escapeHtml(__('Shopping Options')) ?></strong>
             <dl class="options" id="narrow-by-list2">
-                <dt><?= $block->escapeHtml(__('Category')) ?></dt>
+                <dt><?= $escaper->escapeHtml(__('Category')) ?></dt>
                 <dd>
                     <ol class="items">
                         <?php /** @var \Magento\Catalog\Model\Category $_category */ ?>
                         <?php foreach ($_categories as $_category) :?>
                             <?php if ($_category->getIsActive()) :?>
                                 <li class="item">
-                                    <a href="<?= $block->escapeUrl($block->getCategoryUrl($_category)) ?>"
+                                    <a href="<?= $escaper->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>
+                                    ><?= $escaper->escapeHtml($_category->getName()) ?></a>
+                                    <span class="count"><?= $escaper->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 fd18db94fdc88..5a7d83b3c2f5d 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/breadcrumbs.phtml
@@ -3,15 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/** @var \Magento\Theme\Block\Html\Breadcrumbs $block */
-/** @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel */
+
+/**
+ * @var \Magento\Theme\Block\Html\Breadcrumbs $block
+ * @var \Magento\Catalog\ViewModel\Product\Breadcrumbs $viewModel
+ */
 $viewModel = $block->getData('viewModel');
-?>
-<div class="breadcrumbs"></div>
-<?php
 $widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($viewModel->getJsonConfigurationHtmlEscaped());
 $widgetOptions = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['breadcrumbs']);
 ?>
+<div class="breadcrumbs"></div>
 <script type="text/x-magento-init">
     {
         ".breadcrumbs": {
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 05a5649135ef5..89ec1a5904446 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,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Framework\View\Element\Template */
+/**
+ * @var \Magento\Framework\View\Element\Template $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <li class="item link compare" data-bind="scope: 'compareProducts'" data-role="compare-products-link">
-    <a class="action compare no-display" title="<?= $block->escapeHtmlAttr(__('Compare Products')) ?>"
+    <a class="action compare no-display" title="<?= $escaper->escapeHtmlAttr(__('Compare Products')) ?>"
        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
     >
-        <?= $block->escapeHtml(__('Compare Products')) ?>
+        <?= $escaper->escapeHtml(__('Compare Products')) ?>
         <span class="counter qty" data-bind="text: compareProducts().countCaption"></span>
     </a>
 </li>
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 07cca77178a38..0e4853e4263ff 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -8,12 +8,15 @@
 // phpcs:disable PSR2.ControlStructures.SwitchDeclaration
 // phpcs:disable Generic.WhiteSpace.ScopeIndent
 
-/* @var $block \Magento\Catalog\Block\Product\Compare\ListCompare */
+/**
+ * @var \Magento\Catalog\Block\Product\Compare\ListCompare $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php $total = $block->getItems()->getSize() ?>
 <?php if ($total) :?>
-    <a href="#" class="action print hidden-print" title="<?= $block->escapeHtmlAttr(__('Print This Page')) ?>">
-        <span><?= $block->escapeHtml(__('Print This Page')) ?></span>
+    <a href="#" class="action print hidden-print" title="<?= $escaper->escapeHtmlAttr(__('Print This Page')) ?>">
+        <span><?= $escaper->escapeHtml(__('Print This Page')) ?></span>
     </a>
         <div class="table-wrapper comparison">
             <table class="data table table-comparison" id="product-comparison"
@@ -23,19 +26,19 @@
                     "selectors":{
                         "productAddToCartSelector":"button.action.tocart"}
                 }}'>
-                <caption class="table-caption"><?= $block->escapeHtml(__('Compare Products')) ?></caption>
+                <caption class="table-caption"><?= $escaper->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><?= $block->escapeHtml(__('Remove Product')) ?></span></th>
+                            <th scope="row" class="cell label remove"><span><?= $escaper->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='<?= /* @noEscape */ $compareHelper->getPostDataRemove($item) ?>'
-                               class="action delete" title="<?= $block->escapeHtmlAttr(__('Remove Product')) ?>">
-                                <span><?= $block->escapeHtml(__('Remove Product')) ?></span>
+                               class="action delete" title="<?= $escaper->escapeHtmlAttr(__('Remove Product')) ?>">
+                                <span><?= $escaper->escapeHtml(__('Remove Product')) ?></span>
                             </a>
                         </td>
                     <?php endforeach; ?>
@@ -49,17 +52,17 @@
                     <?php foreach ($block->getItems() as $item) :?>
                         <?php if ($index++ == 0) :?>
                             <th scope="row" class="cell label product">
-                                <span><?= $block->escapeHtml(__('Product')) ?></span>
+                                <span><?= $escaper->escapeHtml(__('Product')) ?></span>
                             </th>
                         <?php endif; ?>
-                        <td data-th="<?= $block->escapeHtmlAttr(__('Product')) ?>" class="cell product info">
+                        <td data-th="<?= $escaper->escapeHtmlAttr(__('Product')) ?>" class="cell product info">
                             <a class="product-item-photo"
-                               href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
+                               href="<?= $escaper->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="<?= $block->escapeUrl($block->getProductUrl($item)) ?>"
+                                <a href="<?= $escaper->escapeUrl($block->getProductUrl($item)) ?>"
                                    title="<?= /* @noEscape */ $block->stripTags($item->getName(), null, true) ?>">
                                     <?= /* @noEscape */ $helper->productAttribute($item, $item->getName(), 'name') ?>
                                 </a>
@@ -70,18 +73,18 @@
                                 <div class="actions-primary">
                                     <?php if ($item->isSaleable()) :?>
                                         <form data-role="tocart-form"
-                                              action="<?= $block->escapeUrl($this->helper(Magento\Catalog\Helper\Product\Compare::class)->getAddToCartUrl($item)) ?>"
+                                              action="<?= $escaper->escapeUrl($this->helper(Magento\Catalog\Helper\Product\Compare::class)->getAddToCartUrl($item)) ?>"
                                               method="post">
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit" class="action tocart primary" disabled>
-                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
                                     <?php else :?>
                                         <?php if ($item->getIsSalable()) :?>
-                                            <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                            <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
                                         <?php else :?>
-                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                            <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
@@ -91,7 +94,7 @@
                                            data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'
                                            class="action towishlist"
                                            data-action="add-to-wishlist">
-                                            <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                            <span><?= $escaper->escapeHtml(__('Add to Wish List')) ?></span>
                                         </a>
                                     </div>
                                 <?php endif; ?>
@@ -109,7 +112,7 @@
                                 <?php if ($index++ == 0) :?>
                                     <th scope="row" class="cell label">
                                         <span class="attribute label">
-                                            <?= $block->escapeHtml($attribute->getStoreLabel() ? $attribute->getStoreLabel() : __($attribute->getFrontendLabel())) ?>
+                                            <?= $escaper->escapeHtml($attribute->getStoreLabel() ? $attribute->getStoreLabel() : __($attribute->getFrontendLabel())) ?>
                                         </span>
                                     </th>
                                 <?php endif; ?>
@@ -131,7 +134,7 @@
                                                 <?php if (is_string($block->getProductAttributeValue($item, $attribute))) :?>
                                                     <?= /* @noEscape */ $helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode()) ?>
                                                 <?php else : ?>
-                                                    <?=  $block->escapeHtml($helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode())) ?>
+                                                    <?=  $escaper->escapeHtml($helper->productAttribute($item, $block->getProductAttributeValue($item, $attribute), $attribute->getAttributeCode())) ?>
                                                 <?php endif; ?>
                                                 <?php break;
                                         } ?>
@@ -152,5 +155,5 @@
         }
         </script>
 <?php else :?>
-    <div class="message info empty"><div><?= $block->escapeHtml(__('You have no items to compare.')) ?></div></div>
+    <div class="message info empty"><div><?= $escaper->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 809ddc5c61701..9f2547cb3fce4 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
@@ -6,11 +6,14 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 
-/* @var $block \Magento\Framework\View\Element\Template */
+/**
+ * @var \Magento\Framework\View\Element\Template $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <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"><?= $block->escapeHtml(__('Compare Products')) ?></strong>
+        <strong id="block-compare-heading" role="heading" aria-level="2"><?= $escaper->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 -->
@@ -23,28 +26,28 @@
                     </strong>
                     <a href="#"
                        data-bind="attr: {'data-post': remove_url}"
-                       title="<?= $block->escapeHtmlAttr(__('Remove This Item')) ?>"
+                       title="<?= $escaper->escapeHtmlAttr(__('Remove This Item')) ?>"
                        class="action delete">
-                        <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
+                        <span><?= $escaper->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><?= $block->escapeHtml(__('Compare')) ?></span></a>
+                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= $escaper->escapeHtml(__('Compare')) ?></span></a>
             </div>
             <div class="secondary">
-                <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$block->escapeHtml(
+                <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$escaper->escapeHtml(
                     $this->helper(Magento\Catalog\Helper\Product\Compare::class)->getPostDataClearList()
                 ) ?>">
-                    <span><?= $block->escapeHtml(__('Clear All')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Clear All')) ?></span>
                 </a>
             </div>
         </div>
     </div>
     <!-- /ko -->
     <!-- ko ifnot: compareProducts().count -->
-    <div class="empty"><?= $block->escapeHtml(__('You have no items to compare.')) ?></div>
+    <div class="empty"><?= $escaper->escapeHtml(__('You have no items to compare.')) ?></div>
     <!-- /ko -->
 </div>
 <script type="text/x-magento-init">
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 aab181a8f7321..a21ae5f8184cc 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
@@ -4,52 +4,55 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Catalog\Block\Product\Gallery $block */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Product\Gallery $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
 <?php $_width = $block->getImageWidth(); ?>
 <div class="product-image-popup">
     <div class="buttons-set"><a href="#" class="button" role="close-window">
-            <span><?= $block->escapeHtml(__('Close Window')) ?></span></a></div>
+            <span><?= $escaper->escapeHtml(__('Close Window')) ?></span></a></div>
     <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()):?>
         <div class="nav">
             <?php if ($_prevUrl = $block->getPreviousImageUrl()):?>
-                <a href="<?= $block->escapeUrl($_prevUrl) ?>"
-                   class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
+                <a href="<?= $escaper->escapeUrl($_prevUrl) ?>"
+                   class="prev">&laquo; <?= $escaper->escapeHtml(__('Prev')) ?></a>
             <?php endif; ?>
             <?php if ($_nextUrl = $block->getNextImageUrl()):?>
-                <a href="<?= $block->escapeUrl($_nextUrl) ?>"
-                   class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
+                <a href="<?= $escaper->escapeUrl($_nextUrl) ?>"
+                   class="next"><?= $escaper->escapeHtml(__('Next')) ?> &raquo;</a>
             <?php endif; ?>
         </div>
     <?php endif; ?>
-    <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())):?>
+    <?php if ($_imageTitle = $escaper->escapeHtml($block->getCurrentImage()->getLabel())):?>
         <h1 class="image-label"><?= /* @noEscape */ $_imageTitle ?></h1>
     <?php endif; ?>
     <?php
     $imageUrl = $block->getImageUrl();
     ?>
-    <img src="<?= $block->escapeUrl($imageUrl) ?>"
+    <img src="<?= $escaper->escapeUrl($imageUrl) ?>"
         <?php if ($_width):?>
             width="<?= /* @noEscape */ $_width ?>"
         <?php endif; ?>
-         alt="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
-         title="<?= $block->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
+         alt="<?= $escaper->escapeHtmlAttr($block->getCurrentImage()->getLabel()) ?>"
+         title="<?= $escaper->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><?= $block->escapeHtml(__('Close Window')) ?></span></a>
+        a href="#" class="button" role="close-window"><span><?= $escaper->escapeHtml(__('Close Window')) ?></span></a>
     </div>
     <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()):?>
         <div class="nav">
             <?php if ($_prevUrl = $block->getPreviousImageUrl()):?>
-                <a href="<?= $block->escapeUrl($_prevUrl) ?>"
-                   class="prev">&laquo; <?= $block->escapeHtml(__('Prev')) ?></a>
+                <a href="<?= $escaper->escapeUrl($_prevUrl) ?>"
+                   class="prev">&laquo; <?= $escaper->escapeHtml(__('Prev')) ?></a>
             <?php endif; ?>
             <?php if ($_nextUrl = $block->getNextImageUrl()):?>
-                <a href="<?= $block->escapeUrl($_nextUrl) ?>"
-                   class="next"><?= $block->escapeHtml(__('Next')) ?> &raquo;</a>
+                <a href="<?= $escaper->escapeUrl($_nextUrl) ?>"
+                   class="next"><?= $escaper->escapeHtml(__('Next')) ?> &raquo;</a>
             <?php endif; ?>
         </div>
     <?php endif; ?>
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 86b332679bcb4..2b8ffbaae85ab 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-/** @var $block \Magento\Catalog\Block\Product\Image */
-/** @var $escaper \Magento\Framework\Escaper */
+
+/**
+ * @var \Magento\Catalog\Block\Product\Image $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <!--deprecated template as image_with_borders is a primary one-->
 <img class="photo image <?= $escaper->escapeHtmlAttr($block->getClass()) ?>"
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 cc1a7276c70b8..0cc6c486fe90b 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
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-/** @var $block \Magento\Catalog\Block\Product\Image */
-/** @var $escaper \Magento\Framework\Escaper */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+
+/**
+ * @var \Magento\Catalog\Block\Product\Image $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 $width = (int)$block->getWidth();
 $paddingBottom = $block->getRatio() * 100;
 ?>
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 a831bd7be6f71..80a92d7b23466 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -3,19 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 use Magento\Framework\App\Action\Action;
 
-?>
-<?php
 /**
  * Product list template
  *
- * @var $block \Magento\Catalog\Block\Product\ListProduct
+ * @var \Magento\Catalog\Block\Product\ListProduct $block
  * @var \Magento\Framework\Escaper $escaper
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
  */
-?>
-<?php
+
 $_productCollection = $block->getLoadedProductCollection();
 /** @var \Magento\Catalog\Helper\Output $_helper */
 $_helper = $block->getData('outputHelper');
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 c23ee021ca3a8..48e0079cdcc74 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,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare */
+/**
+ * @var Magento\Catalog\Block\Product\ProductList\Item\AddTo\Compare $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <a href="#"
    class="action tocompare"
-   title="<?= $block->escapeHtml(__('Add to Compare')) ?>"
-   aria-label="<?= $block->escapeHtml(__('Add to Compare')) ?>"
+   title="<?= $escaper->escapeHtml(__('Add to Compare')) ?>"
+   aria-label="<?= $escaper->escapeHtml(__('Add to Compare')) ?>"
    data-post='<?= /* @noEscape */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
    role="button">
-    <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+    <span><?= $escaper->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 e426b940deab7..7524c58079528 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
@@ -7,11 +7,12 @@
 use Magento\Catalog\ViewModel\Product\Listing\PreparePostData;
 use Magento\Framework\App\ActionInterface;
 
-/* @var $block \Magento\Catalog\Block\Product\AbstractProduct */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
-?>
+/**
+ * @var \Magento\Catalog\Block\Product\AbstractProduct $block
+ * @var \Magento\Framework\Escaper $escaper
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
-<?php
 switch ($type = $block->getType()) {
 
     case 'related-rule':
@@ -162,34 +163,34 @@ $_item = null;
 
     <?php if ($type == 'related' || $type == 'upsell'):?>
         <?php if ($type == 'related'):?>
-<div class="block <?= $block->escapeHtmlAttr($class) ?>"
+<div class="block <?= $escaper->escapeHtmlAttr($class) ?>"
      data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}'
-     data-limit="<?= $block->escapeHtmlAttr($limit) ?>"
+     data-limit="<?= $escaper->escapeHtmlAttr($limit) ?>"
      data-shuffle="<?= /* @noEscape */ $shuffle ?>"
      data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
     <?php else:?>
-    <div class="block <?= $block->escapeHtmlAttr($class) ?>"
+    <div class="block <?= $escaper->escapeHtmlAttr($class) ?>"
          data-mage-init='{"upsellProducts":{}}'
-         data-limit="<?= $block->escapeHtmlAttr($limit) ?>"
+         data-limit="<?= $escaper->escapeHtmlAttr($limit) ?>"
          data-shuffle="<?= /* @noEscape */ $shuffle ?>"
          data-shuffle-weighted="<?= /* @noEscape */ $isWeightedRandom ?>">
         <?php endif; ?>
         <?php else:?>
-        <div class="block <?= $block->escapeHtmlAttr($class) ?>">
+        <div class="block <?= $escaper->escapeHtmlAttr($class) ?>">
             <?php endif; ?>
             <div class="block-title title">
-                <strong id="block-<?= $block->escapeHtmlAttr($class) ?>-heading" role="heading"
-                        aria-level="2"><?= $block->escapeHtml($title) ?></strong>
+                <strong id="block-<?= $escaper->escapeHtmlAttr($class) ?>-heading" role="heading"
+                        aria-level="2"><?= $escaper->escapeHtml($title) ?></strong>
             </div>
-            <div class="block-content content" aria-labelledby="block-<?= $block->escapeHtmlAttr($class) ?>-heading">
+            <div class="block-content content" aria-labelledby="block-<?= $escaper->escapeHtmlAttr($class) ?>-heading">
                 <?php if ($type == 'related' && $canItemsAddToCart):?>
                     <div class="block-actions">
-                        <?= $block->escapeHtml(__('Check items to add to the cart or')) ?>
+                        <?= $escaper->escapeHtml(__('Check items to add to the cart or')) ?>
                         <button type="button" class="action select"
-                                data-role="select-all"><span><?= $block->escapeHtml(__('select all')) ?></span></button>
+                                data-role="select-all"><span><?= $escaper->escapeHtml(__('select all')) ?></span></button>
                     </div>
                 <?php endif; ?>
-                <div class="products wrapper grid products-grid products-<?= $block->escapeHtmlAttr($type) ?>">
+                <div class="products wrapper grid products-grid products-<?= $escaper->escapeHtmlAttr($type) ?>">
                     <ol class="products list items product-items">
                         <?php foreach ($items as $_item):?>
                             <?php $available = ''; ?>
@@ -201,7 +202,7 @@ $_item = null;
                             <?php if ($type == 'related' || $type == 'upsell'):?>
                                 <li class="item product product-item"
                                 id="product-item_<?= /* @noEscape */ $_item->getId() ?>"
-                                data-shuffle-group="<?= $block->escapeHtmlAttr($_item->getPriority()) ?>" >
+                                data-shuffle-group="<?= $escaper->escapeHtmlAttr($_item->getPriority()) ?>" >
                                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                                     'display:none;',
                                     'li#product-item_' . $_item->getId()
@@ -211,16 +212,16 @@ $_item = null;
                             <?php endif; ?>
                             <div class="product-item-info <?= /* @noEscape */ $available ?>">
                                 <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
-                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                <a href="<?= $escaper->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->escapeHtmlAttr($_item->getName()) ?>"
-                                                href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>">
-                                            <?= $block->escapeHtml($_item->getName()) ?></a>
+                                                title="<?= $escaper->escapeHtmlAttr($_item->getName()) ?>"
+                                                href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>">
+                                            <?= $escaper->escapeHtml($_item->getName()) ?></a>
                                     </strong>
 
                                     <?= /* @noEscape */ $block->getProductPrice($_item) ?>
@@ -236,12 +237,12 @@ $_item = null;
                                                 <input
                                                     type="checkbox"
                                                     class="checkbox related"
-                                                    id="related-checkbox<?= $block->escapeHtmlAttr($_item->getId()) ?>"
+                                                    id="related-checkbox<?= $escaper->escapeHtmlAttr($_item->getId()) ?>"
                                                     name="related_products[]"
-                                                    value="<?= $block->escapeHtmlAttr($_item->getId()) ?>" />
+                                                    value="<?= $escaper->escapeHtmlAttr($_item->getId()) ?>" />
                                                 <label class="label"
-                                                       for="related-checkbox<?= $block->escapeHtmlAttr($_item->getId())
-                                                        ?>"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                       for="related-checkbox<?= $escaper->escapeHtmlAttr($_item->getId())
+                                                        ?>"><span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                 </label>
                                             </div>
                                         <?php endif; ?>
@@ -256,22 +257,22 @@ $_item = null;
                                                     <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)):?>
                                                         <button
                                                                 class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                                data-mage-init='{"redirectUrl": {"url": "<?= $escaper->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>
                                                     <?php else :?>
                                                         <?php
                                                         /** @var $viewModel PreparePostData */
                                                         $viewModel = $block->getViewModel();
                                                         $postArray = $viewModel->getPostData(
-                                                            $block->escapeUrl($block->getAddToCartUrl($_item)),
+                                                            $escaper->escapeUrl($block->getAddToCartUrl($_item)),
                                                             ['product' => $_item->getEntityId()]
                                                         );
                                                         $value = $postArray['data'][ActionInterface::PARAM_NAME_URL_ENCODED];
                                                         ?>
                                                         <form data-role="tocart-form"
-                                                              data-product-sku="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
-                                                              action="<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"
+                                                              data-product-sku="<?= $escaper->escapeHtmlAttr($_item->getSku()) ?>"
+                                                              action="<?= $escaper->escapeUrl($block->getAddToCartUrl($_item)) ?>"
                                                               method="post">
                                                             <input type="hidden" name="product"
                                                                    value="<?= /* @noEscape */ (int)$_item->getEntityId() ?>">
@@ -280,20 +281,20 @@ $_item = null;
                                                                    value="<?= /* @noEscape */ $value ?>">
                                                             <?= $block->getBlockHtml('formkey') ?>
                                                             <button type="submit"
-                                                                    title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
+                                                                    title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                                     class="action tocart primary">
-                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                                <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>
                                                         </form>
                                                     <?php endif; ?>
                                                 <?php else:?>
                                                     <?php if ($_item->getIsSalable()):?>
                                                         <div class="stock available">
-                                                            <span><?= $block->escapeHtml(__('In stock')) ?></span>
+                                                            <span><?= $escaper->escapeHtml(__('In stock')) ?></span>
                                                         </div>
                                                     <?php else:?>
                                                         <div class="stock unavailable">
-                                                            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
+                                                            <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span>
                                                         </div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
@@ -324,7 +325,7 @@ $_item = null;
             {
                 "[data-role=tocart-form], .form.map.checkout": {
                     "catalogAddToCart": {
-                        "product_sku": "<?= $block->escapeJs($_item->getSku()) ?>"
+                        "product_sku": "<?= $escaper->escapeJs($_item->getSku()) ?>"
                     }
                 }
             }
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 76ef6baf4993e..748f1618c090c 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,16 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
+// phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
+// phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
+
 /**
  * Product list toolbar
  *
- * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
+ * @var \Magento\Catalog\Block\Product\ProductList\Toolbar $block
  */
-
-// phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
-// phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
 ?>
 <?php if ($block->getCollection()->getSize()) :?>
     <?php $widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getWidgetOptionsJson());
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 a8f504d6a4f17..450ef92093cf6 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,17 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Product list toolbar
  *
- * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
+ * @var \Magento\Catalog\Block\Product\ProductList\Toolbar $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <p class="toolbar-amount" id="toolbar-amount">
     <?php if ($block->getLastPageNum() > 1) :?>
-        <?= $block->escapeHtml(
+        <?= $escaper->escapeHtml(
             __(
                 'Items %1-%2 of %3',
                 '<span class="toolbar-number">' . $block->getFirstNum() . '</span>',
@@ -23,12 +23,12 @@
             ['span']
         ) ?>
     <?php elseif ($block->getTotalNum() == 1) :?>
-        <?= $block->escapeHtml(
+        <?= $escaper->escapeHtml(
             __('%1 Item', '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'),
             ['span']
         ) ?>
     <?php else :?>
-        <?= $block->escapeHtml(
+        <?= $escaper->escapeHtml(
             __('%1 Items', '<span class="toolbar-number">' . $block->getTotalNum() . '</span>'),
             ['span']
         ) ?>
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 4ded219748c64..32e719fbfeab2 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,29 +3,29 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Product list toolbar
  *
- * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
+ * @var \Magento\Catalog\Block\Product\ProductList\Toolbar $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <div class="field limiter">
     <label class="label" for="limiter">
-        <span><?= $block->escapeHtml(__('Show')) ?></span>
+        <span><?= $escaper->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="<?= $block->escapeHtmlAttr($_key) ?>"
+                <option value="<?= $escaper->escapeHtmlAttr($_key) ?>"
                     <?php if ($block->isLimitCurrent($_key)) :?>
                         selected="selected"
                     <?php endif ?>>
-                    <?= $block->escapeHtml($_limit) ?>
+                    <?= $escaper->escapeHtml($_limit) ?>
                 </option>
             <?php endforeach; ?>
         </select>
     </div>
-    <span class="limiter-text"><?= $block->escapeHtml(__('per page')) ?></span>
+    <span class="limiter-text"><?= $escaper->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 58dde199998bc..528d91cf339eb 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,42 +3,42 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Product list toolbar
  *
- * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
+ * @var \Magento\Catalog\Block\Product\ProductList\Toolbar $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <div class="toolbar-sorter sorter">
-    <label class="sorter-label" for="sorter"><?= $block->escapeHtml(__('Sort By')) ?></label>
+    <label class="sorter-label" for="sorter"><?= $escaper->escapeHtml(__('Sort By')) ?></label>
     <select id="sorter" data-role="sorter" class="sorter-options">
         <?php foreach ($block->getAvailableOrders() as $_key => $_order) :?>
-            <option value="<?= $block->escapeHtmlAttr($_key) ?>"
+            <option value="<?= $escaper->escapeHtmlAttr($_key) ?>"
                 <?php if ($block->isOrderCurrent($_key)) :?>
                     selected="selected"
                 <?php endif; ?>
                 >
-                <?= $block->escapeHtml(__($_order)) ?>
+                <?= $escaper->escapeHtml(__($_order)) ?>
             </option>
         <?php endforeach; ?>
     </select>
     <?php if ($block->getCurrentDirection() == 'desc') :?>
-        <a title="<?= $block->escapeHtmlAttr(__('Set Ascending Direction')) ?>"
+        <a title="<?= $escaper->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>
+            <span><?= $escaper->escapeHtml(__('Set Ascending Direction')) ?></span>
         </a>
     <?php else :?>
-        <a title="<?= $block->escapeHtmlAttr(__('Set Descending Direction')) ?>"
+        <a title="<?= $escaper->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>
+            <span><?= $escaper->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 955897f315d6f..5b29e7e9c6f8d 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,35 +3,35 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 /**
  * Product list toolbar
  *
- * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
+ * @var \Magento\Catalog\Block\Product\ProductList\Toolbar $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?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>
+            <strong class="modes-label" id="modes-label"><?= $escaper->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 title="<?= $escaper->escapeHtmlAttr($_label) ?>"
+                            class="modes-mode active mode-<?= $escaper->escapeHtmlAttr(strtolower($_code)) ?>"
+                            data-value="<?= $escaper->escapeHtmlAttr(strtolower($_code)) ?>">
+                        <span><?= $escaper->escapeHtml($_label) ?></span>
                     </strong>
                 <?php else :?>
-                    <a class="modes-mode mode-<?= $block->escapeHtmlAttr(strtolower($_code)) ?>"
-                       title="<?= $block->escapeHtmlAttr($_label) ?>"
+                    <a class="modes-mode mode-<?= $escaper->escapeHtmlAttr(strtolower($_code)) ?>"
+                       title="<?= $escaper->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>
+                       data-value="<?= $escaper->escapeHtmlAttr(strtolower($_code)) ?>"
+                       id="mode-<?= $escaper->escapeHtmlAttr(strtolower($_code)) ?>"
+                       aria-labelledby="modes-label mode-<?= $escaper->escapeHtmlAttr(strtolower($_code)) ?>">
+                        <span><?= $escaper->escapeHtml($_label) ?></span>
                     </a>
                 <?php endif; ?>
             <?php endforeach; ?>
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 6cebd51284f48..0b669bc41262f 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -3,8 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable Magento2.Files.LineLength.MaxExceeded
 // phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
@@ -12,15 +11,14 @@
 /**
  * Product list template
  *
- * @var $block \Magento\Catalog\Block\Product\ListProduct
+ * @var \Magento\Catalog\Block\Product\ListProduct $block
+ * @var \Magento\Framework\Escaper $escaper
  */
-?>
-<?php
 $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 ?>
 <?php if (!$_productCollection->count()) :?>
-    <p class="message note"><?= $block->escapeHtml(__('We can\'t find products matching the selection.')) ?></p>
+    <p class="message note"><?= $escaper->escapeHtml(__('We can\'t find products matching the selection.')) ?></p>
 <?php else :?>
     <?= $block->getToolbarHtml() ?>
     <?= $block->getAdditionalHtml() ?>
@@ -43,7 +41,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                 <li class="item product">
                     <div class="product">
                         <?php // Product Image ?>
-                        <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="product photo">
+                        <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>" class="product photo">
                             <?= $block->getImage($_product, $image)->toHtml() ?>
                         </a>
                         <div class="product details">
@@ -51,7 +49,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 
                             $info = [];
                             $info['name'] = '<strong class="product name">'
-                                . ' <a href="' . $block->escapeUrl($_product->getProductUrl()) . '" title="'
+                                . ' <a href="' . $escaper->escapeUrl($_product->getProductUrl()) . '" title="'
                                 . $block->stripTags($_product->getName(), null, true) . '">'
                                 . $_helper->productAttribute($_product, $_product->getName(), 'name')
                                 . '</a></strong>';
@@ -59,26 +57,26 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                             $info['review'] = $block->getReviewsSummaryHtml($_product, $templateType);
 
                             if ($_product->isSaleable()) {
-                                $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>';
+                                $info['button'] = '<button type="button" title="' . $escaper->escapeHtmlAttr(__('Add to Cart')) . '" class="action tocart"'
+                                    . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $escaper->escapeUrl($block->getAddToCartUrl($_product)) . '"} }\'>'
+                                    . '<span>' . $escaper->escapeHtml(__('Add to Cart')) . '</span></button>';
                             } else {
-                                $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['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . $escaper->escapeHtml(__('In stock')) . '</span></div>' :
+                                    '<div class="stock unavailable"><span>' . $escaper->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::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>';
+                                . '<span>' . $escaper->escapeHtml(__('Add to Wish List')) . '</span></a>'
+                                . '<a href="' . $escaper->escapeUrl($block->getAddToCompareUrl($_product)) . '" class="action tocompare">'
+                                . '<span>' . $escaper->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="' . $block->escapeUrl($_product->getProductUrl()) . '" class="action more">'
-                                    . $block->escapeHtml(__('Learn More')) . '</a></div>';
+                                    . ' <a href="' . $escaper->escapeUrl($_product->getProductUrl()) . '" class="action more">'
+                                    . $escaper->escapeHtml(__('Learn More')) . '</a></div>';
                             } else {
                                 $info['description'] = '';
                             }
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 316fdb06592e2..a7e781c87fea6 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,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View\Additional */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Additional $block
+ */
 ?>
 <?php foreach ($block->getChildHtmlList() as $_html) :?>
     <?= /* @noEscape */ $_html ?>
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 1924175764555..31cb4dd18e283 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,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View*/
+/**
+ * @var \Magento\Catalog\Block\Product\View $block
+ */
 ?>
 <div class="product-addto-links" data-role="add-to-links">
     <?= $block->getChildHtml() ?>
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 9183e65181c48..fbed1caa6b59c 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,13 +4,14 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View\Addto\Compare */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Addto\Compare $block
+ */
 ?>
-
 <?php $viewModel = $block->getData('addToCompareViewModel'); ?>
 <?php if ($viewModel->isAvailableForCompare($block->getProduct())) :?>
 <a href="#" data-post='<?= /* @noEscape */ $block->getPostDataParams() ?>'
         data-role="add-to-links"
-        class="action tocompare"><span><?= $block->escapeHtml(__('Add to Compare')) ?></span></a>
+        class="action tocompare"><span><?= $escaper->escapeHtml(__('Add to Compare')) ?></span></a>
 <?php endif; ?>
 
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 f15824595f0ba..712c26a433302 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,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View */
+/**
+ * @var \Magento\Catalog\Block\Product\View $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php $_product = $block->getProduct(); ?>
 <?php $buttonTitle = __('Add to Cart'); ?>
@@ -13,26 +16,26 @@
     <div class="fieldset">
         <?php if ($block->shouldRenderQuantity()) :?>
         <div class="field qty">
-            <label class="label" for="qty"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
+            <label class="label" for="qty"><span><?= $escaper->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
                 <input type="number"
                        name="qty"
                        id="qty"
                        min="0"
                        value="<?= $block->getProductDefaultQty() * 1 ?>"
-                       title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
+                       title="<?= $escaper->escapeHtmlAttr(__('Qty')) ?>"
                        class="input-text qty"
-                       data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
+                       data-validate="<?= $escaper->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
                        />
             </div>
         </div>
         <?php endif; ?>
         <div class="actions">
             <button type="submit"
-                    title="<?= $block->escapeHtmlAttr($buttonTitle) ?>"
+                    title="<?= $escaper->escapeHtmlAttr($buttonTitle) ?>"
                     class="action primary tocart"
                     id="product-addtocart-button" disabled>
-                <span><?= $block->escapeHtml($buttonTitle) ?></span>
+                <span><?= $escaper->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 a045a21e55d27..57405e6ed40d6 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
@@ -9,10 +9,10 @@
 /**
  * Product view template
  *
- * @var $block \Magento\Catalog\Block\Product\View\Description
+ * @var \Magento\Catalog\Block\Product\View\Description $block
+ * @var \Magento\Framework\Escaper $escaper
  */
-?>
-<?php
+
 $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
 $_product = $block->getProduct();
 
@@ -46,9 +46,9 @@ if ($_attributeType && $_attributeType == 'text') {
 ?>
 
 <?php if ($_attributeValue) :?>
-<div class="product attribute <?= $block->escapeHtmlAttr($_className) ?>">
+<div class="product attribute <?= $escaper->escapeHtmlAttr($_className) ?>">
     <?php if ($renderLabel) :?>
-        <strong class="type"><?= $block->escapeHtml($_attributeLabel) ?></strong>
+        <strong class="type"><?= $escaper->escapeHtml($_attributeLabel) ?></strong>
     <?php endif; ?>
     <div class="value" <?= /* @noEscape */ $_attributeAddAttribute ?>><?= /* @noEscape */ $_attributeValue ?></div>
 </div>
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 a4f0fb3efab9e..7a947a246e42f 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
@@ -9,22 +9,22 @@
 /**
  * Product additional attributes template
  *
- * @var $block \Magento\Catalog\Block\Product\View\Attributes
+ * @var \Magento\Catalog\Block\Product\View\Attributes $block
+ * @var \Magento\Framework\Escaper $escaper
  */
-?>
-<?php
-    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
-    $_product = $block->getProduct();
+
+$_helper = $this->helper(Magento\Catalog\Helper\Output::class);
+$_product = $block->getProduct();
 ?>
 <?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"><?= $block->escapeHtml(__('More Information')) ?></caption>
+            <caption class="table-caption"><?= $escaper->escapeHtml(__('More Information')) ?></caption>
             <tbody>
             <?php foreach ($_additional as $_data) :?>
                 <tr>
-                    <th class="col label" scope="row"><?= $block->escapeHtml($_data['label']) ?></th>
-                    <td class="col data" data-th="<?= $block->escapeHtmlAttr($_data['label']) ?>"><?= /* @noEscape */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                    <th class="col label" scope="row"><?= $escaper->escapeHtml($_data['label']) ?></th>
+                    <td class="col data" data-th="<?= $escaper->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 a4aa675b2c346..b5eb4fa3414fe 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
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /**
  * Product viewed counter template
  *
- * @var $block \Magento\Catalog\Block\Ui\ProductViewCounter
+ * @var \Magento\Catalog\Block\Ui\ProductViewCounter $block
  */
 ?>
 <script type="text/x-magento-init">
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 c08c4d771b34a..52a065466bbbc 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
@@ -9,7 +9,7 @@
 /**
  * Product description template
  *
- * @var $block \Magento\Catalog\Block\Product\View\Description
+ * @var \Magento\Catalog\Block\Product\View\Description $block
  */
 ?>
 <?= /* @noEscape */ $this->helper(Magento\Catalog\Helper\Output::class)->productAttribute(
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 f4de22f98b021..bc4ddf22b6e7f 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,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-/** @var \Magento\Catalog\Block\Product\View\Details $block */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Details $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if ($detailedInfoGroup = $block->getGroupSortedChildNames('detailed_info', 'getChildHtml')) :?>
     <div class="product info detailed">
@@ -20,17 +23,17 @@
                 $label = $block->getChildData($alias, 'title');
                 ?>
                 <div class="data item title"
-                     data-role="collapsible" id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>">
+                     data-role="collapsible" id="tab-label-<?= $escaper->escapeHtmlAttr($alias) ?>">
                     <a class="data switch"
                        tabindex="-1"
                        data-toggle="trigger"
-                       href="#<?= $block->escapeUrl($alias) ?>"
-                       id="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title">
+                       href="#<?= $escaper->escapeUrl($alias) ?>"
+                       id="tab-label-<?= $escaper->escapeHtmlAttr($alias) ?>-title">
                         <?= /* @noEscape */ $label ?>
                     </a>
                 </div>
                 <div class="data item content"
-                     aria-labelledby="tab-label-<?= $block->escapeHtmlAttr($alias) ?>-title" id="<?= $block->escapeHtmlAttr($alias) ?>" data-role="content">
+                     aria-labelledby="tab-label-<?= $escaper->escapeHtmlAttr($alias) ?>-title" id="<?= $escaper->escapeHtmlAttr($alias) ?>" data-role="content">
                     <?= /* @noEscape */ $html ?>
                 </div>
             <?php endforeach;?>
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 25257f4bcea8a..3984402303161 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
@@ -9,15 +9,16 @@
 /**
  * Product view template
  *
- * @var $block \Magento\Catalog\Block\Product\View
+ * @var \Magento\Catalog\Block\Product\View $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?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="<?= $block->escapeUrl($block->getSubmitUrl($_product)) ?>" method="post"
+    <form data-product-sku="<?= $escaper->escapeHtml($_product->getSku()) ?>"
+          action="<?= $escaper->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="" />
@@ -42,7 +43,7 @@
 
 <script type="text/x-magento-init">
     {
-        "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeHtml($_product->getId()) ?>]": {
+        "[data-role=priceBox][data-price-box=product-id-<?= $escaper->escapeHtml($_product->getId()) ?>]": {
             "priceBox": {
                 "priceConfig":  <?= /* @noEscape */ $block->getJsonConfig() ?>
             }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 4b33864aef47a..feb03b90369f8 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -7,11 +7,9 @@
 /**
  * Product media data template
  *
- * @var $block \Magento\Catalog\Block\Product\View\Gallery
+ * @var \Magento\Catalog\Block\Product\View\Gallery $block
  */
-?>
 
-<?php
 $images = $block->getGalleryImages()->getItems();
 $mainImage = current(array_filter($images, function ($img) use ($block) {
     return $block->isMainImage($img);
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 f57c9b68ddbd2..8887b61c49c0c 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
@@ -5,9 +5,13 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php $_product = $block->getProduct() ?>
 <?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>
+    <a href="<?= $escaper->escapeUrl($this->helper(Magento\Catalog\Helper\Product::class)->getEmailToFriendUrl($_product)) ?>"
+       class="action mailto friend"><span><?= $escaper->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 7f14b71a60c7a..02716a1b54894 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,7 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Directory\Block\Currency */
+/**
+ * @var \Magento\Directory\Block\Currency $block
+ */
 ?>
 <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 4bfdbb7bc24bc..b7a786d2f33ee 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,21 +4,24 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Catalog\Block\Product\View */
+/**
+ * @var \Magento\Catalog\Block\Product\View $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
 <meta property="og:type" content="product" />
 <meta property="og:title"
-      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
+      content="<?= $escaper->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
 <meta property="og:image"
-      content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
+      content="<?= $escaper->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
 <meta property="og:description"
-      content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
-<meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
+      content="<?= $escaper->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
+<meta property="og:url" content="<?= $escaper->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="<?= $block->escapeHtmlAttr($priceAmount) ?>"/>
+    <meta property="product:price:amount" content="<?= $escaper->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 d9a0c845b9f83..bdc75ee83155e 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,9 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-
 <?php $_options = $block->decorateArray($block->getOptions()) ?>
 <?php $_productId = $block->getProduct()->getId() ?>
 <?php if (count($_options)) :?>
@@ -16,7 +18,7 @@
             "priceOptions": {
                 "optionConfig": <?= /* @noEscape */ $block->getJsonConfig() ?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-product-id='<?= $block->escapeHtml($_productId) ?>'][data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?= $escaper->escapeHtml($_productId) ?>'][data-role=priceBox]"
             }
         }
     }
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 b7cd64277fe40..1007d9755d68b 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,16 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Date $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Date */ ?>
 <?php $_option = $block->getOption() ?>
-<?php $_optionId = $block->escapeHtmlAttr($_option->getId()) ?>
+<?php $_optionId = $escaper->escapeHtmlAttr($_option->getId()) ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
 <div class="field date<?= /* @noEscape */ $class ?>"
     data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
     <fieldset class="fieldset fieldset-product-options-inner<?= /* @noEscape */ $class ?>">
         <legend class="legend">
-            <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+            <span><?= $escaper->escapeHtml($_option->getTitle()) ?></span>
             <?= /* @noEscape */ $block->getFormattedPrice() ?>
         </legend>
         <div class="control">
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 c25dab8b70a5c..6fde8938b37e2 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
@@ -6,5 +6,5 @@
 ?>
 <?php $_option = $block->getOption() ?>
 <div class="field">
-    <label class="label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <label class="label"><span><?= $escaper->escapeHtml($_option->getTitle()) ?></span></label>
 </div>
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 4385829a5bdc1..54a4d2ff230f2 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
@@ -4,13 +4,16 @@
  * See COPYING.txt for license details.
  */
 
-/* @var $block \Magento\Catalog\Block\Product\View\Options\Type\File */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\File $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php $_option = $block->getOption(); ?>
 <?php $_fileInfo = $block->getFileInfo(); ?>
 <?php $_fileExists = $_fileInfo->hasData(); ?>
-<?php $_fileName = 'options_' . $block->escapeHtmlAttr($_option->getId()) . '_file'; ?>
+<?php $_fileName = 'options_' . $escaper->escapeHtmlAttr($_option->getId()) . '_file'; ?>
 <?php $_fieldNameAction = $_fileName . '_action'; ?>
 <?php $_fieldValueAction = $_fileExists ? 'save_old' : 'save_new'; ?>
 <?php $_fileNamed = $_fileName . '_name'; ?>
@@ -18,14 +21,14 @@
 
 <div class="field file<?= /* @noEscape */ $class ?>">
     <label class="label" for="<?= /* @noEscape */ $_fileName ?>" id="<?= /* @noEscape */ $_fileName ?>-label">
-        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+        <span><?= $escaper->escapeHtml($_option->getTitle()) ?></span>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
     <?php if ($_fileExists):?>
     <div class="control">
-        <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
+        <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $escaper->escapeHtml($_fileInfo->getTitle()) ?></span>
         <a href="#" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
-            <?= $block->escapeHtml(__('Change')) ?>
+            <?= $escaper->escapeHtml(__('Change')) ?>
         </a>
         <?= /* @noEscape */ $secureRenderer->renderEventListenerAsTag(
             'onclick',
@@ -34,7 +37,7 @@
         ) ?>
         <?php if (!$_option->getIsRequire()):?>
             <input type="checkbox" id="delete-<?= /* @noEscape */ $_fileName ?>" />
-            <span class="label"><?= $block->escapeHtml(__('Delete')) ?></span>
+            <span class="label"><?= $escaper->escapeHtml(__('Delete')) ?></span>
         <?php endif; ?>
     </div>
     <?php endif; ?>
@@ -55,20 +58,20 @@
                value="<?= /* @noEscape */ $_fieldValueAction ?>" />
         <?php if ($_option->getFileExtension()):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Compatible file extensions to upload')) ?>:
-                <strong><?= $block->escapeHtml($_option->getFileExtension()) ?></strong>
+                <?= $escaper->escapeHtml(__('Compatible file extensions to upload')) ?>:
+                <strong><?= $escaper->escapeHtml($_option->getFileExtension()) ?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeX() > 0):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX()
-                ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                <?= $escaper->escapeHtml(__('Maximum image width')) ?>: <strong><?= (int)$_option->getImageSizeX()
+                ?> <?= $escaper->escapeHtml(__('px.')) ?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeY() > 0):?>
             <p class="note">
-                <?= $block->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY()
-                ?> <?= $block->escapeHtml(__('px.')) ?></strong>
+                <?= $escaper->escapeHtml(__('Maximum image height')) ?>: <strong><?= (int)$_option->getImageSizeY()
+                ?> <?= $escaper->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 c4c1d24423bb0..70b6cf70e835d 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,22 +3,24 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
 
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Select */ ?>
-<?php
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Select $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
+
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
 ?>
 <div class="field<?= /* @noEscape */ $class ?>">
-    <label class="label" for="select_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+    <label class="label" for="select_<?= $escaper->escapeHtmlAttr($_option->getId()) ?>">
+        <span><?= $escaper->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-<?= $block->escapeHtmlAttr($_option->getId()) ?>-container"></span>
+                <span id="options-<?= $escaper->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 dd4c000d1f338..51af91203ab13 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,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\Options\Type\Text */ ?>
-<?php
+
+/**
+ * @var \Magento\Catalog\Block\Product\View\Options\Type\Text $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
 ?>
@@ -13,8 +15,8 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
 <div class="field<?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) {
     echo ' textarea';
 } ?><?= /* @noEscape */ $class ?>">
-    <label class="label" for="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text">
-        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+    <label class="label" for="options_<?= $escaper->escapeHtmlAttr($_option->getId()) ?>_text">
+        <span><?= $escaper->escapeHtml($_option->getTitle()) ?></span>
         <?= /* @noEscape */ $block->getFormattedPrice() ?>
     </label>
 
@@ -30,14 +32,14 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             $_textValidate['validate-no-utf8mb4-characters'] = true;
             ?>
             <input type="text"
-                   id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
+                   id="options_<?= $escaper->escapeHtmlAttr($_option->getId()) ?>_text"
                    class="input-text product-custom-option"
                 <?php if (!empty($_textValidate)) {?>
-                    data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
+                    data-validate="<?= $escaper->escapeHtml(json_encode($_textValidate)) ?>"
                 <?php } ?>
-                   name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                   data-selector="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                   value="<?= $block->escapeHtml($block->getDefaultValue()) ?>"/>
+                   name="options[<?= $escaper->escapeHtmlAttr($_option->getId()) ?>]"
+                   data-selector="options[<?= $escaper->escapeHtmlAttr($_option->getId()) ?>]"
+                   value="<?= $escaper->escapeHtml($block->getDefaultValue()) ?>"/>
         <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) :?>
             <?php $_textAreaValidate = null;
             if ($_option->getIsRequire()) {
@@ -48,19 +50,19 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             }
             $_textAreaValidate['validate-no-utf8mb4-characters'] = true;
             ?>
-            <textarea id="options_<?= $block->escapeHtmlAttr($_option->getId()) ?>_text"
+            <textarea id="options_<?= $escaper->escapeHtmlAttr($_option->getId()) ?>_text"
                       class="product-custom-option"
                     <?php if (!empty($_textAreaValidate)) {?>
-                        data-validate="<?= $block->escapeHtml(json_encode($_textAreaValidate)) ?>"
+                        data-validate="<?= $escaper->escapeHtml(json_encode($_textAreaValidate)) ?>"
                     <?php } ?>
-                      name="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
-                      data-selector="options[<?= $block->escapeHtmlAttr($_option->getId()) ?>]"
+                      name="options[<?= $escaper->escapeHtmlAttr($_option->getId()) ?>]"
+                      data-selector="options[<?= $escaper->escapeHtmlAttr($_option->getId()) ?>]"
                       rows="5"
-                      cols="25"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+                      cols="25"><?= $escaper->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif; ?>
         <?php if ($_option->getMaxCharacters()) :?>
-            <p class="note note_<?= $block->escapeHtmlAttr($_option->getId()) ?>">
-                <?= $block->escapeHtml(__('Maximum %1 characters', $_option->getMaxCharacters())) ?>
+            <p class="note note_<?= $escaper->escapeHtmlAttr($_option->getId()) ?>">
+                <?= $escaper->escapeHtml(__('Maximum %1 characters', $_option->getMaxCharacters())) ?>
                 <span class="character-counter no-display"></span>
             </p>
         <?php endif; ?>
@@ -68,11 +70,11 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
     <?php if ($_option->getMaxCharacters()) :?>
         <script type="text/x-magento-init">
         {
-            "[data-selector='options[<?= $block->escapeJs($_option->getId()) ?>]']": {
+            "[data-selector='options[<?= $escaper->escapeJs($_option->getId()) ?>]']": {
                 "Magento_Catalog/js/product/remaining-characters": {
                     "maxLength":  "<?= (int)$_option->getMaxCharacters() ?>",
-                    "noteSelector": ".note_<?= $block->escapeJs($_option->getId()) ?>",
-                    "counterSelector": ".note_<?= $block->escapeJs($_option->getId()) ?> .character-counter"
+                    "noteSelector": ".note_<?= $escaper->escapeJs($_option->getId()) ?>",
+                    "counterSelector": ".note_<?= $escaper->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 88ee45bafe731..7d6a8a5f44d3c 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
@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block Magento\Catalog\Block\Product\View */
+/**
+ * @var Magento\Catalog\Block\Product\View $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php
 $required = '';
 if ($block->hasRequiredOptions()) {
-    $required = ' data-hasrequired="' . $block->escapeHtmlAttr(__('* Required Fields')) . '"';
+    $required = ' data-hasrequired="' . $escaper->escapeHtmlAttr(__('* Required Fields')) . '"';
 }
 ?>
 <div class="product-options-wrapper" id="product-options-wrapper"<?= /* @noEscape */ $required ?>>
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 979bab167c344..2e243c88b77fd 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,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @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 5250673436648..290be9cb8d445 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,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Catalog\Block\Product\AbstractProduct $block
+ */
 ?>
-<?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 30edb2df03754..c579dd7829e1e 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,18 +3,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Catalog\Block\Product\View\AbstractView $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
-<?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="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-            <span><?= $block->escapeHtml(__('In stock')) ?></span>
+        <div class="stock available" title="<?= $escaper->escapeHtmlAttr(__('Availability')) ?>">
+            <span><?= $escaper->escapeHtml(__('In stock')) ?></span>
         </div>
     <?php else :?>
-        <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
+        <div class="stock unavailable" title="<?= $escaper->escapeHtmlAttr(__('Availability')) ?>">
+            <span><?= $escaper->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 a2187b685ca0e..a15e8ae5eb3bc 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
@@ -3,14 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
-?>
+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-<?php /* @noEscape */ echo $block->renderApp(
+/**
+ * @var \Magento\Ui\Block\Wrapper $block
+ */
+/* @noEscape */ echo $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 5c5f6493c3163..34887f4a05374 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,14 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
-?>
+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-<?php /* @noEscape */ echo $block->renderApp(
+/**
+ * @var \Magento\Ui\Block\Wrapper $block
+ */
+/* @noEscape */ echo $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 8db3cc80368e2..146eb66aa19f8 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,14 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
-?>
+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-<?php /* @noEscape */ echo $block->renderApp(
+/**
+ * @var \Magento\Ui\Block\Wrapper $block
+ */
+/* @noEscape */ echo $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 69f0319134ea0..f062dc4c77380 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,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <div class="widget block block-product-link">
-    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $escaper->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 8d9f6500894b4..9b1d42200890d 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,7 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <span class="widget block block-product-link-inline">
-    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><span><?= $escaper->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 53a0682311b1f..c0642ecc31f2a 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
@@ -6,25 +6,29 @@
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable Magento2.Files.LineLength.MaxExceeded
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
     <div class="block widget block-new-products-list">
         <div class="block-title">
-            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
+            <strong><?= $escaper->escapeHtml(__('New Products')) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol class="product-items" id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>">
+            <ol class="product-items" id="widget-new-products-<?= $escaper->escapeHtmlAttr($suffix) ?>">
                 <?php foreach ($_products->getItems() as $_product) :?>
                     <li class="product-item">
                         <div class="product-item-info">
-                            <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                            <a class="product-item-photo" href="<?= $escaper->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="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                                    <a href="<?= $escaper->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') ?>
@@ -35,30 +39,30 @@
                                     <div class="actions-primary">
                                         <?php if ($_product->isSaleable()) :?>
                                             <?php if (!$_product->getTypeInstance()->isPossibleBuyFromList($_product)) :?>
-                                                <button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
+                                                <button type="button" title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                         class="action tocart primary"
-                                                        data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'>
-                                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                        data-mage-init='{"redirectUrl":{"url":"<?= $escaper->escapeUrl($block->getAddToCartUrl($_product)) ?>"}}'>
+                                                    <span><?= $escaper->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($_product)), ['product' => $_product->getEntityId()]);
+                                                $postData = $postDataHelper->getPostData($escaper->escapeUrl($block->getAddToCartUrl($_product)), ['product' => $_product->getEntityId()]);
                                                 ?>
-                                                <button type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
+                                                <button type="button" title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
                                                         class="action tocart primary"
                                                         data-post='<?= /* @noEscape */ $postData ?>'>
-                                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                    <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                 </button>
                                             <?php endif; ?>
                                         <?php else :?>
                                             <?php if ($_product->getIsSalable()) :?>
-                                                <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-                                                    <span><?= $block->escapeHtml(__('In stock')) ?></span>
+                                                <div class="stock available" title="<?= $escaper->escapeHtmlAttr(__('Availability')) ?>">
+                                                    <span><?= $escaper->escapeHtml(__('In stock')) ?></span>
                                                 </div>
                                             <?php else :?>
-                                                <div class="stock unavailable" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
-                                                    <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
+                                                <div class="stock unavailable" title="<?= $escaper->escapeHtmlAttr(__('Availability')) ?>">
+                                                    <span><?= $escaper->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 8a776adc95018..159d261a26c6a 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,19 +3,23 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
     <div class="block widget block-new-products-images">
         <div class="block-title">
-            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
+            <strong><?= $escaper->escapeHtml(__('New Products')) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>"
+            <ol id="widget-new-products-<?= $escaper->escapeHtmlAttr($suffix) ?>"
                 class="product-items product-items-images">
                 <?php foreach ($_products->getItems() as $_product) :?>
                     <li class="product-item">
-                        <a class="product-item-photo" href="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                        <a class="product-item-photo" href="<?= $escaper->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() ?>
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 371d4df7c0206..fb7558d6b4067 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
@@ -5,20 +5,24 @@
  */
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()) :?>
     <div class="block widget block-new-products-names">
         <div class="block-title">
-            <strong><?= $block->escapeHtml(__('New Products')) ?></strong>
+            <strong><?= $escaper->escapeHtml(__('New Products')) ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?= $block->escapeHtmlAttr($suffix) ?>"
+            <ol id="widget-new-products-<?= $escaper->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="<?= $block->escapeUrl($_product->getProductUrl()) ?>"
+                            <a href="<?= $escaper->escapeUrl($_product->getProductUrl()) ?>"
                                title="<?= /* @noEscape */ $block->stripTags($_product->getName(), null, true) ?>)"
                                class="product-item-link">
                                 <?= /* @noEscape */ $this->helper(
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 5108c488aec19..0d88241e40088 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,17 +3,17 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
+// phpcs:disable Magento2.Files.LineLength.MaxExceeded
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+
 /**
  * Template for displaying new products widget
  *
- * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
+ * @var \Magento\Catalog\Block\Product\Widget\NewWidget $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 
-// phpcs:disable Magento2.Files.LineLength.MaxExceeded
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-
 if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) {
     $type = 'widget-new-grid';
 
@@ -34,7 +34,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 <?php if ($exist) :?>
     <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
+            <strong role="heading" aria-level="2"><?= $escaper->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
             <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
@@ -43,16 +43,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                     <?php foreach ($items as $_item) :?>
                     <li class="product-item">
                         <div class="product-item-info">
-                            <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                            <a href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>"
                                class="product-item-photo">
                                 <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                    <a title="<?= $escaper->escapeHtml($_item->getName()) ?>"
+                                       href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>"
                                        class="product-item-link">
-                                        <?= $block->escapeHtml($_item->getName()) ?>
+                                        <?= $escaper->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?= $block->getProductPriceHtml($_item, $type); ?>
@@ -68,34 +68,34 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                 <?php if ($_item->isSaleable()) :?>
                                                     <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)) :?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
+                                                                data-mage-init='{"redirectUrl":{"url":"<?= $escaper->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
                                                                 type="button"
-                                                                title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                                title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $escaper->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)),
+                                                                $escaper->escapeUrl($block->getAddToCartUrl($_item)),
                                                                 ['product' => (int) $_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>
+                                                                title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else :?>
                                                     <?php if ($_item->getIsSalable()) :?>
                                                         <div class="stock available">
-                                                            <span><?= $block->escapeHtml(__('In stock')) ?></span>
+                                                            <span><?= $escaper->escapeHtml(__('In stock')) ?></span>
                                                         </div>
                                                     <?php else :?>
                                                         <div class="stock unavailable">
-                                                            <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
+                                                            <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span>
                                                         </div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
@@ -108,16 +108,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                        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>
+                                                       title="<?= $escaper->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                        <span><?= $escaper->escapeHtml(__('Add to Wish List')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
                                                     <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);?>
                                                     <a href="#" class="action tocompare"
                                                        data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
-                                                       title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                       title="<?= $escaper->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                        <span><?= $escaper->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 378cd49493a6e..9af0ea1d792ce 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,8 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 // phpcs:disable Magento2.Files.LineLength.MaxExceeded
@@ -12,7 +10,8 @@
 /**
  * Template for displaying new products widget
  *
- * @var $block \Magento\Catalog\Block\Product\Widget\NewWidget
+ * @var \Magento\Catalog\Block\Product\Widget\NewWidget $block
+ * @var \Magento\Framework\Escaper $escaper
  */
 if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) {
     $type = 'widget-new-list';
@@ -36,7 +35,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 <?php if ($exist) :?>
     <div class="block widget block-new-products <?= /* @noEscape */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= $block->escapeHtml($title) ?></strong>
+            <strong role="heading" aria-level="2"><?= $escaper->escapeHtml($title) ?></strong>
         </div>
         <div class="block-content">
             <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
@@ -45,16 +44,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                     <?php foreach ($items as $_item) :?>
                         <li class="product-item">
                             <div class="product-item-info">
-                                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                <a href="<?= $escaper->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)) ?>"
+                                        <a title="<?= $escaper->escapeHtmlAttr($_item->getName()) ?>"
+                                           href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>"
                                            class="product-item-link">
-                                            <?= $block->escapeHtml($_item->getName()) ?>
+                                            <?= $escaper->escapeHtml($_item->getName()) ?>
                                         </a>
                                     </strong>
                                     <?= $block->getProductPriceHtml($_item, $type) ?>
@@ -71,10 +70,10 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                         <?php if (!$_item->getTypeInstance()->isPossibleBuyFromList($_item)
                                                         ) :?>
                                                             <button class="action tocart primary"
-                                                                    data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
+                                                                    data-mage-init='{"redirectUrl":{"url":"<?= $escaper->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}'
                                                                     type="button"
-                                                                    title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                                    title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                             </button>
                                                         <?php else :?>
                                                             <?php
@@ -83,15 +82,15 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                             ?>
                                                             <button class="action tocart primary"
                                                                     data-post='<?= /* @noEscape */ $postData ?>'
-                                                                    type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                                    type="button" title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                                <span><?= $escaper->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>
+                                                            <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else :?>
-                                                            <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                            <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
                                                         <?php endif; ?>
                                                     <?php endif; ?>
                                                 </div>
@@ -102,17 +101,17 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                         <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>
+                                                           title="<?= $escaper->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                            <span><?= $escaper->escapeHtml(__('Add to Wish List')) ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                     <?php if ($block->getAddToCompareUrl() && $showCompare) :?>
                                                         <?php $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class); ?>
                                                         <a href="#" class="action tocompare"
-                                                           title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>"
+                                                           title="<?= $escaper->escapeHtmlAttr(__('Add to Compare')) ?>"
                                                            data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>'
                                                         >
-                                                            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                            <span><?= $escaper->escapeHtml(__('Add to Compare')) ?></span>
                                                         </a>
                                                     <?php endif; ?>
                                                 </div>
@@ -126,9 +125,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                 $_item->getShortDescription(),
                                                 'short_description'
                                             ) ?>
-                                            <a title="<?= $block->escapeHtmlAttr($_item->getName()) ?>"
-                                               href="<?= $block->escapeUrl($block->getProductUrl($_item))?>"
-                                               class="action more"><?= $block->escapeHtml(__('Learn More')) ?></a>
+                                            <a title="<?= $escaper->escapeHtmlAttr($_item->getName()) ?>"
+                                               href="<?= $escaper->escapeUrl($block->getProductUrl($_item))?>"
+                                               class="action more"><?= $escaper->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 d4db174dbe5e7..2e61b2cd6f3cc 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
@@ -3,15 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 // phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
-?>
-
-<?php /* @noEscape */ echo $block->renderApp([
+/**
+ * @var \Magento\Ui\Block\Wrapper $block
+ */
+/* @noEscape */ echo $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 e03ac9ca692cc..a43eaa3dd6722 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
@@ -3,15 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
+
 // phpcs:disable Magento2.Security.LanguageConstruct.DirectOutput
 // phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
-?>
-
-<?php /* @noEscape */ echo $block->renderApp([
+/**
+ * @var \Magento\Ui\Block\Wrapper $block
+ */
+/* @noEscape */ echo $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 a42b46a5238f9..b26ee940f7696 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,14 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-?>
-<?php
-// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-/** @var $block \Magento\Ui\Block\Wrapper */
-?>
+// phpcs:disable Magento2.PHP.ShortEchoSyntax.ShortEchoTag
 
-<?php /* @noEscape */ echo $block->renderApp(
+/**
+ * @var \Magento\Ui\Block\Wrapper $block
+ */
+/* @noEscape */ echo $block->renderApp(
     [
         'listing' => [
             'displayMode' => 'grid'
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/SelectGroupDataProvider.php b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/SelectGroupDataProvider.php
index ad9ffb40f5762..2a592a0c2c431 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/SelectGroupDataProvider.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Catalog/Block/Product/View/Options/SelectGroupDataProvider.php
@@ -44,7 +44,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option drop-down title 1</span>',
                     'required_element' => '/<select/',
-                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s{11}\$10.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s*\$10.00.*/',
                     'not_contain_arr' => [
                         '/<select.*multiple="multiple"/',
                     ],
@@ -62,12 +62,13 @@ public function getData(): array
                     Value::KEY_PRICE_TYPE => ProductPriceOptionsInterface::VALUE_FIXED,
                     Value::KEY_SKU => 'test-option-drop-down-title-2-value-1',
                 ],
+
                 [
                     'block_with_required_class' => '<div class="field">',
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option drop-down title 2</span>',
                     'required_element' => '/<select/',
-                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s{11}\$10.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s*\$10.00.*/',
                     'not_contain_arr' => [
                         '/<select.*multiple="multiple"/',
                     ],
@@ -90,7 +91,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option drop-down title 3</span>',
                     'required_element' => '/<select/',
-                    'option_value_item' => '/<option value="%s"  price="50" >%s \+\s{11}\$50.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="50" >%s \+\s*\$50.00.*/',
                     'not_contain_arr' => [
                         '/<select.*multiple="multiple"/',
                     ],
@@ -113,7 +114,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option drop-down title 4</span>',
                     'required_element' => '/<select/',
-                    'option_value_item' => '/<option value="%s"  price="5" >%s \+\s{11}\$5.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="5" >%s \+\s*\$5.00.*/',
                     'not_contain_arr' => [
                         '/<select.*multiple="multiple"/',
                     ],
@@ -296,7 +297,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option multiselect title 1</span>',
                     'required_element' => '/<select.*multiple="multiple"/',
-                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s{11}\$10.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s*\$10.00.*/',
                 ],
             ],
             'type_multiselect_not_required' => [
@@ -316,7 +317,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option multiselect title 2</span>',
                     'required_element' => '/<select.*multiple="multiple"/',
-                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s{11}\$10.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="10" >%s \+\s*\$10.00.*/',
                 ],
             ],
             'type_multiselect_value_fixed_price' => [
@@ -336,7 +337,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option multiselect title 3</span>',
                     'required_element' => '/<select.*multiple="multiple"/',
-                    'option_value_item' => '/<option value="%s"  price="50" >%s \+\s{11}\$50.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="50" >%s \+\s*\$50.00.*/',
                 ],
             ],
             'type_multiselect_value_percent_price' => [
@@ -356,7 +357,7 @@ public function getData(): array
                     'label_for_created_option' => '<label class="label" for="select_%s">',
                     'title' => '<span>Test option multiselect title 4</span>',
                     'required_element' => '/<select.*multiple="multiple"/',
-                    'option_value_item' => '/<option value="%s"  price="5" >%s \+\s{11}\$5.00.*/',
+                    'option_value_item' => '/<option value="%s"  price="5" >%s \+\s*\$5.00.*/',
                 ],
             ],
         ];