diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
index 7c6fa50070315..e44aab87060fa 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/catalog/product/composite/fieldset/grouped.phtml
@@ -6,29 +6,34 @@
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 
-<?php /* @var $block \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
+<?php
+/**
+ * @var $block \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
 <?php $_skipSaleableCheck = $this->helper(Magento\Catalog\Helper\Product::class)->getSkipSaleableCheck(); ?>
 <div id="catalog_product_composite_configure_fields_grouped" class="<?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-    <h4><?= $block->escapeHtml(__('Associated Products')) ?></h4>
+    <h4><?= $escaper->escapeHtml(__('Associated Products')) ?></h4>
     <div class="product-options">
         <?php $_product = $block->getProduct(); ?>
         <?php $block->setPreconfiguredValue(); ?>
         <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
         <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
         <?php if ((!$_product->isAvailable() && !$_skipSaleableCheck) || !$_hasAssociatedProducts) : ?>
-            <p class="availability out-of-stock"><?= $block->escapeHtml(__('Availability:')) ?> <span><?= $block->escapeHtml(__('Out of stock')) ?></span></p>
+            <p class="availability out-of-stock"><?= $escaper->escapeHtml(__('Availability:')) ?> <span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></p>
         <?php endif; ?>
         <table class="data-table admin__table-primary grouped-items-table" id="super-product-table">
             <thead>
                 <tr class="headings">
-                    <th class="col-id"><?= $block->escapeHtml(__('ID')) ?></th>
-                    <th class="col-sku"><?= $block->escapeHtml(__('SKU')) ?></th>
-                    <th class="col-name"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th class="col-id"><?= $escaper->escapeHtml(__('ID')) ?></th>
+                    <th class="col-sku"><?= $escaper->escapeHtml(__('SKU')) ?></th>
+                    <th class="col-name"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
                     <?php if ($block->getCanShowProductPrice($_product)) : ?>
-                    <th class="col-price"><?= $block->escapeHtml(__('Price')) ?></th>
+                    <th class="col-price"><?= $escaper->escapeHtml(__('Price')) ?></th>
                     <?php endif; ?>
                     <?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>
-                    <th class="col-qty"><?= $block->escapeHtml(__('Qty')) ?></th>
+                    <th class="col-qty"><?= $escaper->escapeHtml(__('Qty')) ?></th>
                     <?php endif; ?>
                 </tr>
             </thead>
@@ -36,10 +41,10 @@
             <?php if ($_hasAssociatedProducts) : ?>
                 <?php $i = 0 ?>
                 <?php foreach ($_associatedProducts as $_item) : ?>
-                <tr class="<?= $block->escapeHtmlAttr((++$i % 2) ? 'even' : 'odd') ?>">
-                    <td class="col-id"><?= $block->escapeHtml($_item->getId()) ?></td>
-                    <td class="col-sku"><?= $block->escapeHtml($_item->getSku()) ?></td>
-                    <td class="col-name"><?= $block->escapeHtml($_item->getName()) ?></td>
+                <tr class="<?= $escaper->escapeHtmlAttr((++$i % 2) ? 'even' : 'odd') ?>">
+                    <td class="col-id"><?= $escaper->escapeHtml($_item->getId()) ?></td>
+                    <td class="col-sku"><?= $escaper->escapeHtml($_item->getSku()) ?></td>
+                    <td class="col-name"><?= $escaper->escapeHtml($_item->getName()) ?></td>
                     <?php if ($block->getCanShowProductPrice($_product)) : ?>
                     <td class="col-price">
                         <?php if ($block->getCanShowProductPrice($_item)) : ?>
@@ -51,15 +56,15 @@
                     <td class="col-qty">
                         <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
                         <input type="text"
-                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-                               id="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
+                               name="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]"
+                               id="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]"
                                maxlength="12"
-                               value="<?= $block->escapeHtmlAttr($_item->getQty()*1) ?>"
-                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
+                               value="<?= $escaper->escapeHtmlAttr($_item->getQty()*1) ?>"
+                               title="<?= $escaper->escapeHtmlAttr(__('Qty')) ?>"
                                class="input-text admin__control-text qty" />
-                        <input type="hidden" value="1" price="<?= $block->escapeHtmlAttr($block->getCurrencyPrice($_item->getPrice())) ?>" qtyId="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]" />
+                        <input type="hidden" value="1" price="<?= $escaper->escapeHtmlAttr($block->getCurrencyPrice($_item->getPrice())) ?>" qtyId="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]" />
                     <?php else : ?>
-                        <p class="availability out-of-stock"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></p>
+                        <p class="availability out-of-stock"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></p>
                     <?php endif; ?>
                     </td>
                     <?php endif; ?>
@@ -67,7 +72,7 @@
             <?php endforeach; ?>
             <?php else : ?>
                <tr>
-                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>4<?php else : ?>3<?php endif; ?>"><?= $block->escapeHtml(__('No options of this product are available.')) ?></td>
+                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck) : ?>4<?php else : ?>3<?php endif; ?>"><?= $escaper->escapeHtml(__('No options of this product are available.')) ?></td>
                </tr>
             <?php endif; ?>
             </tbody>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
index ac6161d940a3a..a7320c3e42b2a 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/grouped.phtml
@@ -4,15 +4,18 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $block \Magento\Framework\View\Element\Template */
+/**
+ * @var $block \Magento\Framework\View\Element\Template
+ * @var \Magento\Framework\Escaper $escaper
+ */
 
 /** @var $block \Magento\Framework\View\Element\Template */
 $_gridPopupBlock = $block->getChildBlock('catalog.product.group.grid.popup.container')->getChildBlock('grid');
 $_gridPopupBlock->setRowClickCallback('function(){}');
 ?>
-<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= $block->escapeHtmlAttr($_gridPopupBlock->getId()) ?>]"}}'>
+<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= $escaper->escapeHtmlAttr($_gridPopupBlock->getId()) ?>]"}}'>
     <div class="no-products-message">
-        <?= $block->escapeHtml(__('There are no grouped products.')) ?>
+        <?= $escaper->escapeHtml(__('There are no grouped products.')) ?>
     </div>
     <?= $block->getChildHtml('list') ?>
     <div data-role="add-product-dialog" class="no-display">
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
index 0872afcc8b3c7..a832d7d72321d 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
@@ -4,7 +4,10 @@
  * See COPYING.txt for license details.
  */
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
-/* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts */
+/**
+ * @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts\ListAssociatedProducts
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <script type="text/x-magento-template" id="group-product-template">
 <tr title="#" class="pointer" data-role="row">
@@ -47,7 +50,7 @@
 </script>
 <div class="grid-container no-display">
     <table class="admin__control-table" data-role="grouped-product-grid"
-        data-products="<?= $block->escapeHtml(
+        data-products="<?= $escaper->escapeHtml(
             $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getAssociatedProducts())
         ); ?>">
         <thead>
@@ -56,16 +59,16 @@
                     <span></span>
                 </th>
                 <th data-column="name" class="no-link col-name">
-                    <span><?= $block->escapeHtml(__('Name')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Name')) ?></span>
                 </th>
                 <th data-column="sku" class="no-link col-sku">
-                    <span><?= $block->escapeHtml(__('SKU')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('SKU')) ?></span>
                 </th>
                 <th data-column="price" class="no-link col-price">
-                    <span><?= $block->escapeHtml(__('Price')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Price')) ?></span>
                     </th>
                 <th data-column="qty" class="no-link col-qty">
-                    <span><?= $block->escapeHtml(__('Default Qty')) ?></span>
+                    <span><?= $escaper->escapeHtml(__('Default Qty')) ?></span>
                 </th>
                 <th data-column="actions" class="last no-link col-actions">
                     <span></span>
diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
index c9c03b9f214d9..ba4ddab55175a 100644
--- a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
@@ -7,6 +7,9 @@
 /**
  * Template for displaying grouped product price
  */
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 <?php
 $minProduct = $block->getSaleableItem()
@@ -27,7 +30,7 @@ if ($minProduct) {
 <div class="price-box">
     <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()) : ?>
     <p class="minimal-price">
-        <span class="price-label"><?= $block->escapeHtml(__('Starting at')) ?></span><?= $amountRender->toHtml() ?>
+        <span class="price-label"><?= $escaper->escapeHtml(__('Starting at')) ?></span><?= $amountRender->toHtml() ?>
     </p>
     <?php endif ?>
 </div>
diff --git a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
index b1697bfb012b9..fe5e38c2bd5c1 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/default.phtml
@@ -4,19 +4,24 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /* @var $block \Magento\Catalog\Block\Product\View\AbstractView */?>
+<?php
+/**
+ * @var $block \Magento\Catalog\Block\Product\View\AbstractView
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
 <?php $_product = $block->getProduct() ?>
 
 <?php $_associatedProducts = $block->getAssociatedProducts(); ?>
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
 <?php if ($block->displayProductStockStatus()) : ?>
     <?php if ($_product->isAvailable() && $_hasAssociatedProducts) : ?>
-        <div class="stock available" title="<?= $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/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
index 0257d87a2d9ee..d66ff29fe7d21 100644
--- a/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
+++ b/app/code/Magento/GroupedProduct/view/frontend/templates/product/view/type/grouped.phtml
@@ -9,6 +9,7 @@
  *
  * @var $block \Magento\Catalog\Block\Product\View\BaseImage
  * @var $block \Magento\GroupedProduct\Block\Product\View\Type\Grouped
+ * @var \Magento\Framework\Escaper $escaper
  */
 ?>
 <?php $block->setPreconfiguredValue(); ?>
@@ -20,12 +21,12 @@
     <table class="table data grouped"
            id="super-product-table"
            data-mage-init='{ "Magento_GroupedProduct/js/product-ids-resolver": {} }'>
-        <caption class="table-caption"><?= $block->escapeHtml(__('Grouped product items')) ?></caption>
+        <caption class="table-caption"><?= $escaper->escapeHtml(__('Grouped product items')) ?></caption>
         <thead>
         <tr>
-            <th class="col item" scope="col"><?= $block->escapeHtml(__('Product Name')) ?></th>
+            <th class="col item" scope="col"><?= $escaper->escapeHtml(__('Product Name')) ?></th>
             <?php if ($_product->isSaleable()) : ?>
-                <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
+                <th class="col qty" scope="col"><?= $escaper->escapeHtml(__('Qty')) ?></th>
             <?php endif; ?>
         </tr>
         </thead>
@@ -34,8 +35,8 @@
         <tbody>
             <?php foreach ($_associatedProducts as $_item) : ?>
             <tr>
-                <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
-                    <strong class="product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
+                <td data-th="<?= $escaper->escapeHtml(__('Product Name')) ?>" class="col item">
+                    <strong class="product-item-name"><?= $escaper->escapeHtml($_item->getName()) ?></strong>
                     <?php if ($block->getCanShowProductPrice($_product)) : ?>
                         <?php if ($block->getCanShowProductPrice($_item)) : ?>
                             <?= /* @noEscape */ $block->getProductPrice($_item) ?>
@@ -43,21 +44,21 @@
                         <?php endif; ?>
                 </td>
                 <?php if ($_product->isSaleable()) : ?>
-                <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty">
+                <td data-th="<?= $escaper->escapeHtml(__('Qty')) ?>" class="col qty">
                     <?php if ($_item->isSaleable()) : ?>
                     <div class="control qty">
                         <input type="number"
-                               name="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-                               data-selector="super_group[<?= $block->escapeHtmlAttr($_item->getId()) ?>]"
-                               value="<?= $block->escapeHtmlAttr($_item->getQty() * 1) ?>"
-                               title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
+                               name="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]"
+                               data-selector="super_group[<?= $escaper->escapeHtmlAttr($_item->getId()) ?>]"
+                               value="<?= $escaper->escapeHtmlAttr($_item->getQty() * 1) ?>"
+                               title="<?= $escaper->escapeHtmlAttr(__('Qty')) ?>"
                                class="input-text qty"
                                data-validate="{'validate-grouped-qty':'#super-product-table'}"
                                data-errors-message-box="#validation-message-box"/>
                     </div>
                 <?php else : ?>
-                    <div class="stock unavailable" title="<?= $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; ?>
                 </td>
@@ -85,7 +86,7 @@
             <tr>
                 <td class="unavailable"
                     colspan="<?php if ($_product->isSaleable()) : ?>4<?php else : ?>3<?php endif; ?>">
-                    <?= $block->escapeHtml(__('No options of this product are available.')) ?>
+                    <?= $escaper->escapeHtml(__('No options of this product are available.')) ?>
                 </td>
             </tr>
         </tbody>