diff --git a/app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html b/app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html
index 15215a72ef468..0f01259825c86 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html
+++ b/app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html
@@ -9,13 +9,13 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
@@ -23,7 +23,7 @@
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>
diff --git a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
index 4f7384cb4d2c0..9e0814f673fef 100644
--- a/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
+++ b/app/code/Magento/AsynchronousOperations/view/adminhtml/web/template/grid/listing.html
@@ -9,13 +9,13 @@
         <div class="message-system-short">
             <button class="message-system-action-dropdown" toggleCollapsible>
                 <span>
-                    <translate args="'System Messages'"/>:
-                    <text args="totalRecords"/>
+                    <translate args="'System Messages'"></translate>:
+                    <text args="totalRecords"></text>
                 </span>
             </button>
             <div class="message-system-short-wrapper" if="rows[0]" repeat="foreach: [rows[0]], item: '$row'" visible="!$collapsible.opened()">
                 <fastForEach args="data: getVisible(), as: '$col'" >
-                    <render args="$col.getBody()"/>
+                    <render args="$col.getBody()"></render>
                 </fastForEach>
             </div>
         </div>
@@ -23,7 +23,7 @@
             <ul class="message-system-list">
                 <li repeat="foreach: rows, item: '$row'">
                     <fastForEach args="data: getVisible(), as: '$col'" >
-                        <render args="$col.getBody()"/>
+                        <render args="$col.getBody()"></render>
                     </fastForEach>
                 </li>
             </ul>
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
index 4b520a53857a3..ec77038ba2699 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -11,7 +11,7 @@
     </div>
 
     <div class="admin__field-complex-elements">
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
         <button attr="{disabled: disabled}"
                 class="action-secondary"
                 type="button"
diff --git a/app/code/Magento/Bundle/view/base/web/template/product/final_price.html b/app/code/Magento/Bundle/view/base/web/template/product/final_price.html
index 6533ed934b614..f473b1d9aa094 100644
--- a/app/code/Magento/Bundle/view/base/web/template/product/final_price.html
+++ b/app/code/Magento/Bundle/view/base/web/template/product/final_price.html
@@ -7,27 +7,27 @@
 <if args="hasPriceRange($row())">
     <div class="price-from">
         <with args="getPriceByCode('minimal_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
         <with args="getPriceByCode('minimal_regular_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
     </div>
     <div class="price-to">
         <with args="getPriceByCode('max_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
         <with args="getPriceByCode('max_regular_price')">
-            <render args="getBody()" />
+            <render args="getBody()" ></render>
         </with>
     </div>
 </if>
 
 <ifnot args="hasPriceRange($row())">
     <with args="getPriceByCode('minimal_price')">
-        <render args="getBody()" />
+        <render args="getBody()" ></render>
     </with>
     <with args="getPriceByCode('minimal_regular_price')">
-        <render args="getBody()" />
+        <render args="getBody()" ></render>
     </with>
 </ifnot>
diff --git a/app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html b/app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html
index 57c4857f5dbea..4c96444d77564 100644
--- a/app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html
+++ b/app/code/Magento/Bundle/view/base/web/template/product/price/minimal_price.html
@@ -19,7 +19,7 @@
               html="getMinimalPriceUnsanitizedHtml($row())"></span>
 
         <each args="data: getAdjustments(), as: '$adj'">
-                <render args="$adj.getBody()"/>
+                <render args="$adj.getBody()"></render>
         </each>
     </span>
 </if>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html b/app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html
index fa694f1487972..1793c694364fc 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/attributes/grid/paging.html
@@ -10,7 +10,7 @@
         <span text="label"></span>
     </li>
     <li class="attributes-found">
-        <text args="totalRecords"/> records found
-        <text args="'(' + totalSelected + ' selected)'" if="totalSelected"/>
+        <text args="totalRecords"></text> records found
+        <text args="'(' + totalSelected + ' selected)'" if="totalSelected"></text>
     </li>
 </ul>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html b/app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html
index 43b06e7f7ea28..f0eb87ec79c0a 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/form/field.html
@@ -13,10 +13,10 @@
     </label>
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
-        <render args="elementTmpl" ifnot="hasAddons()"/>
+        <render args="elementTmpl" ifnot="hasAddons()"></render>
 
         <div class="admin__control-addon" if="hasAddons()">
-            <render args="elementTmpl"/>
+            <render args="elementTmpl"></render>
 
             <label class="admin__addon-prefix" if="addBefore()" attr="for: uid">
                 <span text="addBefore()"></span>
@@ -26,9 +26,9 @@
             </label>
         </div>
 
-        <render args="tooltipTpl" if="$data.tooltip"/>
+        <render args="tooltipTpl" if="$data.tooltip"></render>
 
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
 
         <label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
 
@@ -42,6 +42,6 @@
             <!-- /ko -->
         <!-- /ko -->
 
-        <render args="$data.service.template" if="$data.hasService()"/>
+        <render args="$data.service.template" if="$data.hasService()"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
index 5c344ba56f109..04f4715483fb8 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
+++ b/app/code/Magento/Catalog/view/adminhtml/web/template/image-preview.html
@@ -33,7 +33,7 @@
 
     <div class="file-uploader-filename" text="$file.name"></div>
     <div class="file-uploader-meta">
-        <text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>,
-        <text args="$parent.formatSize($file.size)"/>
+        <text args="$file.previewWidth"></text>x<text args="$file.previewHeight"></text>,
+        <text args="$parent.formatSize($file.size)"></text>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html b/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
index b156bf7e4a3bc..a3dacc7062b90 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/list/listing.html
@@ -17,19 +17,19 @@
                 <li class="product-item" repeat="foreach: filteredRows, item: '$row'">
                     <div class="product-item-info">
                         <fastForEach args="data: getRegion('general-area'), as: '$col'" >
-                            <render args="$col.getBody()"/>
+                            <render args="$col.getBody()"></render>
                         </fastForEach>
 
                         <div class="product-item-details">
                             <fastForEach args="data: getRegion('details-area'), as: '$col'" >
-                                <render args="$col.getBody()"/>
+                                <render args="$col.getBody()"></render>
                             </fastForEach>
 
                             <div if="regionHasElements('action-primary-area') || regionHasElements('action-secondary-area')"
                                  class="product-item-actions">
                                 <div class="actions-primary" if="regionHasElements('action-primary-area')">
                                     <fastForEach args="data: getRegion('action-primary-area'), as: '$col'" >
-                                        <render args="$col.getBody()"/>
+                                        <render args="$col.getBody()"></render>
                                     </fastForEach>
                                 </div>
 
@@ -37,7 +37,7 @@
                                      class="actions-secondary"
                                      data-role="add-to-links">
                                     <fastForEach args="data: getRegion('action-secondary-area'), as: '$col'" >
-                                        <render args="$col.getBody()"/>
+                                        <render args="$col.getBody()"></render>
                                     </fastForEach>
                                 </div>
                             </div>
@@ -45,7 +45,7 @@
                             <div if="regionHasElements('description-area')"
                                  class="product-item-description">
                                 <fastForEach args="data: getRegion('description-area'), as: '$col'" >
-                                    <render args="$col.getBody()"/>
+                                    <render args="$col.getBody()"></render>
                                 </fastForEach>
                             </div>
                         </div>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html b/app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html
index 66f8ccae91be8..2ac8cd58b41bc 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/price/max_price.html
@@ -19,7 +19,7 @@
           html="getMaxPriceUnsanitizedHtml($row())"></span>
 
     <each args="data: getAdjustments('max_price'), as: '$adj'">
-        <render args="$adj.getBody()"/>
+        <render args="$adj.getBody()"></render>
     </each>
 </span>
 
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html b/app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html
index 4238cd3910a5f..a1d431648f2d8 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/price/price_box.html
@@ -8,7 +8,7 @@
      if="isAllowed()">
     <each args="data: getPrices($row()), as: '$price'">
         <with args="$price">
-            <render args="getBody()"/>
+            <render args="getBody()"></render>
         </with>
     </each>
 </div>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html b/app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html
index f8c0d45e836e3..9dff0a601d20c 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/price/pricetype_box.html
@@ -5,5 +5,5 @@
  */
 -->
 <with args="getPrice($row())">
-    <render args="getBody()"/>
+    <render args="getBody()"></render>
 </with>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html b/app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html
index 9926e525edd18..8dec03701990a 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/price/regular_price.html
@@ -22,7 +22,7 @@
 
                 <if args="!hasSpecialPrice($row())">
                     <each args="data: getAdjustments(), as: '$adj'">
-                        <render args="$adj.getBody()"/>
+                        <render args="$adj.getBody()"></render>
                     </each>
                 </if>
             </span>
diff --git a/app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html b/app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html
index 92b8036e1e389..2e56185e5bd19 100644
--- a/app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html
+++ b/app/code/Magento/Catalog/view/base/web/template/product/price/special_price.html
@@ -20,7 +20,7 @@
                   html="getPriceUnsanitizedHtml($row())"></span>
 
             <each args="data: getAdjustments(), as: '$adj'">
-                <render args="$adj.getBody()"/>
+                <render args="$adj.getBody()"></render>
             </each>
         </span>
     </span>
diff --git a/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html b/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html
index 8755c7ec9103d..70f93834f3206 100644
--- a/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html
+++ b/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html
@@ -17,7 +17,7 @@
 
     <if args="isAvailable($row()) === false">
         <div class="stock unavailable">
-            <text args="$t('Availability')"/>
+            <text args="$t('Availability')"></text>
             <span translate="'Out of stock'"></span>
         </div>
     </if>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index 28057b373432c..d9ae28b959c02 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -10,9 +10,9 @@
          class="step-content"
          data-role="content">
 
-        <each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" />
-        <each args="getRegion('address-list')" render="" />
-        <each args="getRegion('address-list-additional-addresses')" render="" />
+        <each if="!quoteIsVirtual" args="getRegion('customer-email')" render="" ></each>
+        <each args="getRegion('address-list')" render="" ></each>
+        <each args="getRegion('address-list-additional-addresses')" render="" ></each>
 
         <!-- Address form pop up -->
         <if args="!isFormInline">
@@ -29,10 +29,10 @@
                  render="shippingFormTemplate"></div>
         </if>
 
-        <each args="getRegion('before-form')" render="" />
+        <each args="getRegion('before-form')" render="" ></each>
 
         <!-- Inline address form -->
-        <render if="isFormInline" args="shippingFormTemplate"/>
+        <render if="isFormInline" args="shippingFormTemplate"></render>
     </div>
 </li>
 
@@ -46,7 +46,7 @@
              translate="'Shipping Methods'"
              data-role="title"></div>
 
-        <each args="getRegion('before-shipping-method-form')" render="" />
+        <each args="getRegion('before-shipping-method-form')" render="" ></each>
 
         <div id="checkout-step-shipping_method"
              class="step-content"
@@ -59,10 +59,10 @@
                   submit="setShippingInformation"
                   novalidate="novalidate">
 
-                <render args="shippingMethodListTemplate"/>
+                <render args="shippingMethodListTemplate"></render>
 
                 <div id="onepage-checkout-shipping-method-additional-load">
-                    <each args="getRegion('shippingAdditional')" render="" />
+                    <each args="getRegion('shippingAdditional')" render="" ></each>
                 </div>
                 <div role="alert"
                      if="errorValidationMessage().length"
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html
index ddb7bf166e9cd..614d219fd4d38 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/components/file-uploader.html
@@ -14,7 +14,7 @@
         <img class="file-uploader-image" attr="src: $data.thumbnailUrl()"/>
         <!-- /ko -->
         <!-- ko if: !$data.processedFile().url && !$data.thumbnail() -->
-        <text args="$data.processedFile().name"/>
+        <text args="$data.processedFile().name"></text>
         <!-- /ko -->
         <div class="file-uploader-area">
             <input type="file"
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html b/app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html
index 89d0033c9c534..9224c69b8eadb 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/web/template/product/minimal_price.html
@@ -20,7 +20,7 @@
         </ifnot>
 
         <each args="data: getAdjustments(), as: '$adj'">
-            <render args="$adj.getBody()"/>
+            <render args="$adj.getBody()"></render>
         </each>
     </ifnot>
 </span>
diff --git a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
index cc13833784683..9b8cff43cc3e2 100644
--- a/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
+++ b/app/code/Magento/Customer/view/adminhtml/web/template/default-address.html
@@ -8,46 +8,46 @@
     <div data-bind="attr: {class: 'fieldset-wrapper address-information ' + defaultAddressClass}">
         <address>
             <div class="address_caption">
-                <text args="title"/>
+                <text args="title"></text>
                 <each args="data: elems, as: 'element'">
-                    <render if="hasTemplate()"/>
+                    <render if="hasTemplate()"></render>
                 </each>
             </div>
             <div class="address_details" ifnot="_.isEmpty($data.address)">
-                <text args="address.prefix" if="address.prefix"/>
-                <text args="address.firstname"/>
-                <text args="address.middlename" if="address.middlename"/>
-                <text args="address.lastname"/>
-                <text args="address.suffix" if="address.suffix"/>
+                <text args="address.prefix" if="address.prefix"></text>
+                <text args="address.firstname"></text>
+                <text args="address.middlename" if="address.middlename"></text>
+                <text args="address.lastname"></text>
+                <text args="address.suffix" if="address.suffix"></text>
                 <br/>
                 <if args="address.company">
-                    <text args="address.company"/>
+                    <text args="address.company"></text>
                     <br/>
                 </if>
                 <if args="address.street">
-                    <text args="address.street" if="_.isString(address.street)"/>
+                    <text args="address.street" if="_.isString(address.street)"></text>
                     <text args="_.filter(_.values(address.street), function (value) { return _.isString(value)}).join(', ')"
-                          ifnot="_.isString(address.street)"/>
+                          ifnot="_.isString(address.street)"></text>
                     <br/>
                 </if>
-                <text args="address.city + ', '" if="address.city"/>
-                <text args="address.region + ', '" if="address.region"/>
+                <text args="address.city + ', '" if="address.city"></text>
+                <text args="address.region + ', '" if="address.region"></text>
                 <if args="address.postcode">
-                    <text args="address.postcode"/>
+                    <text args="address.postcode"></text>
                     <br/>
                 </if>
-                <text args="address.country"/>
+                <text args="address.country"></text>
                 <if args="address.telephone">
                     <br/>T: <a attr="href: 'tel:' + address.telephone" text="address.telephone"></a>
                 </if>
                 <if args="address.fax">
-                    <br/>F: <text args="address.fax"/>
+                    <br/>F: <text args="address.fax"></text>
                 </if>
                 <if args="address.vat_id">
-                    <br/>VAT: <text args="address.vat_id"/>
+                    <br/>VAT: <text args="address.vat_id"></text>
                 </if>
             </div>
-            <translate args="notExistsMessage" if="_.isEmpty($data.address)"/>
+            <translate args="notExistsMessage" if="_.isEmpty($data.address)"></translate>
         </address>
     </div>
 </div>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html b/app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html
index 57fb2c389aaf4..e7ecde4866bee 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html
+++ b/app/code/Magento/Downloadable/view/adminhtml/web/template/components/file-uploader.html
@@ -11,8 +11,8 @@
             <div class="file-uploader-summary">
                 <div class="file-uploader-filename">
                     <!-- ko if: $file.url --><a attr="href: $file.url" target="_blank" text="$file.name"></a><!-- /ko -->
-                    <!-- ko if: !$file.url --><text args="$file.name"/><!-- /ko -->
-                    (<text args="$parent.formatSize($file.size)"/>)
+                    <!-- ko if: !$file.url --><text args="$file.name"></text><!-- /ko -->
+                    (<text args="$parent.formatSize($file.size)"></text>)
                 </div>
             </div>
         </each>
diff --git a/app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html b/app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html
index c40b011204cfb..8f76187265ae3 100644
--- a/app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html
+++ b/app/code/Magento/GroupedProduct/view/base/web/template/product/price/minimal_price.html
@@ -18,7 +18,7 @@
                   html="getPriceUnsanitizedHtml($row())"></span>
 
             <each args="data: getAdjustments(), as: '$adj'">
-                <render args="$adj.getBody()"/>
+                <render args="$adj.getBody()"></render>
             </each>
         </span>
     </div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
index 3b88c58201be7..ada4dfd265a76 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
@@ -21,7 +21,7 @@
         </div>
         <ul class="action-menu" css="_active: $collapsible.opened">
             <scope args="actions">
-                <render args="template"/>
+                <render args="template"></render>
             </scope>
         </ul>
     </div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html
index 5bbdafebe4095..62a55f8a7d1a8 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/count.html
@@ -5,5 +5,5 @@
  */
 -->
 <div visible="massActionMode()" class="mediagallery-massaction-items-count">
-  <div class="selected_count_text">(<b><text args="getSelectedCount()"/> Selected</b>) </div>
+  <div class="selected_count_text">(<b><text args="getSelectedCount()"></text> Selected</b>) </div>
 </div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html
index 1b8d0a38f2bd0..7f5127c561233 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/toolbar.html
@@ -7,7 +7,7 @@
 <div class="admin__data-grid-header" data-role="masonry-main-toolbar" afterRender="$data.setToolbarNode">
     <div class="admin__data-grid-header-row">
         <div class="admin__data-grid-actions-wrap" each="getRegion('dataGridActions')" render=""></div>
-        <each args="getRegion('dataGridFilters')" render=""/>
+        <each args="getRegion('dataGridFilters')" render=""></each>
     </div>
     <div class="admin__data-grid-header-row row row-gutter">
         <div class="col-xs-2" if="hasChild('listing_massaction')" ko-scope="requestChild('listing_massaction')" render=""></div>
@@ -17,9 +17,9 @@
             <div class="row">
                 <div class="col-xs-4">
                     <div class="masonry-results-number" ko-scope="requestChild('listing_paging')">
-                        <render args="totalTmpl"/>
+                        <render args="totalTmpl"></render>
                     </div>
-                    <each args="getRegion('sorting')" render=""/>
+                    <each args="getRegion('sorting')" render=""></each>
                 </div>
                 <div class="col-xs-8" ko-scope="requestChild('listing_paging')">
                     <div render=""></div>
@@ -29,4 +29,4 @@
     </div>
 </div>
 
-<render args="stickyTmpl" if="$data.sticky"/>
+<render args="stickyTmpl" if="$data.sticky"></render>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
index 15b94f823c2ba..c5f6f87bc3f87 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
@@ -59,6 +59,6 @@ <h3 translate="'Tags'"></h3>
             </div>
         </div>
 
-        <each args="getRegion('additional_image_details')" render=""/>
+        <each args="getRegion('additional_image_details')" render=""></each>
     </div>
 </div>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
index 80d1e29fd683f..dc9f15760a0f4 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
@@ -47,7 +47,7 @@
             <div class="admin__field-control">
                 <div class="admin__field">
                     <scope args="keywordsSelect">
-                         <render args="template"/>
+                         <render args="template"></render>
                     </scope>
                 </div>
                 <div class="admin__field">
diff --git a/app/code/Magento/Msrp/view/frontend/web/template/product/item/popup.html b/app/code/Magento/Msrp/view/frontend/web/template/product/item/popup.html
index 23cf450bf93b3..6262687373ef5 100644
--- a/app/code/Magento/Msrp/view/frontend/web/template/product/item/popup.html
+++ b/app/code/Magento/Msrp/view/frontend/web/template/product/item/popup.html
@@ -28,7 +28,7 @@
                     <if args="isAllowed()">
                         <each args="data: getPrices($row()), as: '$price'">
                             <with args="$price">
-                                <render args="getBody()"/>
+                                <render args="getBody()"></render>
                             </with>
                         </each>
                     </if>
@@ -38,7 +38,7 @@
 
         <div class="map-form-addtocart">
             <with args="$parent.getComponentByCode('addtocart-button')">
-                <render args="getBody()"/>
+                <render args="getBody()"></render>
             </with>
         </div>
     </div>
diff --git a/app/code/Magento/Msrp/view/frontend/web/template/product/price/price_box.html b/app/code/Magento/Msrp/view/frontend/web/template/product/price/price_box.html
index f427a3557206e..0697a38b7b192 100644
--- a/app/code/Magento/Msrp/view/frontend/web/template/product/price/price_box.html
+++ b/app/code/Magento/Msrp/view/frontend/web/template/product/price/price_box.html
@@ -24,7 +24,7 @@
             <span translate="'Click for price'"></span>
         </button>
 
-        <render args="popupTmpl"/>
+        <render args="popupTmpl"></render>
     </if>
 
     <ifnot args="isShowPriceOnGesture($row())">
@@ -38,7 +38,7 @@
          if="isAllowed()">
         <each args="data: getPrices($row()), as: '$price'">
             <with args="$price">
-                <render args="getBody()"/>
+                <render args="getBody()"></render>
             </with>
         </each>
     </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
index e8fdff4a0ff2a..67d3e17fbb945 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
@@ -39,7 +39,7 @@
             <!--/ko-->
         </div>
         <div class="payment-method-extra-content">
-            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""></each>
         </div>
         <div class="actions-toolbar">
             <div class="primary">
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
index 77b07913c8892..5450dc301334f 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
@@ -36,7 +36,7 @@
             <!--/ko-->
         </div>
         <div class="payment-method-extra-content">
-            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""></each>
         </div>
         <div class="actions-toolbar">
             <div class="primary">
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
index 0d99636f99d6c..1658febe44e6f 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-in-context.html
@@ -26,13 +26,13 @@
         </label>
     </div>
     <div class="payment-method-content">
-        <each args="getRegion('messages')" render=""/>
+        <each args="getRegion('messages')" render=""></each>
         <div class="checkout-agreements-block">
-            <each args="$parent.getRegion('before-place-order')" render=""/>
+            <each args="$parent.getRegion('before-place-order')" render=""></each>
         </div>
         <div class="actions-toolbar" attr="id: getButtonId()" afterRender="renderPayPalButtons"></div>
         <div class="payment-method-extra-content">
-            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""></each>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
index a88e1510b4ac4..f4795241311d0 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
@@ -37,7 +37,7 @@
             <!--/ko-->
         </div>
         <div class="payment-method-extra-content">
-            <each args="$parent.getRegion('paypal-method-extra-content')" render=""/>
+            <each args="$parent.getRegion('paypal-method-extra-content')" render=""></each>
         </div>
         <div class="actions-toolbar">
             <div class="primary">
diff --git a/app/code/Magento/Theme/view/adminhtml/web/template/form/button-field.html b/app/code/Magento/Theme/view/adminhtml/web/template/form/button-field.html
index 11e20ac29a945..00a25c969f6a9 100644
--- a/app/code/Magento/Theme/view/adminhtml/web/template/form/button-field.html
+++ b/app/code/Magento/Theme/view/adminhtml/web/template/form/button-field.html
@@ -14,8 +14,8 @@
 
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip">
-        <render args="tooltipTpl" if="$data.tooltip"/>
-        <render args="buttonTpl" />
+        <render args="tooltipTpl" if="$data.tooltip"></render>
+        <render args="buttonTpl" ></render>
         <div class="admin__field-note" if="$data.notice">
             <span text="notice"></span>
         </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html
index 29920299ddb9c..19abecc1f2896 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/collapsible.html
@@ -37,7 +37,7 @@
 
                             <div class="admin__collapsible-title" data-role="collapsible-title" click="elem.toggleOpened">
                                 <render args="name: $parents[1].dndConfig.template, data: $parents[1].dnd"
-                                        if="$parents[1].dndConfig.enabled" />
+                                        if="$parents[1].dndConfig.enabled" ></render>
 
                                 <span translate="$parent.getLabel(elem)"></span>
                             </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
index 60163819baff5..184b8bdac8020 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -88,6 +88,6 @@
                 <span translate="addButtonLabel"></span>
             </button>
         </div>
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/collection.html b/app/code/Magento/Ui/view/base/web/templates/form/collection.html
index 5006c3eb68693..e65bf0b70df66 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/collection.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/collection.html
@@ -5,5 +5,5 @@
  */
 -->
 <each args="data: items, as: '$item'">
-    <each args="$item" render=""/>
+    <each args="$item" render=""></each>
 </each>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/button/container.html b/app/code/Magento/Ui/view/base/web/templates/form/components/button/container.html
index 1f20c2e043916..f67ad92ec491a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/button/container.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/button/container.html
@@ -10,6 +10,6 @@
     </label>
 
     <div class="admin__field-control">
-        <render args="elementTmpl"/>
+        <render args="elementTmpl"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/button/simple.html b/app/code/Magento/Ui/view/base/web/templates/form/components/button/simple.html
index a7d61aa80b1a4..d3b1306939cf9 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/button/simple.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/button/simple.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<render args="elementTmpl" if="visible"/>
+<render args="elementTmpl" if="visible"></render>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
index 5211c8588e008..477fd8811bace 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/collection.html
@@ -13,7 +13,7 @@
                     <span text="$parent.removeLabel"></span>
                 </button>
             </div>
-            <render args="previewTpl"/>
+            <render args="previewTpl"></render>
             <div each="getRegion('head')" render=""></div>
         </li>
 
@@ -31,7 +31,7 @@
                     <span text="$parent.label"></span>
                 </legend><br />
 
-                <each args="getRegion('body')" render=""/>
+                <each args="getRegion('body')" render=""></each>
             </fieldset>
         </div>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/components/single/field.html b/app/code/Magento/Ui/view/base/web/templates/form/components/single/field.html
index 9018efc28aa21..c3e42cbe086eb 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/components/single/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/components/single/field.html
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 -->
-<render args="elementTmpl" visible="visible"/>
+<render args="elementTmpl" visible="visible"></render>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
index 668eb017872c2..9afe3b6dfe637 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/checkbox-set.html
@@ -33,11 +33,11 @@
         <label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
 
         <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
-            <span><strong translate="NOTE"></strong>: <translate args="$data.notice"/></span>
+            <span><strong translate="NOTE"></strong>: <translate args="$data.notice"></translate></span>
         </div>
 
         <div class="admin__additional-info" if="$data.additionalInfo" html="$data.additionalInfoUnsanitizedHtml"></div>
 
-        <render args="$data.service.template" if="$data.hasService()"/>
+        <render args="$data.service.template" if="$data.hasService()"></render>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html
index aef00f3d8d62c..f85bdd353704d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html
@@ -20,18 +20,18 @@
                     attr="id: mediaGalleryUid, disabled: disabled"
                     data-force_static_path="1"
                     translate="'Select from Gallery'"></label>
-                <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+                <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
                 <p class="image-upload-requirements">
                     <span if="$data.maxFileSize">
-                        <span translate="'Maximum file size'"></span>: <text args="formatSize($data.maxFileSize)"/>.
+                        <span translate="'Maximum file size'"></span>: <text args="formatSize($data.maxFileSize)"></text>.
                     </span>
                     <span if="$data.allowedExtensions">
-                        <span translate="'Allowed file types'"></span>: <text args="getAllowedFileExtensionsInCommaDelimitedFormat()"/>.
+                        <span translate="'Allowed file types'"></span>: <text args="getAllowedFileExtensionsInCommaDelimitedFormat()"></text>.
                     </span>
                 </p>
             </div>
 
-            <render args="tooltipTpl" if="$data.tooltip"/>
+            <render args="tooltipTpl" if="$data.tooltip"></render>
 
             <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
                 <!-- ko with: {noticeUnsanitizedHtml: notice} -->
@@ -41,7 +41,7 @@
 
             <label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
 
-            <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
+            <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"></each>
 
             <div if="!hasData()" class="image image-placeholder" click="triggerImageUpload">
                 <div class="file-uploader-summary product-image-wrapper">
@@ -50,6 +50,6 @@
                 </div>
             </div>
         </div>
-        <render args="$data.service.template" if="$data.hasService()"/>
+        <render args="$data.service.template" if="$data.hasService()"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/preview.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/preview.html
index 06855d34dc3ae..f8c84fe9ca0aa 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/preview.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/preview.html
@@ -34,8 +34,8 @@
 
     <div class="file-uploader-meta">
         <span if="$file.previewType === 'image'">
-            <text args="$file.previewWidth"/>x<text args="$file.previewHeight"/>,
+            <text args="$file.previewWidth"></text>x<text args="$file.previewHeight"></text>,
         </span>
-        <text args="$parent.formatSize($file.size)"/>
+        <text args="$parent.formatSize($file.size)"></text>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
index 24ee447159182..2f128630f9fbb 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/uploader/uploader.html
@@ -17,10 +17,10 @@
                 <label class="file-uploader-button action-default" attr="for: uid" translate="'Upload'"></label>
 
                 <span class="file-uploader-spinner"></span>
-                <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+                <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
             </div>
 
-            <render args="tooltipTpl" if="$data.tooltip"/>
+            <render args="tooltipTpl" if="$data.tooltip"></render>
 
             <div class="admin__field-note" if="$data.notice" attr="id: noticeId">
                 <!-- ko with: {noticeUnsanitizedHtml: notice} -->
@@ -41,6 +41,6 @@
                 </label>
             </div>
         </div>
-        <render args="$data.service.template" if="$data.hasService()"/>
+        <render args="$data.service.template" if="$data.hasService()"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html b/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html
index 1af93bb828a3b..ed9dacf07699a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html
@@ -16,11 +16,11 @@
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
             <div class="type-selector-input-container">
                 <!--render link types select-->
-                <render args="typeSelectorTemplate"/>
+                <render args="typeSelectorTemplate"></render>
 
                 <!--display field to insert link value based on link type-->
                 <div ko-scope="getLinkedElementName()" class="url-input-element-linked-element">
-                    <render/>
+                    <render></render>
                     <label class="admin__field-error" visible="error" attr="for: uid" text="error"></label>
                 </div>
             </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
index a46c26072b6e8..e27efbd25fb85 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -15,10 +15,10 @@
     </div>
     <div class="admin__field-control"
          css="'_with-tooltip': $data.tooltip, '_with-reset': $data.showFallbackReset && $data.isDifferedFromDefault">
-        <render args="elementTmpl" ifnot="hasAddons()"/>
+        <render args="elementTmpl" ifnot="hasAddons()"></render>
 
         <div class="admin__control-addon" if="hasAddons()">
-            <render args="elementTmpl"/>
+            <render args="elementTmpl"></render>
 
             <label class="admin__addon-prefix" if="$data.addbefore" attr="for: uid">
                 <span text="addbefore"></span>
@@ -28,9 +28,9 @@
             </label>
         </div>
 
-        <render args="tooltipTpl" if="$data.tooltip"/>
+        <render args="tooltipTpl" if="$data.tooltip"></render>
 
-        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+        <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
 
         <label class="admin__field-error" if="error" attr="for: uid" text="error"></label>
 
@@ -44,6 +44,6 @@
             <!-- /ko -->
         <!-- /ko -->
 
-        <render args="$data.service.template" if="$data.hasService()"/>
+        <render args="$data.service.template" if="$data.hasService()"></render>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
index 9ba8c3decbd82..18ba017b6e29d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/bulk.html
@@ -16,7 +16,7 @@
 
         <if args="$data.isEditor">
             <label class="admin__field-label admin__field-label-vertical" attr="for: uid" translate="'All in Column'"></label>
-            <render/>
+            <render></render>
         </if>
     </td>
 </tr>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/field.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/field.html
index 26f00d6b2918c..9ee9dff1ec0ec 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/field.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/field.html
@@ -5,6 +5,6 @@
  */
 -->
 <div class="admin__field-control" css=" _error: error(), _focus: focused()">
-    <render/>
+    <render></render>
     <label class="admin__field-error" attr="for: uid" text="error" visible="error() && focused()"></label>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/editing/header-buttons.html b/app/code/Magento/Ui/view/base/web/templates/grid/editing/header-buttons.html
index 6b185a5ed54fb..bec34b7f8aa30 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/editing/header-buttons.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/editing/header-buttons.html
@@ -9,7 +9,7 @@
      class="data-grid-info-panel">
     <div if="hasMessages() || hasErrors()" class="messages">
         <div if="hasErrors()" class="message message-warning">
-            <strong><text args="countErrorsMessage()"/></strong>
+            <strong><text args="countErrorsMessage()"></text></strong>
             <span translate="'Please make corrections to the errors in the table below and re-submit.'"></span>
         </div>
         <div class="message" outereach="messages" text="message"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
index cef3ea2d121d0..4fdc002987acc 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
@@ -15,7 +15,7 @@
                     <span text="label + '\\:'"></span>
                     <span if="typeof preview === 'string'" text="preview"></span>
                     <span if="typeof preview === 'object'">
-                        <text args="preview[0] || '...'"/> - <text args="preview[1] || '...'"/>
+                        <text args="preview[0] || '...'"></text> - <text args="preview[1] || '...'"></text>
                     </span>
                     <button class="action-remove" type="button"
                         data-action="grid-filter-remove-chip"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
index a5184b87abf77..e5a45e42e4c13 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
@@ -12,7 +12,7 @@
     </div>
 </div>
 
-<scope args="chips" render=""/>
+<scope args="chips" render=""></scope>
 
 <div class="admin__data-grid-filters-wrap" data-part="filter-form" css="_show: hasVisible() && $collapsible.opened()" keyboard="{ 13: apply }">
     <fieldset class="admin__fieldset admin__data-grid-filters">
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/paging-total.html b/app/code/Magento/Ui/view/base/web/templates/grid/paging-total.html
index 234bf3cc687d3..ab4c6b91f6155 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/paging-total.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/paging-total.html
@@ -5,8 +5,8 @@
  */
 -->
 <div class="admin__control-support-text">
-    <text args="totalRecords"/> <!-- ko i18n: 'records found' --><!-- /ko -->
+    <text args="totalRecords"></text> <!-- ko i18n: 'records found' --><!-- /ko -->
     <!-- ko if: totalSelected -->
-    (<text args="totalSelected"/> <!-- ko i18n: 'selected' --><!-- /ko -->)
+    (<text args="totalSelected"></text> <!-- ko i18n: 'selected' --><!-- /ko -->)
     <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging-detailed-total.html b/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging-detailed-total.html
index 5c15f14af9dab..f6727b4b64ec3 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging-detailed-total.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging-detailed-total.html
@@ -7,14 +7,14 @@
 <div class="admin__control-support-text">
     <!-- ko if: totalRecords -->
         <strong>
-            <text args="getFirstItemIndex()"/> -
-            <text args="getLastItemIndex()"/>
+            <text args="getFirstItemIndex()"></text> -
+            <text args="getLastItemIndex()"></text>
         </strong>
         <!-- ko i18n: 'of' --><!-- /ko -->
     <!-- /ko -->
     <strong text="totalRecords"></strong>
     <!-- ko i18n: 'records found' --><!-- /ko -->
     <!-- ko if: totalSelected -->
-        (<text args="totalSelected"/> <!-- ko i18n: 'selected' --><!-- /ko -->)
+        (<text args="totalSelected"></text> <!-- ko i18n: 'selected' --><!-- /ko -->)
     <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging.html b/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging.html
index 2999e9469a4a9..15ec5b188f120 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/paging/paging.html
@@ -5,7 +5,7 @@
  */
 -->
 <div class="admin__data-grid-pager-wrap">
-    <scope args="sizes" render=""/>
+    <scope args="sizes" render=""></scope>
 
     <div class="admin__data-grid-pager">
         <button class="action-previous" type="button" attr="title: $t('Previous Page')" click="prev" disable="isFirst()"></button>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
index 9b0b0e0ebde39..7bf73d28e6042 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/sticky/sticky.html
@@ -11,16 +11,16 @@
     <div afterRender="setStickyToolbarNode">
         <div class="admin__data-grid-header">
             <div class="admin__data-grid-header-row">
-                <scope args="requestChild('listing_massaction')" render=""/>
-                <scope args="requestChild('listing_paging')" render="totalTmpl"/>
-                <each args="getRegion('dataGridFilters')" render=" $data.stickyTmpl || getTemplate()"/>
+                <scope args="requestChild('listing_massaction')" render=""></scope>
+                <scope args="requestChild('listing_paging')" render="totalTmpl"></scope>
+                <each args="getRegion('dataGridFilters')" render=" $data.stickyTmpl || getTemplate()"></each>
                 <div class="admin__data-grid-actions-wrap" each="getRegion('dataGridActions')" render=""></div>
-                <scope args="requestChild('listing_paging')" render=""/>
+                <scope args="requestChild('listing_paging')" render=""></scope>
             </div>
         </div>
 
-        <scope args="requestChild('listing_filters_chips')" render="$data.stickyTmpl || getTemplate()"/>
+        <scope args="requestChild('listing_filters_chips')" render="$data.stickyTmpl || getTemplate()"></scope>
 
-        <scope args="columnsProvider" render="stickyTmpl"/>
+        <scope args="columnsProvider" render="stickyTmpl"></scope>
     </div>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
index 06a2cce9d9fbc..409ef2aae2ed1 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
@@ -7,6 +7,6 @@
 <ul class="action-submenu" each="data: action.actions, as: 'action'" css="_active: action.visible">
     <li css="_visible: $data.visible">
         <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"></span>
-        <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
+        <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"></render>
     </li>
 </ul>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html b/app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html
index 2f0e23df5e036..7bdfc3e26cb60 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/toolbar.html
@@ -7,7 +7,7 @@
 <div class="admin__data-grid-header" afterRender="$data.setToolbarNode">
     <div class="admin__data-grid-header-row">
         <div class="admin__data-grid-actions-wrap" each="getRegion('dataGridActions')" render=""></div>
-        <each args="getRegion('dataGridFilters')" render=""/>
+        <each args="getRegion('dataGridFilters')" render=""></each>
     </div>
     <div class="admin__data-grid-header-row row row-gutter">
         <div class="col-xs-2" if="hasChild('listing_massaction')" ko-scope="requestChild('listing_massaction')" render=""></div>
@@ -22,4 +22,4 @@
     </div>
 </div>
 
-<render args="stickyTmpl" if="$data.sticky"/>
+<render args="stickyTmpl" if="$data.sticky"></render>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
index 1ef6171cb3fb0..7b30f39f08dda 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -12,7 +12,7 @@
         <ul class="action-menu" each="data: actions, as: 'action'" css="_active: opened">
             <li css="_visible: $data.visible, _parent: $data.actions">
                 <span class="action-menu-item" translate="label" click="$parent.applyAction.bind($parent, type)"></span>
-                <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"/>
+                <render args="name: $parent.submenuTemplate, data: $parent" if="$data.actions"></render>
             </li>
         </ul>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/group/group.html b/app/code/Magento/Ui/view/base/web/templates/group/group.html
index b261bfe937e4b..470d347306387 100644
--- a/app/code/Magento/Ui/view/base/web/templates/group/group.html
+++ b/app/code/Magento/Ui/view/base/web/templates/group/group.html
@@ -15,12 +15,12 @@
     <div class="admin__field-control" css="$data.additionalClasses">
         <each args="elems">
             <if args="visible()" if="!$data.additionalForGroup">
-                <render args="$parent.fieldTemplate" if="element.input_type != 'checkbox' || element.input_type != 'radio'"/>
-                <render args="elementTmpl" if="element.input_type == 'checkbox' || element.input_type == 'radio'"/>
+                <render args="$parent.fieldTemplate" if="element.input_type != 'checkbox' || element.input_type != 'radio'"></render>
+                <render args="elementTmpl" if="element.input_type == 'checkbox' || element.input_type == 'radio'"></render>
             </if>
         </each>
 
-        <each args="getRegion('insideGroup')" render=""/>
+        <each args="getRegion('insideGroup')" render=""></each>
 
         <each args="elems" if="validateWholeGroup">
             <if args="!$data.additionalForGroup">
@@ -29,5 +29,5 @@
         </each>
     </div>
 
-    <each args="getRegion('outsideGroup')" render=""/>
+    <each args="getRegion('outsideGroup')" render=""></each>
 </fieldset>
diff --git a/app/code/Magento/Ui/view/base/web/templates/modal/modal-component.html b/app/code/Magento/Ui/view/base/web/templates/modal/modal-component.html
index 73647b8356c01..95ed298ce737a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/modal/modal-component.html
+++ b/app/code/Magento/Ui/view/base/web/templates/modal/modal-component.html
@@ -5,5 +5,5 @@
  */
 -->
 <div css="modalClass" hasFocus="focused">
-    <each if="state() || $data.modal" args="data: elems, as: 'element'" render=""/>
+    <each if="state() || $data.modal" args="data: elems, as: 'element'" render=""></each>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/timeline/record.html b/app/code/Magento/Ui/view/base/web/templates/timeline/record.html
index 3c23631657997..18d780df41395 100644
--- a/app/code/Magento/Ui/view/base/web/templates/timeline/record.html
+++ b/app/code/Magento/Ui/view/base/web/templates/timeline/record.html
@@ -6,7 +6,7 @@
 -->
 <div class="timeline-event">
     <strong class="timeline-event-title" ko-scope="requestChild('name')">
-        <text args="getLabel($row())"/>
+        <text args="getLabel($row())"></text>
     </strong>
     <div class="timeline-event-info">
         <div class="timeline-event-details"></div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/timeline/timeline.html b/app/code/Magento/Ui/view/base/web/templates/timeline/timeline.html
index 06a33f5730fab..447dc67875452 100644
--- a/app/code/Magento/Ui/view/base/web/templates/timeline/timeline.html
+++ b/app/code/Magento/Ui/view/base/web/templates/timeline/timeline.html
@@ -50,12 +50,12 @@
                     position: 'top',
                     closeButton: false
                 ">
-                    <text args="isToday($date()) ? $t('Today') \: formatHeader($date())"/>
+                    <text args="isToday($date()) ? $t('Today') \: formatHeader($date())"></text>
                 </div>
                 <time attr="'data-tooltip-trigger': $index" class="timeline-date">
 
                     <!-- NOTE: needs to be replaced by the date binding -->
-                    <text args="isToday($date()) ? $t('Today') \: formatHeader($date())"/>
+                    <text args="isToday($date()) ? $t('Today') \: formatHeader($date())"></text>
                 </time>
             </li>
         </ul>
diff --git a/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
index 05c1a9fb58927..105802b539e38 100644
--- a/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
+++ b/app/code/Magento/Ui/view/frontend/web/templates/form/element/uploader/uploader.html
@@ -13,16 +13,16 @@
             <label class="file-uploader-button action-default" attr="for: uid" translate="'Upload'"></label>
 
             <span class="file-uploader-spinner"></span>
-            <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
+            <render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"></render>
         </div>
 
-        <render args="tooltipTpl" if="$data.tooltip"/>
+        <render args="tooltipTpl" if="$data.tooltip"></render>
 
         <div class="field-note" if="$data.notice" attr="id: noticeId">
-            <span><strong translate="NOTE"></strong>: <translate args="$data.notice"/></span>
+            <span><strong translate="NOTE"></strong>: <translate args="$data.notice"></translate></span>
         </div>
 
-        <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"/>
+        <each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"></each>
 
         <div if="isMultipleFiles" class="file-uploader-summary">
             <label attr="for: uid"
@@ -33,5 +33,5 @@
             </label>
         </div>
     </div>
-    <render args="$data.service.template" if="$data.hasService()"/>
+    <render args="$data.service.template" if="$data.hasService()"></render>
 </div>
diff --git a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
index 98c0fbfb00177..9b53a3203ba09 100644
--- a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
+++ b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
@@ -35,7 +35,7 @@
         <each args="getRegion('messages')" render=""></each>
         <div class="payment-method-billing-address">
             <each args="data: $parent.getRegion(getBillingAddressFormName()), as: '$item'">
-                <render args="$item.getTemplate()"/>
+                <render args="$item.getTemplate()"></render>
             </each>
         </div>
         <div class="checkout-agreements-block">