diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
index c6b8bda208410..3f79e803ccca2 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -19,11 +19,11 @@
             "autoOpen": true,
             "buttons": false,
             "modalClass": "modal-system-messages",
-            "title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
+            "title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
         }
     }'>
     <li class="message message-warning warning">
-        <?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
+        <?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
+        <a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
     </li>
 </ul>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
index 4e8be1fee7658..01d6fdcb29571 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -15,31 +15,31 @@
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">
                 <li class="message message-warning error">
-                    <?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
+                    <?= /* @escapeNotVerified */ $lastCritical->getText() ?>
                 </li>
             </ul>
         <?php endif; ?>
         <div class="message-system-short">
             <span class="message-system-short-label">
-                <?php /* @escapeNotVerified */ echo __('System Messages:')?>
+                <?= /* @escapeNotVerified */ __('System Messages:') ?>
             </span>
 
             <?php if ($block->getCriticalCount()): ?>
                 <div class="message message-warning error">
-                    <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>">
-                        <?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
+                    <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
+                        <?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
                     </a>
                 </div>
             <?php endif;?>
 
             <?php if ($block->getMajorCount()): ?>
                <div class="message message-warning warning">
-                   <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
-                       <?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
+                   <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
+                       <?= /* @escapeNotVerified */ $block->getMajorCount() ?>
                    </a>
                </div>
             <?php endif;?>
         </div>
-        <div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
+        <div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
     </div>
 </div>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
index 624f4d35fee1c..a97293547e132 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -9,11 +9,11 @@
 ?>
 <?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
 
-<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
+<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
     <ul class="message-system-list messages">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
-            <li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
-                <?php /* @escapeNotVerified */ echo $message->getText();?>
+            <li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
+                <?= /* @escapeNotVerified */ $message->getText() ?>
             </li>
         <?php endforeach;?>
     </ul>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
index dea873ec3dde8..777448cdd82b4 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -15,70 +15,70 @@
 <div
     data-mage-init='{"toolbarEntry": {}}'
     class="notifications-wrapper admin__action-dropdown-wrap"
-    data-notification-count="<?php /* @escapeNotVerified */ echo $notificationCount; ?>">
+    data-notification-count="<?= /* @escapeNotVerified */ $notificationCount ?>">
     <?php if ($notificationCount > 0) : ?>
         <a
-            href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
+            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
             class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
-            title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>"
+            title="<?= /* @escapeNotVerified */ __('Notifications') ?>"
             data-toggle="dropdown">
             <span class="notifications-counter">
-                <?php /* @escapeNotVerified */ echo ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount; ?>
+                <?= /* @escapeNotVerified */ ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount ?>
             </span>
         </a>
         <ul
             class="admin__action-dropdown-menu"
-            data-mark-as-read-url="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
+            data-mark-as-read-url="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/ajaxMarkAsRead') ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification) : ?>
             <?php /** @var $notification \Magento\AdminNotification\Model\Inbox*/ ?>
             <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
-                data-notification-id="<?php /* @escapeNotVerified */ echo $notification->getId(); ?>"
+                data-notification-id="<?= /* @escapeNotVerified */ $notification->getId() ?>"
                 data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
                 <?php
                     $notificationDescription = $block->escapeHtml($notification->getDescription());
                     $notificationDescriptionLength = $block->getNotificationDescriptionLength();
                 ?>
                 <strong class="notifications-entry-title">
-                    <?php echo $block->escapeHtml($notification->getTitle()); ?>
+                    <?= $block->escapeHtml($notification->getTitle()) ?>
                 </strong>
                 <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
                     <p class="notifications-entry-description _cutted">
                         <span class="notifications-entry-description-start">
-                            <?php /* @escapeNotVerified */ echo substr($notificationDescription, 0, $notificationDescriptionLength); ?>
+                            <?= /* @escapeNotVerified */ substr($notificationDescription, 0, $notificationDescriptionLength) ?>
                         </span>
                         <span class="notifications-entry-description-end">
-                            <?php /* @escapeNotVerified */ echo substr($notificationDescription, $notificationDescriptionLength); ?>
+                            <?= /* @escapeNotVerified */ substr($notificationDescription, $notificationDescriptionLength) ?>
                         </span>
                     </p>
                 <?php else : ?>
                     <p class="notifications-entry-description">
-                        <?php /* @escapeNotVerified */ echo $notificationDescription; ?>
+                        <?= /* @escapeNotVerified */ $notificationDescription ?>
                     </p>
                 <?php endif; ?>
                 <time class="notifications-entry-time">
-                    <?php /* @escapeNotVerified */ echo $block->formatNotificationDate($notification->getDateAdded()); ?>
+                    <?= /* @escapeNotVerified */ $block->formatNotificationDate($notification->getDateAdded()) ?>
                 </time>
                 <button
                     type="button"
                     class="notifications-close"
-                    title="<?php /* @escapeNotVerified */ echo __('Close'); ?>"
+                    title="<?= /* @escapeNotVerified */ __('Close') ?>"
                     ></button>
             </li>
             <?php endforeach; ?>
             <li class="notifications-entry notifications-entry-last">
                 <a
-                    href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
+                    href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
                     class="action-tertiary action-more">
-                    <?php /* @escapeNotVerified */ echo __('See All (') ?><span class="notifications-counter"><?php /* @escapeNotVerified */ echo $notificationCount ?></span><?php /* @escapeNotVerified */ echo __(' unread)'); ?>
+                    <?= /* @escapeNotVerified */ __('See All (') ?><span class="notifications-counter"><?= /* @escapeNotVerified */ $notificationCount ?></span><?= /* @escapeNotVerified */ __(' unread)') ?>
                 </a>
             </li>
         </ul>
     <?php else : ?>
         <a
             class="notifications-action admin__action-dropdown"
-            href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
-            title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>">
+            href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/notification/index') ?>"
+            title="<?= /* @escapeNotVerified */ __('Notifications') ?>">
         </a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
index ae4e3863faf5c..d037d60840bc8 100644
--- a/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
+++ b/app/code/Magento/Analytics/view/adminhtml/templates/dashboard/section.phtml
@@ -9,25 +9,25 @@
 <section class="dashboard-advanced-reports" data-index="dashboard-advanced-reports">
     <div class="dashboard-advanced-reports-description">
         <header class="dashboard-advanced-reports-title">
-            <?php echo $block->escapeHtml(__('Advanced Reporting')) ?>
+            <?= $block->escapeHtml(__('Advanced Reporting')) ?>
         </header>
         <div class="dashboard-advanced-reports-content">
-            <?php echo $block->escapeHtml(__('Gain new insights and take command of your business\' performance,' .
+            <?= $block->escapeHtml(__('Gain new insights and take command of your business\' performance,' .
                 ' using our dynamic product, order, and customer reports tailored to your customer data.')) ?>
-            <a href="<?php echo $block->escapeUrl($block->getUrl('analytics/reports/show')); ?>"
+            <a href="<?= $block->escapeUrl($block->getUrl('analytics/reports/show')) ?>"
                target="_blank"
                data-index="analytics-service-info-link">
-                <?php echo $block->escapeHtml(__('View details')) ?>
+                <?= $block->escapeHtml(__('View details')) ?>
             </a>
         </div>
     </div>
     <div class="dashboard-advanced-reports-actions">
-        <a href="<?php echo $block->escapeUrl($block->getUrl('analytics/reports/show')); ?>"
+        <a href="<?= $block->escapeUrl($block->getUrl('analytics/reports/show')) ?>"
            target="_blank"
            class="action action-advanced-reports"
            data-index="analytics-service-link"
-           title="<?php echo $block->escapeHtmlAttr(__('Go to Advanced Reporting')) ?>">
-            <span><?php echo $block->escapeHtml(__('Go to Advanced Reporting')) ?></span>
+           title="<?= $block->escapeHtmlAttr(__('Go to Advanced Reporting')) ?>">
+            <span><?= $block->escapeHtml(__('Go to Advanced Reporting')) ?></span>
         </a>
     </div>
 </section>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
index 8bfeede4059c2..2ef93aca480c7 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
@@ -16,15 +16,15 @@ $helper = $block->getHelper('adminhtml');
     <head>
         <script>
         <?php if (isset($params['redirect'])): ?>
-            window.location="<?php echo $block->escapeUrl($params['redirect']); ?>";
+            window.location="<?= $block->escapeUrl($params['redirect']) ?>";
         <?php endif; ?>
         <?php if (isset($params['redirect_parent'])): ?>
-            window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']); ?>";
+            window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
         <?php endif; ?>
         <?php if (isset($params['error_msg'])): ?>
-            window.top.directPostModel.showError(<?php /* @noEscape */ echo json_encode((array)$params['error_msg']); ?>);
+            window.top.directPostModel.showError(<?= /* @noEscape */ json_encode((array)$params['error_msg']) ?>);
             <?php if (isset($params['x_invoice_num'])): ?>
-                window.top.directPostModel.successUrl="<?php echo $block->escapeUrl($helper->getSuccessOrderUrl($params)); ?>";
+                window.top.directPostModel.successUrl="<?= $block->escapeUrl($helper->getSuccessOrderUrl($params)) ?>";
             <?php endif; ?>
         <?php endif; ?>
         </script>
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
index d7d656d13bf06..c468483747509 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
@@ -20,31 +20,31 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
 <!-- IFRAME for request to our server -->
 <iframe id="order-directpost-iframe" allowtransparency="true" frameborder="0" name="iframeSubmitOrder"
         style="display:none;width:100%;background-color:transparent"
-        src="<?php echo $block->escapeUrl($block->getViewFileUrl('blank.html')); ?>">
+        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>">
 </iframe>
 <!-- IFRAME for request to Authorize.net -->
 <iframe id="directpost-iframe" allowtransparency="true" frameborder="0"  name="iframeDirectPost"
         style="display:none;width:100%;background-color:transparent"
-        src="<?php echo $block->escapeUrl($block->getViewFileUrl('blank.html')); ?>">
+        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>">
 </iframe>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>"
           style="display:none;">
     <div class="admin__field _required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_type" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type" name="payment[cc_type]"
+            <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
                     class="admin__control-select"
                     data-validate="{
                         'required':true,
-                        'validate-cc-type-select':'#<?php /* @noEscape */ echo $code; ?>_cc_number'
+                        'validate-cc-type-select':'#<?= /* @noEscape */ $code ?>_cc_number'
                         }">
-                <option value=""><?php echo $block->escapeHtml(__('Please Select')); ?></option>
+                <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                    <option value="<?php echo $block->escapeHtml($typeCode); ?>"
+                    <option value="<?= $block->escapeHtml($typeCode) ?>"
                             <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($typeName); ?>
+                        <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
@@ -52,51 +52,51 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     </div>
 
     <div class="admin__field _required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_number" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_number" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="admin__field-control">
-            <input type="text" id="<?php /* @noEscape */ echo $code; ?>_cc_number"
+            <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number"
                    name="payment[cc_number]"
                    data-validate="{
                        'required-number':true,
-                       'validate-cc-number':'#<?php /* @noEscape */ echo $code; ?>_cc_type',
-                       'validate-cc-type':'#<?php /* @noEscape */ echo $code; ?>_cc_type'
+                       'validate-cc-number':'#<?= /* @noEscape */ $code ?>_cc_type',
+                       'validate-cc-type':'#<?= /* @noEscape */ $code ?>_cc_type'
                    }"
                    class="admin__control-text"
-                   value="<?php /* @noEscape */ echo $block->getInfoData('cc_number'); ?>"/>
+                   value="<?= /* @noEscape */ $block->getInfoData('cc_number') ?>"/>
         </div>
     </div>
 
-    <div class="admin__field _required field-date" id="<?php /* @noEscape */ echo $code; ?>_cc_type_exp_div">
-        <label for="<?php /* @noEscape */ echo $code; ?>_expiration" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+    <div class="admin__field _required field-date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
+        <label for="<?= /* @noEscape */ $code ?>_expiration" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_expiration"
+            <select id="<?= /* @noEscape */ $code ?>_expiration"
                     name="payment[cc_exp_month]"
                     class="admin__control-select admin__control-select-month"
                     data-validate="{
                         'required':true,
-                        'validate-cc-exp':'#<?php /* @noEscape */ echo $code; ?>_expiration_yr'
+                        'validate-cc-exp':'#<?= /* @noEscape */ $code ?>_expiration_yr'
                         }">
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                    <option value="<?php echo $block->escapeHtml($k); ?>"
+                    <option value="<?= $block->escapeHtml($k) ?>"
                             <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
-            <select id="<?php /* @noEscape */ echo $code; ?>_expiration_yr"
+            <select id="<?= /* @noEscape */ $code ?>_expiration_yr"
                     name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-year"
+                    data-container="<?= /* @noEscape */ $code ?>-cc-year"
                     data-validate="{required:true}">
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
-                    <option value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : ''; ?>"
+                    <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                             <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
@@ -106,21 +106,21 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
     <?php if ($block->hasVerification()): ?>
     <div class="admin__field _required field-cvv">
         <label class="admin__field-label"
-               for="<?php /* @noEscape */ echo $code; ?>_cc_cid"
-               id="<?php /* @noEscape */ echo $code; ?>_cc_type_cvv_div">
-            <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+               for="<?= /* @noEscape */ $code ?>_cc_cid"
+               id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
+            <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
         </label>
 
         <div class="admin__field-control">
             <input type="text"
-                   data-container="<?php /* @noEscape */ echo $code; ?>-cc-cvv"
-                   title="<?php echo $block->escapeHtml(__('Card Verification Number')); ?>"
+                   data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
+                   title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
                    class="admin__control-text cvv"
-                   id="<?php /* @noEscape */ echo $code; ?>_cc_cid" name="payment[cc_cid]"
-                   value="<?php /* @noEscape */ echo $block->getInfoData('cc_cid') ?>"
+                   id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
+                   value="<?= /* @noEscape */ $block->getInfoData('cc_cid') ?>"
                    data-validate="{
                        'required-number':true,
-                       'validate-cc-cvn':'#<?php /* @noEscape */ echo $code; ?>_cc_type'
+                       'validate-cc-cvn':'#<?= /* @noEscape */ $code ?>_cc_type'
                    }"
                    autocomplete="off"/>
         </div>
@@ -138,19 +138,19 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         /**
          * Disable card server validation in admin
          */
-        order.addExcludedPaymentMethod('<?php /* @noEscape */ echo $code; ?>');
+        order.addExcludedPaymentMethod('<?= /* @noEscape */ $code ?>');
 
         <?php if (!$block->isAjaxRequest()): ?>
             document.observe('dom:loaded', function(){
         <?php endif; ?>
 
         directPostModel = new directPost(
-            '<?php /* @noEscape */ echo $code; ?>',
+            '<?= /* @noEscape */ $code ?>',
             'directpost-iframe',
-            '<?php /* @noEscape */ echo $controller; ?>',
-            '<?php /* @noEscape */ echo $orderUrl; ?>',
-            '<?php echo $block->escapeUrl($method->getCgiUrl()); ?>',
-            '<?php echo $block->escapeUrl($block->getUrl('*/*/save', [
+            '<?= /* @noEscape */ $controller ?>',
+            '<?= /* @noEscape */ $orderUrl ?>',
+            '<?= $block->escapeUrl($method->getCgiUrl()) ?>',
+            '<?= $block->escapeUrl($block->getUrl('*/*/save', [
                 '_secure' => $block->getRequest()->isSecure()
             ]));?>');
 
diff --git a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
index 016040f1c9019..60fec263352fe 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml
@@ -14,41 +14,41 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
 
 <?php if (!empty($fraudDetails)): ?>
     <div class="admin__page-section-item-title">
-        <span class="title"><?php echo $block->escapeHtml(__('Fraud Detection ')); ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Fraud Detection ')) ?></span>
     </div>
 
     <div class="admin__page-section-item-content">
         <div class="order-payment-additional">
             <?php if(!empty($fraudDetails['fds_filter_action'])): ?>
-                <?php echo $block->escapeHtml(__('FDS Filter Action')); ?>:
-                <?php echo $block->escapeHtml($fraudDetails['fds_filter_action']); ?>
+                <?= $block->escapeHtml(__('FDS Filter Action')) ?>:
+                <?= $block->escapeHtml($fraudDetails['fds_filter_action']) ?>
                 </br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['avs_response'])): ?>
-                <?php echo $block->escapeHtml(__('AVS Response')); ?>:
-                <?php echo $block->escapeHtml($fraudDetails['avs_response']); ?>
+                <?= $block->escapeHtml(__('AVS Response')) ?>:
+                <?= $block->escapeHtml($fraudDetails['avs_response']) ?>
                 </br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['card_code_response'])): ?>
-                <?php echo $block->escapeHtml(__('Card Code Response')); ?>:
-                <?php echo $block->escapeHtml($fraudDetails['card_code_response']); ?>
+                <?= $block->escapeHtml(__('Card Code Response')) ?>:
+                <?= $block->escapeHtml($fraudDetails['card_code_response']) ?>
                 </br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)): ?>
-                <?php echo $block->escapeHtml(__('CAVV Response')); ?>:
-                <?php echo $block->escapeHtml($fraudDetails['cavv_response']); ?>
+                <?= $block->escapeHtml(__('CAVV Response')) ?>:
+                <?= $block->escapeHtml($fraudDetails['cavv_response']) ?>
                 </br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['fraud_filters'])): ?>
-                <b><?php echo $block->escapeHtml(__('Fraud Filters')); ?>:
+                <b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
                 </b></br>
                 <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
-                    <?php echo $block->escapeHtml($filter['name']); ?>:
-                    <?php echo $block->escapeHtml($filter['action']); ?>
+                    <?= $block->escapeHtml($filter['name']) ?>:
+                    <?= $block->escapeHtml($filter['action']) ?>
                     </br>
                 <?php endforeach; ?>
             <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
index c91cf9b079854..852ecd5a07962 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/access_denied.phtml
@@ -12,12 +12,12 @@
  * @see \Magento\Backend\Block\Denied
  */
 ?>
-<h1 class="page-heading"><?php /* @escapeNotVerified */ echo __('Access denied') ?></h1>
+<h1 class="page-heading"><?= /* @escapeNotVerified */ __('Access denied') ?></h1>
 <?php if (!$block->hasAvailableResources()): ?>
 <p>
-<?php /* @escapeNotVerified */ echo __('Please try to sign out and sign in again.') ?><br/>
-<?php /* @escapeNotVerified */ echo __('If you continue to receive this message, please contact the store owner.') ?>
+<?= /* @escapeNotVerified */ __('Please try to sign out and sign in again.') ?><br/>
+<?= /* @escapeNotVerified */ __('If you continue to receive this message, please contact the store owner.') ?>
 </p>
 <?php else: ?>
-<p><?php /* @escapeNotVerified */ echo __('You need more permissions to access this.') ?></p>
+<p><?= /* @escapeNotVerified */ __('You need more permissions to access this.') ?></p>
 <?php endif?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
index 651b2b2405041..9629db9fa455b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/formkey.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<div><input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" /></div>
+<div><input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" /></div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
index c829a2f01fa9c..805e9783f3f18 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -11,12 +11,12 @@
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
     <fieldset class="admin__fieldset">
         <legend class="admin__legend">
-            <span><?php /* @escapeNotVerified */ echo __('Welcome, please sign in') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Welcome, please sign in') ?></span>
         </legend><br/>
-        <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
+        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
         <div class="admin__field _required field-username">
             <label for="username" class="admin__field-label">
-                <span><?php /* @escapeNotVerified */ echo __('Username') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Username') ?></span>
             </label>
             <div class="admin__field-control">
                 <input id="username"
@@ -26,14 +26,14 @@
                        autofocus
                        value=""
                        data-validate="{required:true}"
-                       placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"
+                       placeholder="<?= /* @escapeNotVerified */ __('user name') ?>"
                        autocomplete="off"
                     />
             </div>
         </div>
         <div class="admin__field _required field-password">
             <label for="login" class="admin__field-label">
-                <span><?php /* @escapeNotVerified */ echo __('Password') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Password') ?></span>
             </label>
             <div class="admin__field-control">
                 <input id="login"
@@ -42,14 +42,14 @@
                        name="login[password]"
                        data-validate="{required:true}"
                        value=""
-                       placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>"
+                       placeholder="<?= /* @escapeNotVerified */ __('password') ?>"
                        autocomplete="new-password"
                     />
             </div>
         </div>
-        <?php echo $block->getChildHtml('form.additional.info'); ?>
+        <?= $block->getChildHtml('form.additional.info') ?>
         <div class="form-actions">
-            <?php echo $block->getChildHtml('form.buttons'); ?>
+            <?= $block->getChildHtml('form.buttons') ?>
         </div>
     </fieldset>
 </form>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
index 8561473e048cd..2459bc54e0c34 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login_buttons.phtml
@@ -8,6 +8,6 @@
     <button
         <?php $block->getUiId(); ?>
         class="action-login action-primary">
-        <span><?php /* @escapeNotVerified */ echo __('Sign in')?></span>
+        <span><?= /* @escapeNotVerified */ __('Sign in') ?></span>
     </button>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
index 833570254095a..93509cc62f7d5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/overlay_popup.phtml
@@ -11,29 +11,29 @@
     <div class="middle" id="anchor-content">
         <div id="page:main-container">
         <?php if ($block->getChildHtml('left')): ?>
-            <div class="columns <?php /* @escapeNotVerified */ echo $block->getContainerCssClass() ?>" id="page:container">
+            <div class="columns <?= /* @escapeNotVerified */ $block->getContainerCssClass() ?>" id="page:container">
                 <div id="page:left" class="side-col">
-                    <?php echo $block->getChildHtml('left') ?>
+                    <?= $block->getChildHtml('left') ?>
                 </div>
                 <div class="main-col" id="content">
                     <div class="main-col-inner">
                         <div id="messages" class="messages" data-container-for="messages">
-                            <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+                            <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
                         </div>
-                        <?php echo $block->getChildHtml('content') ?>
+                        <?= $block->getChildHtml('content') ?>
                     </div>
                 </div>
             </div>
       <?php else: ?>
-          <div id="messages" data-container-for="messages"><?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
-          <?php echo $block->getChildHtml('content') ?>
+          <div id="messages" data-container-for="messages"><?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?></div>
+          <?= $block->getChildHtml('content') ?>
       <?php endif; ?>
          </div>
     </div>
     <?php if ($block->getChildHtml('footer')): ?>
     <div class="footer">
-        <?php echo $block->getChildHtml('footer') ?>
+        <?= $block->getChildHtml('footer') ?>
     </div>
     <?php endif; ?>
-    <?php echo $block->getChildHtml('js') ?>
+    <?= $block->getChildHtml('js') ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
index e09dc3912cdde..ebb8e26c93f9d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
@@ -9,50 +9,50 @@
 ?>
 <?php /** @var $block \Magento\Backend\Block\Page */ ?>
 <!doctype html>
-<html lang="<?php /* @escapeNotVerified */ echo $block->getLang() ?>" class="no-js">
+<html lang="<?= /* @escapeNotVerified */ $block->getLang() ?>" class="no-js">
 
 <head>
-    <?php echo $block->getChildHtml('head') ?>
+    <?= $block->getChildHtml('head') ?>
 </head>
 
-<body id="html-body"<?php echo $block->getBodyClass() ? ' class="' . $block->getBodyClass() . '"' : ''; ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
+<body id="html-body"<?= $block->getBodyClass() ? ' class="' . $block->getBodyClass() . '"' : '' ?> data-container="body" data-mage-init='{"loaderAjax":{},"loader":{}}'>
     <div class="page-wrapper">
-        <?php echo $block->getChildHtml('notification_window'); ?>
-        <?php echo $block->getChildHtml('global_notices') ?>
+        <?= $block->getChildHtml('notification_window') ?>
+        <?= $block->getChildHtml('global_notices') ?>
         <div class="page-header-wrapper">
-            <?php echo $block->getChildHtml('header') ?>
+            <?= $block->getChildHtml('header') ?>
         </div>
-        <?php echo $block->getChildHtml('menu') ?>
-        <?php echo $block->getChildHtml('notifications'); ?>
+        <?= $block->getChildHtml('menu') ?>
+        <?= $block->getChildHtml('notifications') ?>
 
         <main class="page-content" id="anchor-content">
-            <?php echo $block->getChildHtml('main-top'); ?>
+            <?= $block->getChildHtml('main-top') ?>
             <div class="messages" id="messages" data-container-for="messages">
-                <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+                <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
             </div>
-            <?php echo $block->getChildHtml('page_main_actions'); ?>
+            <?= $block->getChildHtml('page_main_actions') ?>
             <?php if ($block->getChildHtml('left')): ?>
-                <div id="page:main-container" class="<?php /* @escapeNotVerified */ echo $block->getContainerCssClass() ?> col-2-left-layout">
+                <div id="page:main-container" class="<?= /* @escapeNotVerified */ $block->getContainerCssClass() ?> col-2-left-layout">
                     <div class="main-col" id="content">
-                        <?php echo $block->getChildHtml('content') ?>
+                        <?= $block->getChildHtml('content') ?>
                     </div>
 
                     <div class="side-col" id="page:left">
-                        <?php echo $block->getChildHtml('left') ?>
+                        <?= $block->getChildHtml('left') ?>
                     </div>
                 </div>
             <?php else: ?>
                 <div id="page:main-container" class="col-1-layout">
-                    <?php echo $block->getChildHtml('content') ?>
+                    <?= $block->getChildHtml('content') ?>
                 </div>
             <?php endif; ?>
         </main>
 
-        <?php echo $block->getChildHtml('js') ?>
+        <?= $block->getChildHtml('js') ?>
         <footer class="page-footer">
-            <?php echo $block->getChildHtml('footer') ?>
+            <?= $block->getChildHtml('footer') ?>
         </footer>
     </div>
-    <?php echo $block->getChildHtml('before_body_end') ?>
+    <?= $block->getChildHtml('before_body_end') ?>
 </body>
 </html>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
index aef3e7f2f5396..ae123511bd478 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
@@ -9,27 +9,27 @@
 ?>
 <div class="dashboard-diagram">
     <div class="dashboard-diagram-switcher">
-        <label for="order_<?php echo $block->getHtmlId() ?>_period"
-               class="label"><?php /* @escapeNotVerified */ echo __('Select Range:') ?></label>
-        <select name="period" id="order_<?php echo $block->getHtmlId() ?>_period"
+        <label for="order_<?= $block->getHtmlId() ?>_period"
+               class="label"><?= /* @escapeNotVerified */ __('Select Range:') ?></label>
+        <select name="period" id="order_<?= $block->getHtmlId() ?>_period"
                 onchange="changeDiagramsPeriod(this);" class="admin__control-select">
             <?php foreach ($this->helper('Magento\Backend\Helper\Dashboard\Data')->getDatePeriods() as $value => $label): ?>
                 <?php if (in_array($value, ['custom'])) {
                     continue;
                 } ?>
-                <option value="<?php /* @escapeNotVerified */ echo $value ?>"
+                <option value="<?= /* @escapeNotVerified */ $value ?>"
                     <?php if ($block->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>
-                    ><?php /* @escapeNotVerified */ echo $label ?></option>
+                    ><?= /* @escapeNotVerified */ $label ?></option>
             <?php endforeach; ?>
         </select>
     </div>
     <?php if ($block->getCount()): ?>
     <div class="dashboard-diagram-image">
-        <img src="<?php /* @escapeNotVerified */ echo $block->getChartUrl(false) ?>" class="dashboard-diagram-chart" alt="Chart" title="Chart" />
+        <img src="<?= /* @escapeNotVerified */ $block->getChartUrl(false) ?>" class="dashboard-diagram-chart" alt="Chart" title="Chart" />
     </div>
     <?php else: ?>
     <div class="dashboard-diagram-nodata">
-        <span><?php /* @escapeNotVerified */ echo __('No Data Found') ?></span>
+        <span><?= /* @escapeNotVerified */ __('No Data Found') ?></span>
     </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
index 5a2736b72a884..7dddc15121831 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph/disabled.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 ?>
 <div class="dashboard-diagram-disabled">
-    <?php /* @escapeNotVerified */ echo __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->getConfigUrl())?>
+    <?= /* @escapeNotVerified */ __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->getConfigUrl()) ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
index 0090a4a9d163d..1041aef59ceac 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -14,18 +14,18 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
 <div class="dashboard-item-content">
     <?php if ($block->getCollection()->getSize()>0): ?>
-        <table class="admin__table-primary dashboard-data" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
+        <table class="admin__table-primary dashboard-data" id="<?= /* @escapeNotVerified */ $block->getId() ?>_table">
             <?php
             /* This part is commented to remove all <col> tags from the code. */
             /* foreach ($block->getColumns() as $_column): ?>
-            <col <?php echo $_column->getHtmlProperty() ?> />
+            <col <?= $_column->getHtmlProperty() ?> />
             <?php endforeach; */ ?>
             <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
                 <thead>
                 <?php if ($block->getHeadersVisibility()): ?>
                     <tr>
                         <?php foreach ($block->getColumns() as $_column): ?>
-                            <?php echo $_column->getHeaderHtml() ?>
+                            <?= $_column->getHeaderHtml() ?>
                         <?php endforeach; ?>
                     </tr>
                 <?php endif; ?>
@@ -34,9 +34,9 @@ $numColumns = sizeof($block->getColumns());
             <?php if (!$block->getIsCollapsed()): ?>
                 <tbody>
                 <?php foreach ($block->getCollection() as $_index => $_item): ?>
-                    <tr title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>">
+                    <tr title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>">
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
-                        <td class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"><?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?></td>
+                        <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= ++$i == $numColumns ? 'last' : '' ?>"><?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?></td>
                     <?php endforeach; ?>
                     </tr>
                 <?php endforeach; ?>
@@ -44,7 +44,7 @@ $numColumns = sizeof($block->getColumns());
             <?php endif; ?>
         </table>
     <?php else: ?>
-        <div class="<?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?>"><?php /* @escapeNotVerified */ echo $block->getEmptyText() ?></div>
+        <div class="<?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?>"><?= /* @escapeNotVerified */ $block->getEmptyText() ?></div>
     <?php endif; ?>
 </div>
 <?php if ($block->canDisplayContainer()): ?>
@@ -61,27 +61,27 @@ deps.push('Magento_Sales/order/create/form');
 
 deps.push('mage/adminhtml/grid');
 
-require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
+require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
     <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
     <?php if ($block->getDependencyJsObject()): ?>
-        registry.get('<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>', function (<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>) {
+        registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
     <?php endif; ?>
 
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?> = new varienGrid('<?php /* @escapeNotVerified */ echo $block->getId() ?>', '<?php /* @escapeNotVerified */ echo $block->getGridUrl() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameSort() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameDir() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameFilter() ?>');
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.useAjax = '<?php /* @escapeNotVerified */ echo $block->getUseAjax() ?>';
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= /* @escapeNotVerified */ $block->getId() ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?= /* @escapeNotVerified */ $block->getUseAjax() ?>';
     <?php if ($block->getRowClickCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rowClickCallback = <?php /* @escapeNotVerified */ echo $block->getRowClickCallback() ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rowClickCallback = <?= /* @escapeNotVerified */ $block->getRowClickCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getCheckboxCheckCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php /* @escapeNotVerified */ echo $block->getCheckboxCheckCallback() ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.checkboxCheckCallback = <?= /* @escapeNotVerified */ $block->getCheckboxCheckCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getRowInitCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initRowCallback = <?php /* @escapeNotVerified */ echo $block->getRowInitCallback() ?>;
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rows.each(function(row){<?php /* @escapeNotVerified */ echo $block->getRowInitCallback() ?>(<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>, row)});
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initRowCallback = <?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rows.each(function(row){<?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>(<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>, row)});
     <?php endif; ?>
     <?php if ($block->getMassactionBlock()->isAvailable()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getMassactionBlock()->getJavaScript() ?>
+    <?= /* @escapeNotVerified */ $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
 
     <?php if ($block->getDependencyJsObject()): ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
index 3ce981fd7eed5..865e0fac38314 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -18,12 +18,12 @@ require([
 window.changeDiagramsPeriod = function(periodObj) {
     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
 <?php foreach ($block->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>
-    ajaxBlockParam = 'block/tab_<?php /* @escapeNotVerified */ echo $tabId ?>/';
-    ajaxBlockUrl = '<?php echo $block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => '', 'period' => '']) ?>' + ajaxBlockParam + periodParam;
+    ajaxBlockParam = 'block/tab_<?= /* @escapeNotVerified */ $tabId ?>/';
+    ajaxBlockUrl = '<?= $block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => '', 'period' => '']) ?>' + ajaxBlockParam + periodParam;
     new Ajax.Request(ajaxBlockUrl, {
         parameters: {isAjax: 'true', form_key: FORM_KEY},
         onSuccess: function(transport) {
-            tabContentElementId = '<?php /* @escapeNotVerified */ echo $block->getChildBlock('diagrams')->getId() ?>_<?php /* @escapeNotVerified */ echo $tabId ?>_content';
+            tabContentElementId = '<?= /* @escapeNotVerified */ $block->getChildBlock('diagrams')->getId() ?>_<?= /* @escapeNotVerified */ $tabId ?>_content';
             try {
                 if (transport.responseText.isJSON()) {
                     var response = transport.responseText.evalJSON()
@@ -45,7 +45,7 @@ window.changeDiagramsPeriod = function(periodObj) {
         }
     });
 <?php endforeach; ?>
-    ajaxBlockUrl = '<?php echo $block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => 'totals', 'period' => '']) ?>' + periodParam;
+    ajaxBlockUrl = '<?= $block->getUrl('adminhtml/*/ajaxBlock', ['_current' => true, 'block' => 'totals', 'period' => '']) ?>' + periodParam;
     new Ajax.Request(ajaxBlockUrl, {
         parameters: {isAjax: 'true', form_key: FORM_KEY},
         onSuccess: function(transport) {
@@ -78,31 +78,31 @@ window.changeDiagramsPeriod = function(periodObj) {
 <div class="dashboard-container row">
     <div class="dashboard-main col-m-8 col-m-push-4">
         <div class="dashboard-diagram-container">
-            <?php echo $block->getChildHtml('diagrams') ?>
+            <?= $block->getChildHtml('diagrams') ?>
             <?php if (is_array($block->getChildBlock('diagrams')->getTabsIds())) : ?>
                 <div id="diagram_tab_content" class="dashboard-diagram-tab-content"></div>
             <?php endif; ?>
         </div>
-        <?php echo $block->getChildHtml('totals') ?>
+        <?= $block->getChildHtml('totals') ?>
         <div class="dashboard-store-stats">
-            <?php echo $block->getChildHtml('grids') ?>
+            <?= $block->getChildHtml('grids') ?>
             <div id="grid_tab_content" class="dashboard-store-stats-content"></div>
-            <?php echo $block->getChildHtml('refresh_statistics') ?>
+            <?= $block->getChildHtml('refresh_statistics') ?>
         </div>
     </div>
     <div class="dashboard-secondary col-m-4 col-m-pull-8">
-        <?php echo $block->getChildHtml('sales') ?>
+        <?= $block->getChildHtml('sales') ?>
         <div class="dashboard-item">
-            <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo __('Last Orders') ?></div>
-            <?php echo $block->getChildHtml('lastOrders'); ?>
+            <div class="dashboard-item-title"><?= /* @escapeNotVerified */ __('Last Orders') ?></div>
+            <?= $block->getChildHtml('lastOrders') ?>
         </div>
         <div class="dashboard-item">
-            <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo __('Last Search Terms') ?></div>
-            <?php echo $block->getChildHtml('lastSearches'); ?>
+            <div class="dashboard-item-title"><?= /* @escapeNotVerified */ __('Last Search Terms') ?></div>
+            <?= $block->getChildHtml('lastSearches') ?>
         </div>
         <div class="dashboard-item">
-            <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo __('Top Search Terms') ?></div>
-            <?php echo $block->getChildHtml('topSearches'); ?>
+            <div class="dashboard-item-title"><?= /* @escapeNotVerified */ __('Top Search Terms') ?></div>
+            <?= $block->getChildHtml('topSearches') ?>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
index d7e6854d86e27..450a2c89b50da 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/salebar.phtml
@@ -10,11 +10,11 @@
 <?php if (sizeof($block->getTotals()) > 0): ?>
     <?php foreach ($block->getTotals() as $_total): ?>
     <div class="dashboard-item dashboard-item-primary">
-        <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo $_total['label'] ?></div>
+        <div class="dashboard-item-title"><?= /* @escapeNotVerified */ $_total['label'] ?></div>
         <div class="dashboard-item-content">
             <strong class="dashboard-sales-value">
-                <?php /* @escapeNotVerified */ echo $_total['value'] ?>
-                <span class="dashboard-sales-decimals"><?php /* @escapeNotVerified */ echo $_total['decimals'] ?></span>
+                <?= /* @escapeNotVerified */ $_total['value'] ?>
+                <span class="dashboard-sales-decimals"><?= /* @escapeNotVerified */ $_total['decimals'] ?></span>
             </strong>
         </div>
     </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
index 58862882d6735..f6e837fd54ede 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/searches.phtml
@@ -10,9 +10,9 @@
 <?php if (count($block->getCollection()->getItems()) > 0): ?>
     <div class="searches-results">
         <?php foreach ($block->getCollection()->getItems() as $item): ?>
-        <span><?php /* @escapeNotVerified */ echo $item->getQueryText() ?></span><br />
+        <span><?= /* @escapeNotVerified */ $item->getQueryText() ?></span><br />
         <?php endforeach; ?>
     </div>
 <?php else: ?>
-    <div class="empty-text"><?php /* @escapeNotVerified */ echo __('There are no search keywords.') ?></div>
+    <div class="empty-text"><?= /* @escapeNotVerified */ __('There are no search keywords.') ?></div>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
index c6634cdee1478..bf9ae27f17b48 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/store/switcher.phtml
@@ -7,10 +7,10 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<p class="switcher"><label for="store_switcher"><?php /* @escapeNotVerified */ echo __('View Statistics For:') ?></label>
-<?php echo $block->getHintHtml() ?>
+<p class="switcher"><label for="store_switcher"><?= /* @escapeNotVerified */ __('View Statistics For:') ?></label>
+<?= $block->getHintHtml() ?>
 <select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
-    <option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
+    <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
     <?php foreach ($block->getWebsiteCollection() as $_website): ?>
         <?php $showWebsite = false; ?>
         <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
@@ -18,14 +18,14 @@
             <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                 <?php if ($showWebsite == false): ?>
                     <?php $showWebsite = true; ?>
-                    <option website="true" value="<?php /* @escapeNotVerified */ echo $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo $_website->getName() ?></option>
+                    <option website="true" value="<?= /* @escapeNotVerified */ $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ $_website->getName() ?></option>
                 <?php endif; ?>
                 <?php if ($showGroup == false): ?>
                     <?php $showGroup = true; ?>
-                    <!--optgroup label="&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $_group->getName() ?>"-->
-                    <option group="true" value="<?php /* @escapeNotVerified */ echo $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $_group->getName() ?></option>
+                    <!--optgroup label="&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?>"-->
+                    <option group="true" value="<?= /* @escapeNotVerified */ $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?></option>
                 <?php endif; ?>
-                <option value="<?php /* @escapeNotVerified */ echo $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $_store->getName() ?></option>
+                <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_store->getName() ?></option>
             <?php endforeach; ?>
             <?php if ($showGroup): ?>
                 <!--</optgroup>-->
@@ -57,7 +57,7 @@
                 var select = $('order_amounts_period');
             }
             var periodParam = select.value ? 'period/' + select.value + '/' : '';
-            setLocation('<?php /* @escapeNotVerified */ echo $block->getSwitchUrl() ?>' + storeParam + periodParam);
+            setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>' + storeParam + periodParam);
         }
     });
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
index c9ce9cb67e75a..8605304b1f528 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar.phtml
@@ -12,10 +12,10 @@
     <ul class="dashboard-totals-list">
         <?php foreach ($block->getTotals() as $_total): ?>
             <li class="dashboard-totals-item">
-                <span class="dashboard-totals-label"><?php /* @escapeNotVerified */ echo $_total['label'] ?></span>
+                <span class="dashboard-totals-label"><?= /* @escapeNotVerified */ $_total['label'] ?></span>
                 <strong class="dashboard-totals-value">
-                    <?php /* @escapeNotVerified */ echo $_total['value'] ?>
-                    <span class="dashboard-totals-decimals"><?php /* @escapeNotVerified */ echo $_total['decimals'] ?></span>
+                    <?= /* @escapeNotVerified */ $_total['value'] ?>
+                    <span class="dashboard-totals-decimals"><?= /* @escapeNotVerified */ $_total['decimals'] ?></span>
                 </strong>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
index f85baa0fe06cf..d59fa17e6d6dc 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
@@ -7,20 +7,20 @@
 <div class="page-actions">
     <div class="page-actions-inner">
         <div class="page-actions-buttons">
-            <?php echo $block->getChildHtml(); ?>
+            <?= $block->getChildHtml() ?>
 
             <form class="action-element"
-                  action="<?php echo $block->escapeUrl($block->getUrl('*/*/refreshStatistics')); ?>"
+                  action="<?= $block->escapeUrl($block->getUrl('*/*/refreshStatistics')) ?>"
                   method="post">
                 <input
                     name="form_key"
                     type="hidden"
-                    value="<?php echo $block->escapeHtmlAttr($block->getFormKey()); ?>"/>
+                    value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>"/>
                 <button
                     class="action-primary"
                     type="submit"
-                    title="<?php echo $block->escapeHtmlAttr(__('Reload Data')) ?>">
-                    <?php echo $block->escapeHtml(__('Reload Data')) ?>
+                    title="<?= $block->escapeHtmlAttr(__('Reload Data')) ?>">
+                    <?= $block->escapeHtml(__('Reload Data')) ?>
                 </button>
             </form>
         </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
index 2152fd5fc44d2..1e14dd837634a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
@@ -9,22 +9,22 @@
 /** @var $block \Magento\Backend\Block\Media\Uploader */
 ?>
 
-<div id="<?php echo $block->getHtmlId() ?>" class="uploader"
+<div id="<?= $block->getHtmlId() ?>" class="uploader"
     data-mage-init='{
         "Magento_Backend/js/media-uploader" : {
-            "maxFileSize": <?php /* @escapeNotVerified */ echo $block->getFileSizeService()->getMaxFileSize() ?>,
-            "maxWidth":<?php /* @escapeNotVerified */ echo \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
-            "maxHeight": <?php /* @escapeNotVerified */ echo \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
+            "maxFileSize": <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?>,
+            "maxWidth":<?= /* @escapeNotVerified */ \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
+            "maxHeight": <?= /* @escapeNotVerified */ \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
         }
     }'
 >
     <div class="fileinput-button form-buttons button">
-        <span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>
-        <input id="fileupload" type="file" name="<?php /* @escapeNotVerified */ echo $block->getConfig()->getFileField() ?>"
-            data-url="<?php /* @escapeNotVerified */ echo $block->getConfig()->getUrl() ?>" multiple="multiple" />
+        <span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>
+        <input id="fileupload" type="file" name="<?= /* @escapeNotVerified */ $block->getConfig()->getFileField() ?>"
+            data-url="<?= /* @escapeNotVerified */ $block->getConfig()->getUrl() ?>" multiple="multiple" />
     </div>
     <div class="clear"></div>
-    <script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template" data-template="uploader">
+    <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template" data-template="uploader">
         <div id="<%- data.id %>" class="file-row">
             <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
             <div class="progressbar-container">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
index 7878809923e79..c448bd61b0791 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
@@ -9,6 +9,6 @@
 ?>
 
 <nav data-mage-init='{"globalNavigation": {}}' class="admin__menu">
-    <?php /* @escapeNotVerified */ echo $block->renderNavigation($block->getMenuModel(), 0, 12); ?>
+    <?= /* @escapeNotVerified */ $block->renderNavigation($block->getMenuModel(), 0, 12) ?>
 </nav>
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
index 61e57faf63b2c..55bdbb460ba07 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
-<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
+<a class="link-copyright" href="http://magento.com" target="_blank" title="<?= /* @escapeNotVerified */ __('Magento') ?>"></a>
+<?= /* @escapeNotVerified */ __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
index 1c45b68e7be6a..78e2e6db15e91 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/footer.phtml
@@ -8,6 +8,6 @@
 
 ?>
 <p class="magento-version">
-    <strong><?php /* @escapeNotVerified */ echo __('Magento'); ?></strong>
-    <?php /* @escapeNotVerified */ echo __('ver. %1', $block->getMagentoVersion()) ?>
+    <strong><?= /* @escapeNotVerified */ __('Magento') ?></strong>
+    <?= /* @escapeNotVerified */ __('ver. %1', $block->getMagentoVersion()) ?>
 </p>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 0d88328e52d8a..40b7173f47417 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -13,56 +13,56 @@
         <?php $edition = $block->hasEdition() ? 'data-edition="' . $block->escapeHtml($block->getEdition()) . '"' : ''; ?>
         <?php $logoSrc = ($block->hasLogoImageSrc()) ? $block->escapeHtml($block->getLogoImageSrc()) : 'images/magento-logo.svg' ?>
         <a
-            href="<?php /* @escapeNotVerified */ echo $block->getHomeLink() ?>"
-            <?php /* @escapeNotVerified */ echo $edition; ?>
+            href="<?= /* @escapeNotVerified */ $block->getHomeLink() ?>"
+            <?= /* @escapeNotVerified */ $edition ?>
             class="logo">
-            <img class="logo-img" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl($logoSrc) ?>"
-            alt="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
+            <img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
+            alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
         </a>
     <?php break; ?>
     <?php case 'user': ?>
         <div class="admin-user admin__action-dropdown-wrap">
             <a
-                href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/system_account/index') ?>"
+                href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
                 class="admin__action-dropdown"
-                title="<?php echo $block->escapeHtml(__('My Account')) ?>"
+                title="<?= $block->escapeHtml(__('My Account')) ?>"
                 data-mage-init='{"dropdown":{}}'
                 data-toggle="dropdown">
                 <span class="admin__action-dropdown-text">
-                    <span class="admin-user-account-text"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>
+                    <span class="admin-user-account-text"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>
                 </span>
             </a>
             <ul class="admin__action-dropdown-menu">
                 <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
                 <li>
                     <a
-                        href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/system_account/index') ?>"
-                        <?php /* @escapeNotVerified */ echo $block->getUiId('user', 'account', 'settings')?>
-                        title="<?php echo $block->escapeHtml(__('Account Setting')) ?>">
-                        <?php /* @escapeNotVerified */ echo __('Account Setting') ?> (<span class="admin-user-name"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>)
+                        href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml/system_account/index') ?>"
+                        <?= /* @escapeNotVerified */ $block->getUiId('user', 'account', 'settings') ?>
+                        title="<?= $block->escapeHtml(__('Account Setting')) ?>">
+                        <?= /* @escapeNotVerified */ __('Account Setting') ?> (<span class="admin-user-name"><?= $block->escapeHtml($block->getUser()->getUsername()) ?></span>)
                     </a>
                 </li>
                 <?php endif; ?>
                 <li>
                     <a
-                        href="<?php /* @escapeNotVerified */ echo $block->getBaseUrl(); ?>"
-                        title="<?php echo $block->escapeHtml(__('Customer View')); ?>"
+                        href="<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>"
+                        title="<?= $block->escapeHtml(__('Customer View')) ?>"
                         target="_blank" class="store-front">
-                        <?php /* @escapeNotVerified */ echo __('Customer View'); ?>
+                        <?= /* @escapeNotVerified */ __('Customer View') ?>
                     </a>
                 </li>
                 <li>
                     <a
-                        href="<?php /* @escapeNotVerified */ echo $block->getLogoutLink() ?>"
+                        href="<?= /* @escapeNotVerified */ $block->getLogoutLink() ?>"
                         class="account-signout"
-                        title="<?php echo $block->escapeHtml(__('Sign Out')) ?>">
-                        <?php /* @escapeNotVerified */ echo __('Sign Out') ?>
+                        title="<?= $block->escapeHtml(__('Sign Out')) ?>">
+                        <?= /* @escapeNotVerified */ __('Sign Out') ?>
                     </a>
                 </li>
             </ul>
         </div>
     <?php break; ?>
     <?php case 'other': ?>
-        <?php echo $block->getChildHtml(); ?>
+        <?= $block->getChildHtml() ?>
     <?php break; ?>
 <?php endswitch; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
index 7278eead4d877..e47bf5830f9ee 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml
@@ -22,20 +22,20 @@ require([
 
     $.extend(true, $, {
         calendarConfig: {
-            dayNames: <?php /* @escapeNotVerified */ echo $days['wide']?>,
-            dayNamesMin: <?php /* @escapeNotVerified */ echo $days['abbreviated']?>,
-            monthNames: <?php /* @escapeNotVerified */ echo $months['wide']?>,
-            monthNamesShort: <?php /* @escapeNotVerified */ echo $months['abbreviated']?>,
-            infoTitle: "<?php /* @escapeNotVerified */ echo __('About the calendar');?>",
-            firstDay: <?php /* @escapeNotVerified */ echo $firstDay?>,
-            closeText: "<?php /* @escapeNotVerified */ echo __('Close');?>",
-            currentText: "<?php /* @escapeNotVerified */ echo __('Go Today'); ?>",
-            prevText: "<?php /* @escapeNotVerified */ echo __('Previous');?>",
-            nextText: "<?php /* @escapeNotVerified */ echo __('Next');?>",
-            weekHeader: "<?php /* @escapeNotVerified */ echo __('WK'); ?>",
-            timeText: "<?php /* @escapeNotVerified */ echo __('Time');?>",
-            hourText: "<?php /* @escapeNotVerified */ echo __('Hour');?>",
-            minuteText: "<?php /* @escapeNotVerified */ echo __('Minute');?>",
+            dayNames: <?= /* @escapeNotVerified */ $days['wide'] ?>,
+            dayNamesMin: <?= /* @escapeNotVerified */ $days['abbreviated'] ?>,
+            monthNames: <?= /* @escapeNotVerified */ $months['wide'] ?>,
+            monthNamesShort: <?= /* @escapeNotVerified */ $months['abbreviated'] ?>,
+            infoTitle: "<?= /* @escapeNotVerified */ __('About the calendar') ?>",
+            firstDay: <?= /* @escapeNotVerified */ $firstDay ?>,
+            closeText: "<?= /* @escapeNotVerified */ __('Close') ?>",
+            currentText: "<?= /* @escapeNotVerified */ __('Go Today') ?>",
+            prevText: "<?= /* @escapeNotVerified */ __('Previous') ?>",
+            nextText: "<?= /* @escapeNotVerified */ __('Next') ?>",
+            weekHeader: "<?= /* @escapeNotVerified */ __('WK') ?>",
+            timeText: "<?= /* @escapeNotVerified */ __('Time') ?>",
+            hourText: "<?= /* @escapeNotVerified */ __('Hour') ?>",
+            minuteText: "<?= /* @escapeNotVerified */ __('Minute') ?>",
             dateFormat: $.datepicker.RFC_2822,
             showOn: "button",
             showAnim: "",
@@ -50,13 +50,13 @@ require([
             showTime: false,
             showHour: false,
             showMinute: false,
-            serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
-            serverTimezoneOffset: <?php echo (int) $block->getTimezoneOffsetSeconds(); ?>,
-            yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
+            serverTimezoneSeconds: <?= (int) $block->getStoreTimestamp() ?>,
+            serverTimezoneOffset: <?= (int) $block->getTimezoneOffsetSeconds() ?>,
+            yearRange: '<?= /* @escapeNotVerified */ $block->getYearRange() ?>'
         }
     });
 
-enUS = <?php /* @escapeNotVerified */ echo $enUS?>; // en_US locale reference
+enUS = <?= /* @escapeNotVerified */ $enUS ?>; // en_US locale reference
 
 });
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
index c055c5057b570..c6c7bcc901e7e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/components.phtml
@@ -15,4 +15,4 @@
 ?>
 
 <?php /** @var $block \Magento\Framework\View\Element\Js\Components */ ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
index 0b46d49febda3..9cb2cec091939 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
@@ -5,9 +5,9 @@
  */
 ?>
 <script>
-    var BASE_URL = '<?php /* @escapeNotVerified */ echo $block->getUrl('*') ?>';
-    var FORM_KEY = '<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>';
+    var BASE_URL = '<?= /* @escapeNotVerified */ $block->getUrl('*') ?>';
+    var FORM_KEY = '<?= /* @escapeNotVerified */ $block->getFormKey() ?>';
     var require = {
-        "baseUrl": "<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('/') ?>"
+        "baseUrl": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('/') ?>"
     };
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
index b45a2ae6cb1c1..5418ad58b9519 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/notices.phtml
@@ -16,8 +16,8 @@
     <noscript>
         <div class="messages">
             <div class="message message-warning message-noscript">
-                <strong><?php /* @escapeNotVerified */ echo __('JavaScript may be disabled in your browser.'); ?></strong>
-                <?php /* @escapeNotVerified */ echo __('To use this website you must first enable JavaScript in your browser.'); ?>
+                <strong><?= /* @escapeNotVerified */ __('JavaScript may be disabled in your browser.') ?></strong>
+                <?= /* @escapeNotVerified */ __('To use this website you must first enable JavaScript in your browser.') ?>
             </div>
         </div>
     </noscript>
@@ -25,7 +25,7 @@
 <?php if ($block->displayDemoNotice()): ?>
     <div class="messages">
         <div class="message message-warning message-demo-mode">
-            <?php /* @escapeNotVerified */ echo __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?>
+            <?= /* @escapeNotVerified */ __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
index 902aee61a480f..3a3dbd99bfba9 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/report.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <?php if ($block->getBugreportUrl()): ?>
-    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report an Issue') ?></a>
+    <a class="link-report" href="<?= /* @escapeNotVerified */ $block->getBugreportUrl() ?>" id="footer_bug_tracking"><?= /* @escapeNotVerified */ __('Report an Issue') ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
index bd3070361024f..69d545f12d075 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/pageactions.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($block->getChildHtml()):?>
-    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?php /* @escapeNotVerified */ echo $block->getUiId('content-header') ?>>
-        <?php echo $block->getChildHtml(); ?>
+    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
+        <?= $block->getChildHtml() ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index 8bfbde8425fe2..bb968c57610be 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -11,20 +11,20 @@
 <?php if ($websites = $block->getWebsites()): ?>
 
 <div class="store-switcher store-view">
-    <span class="store-switcher-label"><?php /* @escapeNotVerified */ echo __('Store View:') ?></span>
+    <span class="store-switcher-label"><?= /* @escapeNotVerified */ __('Store View:') ?></span>
     <div class="actions dropdown closable">
         <input type="hidden" name="store_switcher" id="store_switcher"
-               data-role="store-view-id" data-param="<?php /* @escapeNotVerified */ echo $block->getStoreVarName() ?>"
-               value="<?php echo $block->escapeHtml($block->getStoreId()) ?>"
-               onchange="switchScope(this);"<?php /* @escapeNotVerified */ echo $block->getUiId()?> />
+               data-role="store-view-id" data-param="<?= /* @escapeNotVerified */ $block->getStoreVarName() ?>"
+               value="<?= $block->escapeHtml($block->getStoreId()) ?>"
+               onchange="switchScope(this);"<?= /* @escapeNotVerified */ $block->getUiId() ?> />
         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
-               data-role="store-group-id" data-param="<?php /* @escapeNotVerified */ echo $block->getStoreGroupVarName() ?>"
-               value="<?php echo $block->escapeHtml($block->getStoreGroupId()) ?>"
-               onchange="switchScope(this);"<?php /* @escapeNotVerified */ echo $block->getUiId()?> />
+               data-role="store-group-id" data-param="<?= /* @escapeNotVerified */ $block->getStoreGroupVarName() ?>"
+               value="<?= $block->escapeHtml($block->getStoreGroupId()) ?>"
+               onchange="switchScope(this);"<?= /* @escapeNotVerified */ $block->getUiId() ?> />
         <input type="hidden" name="website_switcher" id="website_switcher"
-               data-role="website-id" data-param="<?php /* @escapeNotVerified */ echo $block->getWebsiteVarName() ?>"
-               value="<?php echo $block->escapeHtml($block->getWebsiteId()) ?>"
-               onchange="switchScope(this);"<?php /* @escapeNotVerified */ echo $block->getUiId()?> />
+               data-role="website-id" data-param="<?= /* @escapeNotVerified */ $block->getWebsiteVarName() ?>"
+               value="<?= $block->escapeHtml($block->getWebsiteId()) ?>"
+               onchange="switchScope(this);"<?= /* @escapeNotVerified */ $block->getUiId() ?> />
         <button
             type="button"
             class="admin__action-dropdown"
@@ -32,7 +32,7 @@
             data-toggle="dropdown"
             aria-haspopup="true"
             id="store-change-button">
-            <?php /* @escapeNotVerified */ echo $block->getCurrentSelectionName() ?>
+            <?= /* @escapeNotVerified */ $block->getCurrentSelectionName() ?>
         </button>
         <ul class="dropdown-menu" data-role="stores-list">
             <?php if ($block->hasDefaultOption()): ?>
@@ -44,12 +44,12 @@
                     <?php if ($block->getDefaultSelectionName() != $block->getCurrentSelectionName()) {
                         ?>
                         <a data-role="store-view-id" data-value="" href="#">
-                            <?php /* @escapeNotVerified */ echo $block->getDefaultSelectionName() ?>
+                            <?= /* @escapeNotVerified */ $block->getDefaultSelectionName() ?>
                         </a>
                     <?php
                     } else {
                         ?>
-                        <span><?php /* @escapeNotVerified */ echo $block->getDefaultSelectionName() ?></span>
+                        <span><?= /* @escapeNotVerified */ $block->getDefaultSelectionName() ?></span>
                     <?php
                     } ?>
                 </li>
@@ -68,13 +68,13 @@
                             } ?>">
                                 <?php if ($block->isWebsiteSwitchEnabled() && ! $block->isWebsiteSelected($website)) {
                                     ?>
-                                    <a data-role="website-id" data-value="<?php echo $block->escapeHtml($website->getId()) ?>" href="#">
-                                        <?php echo $block->escapeHtml($website->getName()) ?>
+                                    <a data-role="website-id" data-value="<?= $block->escapeHtml($website->getId()) ?>" href="#">
+                                        <?= $block->escapeHtml($website->getName()) ?>
                                     </a>
                                 <?php
                                 } else {
                                     ?>
-                                    <span><?php echo $block->escapeHtml($website->getName()) ?></span>
+                                    <span><?= $block->escapeHtml($website->getName()) ?></span>
                                 <?php
                                 } ?>
                             </li>
@@ -88,13 +88,13 @@
                             } ?>">
                                 <?php if ($block->isStoreGroupSwitchEnabled() && ! $block->isStoreGroupSelected($group)) {
                                     ?>
-                                    <a data-role="store-group-id" data-value="<?php echo $block->escapeHtml($group->getId()) ?>" href="#">
-                                        <?php echo $block->escapeHtml($group->getName()) ?>
+                                    <a data-role="store-group-id" data-value="<?= $block->escapeHtml($group->getId()) ?>" href="#">
+                                        <?= $block->escapeHtml($group->getName()) ?>
                                     </a>
                                 <?php
                                 } else {
                                     ?>
-                                    <span><?php echo $block->escapeHtml($group->getName()) ?></span>
+                                    <span><?= $block->escapeHtml($group->getName()) ?></span>
                                 <?php
                                 } ?>
                             </li>
@@ -106,13 +106,13 @@
                         } ?>">
                             <?php if ($block->isStoreSwitchEnabled() && ! $block->isStoreSelected($store)) {
                                 ?>
-                                <a data-role="store-view-id" data-value="<?php echo $block->escapeHtml($store->getId()) ?>" href="#">
-                                    <?php echo $block->escapeHtml($store->getName()) ?>
+                                <a data-role="store-view-id" data-value="<?= $block->escapeHtml($store->getId()) ?>" href="#">
+                                    <?= $block->escapeHtml($store->getName()) ?>
                                 </a>
                             <?php
                             } else {
                                 ?>
-                                <span><?php echo $block->escapeHtml($store->getName()) ?></span>
+                                <span><?= $block->escapeHtml($store->getName()) ?></span>
                             <?php
                             } ?>
                         </li>
@@ -121,12 +121,12 @@
             <?php endforeach; ?>
             <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
                 <li class="dropdown-toolbar">
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getUrl('*/system_store') ?>"><?php /* @escapeNotVerified */ echo __('Stores Configuration') ?></a>
+                    <a href="<?= /* @escapeNotVerified */ $block->getUrl('*/system_store') ?>"><?= /* @escapeNotVerified */ __('Stores Configuration') ?></a>
                 </li>
             <?php endif; ?>
         </ul>
     </div>
-    <?php echo $block->getHintHtml() ?>
+    <?= $block->getHintHtml() ?>
 </div>
 
 <script>
@@ -168,7 +168,7 @@ require([
             var switcherParams = {
                 scopeId: scopeId,
                 scopeParams: scopeParams,
-                useConfirm: <?php echo (int)$block->getUseConfirm() ?>
+                useConfirm: <?= (int)$block->getUseConfirm() ?>
             };
             scopeSwitcherHandler(switcherParams);
         } else {
@@ -176,13 +176,13 @@ require([
             <?php if ($block->getUseConfirm()): ?>
 
             confirm({
-                content:  "<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>",
+                content:  "<?= /* @escapeNotVerified */ __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>",
                 actions: {
                     confirm: function() {
                         reload();
                     },
                     cancel: function() {
-                        obj.value = '<?php echo $block->escapeHtml($block->getStoreId()) ?>';
+                        obj.value = '<?= $block->escapeHtml($block->getStoreId()) ?>';
                     }
                 }
             });
@@ -194,7 +194,7 @@ require([
 
         function reload() {
             <?php if (!$block->isUsingIframe()): ?>
-            var url = '<?php /* @escapeNotVerified */ echo $block->getSwitchUrl() ?>' + scopeParams;
+            var url = '<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>' + scopeParams;
             setLocation(url);
             <?php else: ?>
             jQuery('#preview_selected_store').val(scopeId);
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
index 3b48286ac536b..49a2c681285bf 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml
@@ -9,33 +9,33 @@
 ?>
 <?php $_element = $block->getElement() ?>
 <?php if ($_element->getFieldsetContainerId()): ?>
-    <div id="<?php /* @escapeNotVerified */ echo $_element->getFieldsetContainerId(); ?>">789
+    <div id="<?= /* @escapeNotVerified */ $_element->getFieldsetContainerId() ?>">789
 <?php endif; ?>
 
 <?php if (!$_element->getNoContainer()): ?>
-    <fieldset class="admin__fieldset fieldset <?php /* @escapeNotVerified */ echo $_element->getClass() ?>" id="<?php echo $_element->getHtmlId() ?>">
+    <fieldset class="admin__fieldset fieldset <?= /* @escapeNotVerified */ $_element->getClass() ?>" id="<?= $_element->getHtmlId() ?>">
 <?php endif; ?>
 
     <?php if ($_element->getLegend()): ?>
         <legend class="admin__legend legend">
-            <span><?php /* @escapeNotVerified */ echo $_element->getLegend() ?></span>
-            <?php echo $block->getHintHtml() ?>
+            <span><?= /* @escapeNotVerified */ $_element->getLegend() ?></span>
+            <?= $block->getHintHtml() ?>
         </legend><br/>
-        <?php /* @escapeNotVerified */ echo $_element->getHeaderBar() ?>
+        <?= /* @escapeNotVerified */ $_element->getHeaderBar() ?>
     <?php else: ?>
-        <?php echo $block->getHintHtml() ?>
+        <?= $block->getHintHtml() ?>
     <?php endif; ?>
         <div class="admin__fieldset tree-store-scope">
             <?php if ($_element->getComment()): ?>
-            <p class="comment"><?php echo $block->escapeHtml($_element->getComment()) ?></p>
+            <p class="comment"><?= $block->escapeHtml($_element->getComment()) ?></p>
             <?php endif; ?>
             <?php if ($_element->hasHtmlContent()): ?>
-               <?php echo $_element->getHtmlContent(); ?>
+               <?= $_element->getHtmlContent() ?>
             <?php else: ?>
-                <?php echo $_element->getChildrenHtml(); ?>
+                <?= $_element->getChildrenHtml() ?>
             <?php endif; ?>
         </div>
-<?php echo $_element->getSubFieldsetHtml() ?>
+<?= $_element->getSubFieldsetHtml() ?>
 
 <?php if (!$_element->getNoContainer()): ?>
     </fieldset>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
index c80fe815ac1ad..e25c9d22ca40a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml
@@ -26,19 +26,19 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
 
 <?php if (!$element->getNoDisplay()): ?>
     <?php if ($element->getType() == 'hidden'): ?>
-        <?php echo $element->getElementHtml() ?>
+        <?= $element->getElementHtml() ?>
     <?php else: ?>
-    <div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
+    <div<?= /* @escapeNotVerified */ $fieldAttributes ?>>
         <?php if ($elementBeforeLabel): ?>
-            <?php echo $element->getElementHtml() ?>
-            <?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
-            <?php /* @escapeNotVerified */ echo $note ?>
+            <?= $element->getElementHtml() ?>
+            <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
+            <?= /* @escapeNotVerified */ $note ?>
         <?php else: ?>
-            <?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
+            <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
             <div class="admin__field-control control">
-                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
-                <?php echo $block->getHintHtml() ?>
-                <?php /* @escapeNotVerified */ echo $note ?>
+                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
+                <?= $block->getHintHtml() ?>
+                <?= /* @escapeNotVerified */ $note ?>
             </div>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
index 5c6f1273bb401..22d93241f43f2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
@@ -9,10 +9,10 @@
 ?>
 <ul class="dropdown-menu">
     <?php foreach ($items as $item): ?>
-    <li id="<?php /* @escapeNotVerified */ echo $item['id'] ?>" class="item">
-        <a href="<?php /* @escapeNotVerified */ echo $item['url'] ?>" class="title"><?php echo $block->escapeHtml($item['name']) ?></a>
-        <div class="type"><?php /* @escapeNotVerified */ echo $item['type'] ?></div>
-        <?php echo $block->escapeHtml($item['description']) ?>
+    <li id="<?= /* @escapeNotVerified */ $item['id'] ?>" class="item">
+        <a href="<?= /* @escapeNotVerified */ $item['url'] ?>" class="title"><?= $block->escapeHtml($item['name']) ?></a>
+        <div class="type"><?= /* @escapeNotVerified */ $item['type'] ?></div>
+        <?= $block->escapeHtml($item['description']) ?>
     </li>
     <?php endforeach ?>
 </ul>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
index 4b9b5db088c50..84bbc4ea601ef 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/additional.phtml
@@ -8,31 +8,31 @@
 ?>
 <div class="additional-cache-management">
     <h2>
-        <span><?php /* @escapeNotVerified */ echo __('Additional Cache Management') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Additional Cache Management') ?></span>
     </h2>
     <p>
-        <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanImagesUrl() ?>')" type="button">
-            <?php /* @escapeNotVerified */ echo __('Flush Catalog Images Cache') ?>
+        <button onclick="setLocation('<?= /* @escapeNotVerified */ $block->getCleanImagesUrl() ?>')" type="button">
+            <?= /* @escapeNotVerified */ __('Flush Catalog Images Cache') ?>
         </button>
-        <span><?php /* @escapeNotVerified */ echo __('Pregenerated product images files') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Pregenerated product images files') ?></span>
     </p>
     <p>
-        <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanMediaUrl() ?>')" type="button">
-            <?php /* @escapeNotVerified */ echo __('Flush JavaScript/CSS Cache') ?>
+        <button onclick="setLocation('<?= /* @escapeNotVerified */ $block->getCleanMediaUrl() ?>')" type="button">
+            <?= /* @escapeNotVerified */ __('Flush JavaScript/CSS Cache') ?>
         </button>
-        <span><?php /* @escapeNotVerified */ echo __('Themes JavaScript and CSS files combined to one file') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Themes JavaScript and CSS files combined to one file') ?></span>
     </p>
     <?php
     if (!$block->isInProductionMode()):
         ?>
         <p>
-            <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanStaticFilesUrl() ?>')" type="button">
-                <?php /* @escapeNotVerified */ echo __('Flush Static Files Cache') ?>
+            <button onclick="setLocation('<?= /* @escapeNotVerified */ $block->getCleanStaticFilesUrl() ?>')" type="button">
+                <?= /* @escapeNotVerified */ __('Flush Static Files Cache') ?>
             </button>
-            <span><?php /* @escapeNotVerified */ echo __('Preprocessed view files and static files') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Preprocessed view files and static files') ?></span>
         </p>
     <?php
     endif;
     ?>
-    <?php echo $block->getChildHtml(); ?>
+    <?= $block->getChildHtml() ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
index 02fe22d5210ba..8e52f245f74d5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/cache/edit.phtml
@@ -16,9 +16,9 @@
  *  getForm() - html
  */
 ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getSaveButtonHtml() ?></div>
-<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
-    <?php echo $block->getBlockHtml('formkey')?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getSaveButtonHtml() ?></div>
+<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
+    <?= $block->getBlockHtml('formkey') ?>
 
     <script>
     window.setCacheAction = function(id, button) {
@@ -31,10 +31,10 @@
     <input type="hidden" id="catalog_action" name="catalog_action" value="" />
     <input type="hidden" id="jscss_action" name="jscss_action" value="" />
 
-    <?php echo $block->getChildHtml('form') ?>
+    <?= $block->getChildHtml('form') ?>
     <div class="entry-edit">
         <div class="entry-edit-head">
-            <h4 class="icon-head head-edit-form fieldset-legend"><?php /* @escapeNotVerified */ echo __('Catalog') ?></h4>
+            <h4 class="icon-head head-edit-form fieldset-legend"><?= /* @escapeNotVerified */ __('Catalog') ?></h4>
         </div>
         <fieldset id="catalog">
             <table class="form-list">
@@ -45,15 +45,15 @@
     continue;
 }?>
                     <tr>
-                        <td class="label"><label><?php /* @escapeNotVerified */ echo $_item['label'] ?></label></td>
+                        <td class="label"><label><?= /* @escapeNotVerified */ $_item['label'] ?></label></td>
                         <td class="value">
                             <?php foreach ($_item['buttons'] as $_button): ?>
                                 <?php $clickAction = "setCacheAction('catalog_action',this)"; ?>
                                 <?php if (isset($_button['warning']) && $_button['warning']): ?>
                                     <?php $clickAction = "if (confirm('" . addslashes($_button['warning']) . "')) {{$clickAction}}"; ?>
                                 <?php endif; ?>
-                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>onclick="<?php /* @escapeNotVerified */ echo $clickAction; ?>"<?php endif; ?> id="<?php /* @escapeNotVerified */ echo $_button['name'] ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif; ?>" style=""><span><span><span><?php /* @escapeNotVerified */ echo $_button['action'] ?></span></span></span></button>
-                                <?php if (isset($_button['comment'])): ?> <br /> <small><?php /* @escapeNotVerified */ echo $_button['comment']; ?></small> <?php endif; ?>
+                                <button <?php if (!isset($_button['disabled']) || !$_button['disabled']):?>onclick="<?= /* @escapeNotVerified */ $clickAction ?>"<?php endif; ?> id="<?= /* @escapeNotVerified */ $_button['name'] ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif; ?>" style=""><span><span><span><?= /* @escapeNotVerified */ $_button['action'] ?></span></span></span></button>
+                                <?php if (isset($_button['comment'])): ?> <br /> <small><?= /* @escapeNotVerified */ $_button['comment'] ?></small> <?php endif; ?>
                             <?php endforeach; ?>
                         </td>
                         <td><small>&nbsp;</small></td>
@@ -66,16 +66,16 @@
 
     <div class="entry-edit">
         <div class="entry-edit-head">
-            <h4 class="icon-head head-edit-form fieldset-legend"><?php /* @escapeNotVerified */ echo __('JavaScript/CSS') ?></h4>
+            <h4 class="icon-head head-edit-form fieldset-legend"><?= /* @escapeNotVerified */ __('JavaScript/CSS') ?></h4>
         </div>
 
         <fieldset id="jscss">
             <table class="form-list">
                 <tbody>
                     <tr>
-                        <td class="label"><label><?php /* @escapeNotVerified */ echo __('JavaScript/CSS Cache') ?></label></td>
+                        <td class="label"><label><?= /* @escapeNotVerified */ __('JavaScript/CSS Cache') ?></label></td>
                         <td class="value">
-                            <button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?php /* @escapeNotVerified */ echo __('Clear') ?></span></span></span></button>
+                            <button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?= /* @escapeNotVerified */ __('Clear') ?></span></span></span></button>
                         </td>
                     </tr>
                 </tbody>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
index 62937bd702f04..6b2f932cac7bf 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/edit.phtml
@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="design-edit-form">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="design-edit-form">
+    <?= $block->getBlockHtml('formkey') ?>
 </form>
 <script>
 require([
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
index bb3f69ead1c2d..902c6932f0ae1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/design/index.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
index f662bf5fbe1b7..a528133b2bc3a 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
@@ -17,27 +17,27 @@
                     class="search-global-input"
                     id="search-global"
                     name="query"
-                    data-mage-init='<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()) ?>'>
+                    data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()) ?>'>
             <button
                 type="submit"
                 class="search-global-action"
-                title="<?php /* @escapeNotVerified */ echo __('Search') ?>"
+                title="<?= /* @escapeNotVerified */ __('Search') ?>"
                 ></button>
         </div>
     </form>
     <script data-template="search-suggest" type="text/x-magento-template">
         <ul class="search-global-menu">
         <li class="item">
-            <a id="searchPreviewProducts" href="<?php /* @escapeNotVerified */ echo $block->getURL('catalog/product/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
+            <a id="searchPreviewProducts" href="<?= /* @escapeNotVerified */ $block->getURL('catalog/product/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Products</a>
         </li>
         <li class="item">
-            <a id="searchPreviewOrders" href="<?php /* @escapeNotVerified */ echo $block->getURL('sales/order/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
+            <a id="searchPreviewOrders" href="<?= /* @escapeNotVerified */ $block->getURL('sales/order/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Orders</a>
         </li>
         <li class="item">
-            <a id="searchPreviewCustomers" href="<?php /* @escapeNotVerified */ echo $block->getURL('customer/index/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
+            <a id="searchPreviewCustomers" href="<?= /* @escapeNotVerified */ $block->getURL('customer/index/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Customers</a>
         </li>
         <li class="item">
-            <a id="searchPreviewPages" href="<?php /* @escapeNotVerified */ echo $block->getURL('cms/page/index/'); ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
+            <a id="searchPreviewPages" href="<?= /* @escapeNotVerified */ $block->getURL('cms/page/index/') ?>?search=<%- data.term%>" class="title">"<%- data.term%>" in Pages</a>
         </li>
             <% if (data.items.length) { %>
             <% _.each(data.items, function(value){ %>
@@ -52,7 +52,7 @@
         <% } else { %>
             <li>
                 <span class="mage-suggest-no-records">
-                    <?php /* @escapeNotVerified */ echo __('No records found.') ?>
+                    <?= /* @escapeNotVerified */ __('No records found.') ?>
                 </span>
             </li>
         <% } %>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
index d59617a8693eb..60cd51b496aa7 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
@@ -14,16 +14,16 @@
 $items = $block->getItems();
 ?>
 <?php if (!empty($items)): ?>
-    <dl id="tab_content_<?php echo $block->getHtmlId() ?>" name="tab_content_<?php echo $block->getHtmlId() ?>" class="accordion">
+    <dl id="tab_content_<?= $block->getHtmlId() ?>" name="tab_content_<?= $block->getHtmlId() ?>" class="accordion">
     <?php foreach ($items as $_item): ?>
-        <?php echo $block->getChildHtml($_item->getId()) ?>
+        <?= $block->getChildHtml($_item->getId()) ?>
     <?php endforeach ?>
     </dl>
     <script>
         require([
             'mage/adminhtml/accordion'
         ], function(){
-        	tab_content_<?php echo $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?php echo $block->getHtmlId() ?>', '<?php /* @escapeNotVerified */ echo $block->getShowOnlyOne() ?>');
+        	tab_content_<?= $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?= $block->getHtmlId() ?>', '<?= /* @escapeNotVerified */ $block->getShowOnlyOne() ?>');
     	});
     </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
index 74edd0848e37c..74cd4eb7f2c9d 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
@@ -14,12 +14,12 @@
     <li>
         <?php if (empty($_link['url'])): ?>
             <?php if ($_index != $_size-1): ?>
-                <span><?php echo $block->escapeHtml($_link['label']) ?></span>
+                <span><?= $block->escapeHtml($_link['label']) ?></span>
             <?php else: ?>
-                <strong><?php echo $block->escapeHtml($_link['label']) ?></strong>
+                <strong><?= $block->escapeHtml($_link['label']) ?></strong>
             <?php endif; ?>
         <?php else: ?>
-            <a href="<?php /* @escapeNotVerified */ echo $_link['url'] ?>" title="<?php echo $block->escapeHtml($_link['title']) ?>"><?php echo $block->escapeHtml($_link['label']) ?></a>
+            <a href="<?= /* @escapeNotVerified */ $_link['url'] ?>" title="<?= $block->escapeHtml($_link['title']) ?>"><?= $block->escapeHtml($_link['label']) ?></a>
         <?php endif; ?>
         <?php if ($_index != $_size-1): ?>
             &raquo;
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
index aa59e44471e09..d3376745afe39 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
@@ -12,8 +12,8 @@
  * @var $block \Magento\Backend\Block\Widget\Button
  */
 ?>
-<?php echo $block->getBeforeHtml(); ?>
-<button <?php /* @escapeNotVerified */ echo $block->getAttributesHtml(), $block->getUiId(); ?>>
-    <span><?php /* @escapeNotVerified */ echo $block->getLabel(); ?></span>
+<?= $block->getBeforeHtml() ?>
+<button <?= /* @escapeNotVerified */ $block->getAttributesHtml(), $block->getUiId() ?>>
+    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
 </button>
-<?php echo $block->getAfterHtml(); ?>
+<?= $block->getAfterHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
index 02e5145e569ff..27127e54e5be2 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml
@@ -11,26 +11,26 @@
 /** @var $block \Magento\Backend\Block\Widget\Button\SplitButton */
 ?>
 
-<div <?php echo $block->getAttributesHtml(); ?>>
-    <button <?php echo $block->getButtonAttributesHtml(); ?>>
-        <span><?php echo $block->escapeHtml($block->getLabel()); ?></span>
+<div <?= $block->getAttributesHtml() ?>>
+    <button <?= $block->getButtonAttributesHtml() ?>>
+        <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </button>
     <?php if ($block->hasSplit()): ?>
-        <button <?php echo $block->getToggleAttributesHtml() ?>>
+        <button <?= $block->getToggleAttributesHtml() ?>>
             <span>Select</span>
         </button>
 
         <?php if (!$block->getDisabled()): ?>
-            <ul class="dropdown-menu" <?php /* @escapeNotVerified */ echo $block->getUiId("dropdown-menu"); ?>>
+            <ul class="dropdown-menu" <?= /* @escapeNotVerified */ $block->getUiId("dropdown-menu") ?>>
                 <?php foreach ($block->getOptions() as $key => $option): ?>
                 <li>
-                    <span <?php echo $block->getOptionAttributesHtml($key, $option); ?>>
-                        <?php echo $block->escapeHtml($option['label']); ?>
+                    <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
+                        <?= $block->escapeHtml($option['label']) ?>
                     </span>
                     <?php if (isset($option['hint'])): ?>
-                    <div class="tooltip" <?php /* @escapeNotVerified */ echo $block->getUiId('item', $key, 'tooltip'); ?>>
-                        <a href="<?php echo $block->escapeHtml($option['hint']['href']) ?>" class="help">
-                            <?php echo $block->escapeHtml($option['hint']['label']) ?>
+                    <div class="tooltip" <?= /* @escapeNotVerified */ $block->getUiId('item', $key, 'tooltip') ?>>
+                        <a href="<?= $block->escapeHtml($option['hint']['href']) ?>" class="help">
+                            <?= $block->escapeHtml($option['hint']['label']) ?>
                         </a>
                     </div>
                     <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
index 560da9bc80102..dc7d02795a054 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form.phtml
@@ -12,6 +12,6 @@
 <?php /* ToDo UI: check if we need this wrapper in the process of global forms refactoring */ ?>
 
 <div class="entry-edit form-inline">
-    <?php echo $block->getFormHtml();?>
+    <?= $block->getFormHtml() ?>
 </div>
-<?php echo $block->getChildHtml('form_after');?>
+<?= $block->getChildHtml('form_after') ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
index 358e9f430917d..6f81ba2a275b4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml
@@ -8,14 +8,14 @@
 
 /** @var $block \Magento\Backend\Block\Widget\Form\Container */
  ?>
-<?php /* @escapeNotVerified */ echo $block->getFormInitScripts() ?>
+<?= /* @escapeNotVerified */ $block->getFormInitScripts() ?>
 <?php if ($block->getButtonsHtml('header')): ?>
-    <div class="page-form-actions" <?php /* @escapeNotVerified */ echo $block->getUiId('content-header') ?>><?php echo $block->getButtonsHtml('header') ?></div>
+    <div class="page-form-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>><?= $block->getButtonsHtml('header') ?></div>
 <?php endif; ?>
-<?php echo $block->getFormHtml() ?>
+<?= $block->getFormHtml() ?>
 <?php if ($block->hasFooterButtons()): ?>
     <div class="content-footer">
-        <p class="form-buttons"><?php echo $block->getButtonsHtml('footer') ?></p>
+        <p class="form-buttons"><?= $block->getButtonsHtml('footer') ?></p>
     </div>
 <?php endif; ?>
 <script>
@@ -27,7 +27,7 @@ require([
 
     $('#edit_form').form()
         .validation({
-            validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>',
+            validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>',
             highlight: function(element) {
                 var detailsElement = $(element).closest('details');
                 if (detailsElement.length && detailsElement.is('.details')) {
@@ -42,4 +42,4 @@ require([
 
 });
 </script>
-<?php /* @escapeNotVerified */ echo $block->getFormScripts() ?>
+<?= /* @escapeNotVerified */ $block->getFormScripts() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
index 80209d39c8263..66a61ee9e8462 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -11,23 +11,23 @@
     case 'fieldset': ?>
 
     <fieldset>
-        <legend><?php /* @escapeNotVerified */ echo $element->getLegend() ?></legend><br />
+        <legend><?= /* @escapeNotVerified */ $element->getLegend() ?></legend><br />
         <?php foreach ($element->getElements() as $_element): ?>
-            <?php /* @escapeNotVerified */ echo $formBlock->drawElement($_element) ?>
+            <?= /* @escapeNotVerified */ $formBlock->drawElement($_element) ?>
         <?php endforeach; ?>
     </fieldset>
       <?php break;
     case 'column': ?>
       <?php break;
     case 'hidden': ?>
-    <input type="<?php /* @escapeNotVerified */ echo $element->getType() ?>" name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $element->getValue() ?>">
+    <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>">
       <?php break;
     case 'select': ?>
     <span class="form_row">
-        <?php if ($element->getLabel()): ?><label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label><?php endif; ?>
-        <select name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" class="select<?php /* @escapeNotVerified */ echo $element->getClass() ?>" title="<?php /* @escapeNotVerified */ echo $element->getTitle() ?>">
+        <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>
+        <select name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" class="select<?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>">
         <?php foreach ($element->getValues() as $_value): ?>
-            <option <?php /* @escapeNotVerified */ echo $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo $_value->getLabel() ?></option>
+            <option <?= /* @escapeNotVerified */ $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ $_value->getLabel() ?></option>
         <?php endforeach; ?>
         </select>
     </span>
@@ -36,30 +36,30 @@
     case 'button':
     case 'password': ?>
     <span class="form_row">
-        <?php if ($element->getLabel()): ?><label for="<?php echo $element->getHtmlId() ?>" <?php /* @escapeNotVerified */ echo $block->getUiId('label') ?>><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label><?php endif; ?>
-        <input type="<?php /* @escapeNotVerified */ echo $element->getType() ?>" name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $element->getValue() ?>" class="input-text <?php /* @escapeNotVerified */ echo $element->getClass() ?>" title="<?php /* @escapeNotVerified */ echo $element->getTitle() ?>" <?php echo($element->getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/>
+        <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>" <?= /* @escapeNotVerified */ $block->getUiId('label') ?>><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>
+        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>" class="input-text <?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>" <?= ($element->getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/>
     </span>
       <?php break;
     case 'radio': ?>
     <span class="form_row">
-        <?php if ($element->getLabel()): ?><label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label><?php endif; ?>
-        <input type="<?php /* @escapeNotVerified */ echo $element->getType() ?>" name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $element->getValue() ?>" class="input-text <?php /* @escapeNotVerified */ echo $element->getClass() ?>" title="<?php /* @escapeNotVerified */ echo $element->getTitle() ?>"/>
+        <?php if ($element->getLabel()): ?><label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label><?php endif; ?>
+        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>" class="input-text <?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>"/>
     </span>
       <?php break;
     case 'hidden': ?>
-        <input type="<?php /* @escapeNotVerified */ echo $element->getType() ?>" name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $element->getValue() ?>">
+        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>">
       <?php break;
     case 'radios': ?>
     <span class="form_row">
-        <label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label>
+        <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
     <?php foreach ($element->getRadios() as $_radio): ?>
-    <input type="radio" name="<?php /* @escapeNotVerified */ echo $_radio->getName() ?>" id="<?php echo $_radio->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $_radio->getValue() ?>" class="input-radio <?php /* @escapeNotVerified */ echo $_radio->getClass() ?>" title="<?php /* @escapeNotVerified */ echo $_radio->getTitle() ?>" <?php echo($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >&nbsp;<?php /* @escapeNotVerified */ echo $_radio->getLabel() ?>
+    <input type="radio" name="<?= /* @escapeNotVerified */ $_radio->getName() ?>" id="<?= $_radio->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $_radio->getValue() ?>" class="input-radio <?= /* @escapeNotVerified */ $_radio->getClass() ?>" title="<?= /* @escapeNotVerified */ $_radio->getTitle() ?>" <?= ($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >&nbsp;<?= /* @escapeNotVerified */ $_radio->getLabel() ?>
     <?php endforeach; ?>
     </span>
       <?php break;
     case 'wysiwyg': ?>
     <span class="form_row">
-      <label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label>
+      <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
         <script>
         require([
             'tinymce'
@@ -67,7 +67,7 @@
             tinyMCE.init({
                 mode : "exact",
                 theme : "advanced",
-                elements : "<?php /* @escapeNotVerified */ echo $element->getName(); ?>",
+                elements : "<?= /* @escapeNotVerified */ $element->getName() ?>",
                 plugins : "inlinepopups,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras",
                 theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect",
                 theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
@@ -86,13 +86,13 @@
             });
         });
 </script>
-      <textarea name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" title="<?php /* @escapeNotVerified */ echo $element->getTitle() ?>" id="<?php echo $element->getHtmlId() ?>" class="textarea <?php /* @escapeNotVerified */ echo $element->getClass() ?>" cols="80" rows="20"><?php /* @escapeNotVerified */ echo $element->getValue(); ?></textarea>
+      <textarea name="<?= /* @escapeNotVerified */ $element->getName() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= /* @escapeNotVerified */ $element->getClass() ?>" cols="80" rows="20"><?= /* @escapeNotVerified */ $element->getValue() ?></textarea>
     </span>
       <?php break;
         case 'textarea': ?>
             <span class="form_row">
-                    <label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label>
-                    <textarea name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" title="<?php /* @escapeNotVerified */ echo $element->getTitle() ?>" id="<?php echo $element->getHtmlId() ?>" class="textarea <?php /* @escapeNotVerified */ echo $element->getClass() ?>" cols="15" rows="2"><?php /* @escapeNotVerified */ echo $element->getValue(); ?></textarea>
+                    <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
+                    <textarea name="<?= /* @escapeNotVerified */ $element->getName() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>" id="<?= $element->getHtmlId() ?>" class="textarea <?= /* @escapeNotVerified */ $element->getClass() ?>" cols="15" rows="2"><?= /* @escapeNotVerified */ $element->getValue() ?></textarea>
             </span>
       <?php break;
     case 'editor': ?>
@@ -104,6 +104,6 @@
 } ?>
 <?php if ($element->getScript()): ?>
 <script>
-    <?php /* @escapeNotVerified */ echo $element->getScript() ?>
+    <?= /* @escapeNotVerified */ $element->getScript() ?>
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
index ebc423512120d..4f8d9a56a38a3 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml
@@ -9,20 +9,20 @@
 ?>
 <tr>
 <td colspan="2">
-<label for="gallery"><?php /* @escapeNotVerified */ echo __('Images') ?></label>
+<label for="gallery"><?= /* @escapeNotVerified */ __('Images') ?></label>
 <table id="gallery" class="gallery" border="0" cellspacing="3" cellpadding="0">
 <thead id="gallery_thead" class="gallery">
     <tr class="gallery">
-        <td class="gallery" valign="middle" align="center"><?php /* @escapeNotVerified */ echo __('Big Image') ?></td>
-        <td class="gallery" valign="middle" align="center"><?php /* @escapeNotVerified */ echo __('Thumbnail') ?></td>
-        <td class="gallery" valign="middle" align="center"><?php /* @escapeNotVerified */ echo __('Sort Order') ?></td>
-        <td class="gallery" valign="middle" align="center"><?php /* @escapeNotVerified */ echo __('Delete') ?></td>
+        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Big Image') ?></td>
+        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Thumbnail') ?></td>
+        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Sort Order') ?></td>
+        <td class="gallery" valign="middle" align="center"><?= /* @escapeNotVerified */ __('Delete') ?></td>
     </tr>
 </thead>
 
 <tfoot class="gallery">
 <tr class="gallery">
-<td class="gallery v-middle a-left"colspan="5"><?php echo $block->getAddButtonHtml() ?></td>
+<td class="gallery v-middle a-left"colspan="5"><?= $block->getAddButtonHtml() ?></td>
 </tr>
 </tfoot>
 
@@ -30,15 +30,15 @@
 
 <?php $i = 0; if (!is_null($block->getValues())): ?>
     <?php foreach ($block->getValues() as $image): $i++; ?>
-        <tr id="<?php echo $block->getElement()->getHtmlId() ?>_tr_<?php /* @escapeNotVerified */ echo $image->getValueId() ?>" class="gallery">
+        <tr id="<?= $block->getElement()->getHtmlId() ?>_tr_<?= /* @escapeNotVerified */ $image->getValueId() ?>" class="gallery">
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
-            <a href="<?php /* @escapeNotVerified */ echo $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?php echo $block->getElement()->getHtmlId() ?>_image_<?php /* @escapeNotVerified */ echo $type ?>_<?php /* @escapeNotVerified */ echo $image->getValueId() ?>');return false;">
-            <img id="<?php echo $block->getElement()->getHtmlId() ?>_image_<?php /* @escapeNotVerified */ echo $type ?>_<?php /* @escapeNotVerified */ echo $image->getValueId() ?>" src="<?php /* @escapeNotVerified */ echo $image->setType($type)->getSourceUrl() ?>?<?php /* @escapeNotVerified */ echo time() ?>" alt="<?php /* @escapeNotVerified */ echo $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
-            <input type="file" name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_<?php /* @escapeNotVerified */ echo $type ?>[<?php /* @escapeNotVerified */ echo $image->getValueId() ?>]" size="1"></td>
+            <a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
+            <img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
+            <input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
         <?php endforeach; ?>
-        <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?php /* @escapeNotVerified */ echo $block->getElement()->getParentName() ?>[position][<?php /* @escapeNotVerified */ echo $image->getValueId() ?>]" value="<?php /* @escapeNotVerified */ echo $image->getPosition() ?>" id="<?php echo $block->getElement()->getHtmlId() ?>_position_<?php /* @escapeNotVerified */ echo $image->getValueId() ?>" size="3"/></td>
-        <td class="gallery" align="center" style="vertical-align:bottom;"><?php echo $block->getDeleteButtonHtml($image->getValueId()) ?><input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getElement()->getParentName() ?>[delete][<?php /* @escapeNotVerified */ echo $image->getValueId() ?>]" id="<?php echo $block->getElement()->getHtmlId() ?>_delete_<?php /* @escapeNotVerified */ echo $image->getValueId() ?>"/></td>
+        <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>
+        <td class="gallery" align="center" style="vertical-align:bottom;"><?= $block->getDeleteButtonHtml($image->getValueId()) ?><input type="hidden" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[delete][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" id="<?= $block->getElement()->getHtmlId() ?>_delete_<?= /* @escapeNotVerified */ $image->getValueId() ?>"/></td>
         </tr>
     <?php endforeach; ?>
 <?php endif; ?>
@@ -56,7 +56,7 @@ require([
     'prototype'
 ], function () {
 id = 0;
-num_of_images = <?php /* @escapeNotVerified */ echo $i ?>;
+num_of_images = <?= /* @escapeNotVerified */ $i ?>;
 
 window.addNewImage = function()
 {
@@ -65,17 +65,17 @@ window.addNewImage = function()
 
     id--;
     num_of_images++;
-    new_file_input = '<input type="file" name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_%j%[%id%]" size="1">';
+    new_file_input = '<input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_%j%[%id%]" size="1">';
 
     // Sort order input
     var new_row_input = document.createElement( 'input' );
     new_row_input.type = 'text';
-    new_row_input.name = '<?php /* @escapeNotVerified */ echo $block->getElement()->getParentName() ?>[position]['+id+']';
+    new_row_input.name = '<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position]['+id+']';
     new_row_input.size = '3';
     new_row_input.value = '0';
 
     // Delete button
-    new_row_button = <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
+    new_row_button = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
 
     table = document.getElementById( "gallery" );
 
@@ -114,8 +114,8 @@ window.deleteImage = function(image)
         document.getElementById("gallery_thead").style.visibility="hidden";
     }
     if (image>0) {
-        document.getElementById('<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_delete_'+image).value=image;
-        document.getElementById('<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_tr_'+image).style.display='none';
+        document.getElementById('<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_delete_'+image).value=image;
+        document.getElementById('<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_tr_'+image).style.display='none';
     } else {
         image.parentNode.parentNode.parentNode.removeChild( image.parentNode.parentNode );
     }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
index d946a335d9933..ae0bcb826a1a3 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/element.phtml
@@ -11,8 +11,8 @@
 <?php if ($_element->getNoSpan() !== true): ?>
 <span class="field-row">
 <?php endif; ?>
-<?php echo $_element->getLabelHtml() ?>
-<?php echo $_element->getElementHtml() ?>
+<?= $_element->getLabelHtml() ?>
+<?= $_element->getElementHtml() ?>
 <?php if ($_element->getNoSpan() !== true): ?>
 </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
index 322c33e858a3e..aaf1cb5ff550e 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml
@@ -38,27 +38,27 @@ if ($isField) {
 */ ?>
 
 <?php if ($isWrapped): ?>
-    <div class="fieldset-wrapper <?php echo($isCollapsable) ? 'admin__collapsible-block-wrapper ' : ''; ?>"
-        id="<?php /* @escapeNotVerified */ echo $containerId ? $containerId : $id . '-wrapper';?>"
-        data-role="<?php /* @escapeNotVerified */ echo $id ?>-wrapper">
+    <div class="fieldset-wrapper <?= ($isCollapsable) ? 'admin__collapsible-block-wrapper ' : '' ?>"
+        id="<?= /* @escapeNotVerified */ $containerId ? $containerId : $id . '-wrapper' ?>"
+        data-role="<?= /* @escapeNotVerified */ $id ?>-wrapper">
         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
             <strong <?php /* @escapeNotVerified */ echo($isCollapsable) ?
                 'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
                 'class="title"'; ?>>
-                <span><?php /* @escapeNotVerified */ echo $element->getLegend() ?></span>
+                <span><?= /* @escapeNotVerified */ $element->getLegend() ?></span>
             </strong>
-            <?php /* @escapeNotVerified */ echo $titleActions; ?>
+            <?= /* @escapeNotVerified */ $titleActions ?>
         </div>
-        <div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
-            id="<?php /* @escapeNotVerified */ echo $id ?>-content"
-            data-role="<?php /* @escapeNotVerified */ echo $id ?>-content">
+        <div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?= ($isCollapsable) ? ' collapse' : '' ?>"
+            id="<?= /* @escapeNotVerified */ $id ?>-content"
+            data-role="<?= /* @escapeNotVerified */ $id ?>-content">
 <?php endif; ?>
 
     <?php if (!$element->getNoContainer()): ?>
-        <fieldset class="<?php /* @escapeNotVerified */ echo $cssClass ?>" id="<?php /* @escapeNotVerified */ echo $id ?>">
+        <fieldset class="<?= /* @escapeNotVerified */ $cssClass ?>" id="<?= /* @escapeNotVerified */ $id ?>">
         <?php if ($element->getLegend() && !$isWrapped): ?>
-            <legend class="<?php /* @escapeNotVerified */ echo $isField ? 'label admin__field-label' : 'admin__legend legend'?>">
-                <span><?php /* @escapeNotVerified */ echo $element->getLegend() ?></span>
+            <legend class="<?= /* @escapeNotVerified */ $isField ? 'label admin__field-label' : 'admin__legend legend' ?>">
+                <span><?= /* @escapeNotVerified */ $element->getLegend() ?></span>
             </legend><br />
         <?php endif; ?>
     <?php endif; ?>
@@ -66,46 +66,46 @@ if ($isField) {
 
     <div class="messages">
         <?php if ($element->getComment() && !$isField): ?>
-            <div class="message message-notice"><?php echo $block->escapeHtml($element->getComment()) ?></div>
+            <div class="message message-notice"><?= $block->escapeHtml($element->getComment()) ?></div>
         <?php endif; ?>
     </div>
 
 
-    <?php echo($isField) ? '<div class="control admin__field-control">' : ''; ?>
+    <?= ($isField) ? '<div class="control admin__field-control">' : '' ?>
 
     <?php if ($element->hasHtmlContent() && !$isField): ?>
-        <?php echo $element->getHtmlContent(); ?>
+        <?= $element->getHtmlContent() ?>
     <?php else: ?>
 
         <?php if ($isField && $count > 1):?>
-            <div class="fields-group-<?php /* @escapeNotVerified */ echo $count?>">
+            <div class="fields-group-<?= /* @escapeNotVerified */ $count ?>">
         <?php endif; ?>
 
-        <?php echo $element->getBasicChildrenHtml(); ?>
+        <?= $element->getBasicChildrenHtml() ?>
 
-        <?php echo($isField && $count > 1) ? '</div>' : '' ?>
+        <?= ($isField && $count > 1) ? '</div>' : '' ?>
 
         <?php if ($element->getComment() && $isField): ?>
-            <div class="note"><?php echo $block->escapeHtml($element->getComment()) ?></div>
+            <div class="note"><?= $block->escapeHtml($element->getComment()) ?></div>
         <?php endif; ?>
 
         <?php if ($element->hasAdvanced() && !$isField): ?>
-            <?php echo(!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : ''?>
-            <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?php /* @escapeNotVerified */ echo $id ?>">
-                <summary class="details-summary admin__collapsible-title" id="details-summary<?php /* @escapeNotVerified */ echo $id ?>">
-                    <span><?php /* @escapeNotVerified */ echo $advancedLabel ?></span>
+            <?= (!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : '' ?>
+            <details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?= /* @escapeNotVerified */ $id ?>">
+                <summary class="details-summary admin__collapsible-title" id="details-summary<?= /* @escapeNotVerified */ $id ?>">
+                    <span><?= /* @escapeNotVerified */ $advancedLabel ?></span>
                 </summary>
-                <div class="details-content admin__fieldset" id="details-content<?php /* @escapeNotVerified */ echo $id ?>">
-                    <?php echo $element->getAdvancedChildrenHtml(); ?>
+                <div class="details-content admin__fieldset" id="details-content<?= /* @escapeNotVerified */ $id ?>">
+                    <?= $element->getAdvancedChildrenHtml() ?>
                 </div>
             </details>
         <?php elseif ($element->hasAdvanced() && $isField): ?>
-            <div class="nested" id="nested<?php /* @escapeNotVerified */ echo $id ?>">
-                <?php echo $element->getAdvancedChildrenHtml(); ?>
+            <div class="nested" id="nested<?= /* @escapeNotVerified */ $id ?>">
+                <?= $element->getAdvancedChildrenHtml() ?>
             </div>
         <?php endif; ?>
 
-        <?php echo($isField) ? '</div>' : ''; ?>
+        <?= ($isField) ? '</div>' : '' ?>
 
     <?php endif; ?>
 
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
index e1e030e1fd6dd..3608ed7662e49 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset/element.phtml
@@ -28,18 +28,18 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
 
 <?php if (!$element->getNoDisplay()): ?>
     <?php if ($element->getType() == 'hidden'): ?>
-        <?php echo $element->getElementHtml() ?>
+        <?= $element->getElementHtml() ?>
     <?php else: ?>
-    <div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
+    <div<?= /* @escapeNotVerified */ $fieldAttributes ?>>
         <?php if ($elementBeforeLabel): ?>
-            <?php echo $element->getElementHtml() ?>
-            <?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
-            <?php /* @escapeNotVerified */ echo $note ?>
+            <?= $element->getElementHtml() ?>
+            <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
+            <?= /* @escapeNotVerified */ $note ?>
         <?php else: ?>
-            <?php echo $element->getLabelHtml('', $element->getScopeLabel()) ?>
+            <?= $element->getLabelHtml('', $element->getScopeLabel()) ?>
             <div class="admin__field-control control">
-                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
-                <?php /* @escapeNotVerified */ echo $note ?>
+                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="admin__field">' . $element->getElementHtml() . '</div>' : $element->getElementHtml() ?>
+                <?= /* @escapeNotVerified */ $note ?>
             </div>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index c16955ae071f7..3c44f629cd8af 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -24,9 +24,9 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
 
 <?php if ($block->canDisplayContainer()): ?>
-<div id="<?php echo $block->escapeHtml($block->getId()) ?>" data-grid-id="<?php echo $block->escapeHtml($block->getId()) ?>">
+<div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
 <?php else: ?>
-<?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+<?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
 <?php endif; ?>
 
         <div class="admin__data-grid-header admin__data-grid-toolbar">
@@ -34,34 +34,34 @@ $numColumns = sizeof($block->getColumns());
             <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getChildBlock('grid.columnSet')->getFilterVisibility() || $massActionAvailable): ?>
             <div class="admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>
-                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
 
                 <?php if ($block->getChildBlock('grid.export')): ?>
-                    <?php echo $block->getChildHtml('grid.export'); ?>
+                    <?= $block->getChildHtml('grid.export') ?>
                 <?php endif; ?>
             </div>
             <?php endif; ?>
             <div class="<?php if($massActionAvailable) { echo '_massaction ';} ?>admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>
-                    <?php echo $block->getChildHtml('grid.massaction') ?>
+                    <?= $block->getChildHtml('grid.massaction') ?>
                 <?php else: ?>
-                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
                     <?php $countRecords = $block->getCollection()->getSize(); ?>
                     <div class="admin__control-support-text">
-                        <span id="<?php echo $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?php /* @escapeNotVerified */ echo $block->getUiId('total-count') ?>>
-                            <?php /* @escapeNotVerified */ echo $countRecords ?>
+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @escapeNotVerified */ $block->getUiId('total-count') ?>>
+                            <?= /* @escapeNotVerified */ $countRecords ?>
                         </span>
-                        <?php /* @escapeNotVerified */ echo __('records found') ?>
-                        <span id="<?php echo $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
-                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php /* @escapeNotVerified */ echo __('selected') ?></span></span>
+                        <?= /* @escapeNotVerified */ __('records found') ?>
+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
+                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= /* @escapeNotVerified */ __('selected') ?></span></span>
                     </div>
                 <?php if ($block->getPagerVisibility()): ?>
                     <div class="admin__data-grid-pager-wrap">
-                        <select name="<?php /* @escapeNotVerified */ echo $block->getVarNameLimit() ?>"
-                                id="<?php echo $block->escapeHtml($block->getHtmlId())?>_page-limit"
-                                onchange="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.loadByElement(this)" <?php /* @escapeNotVerified */ echo $block->getUiId('per-page') ?>
+                        <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
+                                id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
+                                onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)" <?= /* @escapeNotVerified */ $block->getUiId('per-page') ?>
                                 class="admin__control-select">
                             <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                                 selected="selected"<?php endif; ?>>20
@@ -79,8 +79,8 @@ $numColumns = sizeof($block->getColumns());
                                 selected="selected"<?php endif; ?>>200
                             </option>
                         </select>
-                        <label for="<?php echo $block->escapeHtml($block->getHtmlId())?>_page-limit"
-                            class="admin__control-support-text"><?php /* @escapeNotVerified */ echo __('per page') ?></label>
+                        <label for="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-limit"
+                            class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
                         <div class="admin__data-grid-pager">
                             <?php $_curPage = $block->getCollection()->getCurPage() ?>
                             <?php $_lastPage = $block->getCollection()->getLastPageNumber() ?>
@@ -88,32 +88,32 @@ $numColumns = sizeof($block->getColumns());
                             <?php if ($_curPage > 1): ?>
                                 <button class="action-previous"
                                         type="button"
-                                        onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage - 1) ?>');return false;">
-                                            <span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span>
+                                        onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage - 1) ?>');return false;">
+                                            <span><?= /* @escapeNotVerified */ __('Previous page') ?></span>
                                 </button>
                             <?php else: ?>
-                                <button type="button" class="action-previous disabled"><span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span></button>
+                                <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
                             <?php endif; ?>
 
                             <input type="text"
-                                   id="<?php echo $block->escapeHtml($block->getHtmlId())?>_page-current"
-                                   name="<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>"
-                                   value="<?php /* @escapeNotVerified */ echo $_curPage ?>"
+                                   id="<?= $block->escapeHtml($block->getHtmlId()) ?>_page-current"
+                                   name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
+                                   value="<?= /* @escapeNotVerified */ $_curPage ?>"
                                    class="admin__control-text"
-                                   onkeypress="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.inputPage(event, '<?php /* @escapeNotVerified */ echo $_lastPage ?>')" <?php /* @escapeNotVerified */ echo $block->getUiId('current-page') ?> />
+                                   onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
 
-                            <label class="admin__control-support-text" for="<?php echo $block->escapeHtml($block->getHtmlId())
+                            <label class="admin__control-support-text" for="<?= $block->escapeHtml($block->getHtmlId())
                             ?>_page-current">
-                                <?php /* @escapeNotVerified */ echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                                <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                             </label>
                             <?php if ($_curPage < $_lastPage): ?>
-                                <button title="<?php /* @escapeNotVerified */ echo __('Next page') ?>"
+                                <button title="<?= /* @escapeNotVerified */ __('Next page') ?>"
                                         class="action-next"
-                                        onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage + 1) ?>');return false;">
-                                    <span><?php /* @escapeNotVerified */ echo __('Next page') ?></span>
+                                        onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage + 1) ?>');return false;">
+                                    <span><?= /* @escapeNotVerified */ __('Next page') ?></span>
                                 </button>
                             <?php else: ?>
-                                <button type="button" class="action-next disabled"><span><?php /* @escapeNotVerified */ echo __('Next page') ?></span></button>
+                                <button type="button" class="action-next disabled"><span><?= /* @escapeNotVerified */ __('Next page') ?></span></button>
                             <?php endif; ?>
                         </div>
                     </div>
@@ -122,19 +122,19 @@ $numColumns = sizeof($block->getColumns());
         </div>
         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
         <?php if ($block->getGridCssClass()): ?>
-            <table class="<?php /* @escapeNotVerified */ echo $block->getGridCssClass() ?> data-grid" id="<?php echo $block->escapeHtml($block->getId()) ?>_table">
+            <table class="<?= /* @escapeNotVerified */ $block->getGridCssClass() ?> data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
                 <!-- Rendering column set -->
-                <?php echo $block->getChildHtml('grid.columnSet'); ?>
+                <?= $block->getChildHtml('grid.columnSet') ?>
             </table>
         <?php else: ?>
 
-            <table class="data-grid" id="<?php echo $block->escapeHtml($block->getId()) ?>_table">
+            <table class="data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
                 <!-- Rendering column set -->
-                <?php echo $block->getChildHtml('grid.columnSet'); ?>
+                <?= $block->getChildHtml('grid.columnSet') ?>
             </table>
 
             <?php if ($block->getChildBlock('grid.bottom.links')): ?>
-                <?php echo $block->getChildHtml('grid.bottom.links') ?>
+                <?= $block->getChildHtml('grid.bottom.links') ?>
             <?php endif; ?>
 
         <?php endif ?>
@@ -154,33 +154,33 @@ $numColumns = sizeof($block->getColumns());
 
     deps.push('mage/adminhtml/grid');
 
-    require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
+    require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
         <?php if ($block->getDependencyJsObject()): ?>
-            registry.get('<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>', function (<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>) {
+            registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
         <?php endif; ?>
 
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->escapeHtml($block->getId()) ?>', '<?php /* @escapeNotVerified */ echo $block->getGridUrl() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameSort() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameDir() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameFilter() ?>');
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.useAjax = <?php /* @escapeNotVerified */ echo $block->getUseAjax() ? 'true' : 'false' ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= $block->escapeHtml($block->getId()) ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = <?= /* @escapeNotVerified */ $block->getUseAjax() ? 'true' : 'false' ?>;
         <?php if ($block->getRowClickCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rowClickCallback = <?php /* @escapeNotVerified */ echo $block->getRowClickCallback() ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rowClickCallback = <?= /* @escapeNotVerified */ $block->getRowClickCallback() ?>;
         <?php endif; ?>
         <?php if ($block->getCheckboxCheckCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php /* @escapeNotVerified */ echo $block->getCheckboxCheckCallback() ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.checkboxCheckCallback = <?= /* @escapeNotVerified */ $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
         <?php if ($block->getSortableUpdateCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.sortableUpdateCallback = <?php /* @escapeNotVerified */ echo $block->getSortableUpdateCallback()?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.sortableUpdateCallback = <?= /* @escapeNotVerified */ $block->getSortableUpdateCallback() ?>;
         <?php endif; ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.bindSortable();
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.bindSortable();
         <?php if ($block->getRowInitCallback()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initRowCallback = <?php /* @escapeNotVerified */ echo $block->getRowInitCallback() ?>;
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initGridRows();
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initRowCallback = <?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>;
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initGridRows();
         <?php endif; ?>
         <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
+        <?= /* @escapeNotVerified */ $block->getChildBlock('grid.massaction')->getJavaScript() ?>
         <?php endif ?>
-        <?php /* @escapeNotVerified */ echo $block->getAdditionalJavaScript(); ?>
+        <?= /* @escapeNotVerified */ $block->getAdditionalJavaScript() ?>
 
         <?php if ($block->getDependencyJsObject()): ?>
             });
@@ -190,7 +190,7 @@ $numColumns = sizeof($block->getColumns());
 <?php endif; ?>
 
 <?php if ($block->getChildBlock('grid.js')): ?>
-    <?php echo $block->getChildHtml('grid.js'); ?>
+    <?= $block->getChildHtml('grid.js') ?>
 <?php endif; ?>
 
 <?php endif ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
index 722218af397be..5ff9cfbd96f2c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/column_set.phtml
@@ -18,7 +18,7 @@ $numColumns = sizeof($block->getColumns());
     <?php
     /* This part is commented to remove all <col> tags from the code. */
     /* foreach ($block->getColumns() as $_column): ?>
-        <col <?php echo $_column->getHtmlProperty() ?> />
+        <col <?= $_column->getHtmlProperty() ?> />
     <?php endforeach; */ ?>
     <?php if ($block->isHeaderVisible()): ?>
         <thead>
@@ -27,10 +27,10 @@ $numColumns = sizeof($block->getColumns());
                 <?php foreach ($block->getColumns() as $_column): ?>
                 <?php /* @var $_column \Magento\Backend\Block\Widget\Grid\Column */ ?>
                     <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
-                        <th class="data-grid-th" data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                            <?php echo $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
+                        <th class="data-grid-th" data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                            <?= $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
                     <?php else: ?>
-                        <?php echo $_column->getHeaderHtml()?>
+                        <?= $_column->getHeaderHtml() ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
                 </tr>
@@ -38,8 +38,8 @@ $numColumns = sizeof($block->getColumns());
             <?php if ($block->isFilterVisible()): ?>
                 <tr class="data-grid-filters" data-role="filter-form">
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
-                        <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
-                            <?php echo $_column->getFilterHtml() ?>
+                        <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>" <?= $_column->getHeaderHtmlProperty() ?>>
+                            <?= $_column->getFilterHtml() ?>
                         </td>
                     <?php endforeach; ?>
                 </tr>
@@ -53,20 +53,20 @@ $numColumns = sizeof($block->getColumns());
         <?php foreach ($block->getCollection() as $_index => $_item): ?>
             <?php if ($block->hasMultipleRows($_item)) :?>
                 <?php $block->updateItemByFirstMultiRow($_item); ?>
-                <tr title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>" data-role="row"
-                    <?php if ($_class = $block->getRowClass($_item)):?> class="<?php /* @escapeNotVerified */ echo $_class; ?>"<?php endif;?>
+                <tr title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>" data-role="row"
+                    <?php if ($_class = $block->getRowClass($_item)):?> class="<?= /* @escapeNotVerified */ $_class ?>"<?php endif;?>
                 ><?php $i = 0; foreach ($block->getColumns() as $_column):
                       if ($block->shouldRenderCell($_item, $_column)):
                             $_rowspan = $block->getRowspan($_item, $_column);
-                          ?><td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                                <?php echo($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-                                class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                          ?><td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                                <?= ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
                             >
-                                <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
+                                <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td><?php
                             if ($block->shouldRenderEmptyCell($_item, $_column)):?>
-                                <td colspan="<?php /* @escapeNotVerified */ echo $block->getEmptyCellColspan($_item)?>" class="last">
-                                <?php /* @escapeNotVerified */ echo $block->getEmptyCellLabel()?>
+                                <td colspan="<?= /* @escapeNotVerified */ $block->getEmptyCellColspan($_item) ?>" class="last">
+                                <?= /* @escapeNotVerified */ $block->getEmptyCellLabel() ?>
                                 </td><?php
                             endif;
                         endif;
@@ -79,10 +79,10 @@ $numColumns = sizeof($block->getColumns());
                     <?php endif; ?>
                     <tr data-role="row">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns($_i) as $_column):
-                            ?><td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                            class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns-1 ? 'last' : '' ?>"
+                            ?><td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                            class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns-1 ? 'last' : '' ?>"
                         >
-                            <?php echo(($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
+                            <?= (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                         </td><?php
                         endforeach; ?>
                     </tr>
@@ -91,8 +91,8 @@ $numColumns = sizeof($block->getColumns());
                 <?php if ($block->shouldRenderSubTotal($_item)): ?>
                     <tr class="subtotals">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns() as $_column): ?>
-                            <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                                class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                            <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?php /* @escapeNotVerified */ echo $_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel()
                                     : $_column->getRowField($block->getSubTotals($_item));
@@ -102,22 +102,22 @@ $numColumns = sizeof($block->getColumns());
                     </tr>
                 <?php endif; ?>
             <?php else: ?>
-                <tr data-role="row" title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)):?>
-                    class="<?php /* @escapeNotVerified */ echo $_class; ?>"<?php endif;?>
+                <tr data-role="row" title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)):?>
+                    class="<?= /* @escapeNotVerified */ $_class ?>"<?php endif;?>
                 >
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
                         <?php if ($block->shouldRenderCell($_item, $_column)):?>
-                            <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                                class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                            <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?> <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?> <?= ++$i == $numColumns ? 'last' : '' ?>"
                             >
-                                <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
+                                <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td>
                             <?php if ($block->shouldRenderEmptyCell($_item, $_column)):?>
-                                <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                                    colspan="<?php /* @escapeNotVerified */ echo $block->getEmptyCellColspan($_item)?>"
-                                    class="col-no-records <?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?> last"
+                                <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                                    colspan="<?= /* @escapeNotVerified */ $block->getEmptyCellColspan($_item) ?>"
+                                    class="col-no-records <?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?> last"
                                 >
-                                    <?php /* @escapeNotVerified */ echo $block->getEmptyCellLabel()?>
+                                    <?= /* @escapeNotVerified */ $block->getEmptyCellLabel() ?>
                                 </td>
                             <?php endif;?>
                         <?php endif;?>
@@ -127,8 +127,8 @@ $numColumns = sizeof($block->getColumns());
         <?php endforeach; ?>
         <?php elseif ($block->getEmptyText()): ?>
             <tr class="data-grid-tr-no-data" data-role="row">
-                <td class="<?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?>"
-                    colspan="<?php /* @escapeNotVerified */ echo $numColumns ?>"><?php /* @escapeNotVerified */ echo $block->getEmptyText() ?></td>
+                <td class="<?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?>"
+                    colspan="<?= /* @escapeNotVerified */ $numColumns ?>"><?= /* @escapeNotVerified */ $block->getEmptyText() ?></td>
             </tr>
         <?php endif; ?>
     </tbody>
@@ -137,8 +137,8 @@ $numColumns = sizeof($block->getColumns());
     <tfoot>
         <tr class="totals" data-role="row">
             <?php foreach ($block->getColumns() as $_column): ?>
-                <th data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                    class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>"
+                <th data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                    class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>"
                 >
                     <?php /* @escapeNotVerified */ echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel()
                         : $_column->getRowField($block->getTotals()) ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
index 8805b8087e84c..8a40853a405b0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container.phtml
@@ -8,6 +8,6 @@
 
 ?>
 <?php if ($block->getButtonsHtml()): ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getButtonsHtml() ?></div>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
 <?php endif; ?>
-<?php echo $block->getGridHtml() ?>
+<?= $block->getGridHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
index 2af3cb632357f..700e9749f734b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/container/empty.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getGridHtml() ?>
+<?= $block->getGridHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
index 35f77715e7c32..35be61dad7f73 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/export.phtml
@@ -8,13 +8,13 @@
 
 ?>
 <div class="admin__data-grid-export">
-    <label for="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" class="admin__control-support-text">
-        <?php /* @escapeNotVerified */ echo __('Export to:') ?>
+    <label for="<?= /* @escapeNotVerified */ $block->getId() ?>_export" class="admin__control-support-text">
+        <?= /* @escapeNotVerified */ __('Export to:') ?>
     </label>
-    <select name="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" class="admin__control-select">
+    <select name="<?= /* @escapeNotVerified */ $block->getId() ?>_export" id="<?= /* @escapeNotVerified */ $block->getId() ?>_export" class="admin__control-select">
         <?php foreach ($block->getExportTypes() as $_type): ?>
-            <option value="<?php /* @escapeNotVerified */ echo $_type->getUrl() ?>"><?php /* @escapeNotVerified */ echo $_type->getLabel() ?></option>
+            <option value="<?= /* @escapeNotVerified */ $_type->getUrl() ?>"><?= /* @escapeNotVerified */ $_type->getLabel() ?></option>
         <?php endforeach; ?>
     </select>
-    <?php echo $block->getExportButtonHtml() ?>
+    <?= $block->getExportButtonHtml() ?>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
index 3e347b5cdb2b7..a31bf4d23abaa 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/extended.phtml
@@ -26,54 +26,54 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
 
-    <div id="<?php echo $block->escapeHtml($block->getId()) ?>" data-grid-id="<?php echo $block->escapeHtml($block->getId()) ?>">
+    <div id="<?= $block->escapeHtml($block->getId()) ?>" data-grid-id="<?= $block->escapeHtml($block->getId()) ?>">
     <?php else: ?>
-        <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+        <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
     <?php $massActionAvailable = $block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable() ?>
     <?php if ($block->getPagerVisibility() || $block->getExportTypes() || $block->getFilterVisibility() || $massActionAvailable): ?>
         <div class="admin__data-grid-header admin__data-grid-toolbar">
             <div class="admin__data-grid-header-row">
                 <?php if ($massActionAvailable): ?>
-                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
             <?php if ($block->getExportTypes()): ?>
                 <div class="admin__data-grid-export">
                     <label
                         class="admin__control-support-text"
-                        for="<?php echo $block->escapeHtml($block->getId()) ?>_export"><?php /* @escapeNotVerified */ echo __('Export to:') ?></label>
-                    <select name="<?php echo $block->escapeHtml($block->getId()) ?>_export" id="<?php echo $block->escapeHtml($block->getId()) ?>_export"
+                        for="<?= $block->escapeHtml($block->getId()) ?>_export"><?= /* @escapeNotVerified */ __('Export to:') ?></label>
+                    <select name="<?= $block->escapeHtml($block->getId()) ?>_export" id="<?= $block->escapeHtml($block->getId()) ?>_export"
                             class="admin__control-select">
                         <?php foreach ($block->getExportTypes() as $_type): ?>
-                            <option value="<?php /* @escapeNotVerified */ echo $_type->getUrl() ?>"><?php /* @escapeNotVerified */ echo $_type->getLabel() ?></option>
+                            <option value="<?= /* @escapeNotVerified */ $_type->getUrl() ?>"><?= /* @escapeNotVerified */ $_type->getLabel() ?></option>
                         <?php endforeach; ?>
                     </select>
-                    <?php echo $block->getExportButtonHtml() ?>
+                    <?= $block->getExportButtonHtml() ?>
                 </div>
             <?php endif; ?>
             </div>
 
-            <div class="admin__data-grid-header-row <?php echo $massActionAvailable ? '_massaction' : '';?>">
+            <div class="admin__data-grid-header-row <?= $massActionAvailable ? '_massaction' : '' ?>">
                 <?php if ($massActionAvailable): ?>
-                    <?php echo $block->getMassactionBlockHtml() ?>
+                    <?= $block->getMassactionBlockHtml() ?>
                 <?php else: ?>
-                    <?php echo $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : ''; ?>
+                    <?= $block->getMainButtonsHtml() ? '<div class="admin__filter-actions">' . $block->getMainButtonsHtml() . '</div>' : '' ?>
                 <?php endif; ?>
                 <?php $countRecords = $block->getCollection()->getSize(); ?>
                 <div class="admin__control-support-text">
-                        <span id="<?php echo $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?php /* @escapeNotVerified */ echo $block->getUiId('total-count') ?>>
-                            <?php /* @escapeNotVerified */ echo $countRecords ?>
+                        <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>-total-count" <?= /* @escapeNotVerified */ $block->getUiId('total-count') ?>>
+                            <?= /* @escapeNotVerified */ $countRecords ?>
                         </span>
-                    <?php /* @escapeNotVerified */ echo __('records found') ?>
-                    <span id="<?php echo $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
-                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php /* @escapeNotVerified */ echo __('selected') ?></span></span>
+                    <?= /* @escapeNotVerified */ __('records found') ?>
+                    <span id="<?= $block->escapeHtml($block->getHtmlId()) ?>_massaction-count"
+                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?= /* @escapeNotVerified */ __('selected') ?></span></span>
                 </div>
 
             <?php if ($block->getPagerVisibility()): ?>
                 <div class="admin__data-grid-pager-wrap">
-                    <select name="<?php /* @escapeNotVerified */ echo $block->getVarNameLimit() ?>"
-                            id="<?php echo $block->escapeHTML($block->getHtmlId())?>_page-limit"
-                            onchange="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.loadByElement(this)"
+                    <select name="<?= /* @escapeNotVerified */ $block->getVarNameLimit() ?>"
+                            id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+                            onchange="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.loadByElement(this)"
                             class="admin__control-select">
                         <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                             selected="selected"<?php endif; ?>>20
@@ -91,8 +91,8 @@ $numColumns = sizeof($block->getColumns());
                             selected="selected"<?php endif; ?>>200
                         </option>
                     </select>
-                    <label for="<?php echo $block->escapeHTML($block->getHtmlId())?><?php echo $block->escapeHTML($block->getHtmlId())?>_page-limit"
-                        class="admin__control-support-text"><?php /* @escapeNotVerified */ echo __('per page') ?></label>
+                    <label for="<?= $block->escapeHTML($block->getHtmlId()) ?><?= $block->escapeHTML($block->getHtmlId()) ?>_page-limit"
+                        class="admin__control-support-text"><?= /* @escapeNotVerified */ __('per page') ?></label>
 
                     <div class="admin__data-grid-pager">
                         <?php $_curPage = $block->getCollection()->getCurPage() ?>
@@ -100,30 +100,30 @@ $numColumns = sizeof($block->getColumns());
                         <?php if ($_curPage > 1): ?>
                             <button class="action-previous"
                                     type="button"
-                                    onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage - 1) ?>');return false;">
-                                <span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span>
+                                    onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage - 1) ?>');return false;">
+                                <span><?= /* @escapeNotVerified */ __('Previous page') ?></span>
                             </button>
                         <?php else: ?>
-                            <button type="button" class="action-previous disabled"><span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span></button>
+                            <button type="button" class="action-previous disabled"><span><?= /* @escapeNotVerified */ __('Previous page') ?></span></button>
                         <?php endif; ?>
                         <input type="text"
-                               id="<?php echo $block->escapeHTML($block->getHtmlId())?>_page-current"
-                               name="<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>"
-                               value="<?php /* @escapeNotVerified */ echo $_curPage ?>"
+                               id="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current"
+                               name="<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>"
+                               value="<?= /* @escapeNotVerified */ $_curPage ?>"
                                class="admin__control-text"
-                               onkeypress="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.inputPage(event, '<?php /* @escapeNotVerified */ echo $_lastPage ?>')" <?php /* @escapeNotVerified */ echo $block->getUiId('current-page') ?> />
-                        <label class="admin__control-support-text" for="<?php echo $block->escapeHTML($block->getHtmlId())?>_page-current">
-                            <?php /* @escapeNotVerified */ echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                               onkeypress="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.inputPage(event, '<?= /* @escapeNotVerified */ $_lastPage ?>')" <?= /* @escapeNotVerified */ $block->getUiId('current-page') ?> />
+                        <label class="admin__control-support-text" for="<?= $block->escapeHTML($block->getHtmlId()) ?>_page-current">
+                            <?= /* @escapeNotVerified */ __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                         </label>
                         <?php if ($_curPage < $_lastPage): ?>
                             <button type="button"
-                                    title="<?php /* @escapeNotVerified */ echo __('Next page') ?>"
+                                    title="<?= /* @escapeNotVerified */ __('Next page') ?>"
                                     class="action-next"
-                                    onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage + 1) ?>');return false;">
-                                <span><?php /* @escapeNotVerified */ echo __('Next page') ?></span>
+                                    onclick="<?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setPage('<?= /* @escapeNotVerified */ ($_curPage + 1) ?>');return false;">
+                                <span><?= /* @escapeNotVerified */ __('Next page') ?></span>
                             </button>
                         <?php else: ?>
-                        <button type="button" class="action-next disabled"><span><?php /* @escapeNotVerified */ echo __('Next page') ?></span></button>
+                        <button type="button" class="action-next disabled"><span><?= /* @escapeNotVerified */ __('Next page') ?></span></button>
                         <?php endif; ?>
                     </div>
                 </div>
@@ -133,11 +133,11 @@ $numColumns = sizeof($block->getColumns());
     <?php endif; ?>
 
     <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-        <table class="data-grid" id="<?php echo $block->escapeHtml($block->getId()) ?>_table">
+        <table class="data-grid" id="<?= $block->escapeHtml($block->getId()) ?>_table">
             <?php
             /* This part is commented to remove all <col> tags from the code. */
             /* foreach ($block->getColumns() as $_column): ?>
-            <col <?php echo $_column->getHtmlProperty() ?> />
+            <col <?= $_column->getHtmlProperty() ?> />
             <?php endforeach; */
             ?>
             <?php if ($block->getHeadersVisibility() || $block->getFilterVisibility()): ?>
@@ -146,10 +146,10 @@ $numColumns = sizeof($block->getColumns());
                     <tr>
                         <?php foreach ($block->getColumns() as $_column): ?>
                             <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
-                                <th class="data-grid-th" data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
-                                    <?php echo $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
+                                <th class="data-grid-th" data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>"
+                                    <?= $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
                             <?php else: ?>
-                                <?php echo $_column->getHeaderHtml()?>
+                                <?= $_column->getHeaderHtml() ?>
                             <?php endif; ?>
                         <?php endforeach; ?>
                     </tr>
@@ -158,8 +158,8 @@ $numColumns = sizeof($block->getColumns());
                     <tr class="data-grid-filters" data-role="filter-form">
                         <?php $i = 0;
                         foreach ($block->getColumns() as $_column): ?>
-                            <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
-                                <?php echo $_column->getFilterHtml() ?>
+                            <td data-column="<?= /* @escapeNotVerified */ $_column->getId() ?>" <?= $_column->getHeaderHtmlProperty() ?>>
+                                <?= $_column->getFilterHtml() ?>
                             </td>
                         <?php endforeach; ?>
                     </tr>
@@ -170,8 +170,8 @@ $numColumns = sizeof($block->getColumns());
                 <tfoot>
                 <tr class="totals">
                     <?php foreach ($block->getColumns() as $_column): ?>
-                        <th class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>">
-                            <?php /* @escapeNotVerified */ echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>
+                        <th class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>">
+                            <?= /* @escapeNotVerified */ ($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>
                         </th>
                     <?php endforeach; ?>
                 </tr>
@@ -181,22 +181,22 @@ $numColumns = sizeof($block->getColumns());
             <tbody>
             <?php if (($block->getCollection()->getSize() > 0) && (!$block->getIsCollapsed())): ?>
                 <?php foreach ($block->getCollection() as $_index => $_item): ?>
-                    <tr title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
-                        class="<?php /* @escapeNotVerified */ echo $_class; ?>"<?php endif; ?> ><?php
+                    <tr title="<?= /* @escapeNotVerified */ $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
+                        class="<?= /* @escapeNotVerified */ $_class ?>"<?php endif; ?> ><?php
                         $i = 0;
                         foreach ($block->getColumns() as $_column):
                             if ($block->shouldRenderCell($_item, $_column)):
                                 $_rowspan = $block->getRowspan($_item, $_column);
                                 ?>
-                            <td <?php echo($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-                                class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>
-                                        <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
-                                <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
+                            <td <?= ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
+                                class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
+                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
+                                <?= (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                                 </td><?php
                                 if ($block->shouldRenderEmptyCell($_item, $_column)):
                                     ?>
-                                    <td colspan="<?php /* @escapeNotVerified */ echo $block->getEmptyCellColspan($_item) ?>"
-                                        class="last"><?php /* @escapeNotVerified */ echo $block->getEmptyCellLabel() ?></td><?php
+                                    <td colspan="<?= /* @escapeNotVerified */ $block->getEmptyCellColspan($_item) ?>"
+                                        class="last"><?= /* @escapeNotVerified */ $block->getEmptyCellLabel() ?></td><?php
                                 endif;
                             endif;
                         endforeach; ?>
@@ -206,9 +206,9 @@ $numColumns = sizeof($block->getColumns());
                             <tr>
                                 <?php $i = 0;
                                 foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
-                                    <td class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>
-                                        <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
-                                        <?php echo(($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
+                                    <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
+                                        <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
+                                        <?= (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                                     </td>
                                 <?php endforeach; ?>
                             </tr>
@@ -219,8 +219,8 @@ $numColumns = sizeof($block->getColumns());
                         <tr class="subtotals">
                             <?php $i = 0;
                             foreach ($block->getSubTotalColumns() as $_column): ?>
-                                <td class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>
-                                           <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
+                                <td class="<?= /* @escapeNotVerified */ $_column->getCssProperty() ?>
+                                           <?= /* @escapeNotVerified */ $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': '' ?>">
                                     <?php /* @escapeNotVerified */ echo($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
                                         $_column->getRowField($block->getSubTotalItem($_item))
                                     );
@@ -232,8 +232,8 @@ $numColumns = sizeof($block->getColumns());
                 <?php endforeach; ?>
             <?php elseif ($block->getEmptyText()): ?>
                 <tr class="data-grid-tr-no-data">
-                    <td class="<?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?>"
-                        colspan="<?php /* @escapeNotVerified */ echo $numColumns ?>"><?php /* @escapeNotVerified */ echo $block->getEmptyText() ?></td>
+                    <td class="<?= /* @escapeNotVerified */ $block->getEmptyTextClass() ?>"
+                        colspan="<?= /* @escapeNotVerified */ $numColumns ?>"><?= /* @escapeNotVerified */ $block->getEmptyText() ?></td>
                 </tr>
             <?php endif; ?>
             </tbody>
@@ -257,34 +257,34 @@ $numColumns = sizeof($block->getColumns());
 
     <?php if (is_array($block->getRequireJsDependencies())): ?>
         <?php foreach ($block->getRequireJsDependencies() as $dependency): ?>
-            deps.push('<?php /* @escapeNotVerified */ echo $dependency; ?>');
+            deps.push('<?= /* @escapeNotVerified */ $dependency ?>');
         <?php endforeach; ?>
     <?php endif; ?>
 
-    require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry' : '') ?>){
+    require(deps, function(<?= ($block->getDependencyJsObject() ? 'registry' : '') ?>){
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
         //<![CDATA[
     <?php if ($block->getDependencyJsObject()): ?>
-        registry.get('<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>', function (<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>) {
+        registry.get('<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>', function (<?= /* @escapeNotVerified */ $block->getDependencyJsObject() ?>) {
     <?php endif; ?>
 
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?> = new varienGrid(<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getId()) ?>, '<?php /* @escapeNotVerified */ echo $block->getGridUrl() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameSort() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameDir() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameFilter() ?>');
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.useAjax = '<?php /* @escapeNotVerified */ echo $block->getUseAjax() ?>';
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid(<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getId()) ?>, '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?= /* @escapeNotVerified */ $block->getUseAjax() ?>';
     <?php if ($block->getRowClickCallback()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rowClickCallback = <?php /* @escapeNotVerified */ echo $block->getRowClickCallback() ?>;
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.rowClickCallback = <?= /* @escapeNotVerified */ $block->getRowClickCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getCheckboxCheckCallback()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php /* @escapeNotVerified */ echo $block->getCheckboxCheckCallback() ?>;
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.checkboxCheckCallback = <?= /* @escapeNotVerified */ $block->getCheckboxCheckCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getRowInitCallback()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initRowCallback = <?php /* @escapeNotVerified */ echo $block->getRowInitCallback() ?>;
-    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initGridRows();
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initRowCallback = <?= /* @escapeNotVerified */ $block->getRowInitCallback() ?>;
+    <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.initGridRows();
     <?php endif; ?>
     <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getMassactionBlock()->getJavaScript() ?>
+    <?= /* @escapeNotVerified */ $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
-    <?php /* @escapeNotVerified */ echo $block->getAdditionalJavaScript(); ?>
+    <?= /* @escapeNotVerified */ $block->getAdditionalJavaScript() ?>
 
     <?php if ($block->getDependencyJsObject()): ?>
         });
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
index b1a7a79514200..ea995d9a80b28 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction.phtml
@@ -7,35 +7,35 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /* @escapeNotVerified */ echo $block->getSomething(); ?>
-<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
+<?= /* @escapeNotVerified */ $block->getSomething() ?>
+<div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
 
     <?php if ($block->getHideFormElement() !== true):?>
-    <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
+    <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
-    <?php echo $block->getBlockHtml('formkey')?>
+    <?= $block->getBlockHtml('formkey') ?>
             <select
-                id="<?php echo $block->getHtmlId() ?>-select"
+                id="<?= $block->getHtmlId() ?>-select"
                 class="required-entry local-validation admin__control-select"
-                <?php /* @escapeNotVerified */ echo $block->getUiId('select') ?>>
-                <option class="admin__control-select-placeholder" value="" selected><?php /* @escapeNotVerified */ echo __('Actions') ?></option>
+                <?= /* @escapeNotVerified */ $block->getUiId('select') ?>>
+                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
                 <?php foreach ($block->getItems() as $_item):?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php /* @escapeNotVerified */ echo $_item->getLabel() ?></option>
+                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
                 <?php endforeach; ?>
             </select>
-            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
-            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
-            <?php echo $block->getApplyButtonHtml() ?>
+            <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
+            <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
+            <?= $block->getApplyButtonHtml() ?>
         </div>
     <?php if ($block->getHideFormElement() !== true):?>
     </form>
     <?php endif ?>
     <div class="no-display">
     <?php foreach ($block->getItems() as $_item): ?>
-        <div id="<?php echo $block->getHtmlId() ?>-item-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-block">
+        <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
             <?php if ('' != $_item->getBlockName()):?>
-                <?php echo $block->getChildHtml($_item->getBlockName());?>
+                <?= $block->getChildHtml($_item->getBlockName()) ?>
             <?php endif;?>
         </div>
     <?php endforeach; ?>
@@ -43,35 +43,35 @@
 
     <div class="mass-select-wrap">
         <select
-            id="<?php echo $block->getHtmlId() ?>-mass-select"
+            id="<?= $block->getHtmlId() ?>-mass-select"
             class="action-select-multiselect _disabled"
             disabled="disabled"
             data-menu="grid-mass-select">
-            <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
+            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
                 <option disabled selected></option>
                 <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
-                        <?php /* @escapeNotVerified */ echo __('Select All') ?>
+                        <?= /* @escapeNotVerified */ __('Select All') ?>
                     </option>
                     <option value="unselectAll">
-                        <?php /* @escapeNotVerified */ echo __('Unselect All') ?>
+                        <?= /* @escapeNotVerified */ __('Unselect All') ?>
                     </option>
                 <?php endif; ?>
                 <option value="selectVisible">
-                    <?php /* @escapeNotVerified */ echo __('Select Visible') ?>
+                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
                 </option>
                 <option value="unselectVisible">
-                    <?php /* @escapeNotVerified */ echo __('Unselect Visible') ?>
+                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
                 </option>
             </optgroup>
         </select>
-        <label for="<?php echo $block->getHtmlId() ?>-mass-select"></label>
+        <label for="<?= $block->getHtmlId() ?>-mass-select"></label>
     </div>
 
 <script>
     require(['jquery', 'domReady!'], function($){
         'use strict';
-        $('#<?php echo $block->getHtmlId() ?>-mass-select')
+        $('#<?= $block->getHtmlId() ?>-mass-select')
             .removeClass('_disabled')
             .prop('disabled', false)
             .change(function () {
@@ -80,23 +80,23 @@
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectAll();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
                     break;
                 case 'unselectAll':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectAll();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
                     break;
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectVisible();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
                     break;
                 case 'unselectVisible':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
         });
     });
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setGridIds('<?php /* @escapeNotVerified */ echo $block->getGridIdsJson() ?>');
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
     <?php endif; ?>
 </script>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
index 4e296f466a1fc..f969fa61097ae 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/massaction_extended.phtml
@@ -7,79 +7,79 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
+<div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
 
     <?php if ($block->getHideFormElement() !== true):?>
-    <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
+    <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
-        <?php echo $block->getBlockHtml('formkey')?>
+        <?= $block->getBlockHtml('formkey') ?>
             <select
-                id="<?php echo $block->getHtmlId() ?>-select"
+                id="<?= $block->getHtmlId() ?>-select"
                 class="required-entry local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?php /* @escapeNotVerified */ echo __('Actions') ?></option>
+                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php /* @escapeNotVerified */ echo $_item->getLabel() ?></option>
+                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
                 <?php endforeach; ?>
             </select>
-            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
-            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
-            <?php echo $block->getApplyButtonHtml() ?>
+            <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
+            <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
+            <?= $block->getApplyButtonHtml() ?>
         </div>
     <?php if ($block->getHideFormElement() !== true):?>
     </form>
     <?php endif ?>
     <div class="no-display">
         <?php foreach ($block->getItems() as $_item): ?>
-            <div id="<?php echo $block->getHtmlId() ?>-item-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-block">
-                <?php echo $_item->getAdditionalActionBlockHtml() ?>
+            <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
+                <?= $_item->getAdditionalActionBlockHtml() ?>
             </div>
         <?php endforeach; ?>
     </div>
     <div class="mass-select-wrap">
         <select
-            id="<?php echo $block->getHtmlId() ?>-mass-select"
+            id="<?= $block->getHtmlId() ?>-mass-select"
             class="action-select-multiselect"
             data-menu="grid-mass-select">
-            <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
+            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
                 <option disabled selected></option>
             <?php if ($block->getUseSelectAll()):?>
                 <option value="selectAll">
-                    <?php /* @escapeNotVerified */ echo __('Select All') ?>
+                    <?= /* @escapeNotVerified */ __('Select All') ?>
                 </option>
                 <option value="unselectAll">
-                    <?php /* @escapeNotVerified */ echo __('Unselect All') ?>
+                    <?= /* @escapeNotVerified */ __('Unselect All') ?>
                 </option>
             <?php endif; ?>
                 <option value="selectVisible">
-                    <?php /* @escapeNotVerified */ echo __('Select Visible') ?>
+                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
                 </option>
                 <option value="unselectVisible">
-                    <?php /* @escapeNotVerified */ echo __('Unselect Visible') ?>
+                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
                 </option>
             </optgroup>
         </select>
-        <label for="<?php echo $block->getHtmlId() ?>-mass-select"></label>
+        <label for="<?= $block->getHtmlId() ?>-mass-select"></label>
     </div>
 <script>
     require(['jquery'], function($){
         'use strict';
-        $('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
+        $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectAll();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
                     break;
                 case 'unselectAll':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectAll();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
                     break;
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectVisible();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
                     break;
                 case 'unselectVisible':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
             this.blur();
@@ -87,7 +87,7 @@
     });
 
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setGridIds('<?php /* @escapeNotVerified */ echo $block->getGridIdsJson() ?>');
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
     <?php endif; ?>
 </script>
 </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
index a0c800f4f09c1..70e2a87987924 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid/serializer.phtml
@@ -23,11 +23,11 @@
         Event.observe(window, "load", function(){
             var serializeInput  = document.createElement('input');
             serializeInput.type = 'hidden';
-            serializeInput.name = '<?php /* @escapeNotVerified */ echo $block->getInputElementName()?>';
-            serializeInput.id   = '<?php /* @escapeNotVerified */ echo $_id?>';
+            serializeInput.name = '<?= /* @escapeNotVerified */ $block->getInputElementName() ?>';
+            serializeInput.id   = '<?= /* @escapeNotVerified */ $_id ?>';
             try {
-                document.getElementById('<?php /* @escapeNotVerified */ echo $formId?>').appendChild(serializeInput);
-                new serializerController('<?php /* @escapeNotVerified */ echo $_id?>', <?php /* @escapeNotVerified */ echo $block->getDataAsJSON() ?>, <?php /* @escapeNotVerified */ echo $block->getColumnInputNames(true) ?>, <?php /* @escapeNotVerified */ echo $block->getGridBlock()->getJsObjectName() ?>, '<?php /* @escapeNotVerified */ echo $block->getReloadParamName()?>');
+                document.getElementById('<?= /* @escapeNotVerified */ $formId ?>').appendChild(serializeInput);
+                new serializerController('<?= /* @escapeNotVerified */ $_id ?>', <?= /* @escapeNotVerified */ $block->getDataAsJSON() ?>, <?= /* @escapeNotVerified */ $block->getColumnInputNames(true) ?>, <?= /* @escapeNotVerified */ $block->getGridBlock()->getJsObjectName() ?>, '<?= /* @escapeNotVerified */ $block->getReloadParamName() ?>');
             } catch(e) {
                 //Error add serializer
             }
@@ -35,12 +35,12 @@
     });
 </script>
 <?php else :?>
-<input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getInputElementName()?>"  value="" id="<?php /* @escapeNotVerified */ echo $_id?>" />
+<input type="hidden" name="<?= /* @escapeNotVerified */ $block->getInputElementName() ?>"  value="" id="<?= /* @escapeNotVerified */ $_id ?>" />
 <script>
     require([
         'mage/adminhtml/grid'
     ], function(){
-        new serializerController('<?php /* @escapeNotVerified */ echo $_id?>', <?php /* @escapeNotVerified */ echo $block->getDataAsJSON() ?>, <?php /* @escapeNotVerified */ echo $block->getColumnInputNames(true) ?>, <?php /* @escapeNotVerified */ echo $block->getGridBlock()->getJsObjectName() ?>, '<?php /* @escapeNotVerified */ echo $block->getReloadParamName()?>');
+        new serializerController('<?= /* @escapeNotVerified */ $_id ?>', <?= /* @escapeNotVerified */ $block->getDataAsJSON() ?>, <?= /* @escapeNotVerified */ $block->getColumnInputNames(true) ?>, <?= /* @escapeNotVerified */ $block->getGridBlock()->getJsObjectName() ?>, '<?= /* @escapeNotVerified */ $block->getReloadParamName() ?>');
     });
 </script>
 <?php endif;?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
index 1d9d1ea949ade..287028f9a1122 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -10,14 +10,14 @@
 ?>
 <?php if (!empty($tabs)): ?>
 
-<div class="admin__page-nav" data-role="container" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
+<div class="admin__page-nav" data-role="container" id="<?= /* @escapeNotVerified */ $block->getId() ?>">
     <?php if ($block->getTitle()): ?>
-        <div class="admin__page-nav-title" data-role="title" <?php /* @escapeNotVerified */ echo $block->getUiId('title') ?>>
-            <strong><?php /* @escapeNotVerified */ echo $block->getTitle() ?></strong>
+        <div class="admin__page-nav-title" data-role="title" <?= /* @escapeNotVerified */ $block->getUiId('title') ?>>
+            <strong><?= /* @escapeNotVerified */ $block->getTitle() ?></strong>
             <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
         </div>
     <?php endif ?>
-    <ul <?php /* @escapeNotVerified */ echo $block->getUiId('tab', $block->getId()) ?> class="<?php /* @escapeNotVerified */ echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
+    <ul <?= /* @escapeNotVerified */ $block->getUiId('tab', $block->getId()) ?> class="<?= /* @escapeNotVerified */ $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
         <?php foreach ($tabs as $_tab): ?>
 
             <?php if (!$block->canShowTab($_tab)): continue;  endif; ?>
@@ -25,25 +25,25 @@
             <?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)): ?> style="display:none"<?php endif; ?><?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-                <a href="<?php /* @escapeNotVerified */ echo $_tabHref ?>" id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>" name="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab, false) ?>" title="<?php /* @escapeNotVerified */ echo $block->getTabTitle($_tab) ?>"
-                   class="admin__page-nav-link <?php /* @escapeNotVerified */ echo $_tabClass;?>"
-                   data-tab-type="<?php /* @escapeNotVerified */ echo $_tabType;?>"
-                   <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
+            <li class="admin__page-nav-item" <?php if ($block->getTabIsHidden($_tab)): ?> style="display:none"<?php endif; ?><?= /* @escapeNotVerified */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
+                <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" name="<?= /* @escapeNotVerified */ $block->getTabId($_tab, false) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>"
+                   class="admin__page-nav-link <?= /* @escapeNotVerified */ $_tabClass ?>"
+                   data-tab-type="<?= /* @escapeNotVerified */ $_tabType ?>"
+                   <?= /* @escapeNotVerified */ $block->getUiId('tab', 'link', $_tab->getId()) ?>>
 
-                   <span><?php /* @escapeNotVerified */ echo $block->getTabLabel($_tab); ?></span>
+                   <span><?= /* @escapeNotVerified */ $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">
-                               <?php /* @escapeNotVerified */ echo __('Changes have been made to this section that have not been saved.'); ?>
+                               <?= /* @escapeNotVerified */ __('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">
-                               <?php /* @escapeNotVerified */ echo __('This tab contains invalid data. Please resolve this before saving.'); ?>
+                               <?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>
                            </span>
                        </span>
                         <span class="admin__page-nav-item-message-loader">
@@ -54,7 +54,7 @@
                        </span>
                    </span>
                 </a>
-                <div id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>_content" style="display:none;"<?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'content', $_tab->getId()) ?>><?php /* @escapeNotVerified */ echo $block->getTabContent($_tab) ?></div>
+                <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" style="display:none;"<?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $_tab->getId()) ?>><?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?></div>
             </li>
         <?php endforeach; ?>
     </ul>
@@ -63,11 +63,11 @@
 <script>
 require(['jquery',"mage/backend/tabs"], function($){
     $(function() {
-        $('#<?php /* @escapeNotVerified */ echo $block->getId() ?>').tabs({
-            active: '<?php /* @escapeNotVerified */ echo $block->getActiveTabId() ?>',
-            destination: '#<?php /* @escapeNotVerified */ echo $block->getDestElementId() ?>',
-            shadowTabs: <?php /* @escapeNotVerified */ echo $block->getAllShadowTabs()?>,
-            tabsBlockPrefix: '<?php /* @escapeNotVerified */ echo $block->getId() ?>_',
+        $('#<?= /* @escapeNotVerified */ $block->getId() ?>').tabs({
+            active: '<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>',
+            destination: '#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>',
+            shadowTabs: <?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>,
+            tabsBlockPrefix: '<?= /* @escapeNotVerified */ $block->getId() ?>_',
             tabIdArgument: 'active_tab'
         });
     });
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
index 108962088ad5a..062528e742201 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabshoriz.phtml
@@ -8,25 +8,25 @@
 
 ?>
 <!-- <?php if ($block->getTitle()): ?>
-    <h3><?php /* @escapeNotVerified */ echo $block->getTitle() ?></h3>
+    <h3><?= /* @escapeNotVerified */ $block->getTitle() ?></h3>
 <?php endif ?> -->
 <?php if (!empty($tabs)): ?>
-<div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
+<div id="<?= /* @escapeNotVerified */ $block->getId() ?>">
 <ul  class="tabs-horiz">
 <?php foreach ($tabs as $_tab): ?>
     <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
     <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
     <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
     <li>
-        <a href="<?php /* @escapeNotVerified */ echo $_tabHref?>" id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>" title="<?php /* @escapeNotVerified */ echo $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
+        <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>" title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
             <span>
-                <span class="changed" title="<?php /* @escapeNotVerified */ echo __('The information in this tab has been changed.') ?>"></span>
-                <span class="error" title="<?php /* @escapeNotVerified */ echo __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
-                <span class="loader" title="<?php /* @escapeNotVerified */ echo __('Loading...') ?>"></span>
-                <?php /* @escapeNotVerified */ echo $block->getTabLabel($_tab) ?>
+                <span class="changed" title="<?= /* @escapeNotVerified */ __('The information in this tab has been changed.') ?>"></span>
+                <span class="error" title="<?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
+                <span class="loader" title="<?= /* @escapeNotVerified */ __('Loading...') ?>"></span>
+                <?= /* @escapeNotVerified */ $block->getTabLabel($_tab) ?>
             </span>
         </a>
-        <div id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>_content" style="display:none"><?php /* @escapeNotVerified */ echo $block->getTabContent($_tab) ?></div>
+        <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" style="display:none"><?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?></div>
     </li>
 <?php endforeach; ?>
 </ul>
@@ -34,10 +34,10 @@
 <script>
 require(["jquery","mage/backend/tabs"], function($){
     $(function() {
-        $('#<?php /* @escapeNotVerified */ echo $block->getId() ?>').tabs({
-            active: '<?php /* @escapeNotVerified */ echo $block->getActiveTabId() ?>',
-            destination: '#<?php /* @escapeNotVerified */ echo $block->getDestElementId() ?>',
-            shadowTabs: <?php /* @escapeNotVerified */ echo $block->getAllShadowTabs()?>
+        $('#<?= /* @escapeNotVerified */ $block->getId() ?>').tabs({
+            active: '<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>',
+            destination: '#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>',
+            shadowTabs: <?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>
         });
     });
 });
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
index c6b61863fd7e3..6af34ca502f4b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabsleft.phtml
@@ -7,17 +7,17 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<dl id="dl-<?php /* @escapeNotVerified */ echo $id ?>" class="accordion">
+<dl id="dl-<?= /* @escapeNotVerified */ $id ?>" class="accordion">
 <?php foreach ($sections as $sectionId => $section): ?>
-    <dt id="dt-<?php /* @escapeNotVerified */ echo $id ?>-<?php /* @escapeNotVerified */ echo $sectionId ?>">
-        <strong><?php /* @escapeNotVerified */ echo $section['title'] ?></strong>
+    <dt id="dt-<?= /* @escapeNotVerified */ $id ?>-<?= /* @escapeNotVerified */ $sectionId ?>">
+        <strong><?= /* @escapeNotVerified */ $section['title'] ?></strong>
     </dt>
-    <dd id="dd-<?php /* @escapeNotVerified */ echo $id ?>-<?php /* @escapeNotVerified */ echo $section['id'] ?>" class="section-menu <?php echo !empty($section['active']) ? 'open' : '' ?>">
+    <dd id="dd-<?= /* @escapeNotVerified */ $id ?>-<?= /* @escapeNotVerified */ $section['id'] ?>" class="section-menu <?= !empty($section['active']) ? 'open' : '' ?>">
         <ul>
         <?php foreach ($section['children'] as $menuId => $menuItem): ?>
-            <li id="li-<?php /* @escapeNotVerified */ echo $id ?>-<?php /* @escapeNotVerified */ echo $sectionId ?>-<?php /* @escapeNotVerified */ echo $menuId ?>">
-                <a href="#" title="<?php /* @escapeNotVerified */ echo $menuItem['title'] ?>">
-                    <span><?php /* @escapeNotVerified */ echo $menuItem['label'] ?></span>
+            <li id="li-<?= /* @escapeNotVerified */ $id ?>-<?= /* @escapeNotVerified */ $sectionId ?>-<?= /* @escapeNotVerified */ $menuId ?>">
+                <a href="#" title="<?= /* @escapeNotVerified */ $menuItem['title'] ?>">
+                    <span><?= /* @escapeNotVerified */ $menuItem['label'] ?></span>
                 </a>
             </li>
         <?php endforeach ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
index 96a67bfa646d3..f29e8fd8624c0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/view/container.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getButtonsHtml() ?></div>
-<?php echo $block->getViewHtml() ?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
+<?= $block->getViewHtml() ?>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
index 2eebcdbe65749..304a60c60cad7 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -9,8 +9,8 @@
 ?>
 <!-- TODO: refactor form styles and js -->
 <script type="text/x-magento-template" id="rollback-warning-template">
-<p><?php /* @escapeNotVerified */ echo __('You will lose any data created since the backup was made, including admin users, customers and orders.')?></p>
-<p><?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?></p>
+<p><?= /* @escapeNotVerified */ __('You will lose any data created since the backup was made, including admin users, customers and orders.') ?></p>
+<p><?= /* @escapeNotVerified */ __('Are you sure you want to continue?') ?></p>
 </script>
 <script type="text/x-magento-template" id="backup-options-template">
     <div class="backup-messages" style="display: none;">
@@ -18,39 +18,39 @@
     </div>
     <div class="messages">
         <div class="message message-warning">
-            <?php /* @escapeNotVerified */ echo __('This may take a few moments.')?>
-            <?php /* @escapeNotVerified */ echo __('Be sure your store is in maintenance mode during backup.')?></div>
+            <?= /* @escapeNotVerified */ __('This may take a few moments.') ?>
+            <?= /* @escapeNotVerified */ __('Be sure your store is in maintenance mode during backup.') ?></div>
     </div>
     <form action="" method="post" id="backup-form" class="form-inline">
         <fieldset class="admin__fieldset form-list question">
             <div class="admin__field field _required">
-                <label for="backup_name" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Backup Name')?></span></label>
+                <label for="backup_name" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Backup Name') ?></span></label>
                 <div class="admin__field-control">
                     <input type="text" name="backup_name" id="backup_name"
                            class="admin__control-text required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
                            maxlength="50" />
                     <div class="admin__field-note">
-                        <?php /* @escapeNotVerified */ echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
+                        <?= /* @escapeNotVerified */ __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.') ?>
                     </div>
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
-                <label for="backup_maintenance_mode" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Maintenance mode')?></span></label>
+                <label for="backup_maintenance_mode" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Maintenance mode') ?></span></label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
-                        <label class="admin__field-label" for="backup_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during backup.')?></label>
+                        <label class="admin__field-label" for="backup_maintenance_mode"><?= /* @escapeNotVerified */ __('Please put your store into maintenance mode during backup.') ?></label>
                     </div>
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
-                <label for="exclude_media" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Exclude')?></span></label>
+                <label for="exclude_media" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Exclude') ?></span></label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
-                        <label class="admin__field-label" for="exclude_media"><?php /* @escapeNotVerified */ echo __('Exclude media folder from backup') ?></label>
+                        <label class="admin__field-label" for="exclude_media"><?= /* @escapeNotVerified */ __('Exclude media folder from backup') ?></label>
                     </div>
                 </div>
             </div>
@@ -64,59 +64,59 @@
     </div>
     <div class="messages">
         <div class="message message-warning">
-            <?php /* @escapeNotVerified */ echo __('Please enter the password to confirm rollback.')?><br>
-            <?php /* @escapeNotVerified */ echo __('This action cannot be undone.')?>
-            <p><?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?></p>
+            <?= /* @escapeNotVerified */ __('Please enter the password to confirm rollback.') ?><br>
+            <?= /* @escapeNotVerified */ __('This action cannot be undone.') ?>
+            <p><?= /* @escapeNotVerified */ __('Are you sure you want to continue?') ?></p>
         </div>
     </div>
     <form action="" method="post" id="rollback-form" class="form-inline">
         <fieldset class="admin__fieldset password-box-container">
             <div class="admin__field field _required">
-                <label for="password" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('User Password')?></span></label>
+                <label for="password" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('User Password') ?></span></label>
                 <div class="admin__field-control"><input type="password" name="password" id="password" class="admin__control-text required-entry" autocomplete="new-password"></div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container">
-                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Maintenance mode')?></span></label>
+                <label for="rollback_maintenance_mode" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Maintenance mode') ?></span></label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>  
-                        <label class="admin__field-label" for="rollback_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during rollback processing.')?></label>  
+                        <label class="admin__field-label" for="rollback_maintenance_mode"><?= /* @escapeNotVerified */ __('Please put your store into maintenance mode during rollback processing.') ?></label>  
                     </div>  
                 </div>
             </div>
 
             <div class="admin__field field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
                 <label for="use_ftp" class="admin__field-label">
-                    <span><?php /* @escapeNotVerified */ echo __('FTP')?></span>
+                    <span><?= /* @escapeNotVerified */ __('FTP') ?></span>
                 </label>
                 <div class="admin__field-control">
                     <div class="admin__field-option">
                         <input class="admin__control-checkbox" type="checkbox" name="use_ftp" value="1" id="use_ftp" onclick="backup.toggleFtpCredentialsForm(event)"/>
-                        <label class="admin__field-label" for="use_ftp"><?php /* @escapeNotVerified */ echo __('Use FTP Connection')?></label>
+                        <label class="admin__field-label" for="use_ftp"><?= /* @escapeNotVerified */ __('Use FTP Connection') ?></label>
                     </div>
                 </div>
             </div>
         </fieldset>
         <div class="entry-edit" id="ftp-credentials-container" style="display: none;">
             <fieldset class="admin__fieldset">
-                <legend class="admin__legend legend"><span><?php /* @escapeNotVerified */ echo __('FTP credentials')?></span></legend><br />
+                <legend class="admin__legend legend"><span><?= /* @escapeNotVerified */ __('FTP credentials') ?></span></legend><br />
                 <div class="admin__field field _required">
-                    <label class="admin__field-label" for="ftp_host"><span><?php /* @escapeNotVerified */ echo __('FTP Host') ?></span></label>
+                    <label class="admin__field-label" for="ftp_host"><span><?= /* @escapeNotVerified */ __('FTP Host') ?></span></label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_host" id="ftp_host">
                     </div>
                 </div>
 
                 <div class="admin__field field _required">
-                    <label class="admin__field-label" for="ftp_user"><span><?php /* @escapeNotVerified */ echo __('FTP Login') ?></span></label>
+                    <label class="admin__field-label" for="ftp_user"><span><?= /* @escapeNotVerified */ __('FTP Login') ?></span></label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_user" id="ftp_user">
                     </div>
                 </div>
                 <div class="admin__field field _required">
                     <label class="admin__field-label" for="ftp_pass">
-                        <span><?php /* @escapeNotVerified */ echo __('FTP Password') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('FTP Password') ?></span>
                     </label>
                     <div class="admin__field-control">
                         <input type="password" class="admin__control-text" name="ftp_pass" id="ftp_pass" autocomplete="new-password">
@@ -124,7 +124,7 @@
                 </div>
                 <div class="admin__field field">
                     <label class="admin__field-label" for="ftp_path">
-                        <span><?php /* @escapeNotVerified */ echo __('Magento root directory') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Magento root directory') ?></span>
                     </label>
                     <div class="admin__field-control">
                         <input type="text" class="admin__control-text" name="ftp_path" id="ftp_path">
@@ -147,8 +147,8 @@ require([
 
 //<![CDATA[
     backup = new AdminBackup();
-    backup.rollbackUrl = '<?php echo $block->escapeUrl($rollbackUrl); ?>';
-    backup.backupUrl = '<?php echo $block->escapeUrl($backupUrl); ?>';
+    backup.rollbackUrl = '<?= $block->escapeUrl($rollbackUrl) ?>';
+    backup.backupUrl = '<?= $block->escapeUrl($backupUrl) ?>';
 //]]>
 
 });
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
index a58cfbfd1891d..1196f7e443820 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/left.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<h3><?php /* @escapeNotVerified */ echo __('Create Backup') ?></h3>
+<h3><?= /* @escapeNotVerified */ __('Create Backup') ?></h3>
diff --git a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
index 0625c917b8daf..9ac9dd496e066 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/list.phtml
@@ -7,6 +7,6 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
-<?php echo $block->getGridHtml() ?>
-<?php echo $block->getDialogsHtml() ?>
+<?= $block->getChildHtml('grid') ?>
+<?= $block->getGridHtml() ?>
+<?= $block->getDialogsHtml() ?>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
index b039d4287a2e8..13249cd8e0e80 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/cc.phtml
@@ -12,20 +12,20 @@ $code = $block->escapeHtml($block->getMethodCode());
 $ccType = $block->getInfoData('cc_type');
 ?>
 <fieldset class="admin__fieldset payment-method"
-          id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+          id="payment_form_<?= /* @noEscape */ $code ?>"
           style="display:none"
     >
     <div class="admin__field _required">
-        <label class="label admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_cc_type" >
-            <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+        <label class="label admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_type" >
+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="admin__field-control control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type" name="payment[cc_type]"
+            <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
                     class="required-entry select admin__control-select validate-cc-type-select">
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                    <option value="<?php echo $block->escapeHtml($typeCode); ?>"
+                    <option value="<?= $block->escapeHtml($typeCode) ?>"
                         <?php if($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($typeName); ?>
+                        <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
@@ -33,45 +33,45 @@ $ccType = $block->getInfoData('cc_type');
     </div>
     <div class="admin__field _required">
         <label class="label admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="admin__field-control control">
-            <div id="<?php /* @noEscape */ echo $code; ?>_cc_number" class="admin__control-text hosted-control">
+            <div id="<?= /* @noEscape */ $code ?>_cc_number" class="admin__control-text hosted-control">
                 <span class="icon-type"></span>
             </div>
             <div class="hosted-error">
-                <?php echo $block->escapeHtml(__('Please, enter valid Credit Card Number')); ?>
+                <?= $block->escapeHtml(__('Please, enter valid Credit Card Number')) ?>
             </div>
         </div>
     </div>
 
     <div class="admin__field _required">
         <label class="label admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
         <div class="admin__field-control control">
             <div class="hosted-date-wrap">
-                <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_month"
+                <div id="<?= /* @noEscape */ $code ?>_cc_exp_month"
                      class="admin__control-text hosted-control hosted-date"></div>
 
-                <div id="<?php /* @noEscape */ echo $code; ?>_cc_exp_year"
+                <div id="<?= /* @noEscape */ $code ?>_cc_exp_year"
                      class="admin__control-text hosted-control hosted-date"></div>
 
-                <div class="hosted-error"><?php echo $block->escapeHtml(__('Please, enter valid Expiration Date')); ?></div>
+                <div class="hosted-error"><?= $block->escapeHtml(__('Please, enter valid Expiration Date')) ?></div>
             </div>
         </div>
     </div>
     <?php if($block->hasVerification()): ?>
         <div class="admin__field _required">
             <label class="label admin__field-label">
-                <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
             <div class="admin__field-control control">
-                <div id="<?php /* @noEscape */ echo $code; ?>_cc_cid"
+                <div id="<?= /* @noEscape */ $code ?>_cc_cid"
                      class="admin__control-text hosted-control hosted-cid"></div>
 
                 <div class="hosted-error">
-                    <?php echo $block->escapeHtml(__('Please, enter valid Card Verification Number')); ?>
+                    <?= $block->escapeHtml(__('Please, enter valid Card Verification Number')) ?>
                 </div>
             </div>
         </div>
@@ -80,16 +80,16 @@ $ccType = $block->getInfoData('cc_type');
     <?php if($block->isVaultEnabled()): ?>
         <div class="field-tooltip-content">
             <input type="checkbox"
-                   id="<?php /* @noEscape */ echo $code; ?>_vault"
+                   id="<?= /* @noEscape */ $code ?>_vault"
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
-            <label class="label" for="<?php /* @noEscape */ echo $code; ?>_vault">
-                <span><?php echo $block->escapeHtml('Save for later use.'); ?></span>
+            <label class="label" for="<?= /* @noEscape */ $code ?>_vault">
+                <span><?= $block->escapeHtml('Save for later use.') ?></span>
             </label>
         </div>
     <?php endif; ?>
 
-    <input type="hidden" id="<?php /* @noEscape */ echo $code; ?>_payment_method_nonce"
+    <input type="hidden" id="<?= /* @noEscape */ $code ?>_payment_method_nonce"
            name="payment[payment_method_nonce]"/>
     <input type="submit" name="Submit" style="display: none;">
 </fieldset>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
index 93f0d07717ca5..22a0f8d8c987d 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/paypal/vault.phtml
@@ -13,18 +13,18 @@ $id = $block->escapeHtml($block->getData('id'));
 ?>
 <div data-mage-init='{
         "Magento_Braintree/js/vault": {
-            "container": "payment_<?php /* @noEscape */ echo $id; ?>",
-            "publicHash": "<?php echo $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)); ?>",
-            "code": "<?php echo $block->escapeHtml($block->getData('code')); ?>",
-            "nonceUrl": "<?php echo $block->escapeUrl($block->getData('nonceUrl')); ?>"
+            "container": "payment_<?= /* @noEscape */ $id ?>",
+            "publicHash": "<?= $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)) ?>",
+            "code": "<?= $block->escapeHtml($block->getData('code')) ?>",
+            "nonceUrl": "<?= $block->escapeUrl($block->getData('nonceUrl')) ?>"
         }
-    }' id="payment_<?php /* @noEscape */ echo $id;?>" class="admin__field">
+    }' id="payment_<?= /* @noEscape */ $id ?>" class="admin__field">
     <div class="admin__field-control control">
-        <input type="radio" id="token_switcher_<?php /* @noEscape */ echo $id; ?>" name="payment[token_switcher]"/>
-        <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
-             width="<?php echo $block->escapeHtml($icon['width']); ?>"
-             height="<?php echo $block->escapeHtml($icon['height']); ?>"
+        <input type="radio" id="token_switcher_<?= /* @noEscape */ $id ?>" name="payment[token_switcher]"/>
+        <img src="<?= $block->escapeUrl($icon['url']) ?>"
+             width="<?= $block->escapeHtml($icon['width']) ?>"
+             height="<?= $block->escapeHtml($icon['height']) ?>"
              class="payment-icon" >
-        <span><?php echo $block->escapeHtml($details['payerEmail']); ?></span>
+        <span><?= $block->escapeHtml($details['payerEmail']) ?></span>
     </div>
 </div>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
index 7146613dd7dc8..77d08dbc5273c 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form/vault.phtml
@@ -13,21 +13,21 @@ $id = $block->escapeHtml($block->getData('id'));
 ?>
 <div data-mage-init='{
         "Magento_Braintree/js/vault": {
-            "container": "payment_<?php /* @noEscape */ echo $id; ?>",
-            "publicHash": "<?php echo $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)); ?>",
-            "code": "<?php echo $block->escapeHtml($block->getData('code')); ?>",
-            "nonceUrl": "<?php echo $block->escapeUrl($block->getData('nonceUrl')); ?>"
+            "container": "payment_<?= /* @noEscape */ $id ?>",
+            "publicHash": "<?= $block->escapeHtml($block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)) ?>",
+            "code": "<?= $block->escapeHtml($block->getData('code')) ?>",
+            "nonceUrl": "<?= $block->escapeUrl($block->getData('nonceUrl')) ?>"
         }
-    }' id="payment_<?php /* @noEscape */ echo $id;?>" class="admin__field">
+    }' id="payment_<?= /* @noEscape */ $id ?>" class="admin__field">
     <div class="admin__field-control control">
-        <input type="radio" id="token_switcher_<?php /* @noEscape */ echo $id; ?>" name="payment[token_switcher]"/>
-        <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
-             width="<?php echo $block->escapeHtml($icon['width']); ?>"
-             height="<?php echo $block->escapeHtml($icon['height']); ?>"
+        <input type="radio" id="token_switcher_<?= /* @noEscape */ $id ?>" name="payment[token_switcher]"/>
+        <img src="<?= $block->escapeUrl($icon['url']) ?>"
+             width="<?= $block->escapeHtml($icon['width']) ?>"
+             height="<?= $block->escapeHtml($icon['height']) ?>"
              class="payment-icon" >
-        <span><?php echo $block->escapeHtml(__('ending'));?></span>
-        <span><?php echo $block->escapeHtml($details['maskedCC']); ?></span>
-        (<span><?php echo $block->escapeHtml(__('expires'));?></span>:
-        <span><?php echo $block->escapeHtml($details['expirationDate']); ?></span>)
+        <span><?= $block->escapeHtml(__('ending')) ?></span>
+        <span><?= $block->escapeHtml($details['maskedCC']) ?></span>
+        (<span><?= $block->escapeHtml(__('expires')) ?></span>:
+        <span><?= $block->escapeHtml($details['expirationDate']) ?></span>)
     </div>
 </div>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/grid/tooltip.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/grid/tooltip.phtml
index de7688608536f..1a852222b8b3d 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/grid/tooltip.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/grid/tooltip.phtml
@@ -7,4 +7,5 @@
 /**
  * @var \Magento\Backend\Block\Template $block
  */
-echo $block->escapeHtml($block->getData('tooltip_content'));
+?>
+<?= $block->escapeHtml($block->getData('tooltip_content'));
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
index 5c84f9b588d0d..1b188b68948bf 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/payment/script.phtml
@@ -17,9 +17,9 @@ $code = $block->escapeHtml($block->getCode());
             'jquery',
             'domReady!'
         ], function(Braintree, $) {
-            var config = <?php /* @noEscape */ echo $block->getPaymentConfig(); ?>,
+            var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
                 payment,
-                form = $('#payment_form_<?php /* @noEscape */ echo $code; ?>');
+                form = $('#payment_form_<?= /* @noEscape */ $code ?>');
 
             config.active = form.length > 0 && !form.is(':hidden');
             payment = new Braintree(config);
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
index a244833051082..1d60d19458a28 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml
@@ -20,13 +20,12 @@ $config = [
 ];
 
 ?>
-<div data-mage-init='<?php /* @noEscape */ echo json_encode($config); ?>'
-     class="paypal checkout paypal-logo braintree-paypal-logo<?php
-     /* @noEscape */ echo $block->getContainerId(); ?>-container">
-    <button data-currency="<?php /* @noEscape */ echo $block->getCurrency(); ?>"
-       data-locale="<?php /* @noEscape */ echo $block->getLocale(); ?>"
-       data-amount="<?php /* @noEscape */ echo $block->getAmount(); ?>"
-       id="<?php /* @noEscape */ echo $id; ?>"
+<div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
+    class="paypal checkout paypal-logo braintree-paypal-logo<?= /* @noEscape */ $block->getContainerId() ?>-container">
+    <button data-currency="<?= /* @noEscape */ $block->getCurrency() ?>"
+       data-locale="<?= /* @noEscape */ $block->getLocale() ?>"
+       data-amount="<?= /* @noEscape */ $block->getAmount() ?>"
+       id="<?= /* @noEscape */ $id ?>"
        class="action-braintree-paypal-logo" disabled>
         <img class="braintree-paypal-button-hidden"
              src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
diff --git a/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml b/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
index e62ba9b37bf6e..e12ffddfe09e2 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml
@@ -13,22 +13,22 @@ $payerEmail = $block->getPayerEmail();
 $confirmDeleteMessage = sprintf('%s: %s?', __('Are you sure you want to delete this PayPal account'), $payerEmail);
 ?>
 <tr>
-    <td data-th="<?php echo $block->escapeHtml(__('PayPal Account')); ?>" class="col paypal-account">
-        <img src="<?php /* @noEscape */ echo $block->getIconUrl(); ?>"
-             width="<?php /* @noEscape */ echo $block->getIconWidth(); ?>"
-             height="<?php /* @noEscape */ echo $block->getIconHeight(); ?>"
-             alt="<?php echo $block->escapeHtml(__('PayPal Logo')); ?>">
-        <span><?php echo $block->escapeHtml($payerEmail); ?></span>
+    <td data-th="<?= $block->escapeHtml(__('PayPal Account')) ?>" class="col paypal-account">
+        <img src="<?= /* @noEscape */ $block->getIconUrl() ?>"
+             width="<?= /* @noEscape */ $block->getIconWidth() ?>"
+             height="<?= /* @noEscape */ $block->getIconHeight() ?>"
+             alt="<?= $block->escapeHtml(__('PayPal Logo')) ?>">
+        <span><?= $block->escapeHtml($payerEmail) ?></span>
     </td>
-    <td data-th="<?php echo $block->escapeHtml(__('Actions')); ?>" class="col actions">
+    <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
         <form
             class="form"
-            action="<?php echo $block->escapeUrl($block->getUrl('vault/cards/deleteaction')); ?>"
+            action="<?= $block->escapeUrl($block->getUrl('vault/cards/deleteaction')) ?>"
             method="post">
-            <?php echo $block->getBlockHtml('formkey'); ?>
+            <?= $block->getBlockHtml('formkey') ?>
             <input
-                name="<?php /* @noEscape */ echo PaymentTokenInterface::PUBLIC_HASH; ?>"
-                value="<?php /* @noEscape */ echo $block->getToken()->getPublicHash(); ?>"
+                name="<?= /* @noEscape */ PaymentTokenInterface::PUBLIC_HASH ?>"
+                value="<?= /* @noEscape */ $block->getToken()->getPublicHash() ?>"
                 type="hidden"/>
             <button type="submit"
                     class="action delete"
@@ -37,11 +37,11 @@ $confirmDeleteMessage = sprintf('%s: %s?', __('Are you sure you want to delete t
                             "type": "popup",
                             "modalClass": "my-credit-cards-popup",
                             "toggleEvent": "click",
-                            "title": "<?php echo $block->escapeHtml(__('Delete')); ?>",
-                            "content":"<?php echo $block->escapeHtml($confirmDeleteMessage); ?>"
+                            "title": "<?= $block->escapeHtml(__('Delete')) ?>",
+                            "content":"<?= $block->escapeHtml($confirmDeleteMessage) ?>"
                         }
                     }'>
-                <span><?php echo $block->escapeHtml(__('Delete')); ?></span>
+                <span><?= $block->escapeHtml(__('Delete')) ?></span>
             </button>
         </form>
     </td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
index 46f1e155c89a6..224cd71538b7b 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/catalog/product/edit/tab/attributes/extend.phtml
@@ -24,14 +24,14 @@ $isElementReadonly = $block->getElement()
     <div class="<?= /* @escapeNotVerified */  $attributeCode ?> "><?= /* @escapeNotVerified */  $elementHtml ?></div>
 <?php } ?>
 
-<?=$block->getExtendedElement($switchAttributeCode)->toHtml(); ?>
+<?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
 
 <?php if (!$isElementReadonly && $block->getDisableChild()) { ?>
     <script>
         require(['prototype'], function () {
-            function <?= /* @escapeNotVerified */ $switchAttributeCode?>_change() {
-                var $attribute = $('<?= /* @escapeNotVerified */ $attributeCode?>');
-                if ($('<?= /* @escapeNotVerified */ $switchAttributeCode?>').value == '<?= /* @escapeNotVerified */ $block::DYNAMIC?>') {
+            function <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change() {
+                var $attribute = $('<?= /* @escapeNotVerified */ $attributeCode ?>');
+                if ($('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').value == '<?= /* @escapeNotVerified */ $block::DYNAMIC ?>') {
                     if ($attribute) {
                         $attribute.disabled = true;
                         $attribute.value = '';
@@ -45,7 +45,7 @@ $isElementReadonly = $block->getElement()
                         <?php if ($attributeCode === 'price' && !$block->getCanEditPrice() && $block->getCanReadPrice()
                                 && $block->getProduct()->isObjectNew()) { ?>
                             <?php $defaultProductPrice = $block->getDefaultProductPrice() ?: "''"; ?>
-                            $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice?>;
+                            $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice ?>;
                         <?php } else { ?>
                             $attribute.disabled = false;
                             $attribute.addClassName('required-entry');
@@ -59,10 +59,10 @@ $isElementReadonly = $block->getElement()
 
             <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
                     && !$block->getProduct()->isObjectNew())) { ?>
-                $('<?= /* @escapeNotVerified */ $switchAttributeCode?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode?>_change);
+                $('<?= /* @escapeNotVerified */ $switchAttributeCode ?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change);
             <?php } ?>
             Event.observe(window, 'load', function(){
-                <?= /* @escapeNotVerified */ $switchAttributeCode?>_change();
+                <?= /* @escapeNotVerified */ $switchAttributeCode ?>_change();
             });
         });
     </script>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
index bc9fee129e6aa..87798a6ba622f 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/bundle.phtml
@@ -12,11 +12,11 @@
 <?php $options = $block->decorateArray($block->getOptions(true)); ?>
 <?php if (count($options)): ?>
 <fieldset id="catalog_product_composite_configure_fields_bundle"
-          class="fieldset admin__fieldset composite-bundle<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend admin__legend"><span><?php /* @escapeNotVerified */ echo __('Bundle Items') ?></span></legend><br />
+          class="fieldset admin__fieldset composite-bundle<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
+    <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Bundle Items') ?></span></legend><br />
     <?php foreach ($options as $option) : ?>
         <?php if ($option->getSelections()) : ?>
-            <?php echo $block->getOptionHtml($option); ?>
+            <?= $block->getOptionHtml($option) ?>
         <?php endif; ?>
     <?php endforeach; ?>
 </fieldset>
@@ -71,7 +71,7 @@ require([
             }
         }
     };
-    ProductConfigure.bundleControl = new BundleControl(<?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>);
+    ProductConfigure.bundleControl = new BundleControl(<?= /* @escapeNotVerified */ $block->getJsonConfig() ?>);
 });
 </script>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
index cea6811a92d25..44ed02f2758d0 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/checkbox.phtml
@@ -14,49 +14,49 @@
 
 <div class="field admin__field options<?php if ($_option->getRequired()) echo ' required _required' ?>">
     <label class="label admin__field-label">
-        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
 
     <div class="control admin__field-control">
         <div class="nested <?php if ($_option->getDecoratedIsLast()):?> last<?php endif;?>">
 
             <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-                <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                       name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                       value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"
-                       price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selections[0]) ?>" />
+                       name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                       value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
+                       price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
             <?php else:?>
 
                 <?php foreach ($_selections as $_selection): ?>
                     <div class="field choice admin__field admin__field-option">
                         <input
-                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
-                            id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                            class="change-container-classname admin__control-checkbox checkbox bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
+                            id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                             type="checkbox"
-                            name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][<?php /* @escapeNotVerified */ echo $_selection->getId() ?>]"
+                            name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
                             <?php if ($block->isSelected($_selection)):?>
-                                <?php echo ' checked="checked"'; ?>
+                                <?= ' checked="checked"' ?>
                             <?php endif;?>
                             <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck):?>
-                                <?php echo ' disabled="disabled"'; ?>
+                                <?= ' disabled="disabled"' ?>
                             <?php endif;?>
-                            value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                            value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                             onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                            price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selection) ?>" />
+                            price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>" />
 
                         <label class="admin__field-label"
-                               for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>">
-                            <span><?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
+                            <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
                         </label>
 
                         <?php if ($_option->getRequired()): ?>
-                            <?php /* @escapeNotVerified */ echo $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
+                            <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
                         <?php endif;?>
                     </div>
                 <?php endforeach; ?>
 
-                <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
             <?php endif; ?>
         </div>
     </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
index 671c410bc8762..8c13dd6479d4d 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/multi.phtml
@@ -12,23 +12,23 @@
 <?php $_selections = $_option->getSelections(); ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <div class="field admin__field <?php if ($_option->getRequired()) echo ' required' ?><?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
-    <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selections[0]) ?>" />
+            <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <input type="hidden" name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
+                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
         <?php else: ?>
-            <select multiple="multiple" size="5" id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
-                    name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][]"
-                    class="admin__control-multiselect bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
+            <select multiple="multiple" size="5" id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
+                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
+                    class="admin__control-multiselect bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
             <?php if(!$_option->getRequired()): ?>
-                <option value=""><?php /* @escapeNotVerified */ echo __('None') ?></option>
+                <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
             <?php endif; ?>
             <?php foreach ($_selections as $_selection): ?>
-                <option value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selection) ?>"><?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
+                <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
             <?php endforeach; ?>
             </select>
         <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
index cfb4e74a4a15f..f0912979a9248 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/radio.phtml
@@ -15,57 +15,57 @@
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
 <div class="field admin__field options<?php if ($_option->getRequired()) echo ' required' ?>">
-    <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <div class="nested<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
         <?php if ($block->showSingle()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selections[0]) ?>" />
+                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
+                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
         <?php else:?>
             <?php if (!$_option->getRequired()): ?>
                 <div class="field choice admin__field admin__field-option">
                     <input type="radio"
                            class="radio admin__control-radio"
-                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
-                           name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
+                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
+                           name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"<?= ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
                            value=""
                            onclick="ProductConfigure.bundleControl.changeSelection(this)" />
                     <label class="admin__field-label"
-                           for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"><span><?php /* @escapeNotVerified */ echo __('None') ?></span></label>
+                           for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"><span><?= /* @escapeNotVerified */ __('None') ?></span></label>
                 </div>
             <?php endif; ?>
 
             <?php foreach ($_selections as $_selection): ?>
                 <div class="field choice admin__field admin__field-option">
                     <input type="radio"
-                           class="radio admin__control-radio <?php echo $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
-                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
-                           name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                           class="radio admin__control-radio <?= $_option->getRequired() ? ' validate-one-required-by-name' : '' ?> change-container-classname"
+                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
+                           name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                            <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
-                           value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                           value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                           price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selection) ?>"
-                           qtyId="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input" />
+                           price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
+                           qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input" />
                     <label class="admin__field-label"
-                           for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"><span><?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selection) ?></span></label>
+                           for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"><span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span></label>
                 <?php if ($_option->getRequired()): ?>
-                    <?php /* @escapeNotVerified */ echo $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
+                    <?= /* @escapeNotVerified */ $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
                 <?php endif; ?>
                 </div>
             <?php endforeach; ?>
-            <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></div>
+            <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
         <?php endif; ?>
             <div class="field admin__field qty">
                 <label class="label admin__field-label"
-                       for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"><span><?php /* @escapeNotVerified */ echo __('Quantity:') ?></span></label>
+                       for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
                 <div class="control admin__field-control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                        id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
+                        id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
                         class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
                         type="text"
-                        name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $_defaultQty ?>" />
+                        name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
index 73a9e6dcb9b4f..32766f62163ed 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/composite/fieldset/options/type/select.phtml
@@ -15,24 +15,24 @@
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
 <div class="field admin__field option<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?><?php if ($_option->getRequired()) echo ' required _required' ?>">
-    <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <label class="label admin__field-label"><span><?= $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if ($block->showSingle()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selections[0]) ?>" />
+            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
+            <input type="hidden" name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"
+                   price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selections[0]) ?>" />
         <?php else:?>
-            <select id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
-                    name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                    class="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
+            <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
+                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
-                <option value=""><?php /* @escapeNotVerified */ echo __('Choose a selection...') ?></option>
+                <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
                     <option
-                        value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
-                        price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selection) ?>"
-                        qtyId="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"><?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selection, false) ?></option>
+                        value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
+                        price="<?= /* @escapeNotVerified */ $block->getSelectionPrice($_selection) ?>"
+                        qtyId="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?></option>
                 <?php endforeach; ?>
             </select>
         <?php endif; ?>
@@ -40,12 +40,12 @@
         <div class="nested">
             <div class="field admin__field qty">
                 <label class="label admin__field-label"
-                       for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"><span><?php /* @escapeNotVerified */ echo __('Quantity:') ?></span></label>
+                       for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"><span><?= /* @escapeNotVerified */ __('Quantity:') ?></span></label>
                 <div class="control admin__field-control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                        id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
+                        id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
                         class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
-                        name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $_defaultQty ?>" />
+                        name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= /* @escapeNotVerified */ $_defaultQty ?>" />
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
index 44c41d435898d..5b27412dd885b 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle.phtml
@@ -19,14 +19,14 @@ if(typeof Bundle=='undefined') {
 <div id="bundle_product_container" class="entry-edit form-inline">
     <fieldset class="fieldset">
         <div class="field field-ship-bundle-items">
-            <label for="shipment_type" class="label"><?php /* @escapeNotVerified */ echo __('Ship Bundle Items') ?></label>
+            <label for="shipment_type" class="label"><?= /* @escapeNotVerified */ __('Ship Bundle Items') ?></label>
             <div class="control">
                 <select <?php if ($block->isReadonly()): ?>disabled="disabled" <?php endif;?>
                         id="shipment_type"
-                        name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[shipment_type]"
+                        name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[shipment_type]"
                         class="select">
-                    <option value="1"><?php /* @escapeNotVerified */ echo __('Separately') ?></option>
-                    <option value="0"<?php if ($block->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Together') ?></option>
+                    <option value="1"><?= /* @escapeNotVerified */ __('Separately') ?></option>
+                    <option value="0"<?php if ($block->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Together') ?></option>
                 </select>
             </div>
         </div>
@@ -34,10 +34,10 @@ if(typeof Bundle=='undefined') {
         <div
             id="product_bundle_container"
             class="entry-edit custom-options bundle sortable-wrapper">
-            <?php echo $block->getOptionsBoxHtml() ?>
+            <?= $block->getOptionsBoxHtml() ?>
         </div>
 
-        <?php echo $block->getAddButtonHtml() ?>
+        <?= $block->getAddButtonHtml() ?>
     </fieldset>
 </div>
 
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
index 1b4d7408bb3bc..62f61a725097e 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option.phtml
@@ -9,69 +9,69 @@
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option */
 ?>
 <script id="bundle-option-template" type="text/x-magento-template">
-    <div id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>" class="option-box">
-        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>-wrapper">
+    <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>" class="option-box">
+        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-wrapper">
             <div class="fieldset-wrapper-title">
-                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">
-                    <?php echo $block->getOptionDeleteButtonHtml() ?>
+                    <?= $block->getOptionDeleteButtonHtml() ?>
                 </div>
                 <div data-role="draggable-handle" class="draggable-handle"></div>
             </div>
-            <div class="fieldset-wrapper-content in collapse" id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>-content">
+            <div class="fieldset-wrapper-content in collapse" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>-content">
                 <fieldset class="fieldset">
                     <fieldset class="fieldset-alt">
                         <div class="field field-option-title required">
-                            <label class="label" for="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_title">
-                                <?php /* @escapeNotVerified */ echo __('Option Title') ?>
+                            <label class="label" for="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title">
+                                <?= /* @escapeNotVerified */ __('Option Title') ?>
                             </label>
                             <div class="control">
                                 <?php if ($block->isDefaultStore()): ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][title]"
-                                       id="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_title"
+                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][title]"
+                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title"
                                        value="<%- data.title %>"
                                        data-original-value="<%- data.title %>" />
                                 <?php else: ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][default_title]"
-                                       id="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_default_title"
+                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][default_title]"
+                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_default_title"
                                        value="<%- data.default_title %>"
                                        data-original-value="<%- data.default_title %>" />
                                 <?php endif; ?>
                                 <input type="hidden"
-                                       id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_id_<%- data.index %>"
-                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][option_id]"
+                                       id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_id_<%- data.index %>"
+                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][option_id]"
                                        value="<%- data.option_id %>" />
                                 <input type="hidden"
-                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][delete]"
+                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][delete]"
                                        value=""
                                        data-state="deleted" />
                             </div>
                         </div>
                         <?php if (!$block->isDefaultStore()): ?>
                         <div class="field field-option-store-view required">
-                            <label class="label" for="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_title_store">
-                                <?php /* @escapeNotVerified */ echo __('Store View Title') ?>
+                            <label class="label" for="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title_store">
+                                <?= /* @escapeNotVerified */ __('Store View Title') ?>
                             </label>
                             <div class="control">
                                 <input class="input-text required-entry" type="text"
-                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][title]"
-                                       id="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_title_store"
+                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][title]"
+                                       id="id_<?= /* @escapeNotVerified */ $block->getFieldName() ?>_<%- data.index %>_title_store"
                                        value="<%- data.title %>" />
                             </div>
                         </div>
                         <?php endif; ?>
                         <div class="field field-option-input-type required">
-                            <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId() . '_<%- data.index %>_type' ?>">
-                                <?php /* @escapeNotVerified */ echo __('Input Type') ?>
+                            <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() . '_<%- data.index %>_type' ?>">
+                                <?= /* @escapeNotVerified */ __('Input Type') ?>
                             </label>
                             <div class="control">
-                                <?php echo $block->getTypeSelectHtml() ?>
+                                <?= $block->getTypeSelectHtml() ?>
                             </div>
                         </div>
                         <div class="field field-option-req">
@@ -81,19 +81,19 @@
                                        checked="checked"
                                        id="field-option-req" />
                                 <label for="field-option-req">
-                                    <?php /* @escapeNotVerified */ echo __('Required')?>
+                                    <?= /* @escapeNotVerified */ __('Required') ?>
                                 </label>
-                                <span style="display:none"><?php echo $block->getRequireSelectHtml() ?></span>
+                                <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
                             </div>
                         </div>
                         <div class="field field-option-position no-display">
                             <label class="label" for="field-option-position">
-                                <?php /* @escapeNotVerified */ echo __('Position') ?>
+                                <?= /* @escapeNotVerified */ __('Position') ?>
                             </label>
                             <div class="control">
                                 <input class="input-text validate-zero-or-greater"
                                        type="text"
-                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][position]"
+                                       name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.index %>][position]"
                                        value="<%- data.position %>"
                                        id="field-option-position" />
                             </div>
@@ -101,17 +101,17 @@
                     </fieldset>
 
                     <div class="no-products-message">
-                        <?php /* @escapeNotVerified */ echo __('There are no products in this option.')?>
+                        <?= /* @escapeNotVerified */ __('There are no products in this option.') ?>
                     </div>
-                    <?php echo $block->getAddSelectionButtonHtml() ?>
+                    <?= $block->getAddSelectionButtonHtml() ?>
                 </fieldset>
             </div>
         </div>
-        <div id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
+        <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
     </div>
 </script>
 
-<?php echo $block->getSelectionHtml() ?>
+<?= $block->getSelectionHtml() ?>
 
 <script>
 require([
@@ -141,7 +141,7 @@ function changeInputType(oldObject, oType) {
 
 Bundle.Option = Class.create();
 Bundle.Option.prototype = {
-    idLabel : '<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>',
+    idLabel : '<?= /* @escapeNotVerified */ $block->getFieldId() ?>',
     templateText : '',
     itemsCount : 0,
     initialize : function(template) {
@@ -150,7 +150,7 @@ Bundle.Option.prototype = {
 
     add : function(data) {
         if (!data) {
-            data = <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(['default_title' => __('New Option')])?>;
+            data = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(['default_title' => __('New Option')]) ?>;
         } else {
             data.title = data.title.replace(/</g, "&lt;");
             data.title = data.title.replace(/"/g, "&quot;");
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
index 964b42ac2e97c..5130c2cd2db8a 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/search.phtml
@@ -5,4 +5,5 @@
  */
 
 /** @var $block \Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab\Bundle\Option\Search */
-echo $block->getChildHtml();
+?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
index 1398c53941fa6..91c245afe5717 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml
@@ -13,16 +13,16 @@
         <thead>
             <tr class="headings">
                 <th class="col-draggable"></th>
-                <th class="col-default"><?php /* @escapeNotVerified */ echo __('Default') ?></th>
-                <th class="col-name"><?php /* @escapeNotVerified */ echo __('Name') ?></th>
-                <th class="col-sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
+                <th class="col-default"><?= /* @escapeNotVerified */ __('Default') ?></th>
+                <th class="col-name"><?= /* @escapeNotVerified */ __('Name') ?></th>
+                <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
             <?php if ($block->getCanReadPrice() !== false): ?>
-                <th class="col-price price-type-box"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th class="col-price price-type-box"><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
+                <th class="col-price price-type-box"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th class="col-price price-type-box"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
             <?php endif; ?>
-                <th class="col-qty"><?php /* @escapeNotVerified */ echo __('Default Quantity') ?></th>
-                <th class="col-uqty qty-box"><?php /* @escapeNotVerified */ echo __('User Defined') ?></th>
-                <th class="col-order type-order" style="display:none"><?php /* @escapeNotVerified */ echo __('Position') ?></th>
+                <th class="col-qty"><?= /* @escapeNotVerified */ __('Default Quantity') ?></th>
+                <th class="col-uqty qty-box"><?= /* @escapeNotVerified */ __('User Defined') ?></th>
+                <th class="col-order type-order" style="display:none"><?= /* @escapeNotVerified */ __('Position') ?></th>
                 <th class="col-actions"></th>
             </tr>
         </thead>
@@ -33,65 +33,65 @@
 <script id="bundle-option-selection-row-template" type="text/x-magento-template">
     <td class="col-draggable">
         <span data-role="draggable-handle" class="draggable-handle"></span>
-        <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_id<%- data.index %>"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
+        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_id<%- data.index %>"
+               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
                value="<%- data.selection_id %>"/>
-        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
+        <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
                value="<%- data.option_id %>"/>
         <input type="hidden" class="product"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
+               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
                value="<%- data.product_id %>"/>
-        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
+        <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
                value="" class="delete"/>
     </td>
     <td class="col-default">
         <input onclick="bSelection.checkGroup(event)" type="<%- data.option_type %>" class="default"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
+               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
                value="1" <%- data.checked %> />
     </td>
     <td class="col-name"><%- data.name %></td>
     <td class="col-sku"><%- data.sku %></td>
 <?php if ($block->getCanReadPrice() !== false): ?>
     <td class="col-price price-type-box">
-        <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>_price_value"
+        <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_value"
                class="input-text required-entry validate-zero-or-greater" type="text"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
+               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
                value="<%- data.selection_price_value %>"
             <?php if ($block->getCanEditPrice() === false): ?>
                disabled="disabled"
             <?php endif; ?>/>
     </td>
     <td class="col-price price-type-box">
-        <?php echo $block->getPriceTypeSelectHtml() ?>
-        <div><?php echo $block->getCheckboxScopeHtml() ?></div>
+        <?= $block->getPriceTypeSelectHtml() ?>
+        <div><?= $block->getCheckboxScopeHtml() ?></div>
     </td>
 <?php else: ?>
-    <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId(); ?>_<%- data.index %>_price_value"
-           name="<?php /* @escapeNotVerified */ echo $block->getFieldName(); ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
-    <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId(); ?>_<%- data.index %>_price_type"
-           name="<?php /* @escapeNotVerified */ echo $block->getFieldName(); ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
+    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_value"
+           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
+    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_type"
+           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
     <?php if ($block->isUsedWebsitePrice()): ?>
-    <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId(); ?>_<%- data.index %>_price_scope"
-           name="<?php /* @escapeNotVerified */ echo $block->getFieldName(); ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
+    <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.index %>_price_scope"
+           name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
     <?php endif; ?>
 <?php endif; ?>
     <td class="col-qty">
         <input class="input-text required-entry validate-greater-zero-based-on-option validate-zero-or-greater" type="text"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
+               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
                value="<%- data.selection_qty %>" />
     </td>
     <td class="col-uqty qty-box">
         <input type="checkbox" class="is-user-defined-qty" checked="checked" />
-        <span style="display:none"><?php echo $block->getQtyTypeSelectHtml() ?></span>
+        <span style="display:none"><?= $block->getQtyTypeSelectHtml() ?></span>
     </td>
     <td class="col-order type-order" style="display:none">
         <input class="input-text required-entry validate-zero-or-greater" type="text"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
+               name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
                value="<%- data.position %>" />
     </td>
     <td class="col-actions">
         <span title="Delete Row">
-            <?php echo $block->getSelectionDeleteButtonHtml() ?>
+            <?= $block->getSelectionDeleteButtonHtml() ?>
         </span>
     </td>
 </script>
@@ -106,8 +106,8 @@ var bundleTemplateBox = jQuery('#bundle-option-selection-box-template').html(),
 
 Bundle.Selection = Class.create();
 Bundle.Selection.prototype = {
-    idLabel : '<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>',
-    scopePrice : <?php echo (int)$block->isUsedWebsitePrice() ?>,
+    idLabel : '<?= /* @escapeNotVerified */ $block->getFieldId() ?>',
+    scopePrice : <?= (int)$block->isUsedWebsitePrice() ?>,
     templateBox : '',
     templateRow : '',
     itemsCount : 0,
@@ -115,7 +115,7 @@ Bundle.Selection.prototype = {
     gridSelection: new Hash(),
     gridRemoval: new Hash(),
     gridSelectedProductSkus: [],
-    selectionSearchUrl: '<?php /* @escapeNotVerified */ echo $block->getSelectionSearchUrl() ?>',
+    selectionSearchUrl: '<?= /* @escapeNotVerified */ $block->getSelectionSearchUrl() ?>',
 
     initialize : function() {
         this.templateBox = '<div class="tier form-list" id="' + this.idLabel + '_box_<%- data.parentIndex %>">' + bundleTemplateBox + '</div>';
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
index f5340c1cbdde6..3aba02fadffbb 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/create/items/renderer.phtml
@@ -33,7 +33,7 @@
     <?php if ($_item->getOrderItem()->getParentItem()): ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -46,21 +46,21 @@
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?php echo(++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
+    <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
+            <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         </td>
         <?php else: ?>
-        <td class="col-product"><div class="option-value"><?php echo $block->getValueHtml($_item)?></div></td>
+        <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-price">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'price'); ?>
+                <?= $block->getColumnHtml($_item, 'price') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -69,44 +69,44 @@
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -120,7 +120,7 @@
                 <?php if ($block->canReturnItemToStock($_item)) : ?>
                     <input type="checkbox"
                            class="admin__control-checkbox"
-                           name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][back_to_stock]"
+                           name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][back_to_stock]"
                            value="1"<?php if ($_item->getBackToStock()):?> checked="checked"<?php endif;?> />
                     <label class="admin__field-label"></label>
                 <?php endif; ?>
@@ -134,10 +134,10 @@
                 <?php if ($block->canEditQty()) : ?>
                     <input type="text"
                            class="input-text admin__control-text qty-input"
-                           name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][qty]"
-                           value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
+                           name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][qty]"
+                           value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
                 <?php else: ?>
-                    <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+                    <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
                 <?php endif; ?>
             <?php else: ?>
                 &nbsp;
@@ -145,28 +145,28 @@
         </td>
         <td class="col-subtotal">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+                <?= $block->getColumnHtml($_item, 'subtotal') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-amount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'total'); ?>
+                <?= $block->getColumnHtml($_item, 'total') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -179,20 +179,20 @@
             <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -204,7 +204,7 @@ require(['prototype'], function(){
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
index cf36a570b255f..a9e71a79f8977 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/creditmemo/view/items/renderer.phtml
@@ -33,7 +33,7 @@
     <?php if ($_item->getOrderItem()->getParentItem()): ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -44,56 +44,56 @@
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?php echo(++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
+    <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
+            <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         </td>
         <?php else: ?>
-        <td class="col-product"><div class="option-value"><?php echo $block->getValueHtml($_item)?></div></td>
+        <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-price">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'price'); ?>
+                <?= $block->getColumnHtml($_item, 'price') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+                <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+                <?= $block->getColumnHtml($_item, 'subtotal') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'total'); ?>
+                <?= $block->getColumnHtml($_item, 'total') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -106,20 +106,20 @@
             <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions() as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -129,7 +129,7 @@ require(['prototype'], function(){
                 <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $block->escapeHtml($block->getItem()->getDescription()) ?>
+            <?= $block->escapeHtml($block->getItem()->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
index 6e055593884af..ff26d67bd8378 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/create/items/renderer.phtml
@@ -33,7 +33,7 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -45,23 +45,23 @@
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?php echo(++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
+    <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
+            <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         </td>
         <?php else: ?>
         <td class="col-product">
-            <div class="option-value"><?php echo $block->getValueHtml($_item)?></div>
+            <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-price">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'price'); ?>
+                <?= $block->getColumnHtml($_item, 'price') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -70,44 +70,44 @@
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-                        <td><span><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
+                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+                        <td><span><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -120,10 +120,10 @@
                 <?php if ($block->canEditQty()) : ?>
                     <input type="text"
                            class="input-text admin__control-text qty-input"
-                           name="invoice[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
-                           value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
+                           name="invoice[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
+                           value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
                 <?php else : ?>
-                    <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+                    <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
                 <?php endif; ?>
             <?php else: ?>
                 &nbsp;
@@ -131,28 +131,28 @@
         </td>
         <td class="col-subtotal">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+                <?= $block->getColumnHtml($_item, 'subtotal') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'total'); ?>
+                <?= $block->getColumnHtml($_item, 'total') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -165,20 +165,20 @@
             <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -190,7 +190,7 @@ require(['prototype'], function(){
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
index b8f505c6eeba2..5f344409b6a4c 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/invoice/view/items/renderer.phtml
@@ -33,7 +33,7 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -44,57 +44,57 @@
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?php echo(++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
+    <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
+            <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         <?php else: ?>
         <td class="col-product">
-            <div class="option-value"><?php echo $block->getValueHtml($_item)?></div>
+            <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-price">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'price'); ?>
+                <?= $block->getColumnHtml($_item, 'price') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+                <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-subtotal">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+                <?= $block->getColumnHtml($_item, 'subtotal') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'total'); ?>
+                <?= $block->getColumnHtml($_item, 'total') ?>
              <?php else: ?>
                  &nbsp;
             <?php endif; ?>
@@ -107,20 +107,20 @@
             <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions() as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['protoype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -130,7 +130,7 @@ require(['protoype'], function(){
                 <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $block->escapeHtml($block->getItem()->getDescription()) ?>
+            <?= $block->escapeHtml($block->getItem()->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
index ef1a7f4358a15..bb0857a80d689 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/order/view/items/renderer.phtml
@@ -33,7 +33,7 @@
     <?php if ($_item->getParentItem()): ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -47,39 +47,39 @@
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
+    <tr<?= (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title" id="order_item_<?php /* @escapeNotVerified */ echo $_item->getId() ?>_title">
-                <?php echo $block->escapeHtml($_item->getName()) ?>
+            <div class="product-title" id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title">
+                <?= $block->escapeHtml($_item->getName()) ?>
             </div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         </td>
         <?php else: ?>
         <td class="col-product">
-            <div class="option-value"><?php echo $block->getValueHtml($_item)?></div>
+            <div class="option-value"><?= $block->getValueHtml($_item) ?></div>
         </td>
         <?php endif; ?>
         <td class="col-status">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $_item->getStatus() ?>
+                <?= /* @escapeNotVerified */ $_item->getStatus() ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price-original">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('original_price') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('original_price') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'price'); ?>
+                <?= $block->getColumnHtml($_item, 'price') ?>
             <?php else: ?>
                     &nbsp;
             <?php endif; ?>
@@ -88,44 +88,44 @@
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyInvoiced()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyInvoiced()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyRefunded()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyRefunded()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyCanceled()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyCanceled()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyShipped()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+                        <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -135,35 +135,35 @@
         </td>
         <td class="col-subtotal">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+                <?= $block->getColumnHtml($_item, 'subtotal') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-amount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-percent">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayTaxPercent($_item) ?>
+                <?= /* @escapeNotVerified */ $block->displayTaxPercent($_item) ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
+                <?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-total last">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'total'); ?>
+                <?= $block->getColumnHtml($_item, 'total') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -176,20 +176,20 @@
             <?php if ($block->getOrderOptions()): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions() as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?>:</dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?>:</dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
                             
 });
 </script>
@@ -201,7 +201,7 @@ require(['prototype'], function(){
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
index adca352ef8bc7..2ede8277bcfc9 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/create/items/renderer.phtml
@@ -29,28 +29,28 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td class="col-product">&nbsp;</td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr class="<?php echo(++$_index == $_count && !$_showlastRow) ? 'border' : '' ?>">
+    <tr class="<?= (++$_index == $_count && !$_showlastRow) ? 'border' : '' ?>">
         <?php if (!$_item->getOrderItem()->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
+            <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         </td>
         <?php else: ?>
-        <td class="col-product"><div class="option-value"><?php echo $block->getValueHtml($_item)?></div></td>
+        <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-ordered-qty">
             <?php if ($block->isShipmentSeparately($_item)): ?>
-                <?php echo $block->getColumnHtml($_item, 'qty') ?>
+                <?= $block->getColumnHtml($_item, 'qty') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -59,8 +59,8 @@
             <?php if ($block->isShipmentSeparately($_item)): ?>
                 <input type="text"
                        class="input-text admin__control-text"
-                       name="shipment[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
-                       value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
+                       name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
+                       value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -73,20 +73,20 @@
             <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-                            $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-                            $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-                            $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+                            $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -98,7 +98,7 @@ require(['prototype'], function(){
                         <?php else: ?>
                 &nbsp;
                         <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
         <td class="col-ordered-qty">&nbsp;</td>
         <td class="col-qty last">&nbsp;</td>
diff --git a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
index 293a620c15add..71eabd45cbb57 100644
--- a/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/adminhtml/templates/sales/shipment/view/items/renderer.phtml
@@ -29,30 +29,30 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
         <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr<?php echo(++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
+    <tr<?= (++$_index == $_count && !$_showlastRow) ? ' class="border"' : '' ?>>
         <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
+            <div class="product-title"><?= $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
             </div>
         </td>
         <?php else: ?>
-        <td class="col-product"><div class="option-value"><?php echo $block->getValueHtml($_item)?></div></td>
+        <td class="col-product"><div class="option-value"><?= $block->getValueHtml($_item) ?></div></td>
         <?php endif; ?>
         <td class="col-qty last">
             <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
                 <?php if (isset($shipItems[$_item->getId()])): ?>
-                    <?php /* @escapeNotVerified */ echo $shipItems[$_item->getId()]->getQty()*1 ?>
+                    <?= /* @escapeNotVerified */ $shipItems[$_item->getId()]->getQty()*1 ?>
                 <?php elseif ($_item->getIsVirtual()): ?>
-                    <?php /* @escapeNotVerified */ echo __('N/A') ?>
+                    <?= /* @escapeNotVerified */ __('N/A') ?>
                 <?php else: ?>
                     0
                 <?php endif; ?>
@@ -68,20 +68,20 @@
             <?php if ($block->getOrderOptions($_item->getOrderItem())): ?>
                 <dl class="item-options">
                 <?php foreach ($block->getOrderOptions($_item->getOrderItem()) as $option): ?>
-                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
+                    <dt><?= /* @escapeNotVerified */ $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $option['value'];?>
+                        <?= /* @escapeNotVerified */ $option['value'] ?>
                     <?php else: ?>
-                        <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
+                        <?= $block->truncateString($option['value'], 55, '', $_remainder) ?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                            ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-                            $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-                            $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-                            $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+                            $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+                            $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -91,7 +91,7 @@ require(['prototype'], function(){
                 <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
         <td class="last">&nbsp;</td>
     </tr>
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
index e92b03a2b5904..53d24dd7c2c07 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/selection/amount.phtml
@@ -10,4 +10,4 @@
 
 <?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
 
-<?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>
+<?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
index efa8cbdc6afc2..5f152c4bbefbc 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
@@ -16,7 +16,7 @@ $tierPriceModel = $block->getPrice();
 $tierPrices = $tierPriceModel->getTierPriceList();
 ?>
 <?php if (count($tierPrices)) : ?>
-    <ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices-tier items'); ?>">
+    <ul class="<?= /* @escapeNotVerified */ ($block->hasListClass() ? $block->getListClass() : 'prices-tier items') ?>">
         <?php foreach ($tierPrices as $index => $price) : ?>
             <li class="item">
                 <?php /* @escapeNotVerified */ echo __(
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
index 8ab61e349b69c..31a39c1cd162c 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/backbutton.phtml
@@ -6,5 +6,5 @@
 ?>
 <button type="button"
         class="action back customization">
-    <span><?php /* @escapeNotVerified */ echo __('Go back to product details') ?></span>
+    <span><?= /* @escapeNotVerified */ __('Go back to product details') ?></span>
 </button>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
index 559ca5dc820a9..d7aea4237b100 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/customize.phtml
@@ -14,7 +14,7 @@
         <button id="bundle-slide"
                 class="action primary customize"
                 type="button">
-            <span><?php /* @escapeNotVerified */ echo __('Customize and Add to Cart'); ?></span>
+            <span><?= /* @escapeNotVerified */ __('Customize and Add to Cart') ?></span>
         </button>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
index 2b4a6fb05828b..2dbea0fd21395 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/options/notice.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<p class="required"><?php /* @escapeNotVerified */ echo __('* Required Fields') ?></p>
+<p class="required"><?= /* @escapeNotVerified */ __('* Required Fields') ?></p>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
index 4278095b4cdb4..bc4337fa7ae24 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml
@@ -16,27 +16,27 @@
      class="block-bundle-summary"
      data-mage-init='{"sticky":{"container": ".product-add-form"}}'>
     <div class="title">
-        <strong><?php /* @escapeNotVerified */ echo __('Your Customization'); ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Your Customization') ?></strong>
     </div>
     <div class="content">
         <div class="bundle-info">
-            <?php echo $block->getImage($_product, 'bundled_product_customization_page')->toHtml(); ?>
+            <?= $block->getImage($_product, 'bundled_product_customization_page')->toHtml() ?>
             <div class="product-details">
-                <strong class="product name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
+                <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
                 <?php if ($_product->getIsSalable()): ?>
-                    <p class="available stock" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+                    <p class="available stock" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                        <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
                     </p>
                 <?php else: ?>
-                    <p class="unavailable stock" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+                    <p class="unavailable stock" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
                     </p>
                 <?php endif; ?>
-                <?php echo $block->getChildHtml('', true);?>
+                <?= $block->getChildHtml('', true) ?>
             </div>
         </div>
         <div class="bundle-summary">
-            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('Summary'); ?></strong>
+            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Summary') ?></strong>
             <div id="bundle-summary" data-container="product-summary">
                 <ul data-mage-init='{"productSummary": []}' class="bundle items"></ul>
                 <script data-template="bundle-summary" type="text/x-magento-template">
@@ -46,7 +46,7 @@
                     </li>
                 </script>
                 <script data-template="bundle-option" type="text/x-magento-template">
-                    <div><?php /* @escapeNotVerified */ echo __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
+                    <div><?= /* @escapeNotVerified */ __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
                 </script>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
index 334aa996bed19..ce9ef89a82bd1 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle.phtml
@@ -11,13 +11,13 @@
 <?php $_product = $block->getProduct() ?>
 <?php if ($block->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable()): ?>
-        <p class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability:') ?>">
-            <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+        <p class="stock available" title="<?= /* @escapeNotVerified */ __('Availability:') ?>">
+            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
         </p>
     <?php else: ?>
-        <p class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability:') ?>">
-            <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+        <p class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability:') ?>">
+            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
         </p>
     <?php endif; ?>
 <?php endif; ?>
-<?php echo $block->getChildHtml('bundle_prices') ?>
+<?= $block->getChildHtml('bundle_prices') ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
index 58fa77f370226..bda649eb603e6 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -11,37 +11,37 @@
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
     <label class="label">
-        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
-                <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                       class="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>  product bundle option"
-                       name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                       value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"/>
+                       class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
+                       name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                       value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
             <?php else:?>
                 <?php foreach($_selections as $_selection): ?>
                     <div class="field choice">
-                        <input class="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?> checkbox product bundle option change-container-classname"
-                               id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                        <input class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> checkbox product bundle option change-container-classname"
+                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                                type="checkbox"
                                <?php if ($_option->getRequired()) /* @escapeNotVerified */ echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
-                               name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][<?php /* @escapeNotVerified */ echo $_selection->getId() ?>]"
-                               data-selector="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][<?php /* @escapeNotVerified */ echo $_selection->getId() ?>]"
+                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
+                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][<?= /* @escapeNotVerified */ $_selection->getId() ?>]"
                                <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
                                <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
-                               value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"/>
+                               value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
                         <label class="label"
-                               for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>">
-                            <span><?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
+                            <span><?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection) ?></span>
                         </label>
                     </div>
                 <?php endforeach; ?>
-                <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
             <?php endif; ?>
         </div>
     </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
index ad6e76af13563..718d43070a5fd 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/multi.phtml
@@ -10,32 +10,32 @@
 <?php /* @var $block \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi */ ?>
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
-        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
+<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
+    <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <?php if ($block->showSingle()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"/>
+                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
         <?php else: ?>
             <select multiple="multiple"
                     size="5"
-                    id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
-                    name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][]"
-                    data-selector="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][]"
-                    class="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?> multiselect product bundle option change-container-classname"
+                    id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
+                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
+                    data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>][]"
+                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> multiselect product bundle option change-container-classname"
                     <?php if ($_option->getRequired()) echo 'data-validate={required:true}' ?>>
                 <?php if(!$_option->getRequired()): ?>
-                    <option value=""><?php /* @escapeNotVerified */ echo __('None') ?></option>
+                    <option value=""><?= /* @escapeNotVerified */ __('None') ?></option>
                 <?php endif; ?>
                 <?php foreach ($_selections as $_selection): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                    <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                             <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
                             <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
-                        <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selection, false) ?>
+                        <?= /* @escapeNotVerified */ $block->getSelectionQtyTitlePrice($_selection, false) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
index 1b588b52c30f4..7ea89e8609818 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/radio.phtml
@@ -13,19 +13,19 @@
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
 
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
+<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
     <label class="label">
-        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
-                <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
+                <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                    class="bundle-option-<?php echo (int)$_option->getId() ?>  product bundle option"
-                    name="bundle_option[<?php echo (int)$_option->getId() ?>]"
-                    value="<?php echo (int)$_selections[0]->getSelectionId() ?>"
-                    id="bundle-option-<?php echo (int)$_option->getId() ?>-<?php echo (int)$_selections[0]->getSelectionId() ?>"
+                    class="bundle-option-<?= (int)$_option->getId() ?>  product bundle option"
+                    name="bundle_option[<?= (int)$_option->getId() ?>]"
+                    value="<?= (int)$_selections[0]->getSelectionId() ?>"
+                    id="bundle-option-<?= (int)$_option->getId() ?>-<?= (int)$_selections[0]->getSelectionId() ?>"
                     checked="checked"
                 />
             <?php else:?>
@@ -33,13 +33,13 @@
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option"
-                               id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
-                               name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                               data-selector="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                               <?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
+                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
+                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                               <?= ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
                                value=""/>
-                        <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
-                            <span><?php /* @escapeNotVerified */ echo __('None') ?></span>
+                        <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+                            <span><?= /* @escapeNotVerified */ __('None') ?></span>
                         </label>
                     </div>
                 <?php endif; ?>
@@ -47,33 +47,33 @@
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option change-container-classname"
-                               id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                               id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                                <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
-                               name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                               data-selector="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                               name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                               data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                                <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
                                <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
-                               value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"/>
+                               value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"/>
                         <label class="label"
-                               for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>">
-                            <span><?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>">
+                            <span><?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection) ?></span>
                         </label>
                     </div>
                 <?php endforeach; ?>
-                <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-container"></div>
             <?php endif; ?>
             <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input">
-                    <span><?php /* @escapeNotVerified */ echo __('Quantity') ?></span>
+                <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input">
+                    <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
                 </label>
                 <div class="control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
+                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
                            class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
                            type="number"
-                           name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                           data-selector="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                           value="<?php /* @escapeNotVerified */ echo $_defaultQty ?>"/>
+                           name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                           data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                           value="<?= /* @escapeNotVerified */ $_defaultQty ?>"/>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
index 21a8e3282a524..977daa2b2a446 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/option/select.phtml
@@ -13,46 +13,46 @@
 <?php $_selections  = $_option->getSelections(); ?>
 <?php $_default     = $_option->getDefaultSelection(); ?>
 <?php list($_defaultQty, $_canChangeQty) = $block->getDefaultValues(); ?>
-<div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
-        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
+<div class="field option <?= ($_option->getRequired()) ? ' required': '' ?>">
+    <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>">
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <?php if ($block->showSingle()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   class="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>  product bundle option"
-                   name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"/>
+                   class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>  product bundle option"
+                   name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   value="<?= /* @escapeNotVerified */ $_selections[0]->getSelectionId() ?>"/>
         <?php else:?>
-            <select id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
-                    name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                    data-selector="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                    class="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
+            <select id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>"
+                    name="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                    data-selector="bundle_option[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                    class="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
                 <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
-                <option value=""><?php /* @escapeNotVerified */ echo __('Choose a selection...') ?></option>
+                <option value=""><?= /* @escapeNotVerified */ __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                    <option value="<?= /* @escapeNotVerified */ $_selection->getSelectionId() ?>"
                         <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
                         <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
-                        <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selection, false) ?>
+                        <?= /* @escapeNotVerified */ $block->getSelectionTitlePrice($_selection, false) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
         <?php endif; ?>
         <div class="nested">
             <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input">
-                    <span><?php /* @escapeNotVerified */ echo __('Quantity') ?></span>
+                <label class="label" for="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input">
+                    <span><?= /* @escapeNotVerified */ __('Quantity') ?></span>
                 </label>
                 <div class="control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
+                           id="bundle-option-<?= /* @escapeNotVerified */ $_option->getId() ?>-qty-input"
                            class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
                            type="number"
-                           name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                           data-selector="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                           value="<?php /* @escapeNotVerified */ echo $_defaultQty ?>"/>
+                           name="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                           data-selector="bundle_option_qty[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                           value="<?= /* @escapeNotVerified */ $_defaultQty ?>"/>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
index e2f56dea1b6c5..0d01afb664bd0 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/type/bundle/options.phtml
@@ -19,7 +19,7 @@ $helper = $this->helper('Magento\Catalog\Helper\Output');
     {
         "#product_addtocart_form": {
             "priceBundle": {
-                "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
+                "optionConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
                 "controlContainer": ".field.option"
             }
         }
@@ -27,17 +27,17 @@ $helper = $this->helper('Magento\Catalog\Helper\Output');
 </script>
         <fieldset class="fieldset fieldset-bundle-options">
             <legend id="customizeTitle" class="legend title">
-                <span><?php /* @escapeNotVerified */ echo __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
+                <span><?= /* @escapeNotVerified */ __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
             </legend><br />
-            <?php echo $block->getChildHtml('product_info_bundle_options_top');?>
+            <?= $block->getChildHtml('product_info_bundle_options_top') ?>
             <?php foreach ($options as $option): ?>
                 <?php if (!$option->getSelections()): ?>
                     <?php continue; ?>
                 <?php endif; ?>
-                <?php echo $block->getOptionHtml($option) ?>
+                <?= $block->getOptionHtml($option) ?>
             <?php endforeach; ?>
         </fieldset>
     <?php else: ?>
-        <p class="empty"><?php /* @escapeNotVerified */ echo __('No options of this product are available.') ?></p>
+        <p class="empty"><?= /* @escapeNotVerified */ __('No options of this product are available.') ?></p>
     <?php endif; ?>
 <?php endif;?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
index be4fa9cb1df91..a87c2167e66d4 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/creditmemo/default.phtml
@@ -45,12 +45,12 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
     <?php else: ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info">
-                <p><?= $block->getValueHtml($_item)?></p>
+                <p><?= $block->getValueHtml($_item) ?></p>
             </td>
     <?php endif; ?>
             <td class="item-qty">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
index 7b9d6d2e3666e..ee79ca3b0a7a5 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
@@ -46,12 +46,12 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
     <?php else: ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info">
-                <p><?= $block->getValueHtml($_item)?></p>
+                <p><?= $block->getValueHtml($_item) ?></p>
             </td>
     <?php endif; ?>
             <td class="item-qty">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
index 092ea5c44dafb..c9c3103c448e4 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
@@ -39,19 +39,19 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
             <td class="item-qty">
                 <?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?>
             </td>
             <td class="item-price">
-                <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
+                <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
             </td>
         </tr>
     <?php else: ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info" colspan="3">
-                <p><?= $block->getValueHtml($_item)?></p>
+                <p><?= $block->getValueHtml($_item) ?></p>
             </td>
         </tr>
     <?php endif; ?>
@@ -74,9 +74,9 @@
                     <tr>
                         <td>
                             <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
-                            <strong><?= /* @escapeNotVerified */  __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                            <br /><strong><?= /* @escapeNotVerified */  __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                            <br /><strong><?= /* @escapeNotVerified */  __('Message:'); ?></strong>
+                            <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                            <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                            <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
                             <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                         </td>
                     </tr>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
index 99f10e1ed72b7..61582087d1fcc 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/shipment/default.phtml
@@ -39,12 +39,12 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
     <?php else: ?>
         <tr class="bundle-item bundle-option-value">
             <td class="item-info">
-                <p><?= $block->getValueHtml($_item)?></p>
+                <p><?= $block->getValueHtml($_item) ?></p>
             </td>
     <?php endif; ?>
             <td class="item-qty">
diff --git a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
index 57abd75c2cacf..b4c2c00e5ac43 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/creditmemo/items/renderer.phtml
@@ -29,51 +29,51 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="options-label">
-                <td class="col label" colspan="7"><div class="option label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+                <td class="col label" colspan="7"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?php /* @escapeNotVerified */ echo $attributes['option_label'] ?>"<?php endif; ?>>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-            <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+            <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         </td>
     <?php else: ?>
-        <td class="col value" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>"><?php echo $block->getValueHtml($_item) ?></td>
+        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $block->getItemPriceHtml($_item); ?>
+            <?= $block->getItemPriceHtml($_item) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Quantity')); ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $block->getItemRowTotalHtml($_item); ?>
+            <?= $block->getItemRowTotalHtml($_item) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col discount" data-th="<?php echo $block->escapeHtml(__('Discount Amount')); ?>">
+    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php /* @escapeNotVerified */ echo $block->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
+            <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col rowtotal" data-th="<?php echo $block->escapeHtml(__('Row Total')); ?>">
+    <td class="col rowtotal" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $block->getItemRowTotalAfterDiscountHtml($_item); ?>
+            <?= $block->getItemRowTotalAfterDiscountHtml($_item) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
@@ -87,27 +87,27 @@
             <?php if ($_options = $block->getItemOptions()): ?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
-                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                         <?php if (!$block->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                     <div class="tooltip content">
                                         <dl class="item options">
-                                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?php endif; ?>
                             </dd>
                         <?php else: ?>
-                            <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                            <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
index 674545b8a850f..f3866d7b1b682 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/invoice/items/renderer.phtml
@@ -28,37 +28,37 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="options-label">
-                <td class="col label" colspan="5"><div class="option label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+                <td class="col label" colspan="5"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getOrderItem()->getParentItem()): ?> data-th="<?php /* @escapeNotVerified */ echo $attributes['option_label'] ?>"<?php endif; ?>>
+    <tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getOrderItem()->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getOrderItem()->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
     <?php if (!$_item->getOrderItem()->getParentItem()): ?>
-        <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-            <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+            <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         </td>
     <?php else: ?>
-        <td class="col value" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>"><?php echo $block->getValueHtml($_item) ?></td>
+        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->escapeHtml($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $block->getItemPriceHtml($_item); ?>
+            <?= $block->getItemPriceHtml($_item) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $block->getItemRowTotalHtml($_item); ?>
+            <?= $block->getItemRowTotalHtml($_item) ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -72,27 +72,27 @@
             <?php if ($_options = $block->getItemOptions()): ?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
-                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                         <?php if (!$block->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                     <div class="tooltip content">
                                         <dl class="item options">
-                                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?php endif; ?>
                             </dd>
                         <?php else: ?>
-                            <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                            <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
index 9d784b61f2b8b..84cbd54d3bdcc 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/items/renderer.phtml
@@ -27,28 +27,28 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="options-label">
-                <td class="col label" colspan="5"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></td>
+                <td class="col label" colspan="5"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?php /* @escapeNotVerified */ echo $attributes['option_label'] ?>"<?php endif; ?>>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
     <?php if (!$_item->getParentItem()): ?>
-        <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-            <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+        <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+            <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         </td>
     <?php else: ?>
-        <td class="col value" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>"><?php echo $block->getValueHtml($_item)?></td>
+        <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($_item->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($_item->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?php if (!$_item->getParentItem()): ?>
-            <?php echo $block->getItemPriceHtml(); ?>
+            <?= $block->getItemPriceHtml() ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Quantity')); ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Quantity')) ?>">
         <?php if (
         ($_item->getParentItem() && $block->isChildCalculated()) ||
         (!$_item->getParentItem() && !$block->isChildCalculated()) || ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately())):?>
@@ -58,32 +58,32 @@
             (!$_item->getParentItem() && !$block->isChildCalculated())): ?>
             <?php if ($_item->getQtyOrdered() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Ordered'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($_item->getQtyShipped() > 0 && !$block->isShipmentSeparately()): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($_item->getQtyCanceled() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Canceled'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($_item->getQtyRefunded() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Refunded'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></span>
                 </li>
             <?php endif; ?>
         <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately()): ?>
             <li class="item">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
-                <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
+                <span class="content"><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></span>
             </li>
         <?php else: ?>
             &nbsp;
@@ -94,9 +94,9 @@
             </ul>
         <?php endif; ?>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
         <?php if (!$_item->getParentItem()): ?>
-            <?php echo $block->getItemRowTotalHtml(); ?>
+            <?= $block->getItemRowTotalHtml() ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
@@ -110,27 +110,27 @@
         <?php if ($_options = $block->getItemOptions()): ?>
             <dl class="item-options">
                 <?php foreach ($_options as $_option) : ?>
-                    <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                             <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
-                                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
                     <?php else: ?>
-                        <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                        <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
index 22cae712632fb..bd99afc59a8c0 100644
--- a/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
+++ b/app/code/Magento/Bundle/view/frontend/templates/sales/order/shipment/items/renderer.phtml
@@ -29,26 +29,26 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="options-label">
-                <td colspan="3" class="col label"><div class="option label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
+                <td colspan="3" class="col label"><div class="option label"><?= /* @escapeNotVerified */ $attributes['option_label'] ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?php /* @escapeNotVerified */ echo $attributes['option_label'] ?>"<?php endif; ?>>
+    <tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?= /* @escapeNotVerified */ $attributes['option_label'] ?>"<?php endif; ?>>
         <?php if (!$_item->getParentItem()): ?>
-            <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-                <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+            <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+                <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
             </td>
         <?php else: ?>
-            <td class="col value" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>"><?php echo $block->getValueHtml($_item) ?></td>
+            <td class="col value" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getValueHtml($_item) ?></td>
         <?php endif; ?>
-        <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->escapeHtml($_item->getSku()) ?></td>
-        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Shipped')); ?>">
+        <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= $block->escapeHtml($_item->getSku()) ?></td>
+        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>">
             <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
                 <?php if (isset($shipItems[$_item->getId()])): ?>
-                    <?php /* @escapeNotVerified */ echo $shipItems[$_item->getId()]->getQty()*1 ?>
+                    <?= /* @escapeNotVerified */ $shipItems[$_item->getId()]->getQty()*1 ?>
                 <?php elseif ($_item->getIsVirtual()): ?>
-                    <?php /* @escapeNotVerified */ echo __('N/A') ?>
+                    <?= /* @escapeNotVerified */ __('N/A') ?>
                 <?php else: ?>
                     0
                 <?php endif; ?>
@@ -65,27 +65,27 @@
             <?php if ($_options = $block->getItemOptions()): ?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
-                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                         <?php if (!$block->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                     <div class="tooltip content">
                                         <dl class="item options">
-                                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?php endif; ?>
                             </dd>
                         <?php else: ?>
-                            <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                            <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                         <?php endif; ?>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
-            <?php echo $block->escapeHtml($_item->getDescription()) ?>
+            <?= $block->escapeHtml($_item->getDescription()) ?>
         </td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
index 1a217d192d667..b8dcd6c654c8e 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -13,18 +13,18 @@ $captcha = $block->getCaptchaModel();
 ?>
 <div class="admin__field _required">
     <label for="captcha" class="admin__field-label">
-        <span><?php echo $block->escapeHtml(__('Please enter the letters from the image')) ?></span>
+        <span><?= $block->escapeHtml(__('Please enter the letters from the image')) ?></span>
     </label>
     <div class="admin__field-control">
         <input
             id="captcha"
             class="admin__control-text"
             type="text"
-            name="<?php echo $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?php echo $block->escapeHtml($block->getFormId())?>]"
+            name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtml($block->getFormId()) ?>]"
             data-validate="{required:true}"/>
         <?php if ($captcha->isCaseSensitive()) :?>
             <div class="admin__field-note">
-                <span><?php echo $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']) ?></span>
+                <span><?= $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']) ?></span>
             </div>
         <?php endif; ?>
     </div>
@@ -33,19 +33,19 @@ $captcha = $block->getCaptchaModel();
     <img
         id="captcha-reload"
         class="captcha-reload"
-        src="<?php echo $block->escapeUrl($block->getViewFileUrl('Magento_Captcha::reload.png')) ?>"
-        alt="<?php echo $block->escapeHtmlAttr(__('Reload captcha')) ?>"/>
+        src="<?= $block->escapeUrl($block->getViewFileUrl('Magento_Captcha::reload.png')) ?>"
+        alt="<?= $block->escapeHtmlAttr(__('Reload captcha')) ?>"/>
     <img
-        id="<?php echo $block->escapeHtmlAttr($block->getFormId()) ?>"
-        width="<?php /* @noEscape */ echo (float) $block->getImgWidth() ?>"
-        height="<?php /* @noEscape */ echo (float) $block->getImgHeight() ?>"
-        src="<?php echo $block->escapeUrl($captcha->getImgSrc()) ?>" />
+        id="<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
+        width="<?= /* @noEscape */ (float) $block->getImgWidth() ?>"
+        height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>"
+        src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>" />
 </div>
 <script>
     require(["prototype", "mage/captcha"], function(){
 
 //<![CDATA[
-        var captcha = new Captcha('<?php echo $block->escapeJs($block->escapeUrl($block->getRefreshUrl())) ?>', '<?php echo $block->escapeJs($block->escapeHtml($block->getFormId())) ?>');
+        var captcha = new Captcha('<?= $block->escapeJs($block->escapeUrl($block->getRefreshUrl())) ?>', '<?= $block->escapeJs($block->escapeHtml($block->getFormId())) ?>');
 
         $('captcha-reload').observe('click', function () {
             captcha.refresh(this);
diff --git a/app/code/Magento/Captcha/view/frontend/templates/default.phtml b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
index 3e4e3a6689798..9851b1cd8bd7d 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
@@ -11,25 +11,25 @@
 /** @var \Magento\Captcha\Model\DefaultModel $captcha */
 $captcha = $block->getCaptchaModel();
 ?>
-<div class="field captcha required" role="<?php echo $block->escapeHtmlAttr($block->getFormId())?>">
-    <label for="captcha_<?php echo $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?php echo $block->escapeHtml(__('Please type the letters below')) ?></span></label>
+<div class="field captcha required" role="<?= $block->escapeHtmlAttr($block->getFormId()) ?>">
+    <label for="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" class="label"><span><?= $block->escapeHtml(__('Please type the letters below')) ?></span></label>
     <div class="control captcha">
-        <input name="<?php echo $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?php echo $block->escapeHtmlAttr($block->getFormId())?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?php echo $block->escapeHtmlAttr($block->getFormId()) ?>" />
+        <input name="<?= $block->escapeHtmlAttr(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE) ?>[<?= $block->escapeHtmlAttr($block->getFormId()) ?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?= $block->escapeHtmlAttr($block->getFormId()) ?>" />
         <div class="nested">
             <div class="field captcha no-label"
-                 data-captcha="<?php echo $block->escapeHtmlAttr($block->getFormId())?>"
-                 id="captcha-container-<?php echo $block->escapeHtmlAttr($block->getFormId())?>"
-                 data-mage-init='{"captcha":{"url": "<?php echo $block->escapeUrl($block->getRefreshUrl())?>",
-                                            "imageLoader": "<?php echo $block->escapeUrl($block->getViewFileUrl('images/loader-2.gif')) ?>",
-                                             "type": "<?php echo $block->escapeHtmlAttr($block->getFormId()) ?>"}}'>
+                 data-captcha="<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
+                 id="captcha-container-<?= $block->escapeHtmlAttr($block->getFormId()) ?>"
+                 data-mage-init='{"captcha":{"url": "<?= $block->escapeUrl($block->getRefreshUrl()) ?>",
+                                            "imageLoader": "<?= $block->escapeUrl($block->getViewFileUrl('images/loader-2.gif')) ?>",
+                                             "type": "<?= $block->escapeHtmlAttr($block->getFormId()) ?>"}}'>
                 <div class="control captcha-image">
-                    <img alt="<?php echo $block->escapeHtmlAttr(__('Please type the letters below')) ?>" class="captcha-img" height="<?php /* @noEscape */ echo (float) $block->getImgHeight() ?>" src="<?php echo $block->escapeUrl($captcha->getImgSrc()) ?>"/>
-                    <button type="button" class="action reload captcha-reload" title="<?php echo $block->escapeHtmlAttr(__('Reload captcha')) ?>"><span><?php echo $block->escapeHtml(__('Reload captcha')) ?></span></button>
+                    <img alt="<?= $block->escapeHtmlAttr(__('Please type the letters below')) ?>" class="captcha-img" height="<?= /* @noEscape */ (float) $block->getImgHeight() ?>" src="<?= $block->escapeUrl($captcha->getImgSrc()) ?>"/>
+                    <button type="button" class="action reload captcha-reload" title="<?= $block->escapeHtmlAttr(__('Reload captcha')) ?>"><span><?= $block->escapeHtml(__('Reload captcha')) ?></span></button>
                 </div>
             </div>
             <?php if ($captcha->isCaseSensitive()) :?>
                 <div class="captcha-note note">
-                    <?php echo $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']) ?>
+                    <?= $block->escapeHtml(__('<strong>Attention</strong>: Captcha is case sensitive.'), ['strong']) ?>
                 </div>
             <?php endif; ?>
         </div>
diff --git a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
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 4cb96a1f840f7..740d389735974 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
@@ -9,7 +9,7 @@
 ?>
 
 <?php $_divId = 'tree-div_' . time() ?>
-<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
+<div id="<?= /* @escapeNotVerified */ $_divId ?>" class="tree"></div>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <script>
     require([
@@ -73,7 +73,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 jQuery(function()
 {
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl() ?>'
+       dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
     });
 
     categoryLoader.createNode = function(config) {
@@ -152,37 +152,37 @@ jQuery(function()
         varienWindowOnload();
     });
 
-    tree = new Ext.tree.TreePanel.Enhanced('<?php /* @escapeNotVerified */ echo $_divId ?>', {
+    tree = new Ext.tree.TreePanel.Enhanced('<?= /* @escapeNotVerified */ $_divId ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
         selModel:         new Ext.tree.CheckNodeMultiSelectionModel(),
-        rootVisible:      '<?php /* @escapeNotVerified */ echo $block->getRoot()->getIsVisible() ?>',
-        useAjax:          <?php /* @escapeNotVerified */ echo $block->getUseAjax() ?>,
-        currentNodeId:    <?php echo (int) $block->getCategoryId() ?>,
+        rootVisible:      '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
+        useAjax:          <?= /* @escapeNotVerified */ $block->getUseAjax() ?>,
+        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
         addNodeTo:        false,
         rootUIProvider:   Ext.tree.CheckboxNodeUI
     });
 
     tree.on('check', function(node, checked) {
-        <?php /* @escapeNotVerified */ echo $block->getJsFormObject() ?>.updateElement.value = this.getChecked().join(', ');
+        <?= /* @escapeNotVerified */ $block->getJsFormObject() ?>.updateElement.value = this.getChecked().join(', ');
         varienElementMethods.setHasChanges(node.getUI().checkbox);
     }, tree);
 
     // set the root node
     var parameters = {
-        text:        '<?php /* @escapeNotVerified */ echo htmlentities($block->getRoot()->getName()) ?>',
+        text:        '<?= /* @escapeNotVerified */ htmlentities($block->getRoot()->getName()) ?>',
         draggable:   false,
-        checked:'<?php /* @escapeNotVerified */ echo $block->getRoot()->getChecked() ?>',
+        checked:'<?= /* @escapeNotVerified */ $block->getRoot()->getChecked() ?>',
         uiProvider: Ext.tree.CheckboxNodeUI,
         allowDrop:   <?php if ($block->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
-        id:          <?php echo (int) $block->getRoot()->getId() ?>,
-        expanded:    <?php echo (int) $block->getIsWasExpanded() ?>,
-        category_id: <?php echo (int) $block->getCategoryId() ?>
+        id:          <?= (int) $block->getRoot()->getId() ?>,
+        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
+        category_id: <?= (int) $block->getCategoryId() ?>
     };
 
-    tree.loadTree({parameters:parameters, data:<?php /* @escapeNotVerified */ echo $block->getTreeJson() ?>},true);
+    tree.loadTree({parameters:parameters, data:<?= /* @escapeNotVerified */ $block->getTreeJson() ?>},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 3b12e1022b8ec..f58b39a819a0c 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
@@ -10,13 +10,13 @@
 ?>
 <div data-id="information-dialog-category" class="messages" style="display: none;">
     <div class="message message-notice">
-        <div><?php /* @escapeNotVerified */ echo __('This operation can take a long time'); ?></div>
+        <div><?= /* @escapeNotVerified */ __('This operation can take a long time') ?></div>
     </div>
 </div>
 <script type="text/x-magento-init">
     {
         "*": {
-            "categoryForm": {"refreshUrl": "<?php /* @escapeNotVerified */ echo $block->getRefreshPathUrl() ?>"}
+            "categoryForm": {"refreshUrl": "<?= /* @escapeNotVerified */ $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 e81b576944cb4..4691a709cadeb 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
@@ -10,14 +10,14 @@
 $blockGrid = $block->getBlockGrid();
 $gridJsObjectName = $blockGrid->getJsObjectName();
 ?>
-<?php  echo $block->getGridHtml(); ?>
+<?= $block->getGridHtml() ?>
 <input type="hidden" name="category_products" id="in_category_products" data-form-part="category_form" value="" />
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Catalog/catalog/category/assign-products": {
-                "selectedProducts": <?php /* @escapeNotVerified */ echo $block->getProductsJson(); ?>,
-                "gridJsObjectName": <?php /* @escapeNotVerified */ echo '"' . $gridJsObjectName . '"' ?: '{}'; ?>
+                "selectedProducts": <?= /* @escapeNotVerified */ $block->getProductsJson() ?>,
+                "gridJsObjectName": <?= /* @escapeNotVerified */ '"' . $gridJsObjectName . '"' ?: '{}' ?>
             }
         }
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml
index 10be90cf42799..a3cf4b478ad3b 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
@@ -10,8 +10,8 @@
 <div class="categories-side-col">
     <div class="sidebar-actions">
         <?php if ($block->getRoot()): ?>
-            <?php echo $block->getAddRootButtonHtml() ?><br/>
-            <?php echo $block->getAddSubButtonHtml() ?>
+            <?= $block->getAddRootButtonHtml() ?><br/>
+            <?= $block->getAddSubButtonHtml() ?>
         <?php endif; ?>
     </div>
     <div class="tree-actions">
@@ -19,9 +19,9 @@
             <?php //echo $block->getCollapseButtonHtml() ?>
             <?php //echo $block->getExpandButtonHtml() ?>
             <a href="#"
-               onclick="tree.collapseTree(); return false;"><?php /* @escapeNotVerified */ echo __('Collapse All'); ?></a>
+               onclick="tree.collapseTree(); return false;"><?= /* @escapeNotVerified */ __('Collapse All') ?></a>
             <span class="separator">|</span> <a href="#"
-                                                onclick="tree.expandTree(); return false;"><?php /* @escapeNotVerified */ echo __('Expand All'); ?></a>
+                                                onclick="tree.expandTree(); return false;"><?= /* @escapeNotVerified */ __('Expand All') ?></a>
         <?php endif; ?>
     </div>
     <?php if ($block->getRoot()): ?>
@@ -32,7 +32,7 @@
 
     <div data-id="information-dialog-tree" class="messages" style="display: none;">
         <div class="message message-notice">
-            <div><?php /* @escapeNotVerified */ echo __('This operation can take a long time'); ?></div>
+            <div><?= /* @escapeNotVerified */ __('This operation can take a long time') ?></div>
         </div>
     </div>
     <script>
@@ -170,7 +170,7 @@
 
                     if (!this.collapsed) {
                         this.collapsed = true;
-                        this.loader.dataUrl = '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl(false) ?>';
+                        this.loader.dataUrl = '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl(false) ?>';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -179,7 +179,7 @@
                     this.expandAll();
                     if (this.collapsed) {
                         this.collapsed = false;
-                        this.loader.dataUrl = '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl(true) ?>';
+                        this.loader.dataUrl = '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl(true) ?>';
                         this.request(this.loader.dataUrl, false);
                     }
                 },
@@ -214,7 +214,7 @@
                 if (tree && switcherParams) {
                     var url;
                     if (switcherParams.useConfirm) {
-                        if (!confirm("<?php /* @escapeNotVerified */ echo __('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
+                        if (!confirm("<?= /* @escapeNotVerified */ __('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
                             return false;
                         }
                     }
@@ -257,7 +257,7 @@
                             }
                         });
                     } else {
-                        var baseUrl = '<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>';
+                        var baseUrl = '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>';
                         var urlExt = switcherParams.scopeParams + 'id/' + tree.currentNodeId + '/';
                         url = parseSidUrl(baseUrl, urlExt);
                         setLocation(url);
@@ -304,7 +304,7 @@
 
             jQuery(function () {
                 categoryLoader = new Ext.tree.TreeLoader({
-                    dataUrl: '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl() ?>'
+                    dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
                 });
 
                 categoryLoader.processResponse = function (response, parent, callback) {
@@ -386,26 +386,26 @@
                     enableDD: true,
                     containerScroll: true,
                     selModel: new Ext.tree.CheckNodeMultiSelectionModel(),
-                    rootVisible: '<?php /* @escapeNotVerified */ echo $block->getRoot()->getIsVisible() ?>',
-                    useAjax: <?php /* @escapeNotVerified */ echo $block->getUseAjax() ?>,
-                    switchTreeUrl: '<?php /* @escapeNotVerified */ echo $block->getSwitchTreeUrl() ?>',
-                    editUrl: '<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>',
-                    currentNodeId: <?php /* @escapeNotVerified */ echo (int)$block->getCategoryId() ?>,
-                    baseUrl: '<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>'
+                    rootVisible: '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
+                    useAjax: <?= /* @escapeNotVerified */ $block->getUseAjax() ?>,
+                    switchTreeUrl: '<?= /* @escapeNotVerified */ $block->getSwitchTreeUrl() ?>',
+                    editUrl: '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>',
+                    currentNodeId: <?= /* @escapeNotVerified */ (int)$block->getCategoryId() ?>,
+                    baseUrl: '<?= /* @escapeNotVerified */ $block->getEditUrl() ?>'
                 };
 
                 defaultLoadTreeParams = {
                     parameters: {
-                        text: <?php /* @escapeNotVerified */ echo json_encode(htmlentities($block->getRoot()->getName())) ?>,
+                        text: <?= /* @escapeNotVerified */ json_encode(htmlentities($block->getRoot()->getName())) ?>,
                         draggable: false,
                         allowDrop: <?php if ($block->getRoot()->getIsVisible()): ?>true<?php else : ?>false<?php endif; ?>,
-                        id: <?php echo (int)$block->getRoot()->getId() ?>,
-                        expanded: <?php echo (int)$block->getIsWasExpanded() ?>,
-                        store_id: <?php echo (int)$block->getStore()->getId() ?>,
-                        category_id: <?php echo (int)$block->getCategoryId() ?>,
-                        parent: <?php echo (int)$block->getRequest()->getParam('parent') ?>
+                        id: <?= (int)$block->getRoot()->getId() ?>,
+                        expanded: <?= (int)$block->getIsWasExpanded() ?>,
+                        store_id: <?= (int)$block->getStore()->getId() ?>,
+                        category_id: <?= (int)$block->getCategoryId() ?>,
+                        parent: <?= (int)$block->getRequest()->getParam('parent') ?>
                     },
-                    data: <?php  /* @escapeNotVerified */ echo $block->getTreeJson() ?>
+                    data: <?= /* @escapeNotVerified */ $block->getTreeJson() ?>
                 };
 
                 reRenderTree();
@@ -483,7 +483,7 @@
                         click: function () {
                             (function ($) {
                                 $.ajax({
-                                    url: '<?php /* @escapeNotVerified */ echo $block->getMoveUrl() ?>',
+                                    url: '<?= /* @escapeNotVerified */ $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 1f5dfa66df2d5..dbe66ef1aecd3 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
@@ -9,18 +9,18 @@
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
-<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
+<div id="<?= /* @escapeNotVerified */ $_divId ?>" class="tree"></div>
 <!--[if IE]>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <![endif]-->
 <script>
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
-var tree<?php /* @escapeNotVerified */ echo $block->getId() ?>;
+var tree<?= /* @escapeNotVerified */ $block->getId() ?>;
 
-var useMassaction = <?php /* @escapeNotVerified */ echo $block->getUseMassaction() ? 1 : 0; ?>;
+var useMassaction = <?= /* @escapeNotVerified */ $block->getUseMassaction() ? 1 : 0 ?>;
 
-var isAnchorOnly = <?php /* @escapeNotVerified */ echo $block->getIsAnchorOnly() ? 1 : 0; ?>;
+var isAnchorOnly = <?= /* @escapeNotVerified */ $block->getIsAnchorOnly() ? 1 : 0 ?>;
 
 Ext.tree.TreePanel.Enhanced = function(el, config)
 {
@@ -45,7 +45,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
         if (firstLoad) {
             <?php if ($block->getNodeClickListener()): ?>
-                this.addListener('click', <?php /* @escapeNotVerified */ echo $block->getNodeClickListener() ?>.createDelegate(this));
+                this.addListener('click', <?= /* @escapeNotVerified */ $block->getNodeClickListener() ?>.createDelegate(this));
             <?php endif; ?>
         }
 
@@ -58,10 +58,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?php /* @escapeNotVerified */ echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+    var emptyNodeAdded = <?= /* @escapeNotVerified */ ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl() ?>'
+       dataUrl: '<?= /* @escapeNotVerified */ $block->getLoadTreeUrl() ?>'
     });
 
     categoryLoader.buildCategoryTree = function(parent, config)
@@ -80,7 +80,7 @@ jQuery(function()
                 // Add empty node to reset category filter
                 if(!emptyNodeAdded) {
                     var empty = Object.clone(_node);
-                    empty.text = '<?php /* @escapeNotVerified */ echo __('None') ?>';
+                    empty.text = '<?= /* @escapeNotVerified */ __('None') ?>';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -151,37 +151,37 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?php /* @escapeNotVerified */ echo $_divId; ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('<?= /* @escapeNotVerified */ $_divId ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?php /* @escapeNotVerified */ echo $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?php /* @escapeNotVerified */ echo $_divId ?>', {
+    tree<?= /* @escapeNotVerified */ $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?= /* @escapeNotVerified */ $_divId ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
-        rootVisible:      '<?php /* @escapeNotVerified */ echo $block->getRoot()->getIsVisible() ?>',
+        rootVisible:      '<?= /* @escapeNotVerified */ $block->getRoot()->getIsVisible() ?>',
         useAjax:          true,
-        currentNodeId:    <?php echo (int) $block->getCategoryId() ?>,
+        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?php /* @escapeNotVerified */ echo $block->getId() ?>.on('check', function(node) {
-            $('<?php /* @escapeNotVerified */ echo $_divId; ?>').fire('node:changed', {node:node});
-        }, tree<?php /* @escapeNotVerified */ echo $block->getId() ?>);
+        tree<?= /* @escapeNotVerified */ $block->getId() ?>.on('check', function(node) {
+            $('<?= /* @escapeNotVerified */ $_divId ?>').fire('node:changed', {node:node});
+        }, tree<?= /* @escapeNotVerified */ $block->getId() ?>);
     }
 
     // set the root node
     var parameters = {
         text:        'Psw',
         draggable:   false,
-        id:          <?php echo (int) $block->getRoot()->getId() ?>,
-        expanded:    <?php echo (int) $block->getIsWasExpanded() ?>,
-        category_id: <?php echo (int) $block->getCategoryId() ?>
+        id:          <?= (int) $block->getRoot()->getId() ?>,
+        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
+        category_id: <?= (int) $block->getCategoryId() ?>
     };
 
-    tree<?php /* @escapeNotVerified */ echo $block->getId() ?>.loadTree({parameters:parameters, data:<?php /* @escapeNotVerified */ echo $block->getTreeJson() ?>},true);
+    tree<?= /* @escapeNotVerified */ $block->getId() ?>.loadTree({parameters:parameters, data:<?= /* @escapeNotVerified */ $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 f2aafeda56124..680361eae448e 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
@@ -38,36 +38,36 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
 ?>
 <?php if (!$element->getNoDisplay()): ?>
     <?php if ($element->getType() == 'hidden'): ?>
-        <?php echo $element->getElementHtml() ?>
+        <?= $element->getElementHtml() ?>
     <?php else: ?>
-    <div<?php /* @escapeNotVerified */ echo $fieldAttributes ?> data-attribute-code="<?php echo $element->getHtmlId() ?>"
-        data-apply-to="<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
+    <div<?= /* @escapeNotVerified */ $fieldAttributes ?> data-attribute-code="<?= $element->getHtmlId() ?>"
+        data-apply-to="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
             $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
         ))?>"
         >
         <?php if ($elementBeforeLabel): ?>
-            <?php echo $block->getElementHtml() ?>
-            <?php echo $element->getLabelHtml('', $block->getScopeLabel()) ?>
-            <?php /* @escapeNotVerified */ echo $note ?>
+            <?= $block->getElementHtml() ?>
+            <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
+            <?= /* @escapeNotVerified */ $note ?>
         <?php else: ?>
-            <?php echo $element->getLabelHtml('', $block->getScopeLabel()) ?>
+            <?= $element->getLabelHtml('', $block->getScopeLabel()) ?>
             <div class="admin__field-control control">
-                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml(); ?>
-                <?php /* @escapeNotVerified */ echo $note ?>
+                <?= /* @escapeNotVerified */ ($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml() ?>
+                <?= /* @escapeNotVerified */ $note ?>
             </div>
         <?php endif; ?>
         <div class="field-service">
             <?php if ($block->canDisplayUseDefault()): ?>
-                <label for="<?php echo $element->getHtmlId() ?>_default" class="choice use-default">
+                <label for="<?= $element->getHtmlId() ?>_default" class="choice use-default">
                     <input <?php if ($element->getReadonly()):?> disabled="disabled"<?php endif; ?>
                             type="checkbox"
                             name="use_default[]"
                             class="use-default-control"
-                            id="<?php echo $element->getHtmlId() ?>_default"
+                            id="<?= $element->getHtmlId() ?>_default"
                             <?php if ($block->usedDefault()): ?> checked="checked"<?php endif; ?>
-                            onclick="<?php /* @escapeNotVerified */ echo $elementToggleCode; ?>"
-                            value="<?php /* @escapeNotVerified */ echo $block->getAttributeCode() ?>"/>
-                    <span class="use-default-label"><?php /* @escapeNotVerified */ echo __('Use Default Value') ?></span>
+                            onclick="<?= /* @escapeNotVerified */ $elementToggleCode ?>"
+                            value="<?= /* @escapeNotVerified */ $block->getAttributeCode() ?>"/>
+                    <span class="use-default-label"><?= /* @escapeNotVerified */ __('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 f56b6ba9eacbc..ce4d8450f5e63 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product.phtml
@@ -13,4 +13,4 @@
  */
 ?>
 
-<?php echo $block->getGridHtml() ?>
+<?= $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 0e9773468ec18..74cf8f5f3a70b 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
@@ -12,22 +12,22 @@
  * @var $block \Magento\Backend\Block\Widget\Form\Container
  */
 ?>
-<?php /* @escapeNotVerified */ echo $block->getFormInitScripts() ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?php /* @escapeNotVerified */ echo $block->getUiId('content-header') ?>>
-    <?php echo $block->getButtonsHtml('header') ?>
+<?= /* @escapeNotVerified */ $block->getFormInitScripts() ?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>>
+    <?= $block->getButtonsHtml('header') ?>
 </div>
 
-<form id="edit_form" class="admin__scope-old edit-form" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
-    <input name="form_key" type="hidden" value="<?php echo $block->escapeHtml($block->getFormKey()) ?>" />
-    <?php echo $block->getChildHtml('form') ?>
+<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()) ?>" />
+    <?= $block->getChildHtml('form') ?>
 </form>
 
 
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
+    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
 
 });
 </script>
-<?php /* @escapeNotVerified */ echo $block->getFormScripts() ?>
+<?= /* @escapeNotVerified */ $block->getFormScripts() ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml
index df914dcf7ca9f..69bc847c30f46 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
@@ -195,7 +195,7 @@ function switchDefaultValueField()
         break;
 
         <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
-            case '<?php /* @escapeNotVerified */ echo $type; ?>':
+            case '<?= /* @escapeNotVerified */ $type ?>':
                 <?php foreach ($fields as $one): ?>
                     <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
@@ -207,7 +207,7 @@ function switchDefaultValueField()
                     <?php elseif ($one == '_scope'): ?>
                         scopeVisibility = false;
                     <?php else: ?>
-                        setRowVisibility('<?php /* @escapeNotVerified */ echo $one; ?>', false);
+                        setRowVisibility('<?= /* @escapeNotVerified */ $one ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>
             break;
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 85a90da5873a9..f3d39257c266c 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
@@ -12,7 +12,7 @@
 <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><?php /* @escapeNotVerified */ echo __('Manage Titles (Size, Color, etc.)') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Manage Titles (Size, Color, etc.)') ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
@@ -22,7 +22,7 @@
                     <thead>
                     <tr>
                         <?php foreach ($block->getStores() as $_store): ?>
-                            <th class="col-store-view"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
+                            <th class="col-store-view"><?= /* @escapeNotVerified */ $_store->getName() ?></th>
                         <?php endforeach; ?>
                     </tr>
                     </thead>
@@ -31,7 +31,7 @@
                         <?php $_labels = $block->getLabelValues() ?>
                         <?php foreach ($block->getStores() as $_store): ?>
                             <td class="col-store-view">
-                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php echo $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
+                                <input class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" name="frontend_label[<?= /* @escapeNotVerified */ $_store->getId() ?>]" value="<?= $block->escapeHtml($_labels[$_store->getId()]) ?>"<?php if ($block->getReadOnly()):?> disabled="disabled"<?php endif;?>/>
                             </td>
                         <?php endforeach; ?>
                     </tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml
index 7e7bbf8a8f601..a0041d2e02988 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
@@ -12,7 +12,7 @@ $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="admin__fieldset fieldset">
     <legend class="legend">
-        <span><?php echo $block->escapeHtml(__('Manage Options (Values of Your Attribute)')); ?></span>
+        <span><?= $block->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">
@@ -20,12 +20,12 @@ $stores = $block->getStoresSortedBySortOrder();
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
                     <th class="col-default control-table-actions-th">
-                        <span><?php echo $block->escapeHtml(__('Is Default')); ?></span>
+                        <span><?= $block->escapeHtml(__('Is Default')) ?></span>
                     </th>
                     <?php
                     foreach ($stores as $_store): ?>
                         <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
-                            <span><?php echo $block->escapeHtml(__($_store->getName())) ?></span>
+                            <span><?= $block->escapeHtml(__($_store->getName())) ?></span>
                         </th>
                     <?php endforeach;
                     $storetotal = count($stores) + 3;
@@ -36,18 +36,18 @@ $stores = $block->getStoresSortedBySortOrder();
             <tbody data-role="options-container" class="ignore-validate"></tbody>
             <tfoot>
             <tr>
-                <th colspan="<?php echo (int)$storetotal; ?>" class="validation">
+                <th colspan="<?= (int)$storetotal ?>" class="validation">
                     <input type="hidden" class="required-dropdown-attribute-entry" name="dropdown_attribute_validation"/>
                     <input type="hidden" class="required-dropdown-attribute-unique" name="dropdown_attribute_validation_unique"/>
                 </th>
             </tr>
             <tr>
-                <th colspan="<?php echo (int) $storetotal; ?>" class="col-actions-add">
+                <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="<?php echo $block->escapeHtml(__('Add Option')); ?>"
+                                title="<?= $block->escapeHtml(__('Add Option')) ?>"
                                 type="button" class="action- scalable add">
-                            <span><?php echo $block->escapeHtml(__('Add Option')); ?></span>
+                            <span><?= $block->escapeHtml(__('Add Option')) ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -61,7 +61,7 @@ $stores = $block->getStoresSortedBySortOrder();
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
                     <div data-role="draggable-handle" class="draggable-handle"
-                         title="<?php echo $block->escapeHtml(__('Sort Option')); ?>">
+                         title="<?= $block->escapeHtml(__('Sort Option')) ?>">
                     </div>
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="option[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
@@ -70,15 +70,15 @@ $stores = $block->getStoresSortedBySortOrder();
                 <input class="input-radio" type="<%- data.intype %>" name="default[]" value="<%- data.id %>" <%- data.checked %><?php if ($block->getReadOnly()):?>disabled="disabled"<?php endif;?>/>
             </td>
             <?php foreach ($stores as $_store): ?>
-            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?php echo (int) $_store->getId() ?>]" value="<%- data.store<?php /* @noEscape */ echo (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
+            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?= (int) $_store->getId() ?>]" value="<%- data.store<?= /* @noEscape */ (int) $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/></td>
             <?php endforeach; ?>
             <td id="delete_button_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="option[delete][<%- data.id %>]" value="" />
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button id="delete_button_<%- data.id %>" title="<?php echo $block->escapeHtml(__('Delete'));?>" type="button"
+                    <button id="delete_button_<%- data.id %>" title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
                         class="action- scalable delete delete-option"
                         >
-                        <span><?php echo $block->escapeHtml(__('Delete')) ?></span>
+                        <span><?= $block->escapeHtml(__('Delete')) ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -95,13 +95,13 @@ $stores = $block->getStoresSortedBySortOrder();
         {
             "*": {
                 "Magento_Catalog/js/options": {
-                    "attributesData": <?php /* @noEscape */ echo json_encode($values, JSON_HEX_QUOT); ?>,
-                    "isSortable":  <?php echo (int)(!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) ?>,
-                    "isReadOnly": <?php echo (int)$block->getReadOnly(); ?>
+                    "attributesData": <?= /* @noEscape */ json_encode($values, JSON_HEX_QUOT) ?>,
+                    "isSortable":  <?= (int)(!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()) ?>,
+                    "isReadOnly": <?= (int)$block->getReadOnly() ?>
                 },
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-dropdown-attribute-unique",
-                    "message": "<?php echo $block->escapeHtml(__("The value of Admin must be unique.")); ?>"
+                    "message": "<?= $block->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 337888f70795c..d5dfe845e54c2 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
@@ -17,7 +17,7 @@
         </div>
     </div>
     <div class="edit-attribute-set attribute-set-col">
-        <?php echo $block->getSetFormHtml() ?>
+        <?= $block->getSetFormHtml() ?>
         <script>
             require([
                 "jquery",
@@ -31,19 +31,19 @@
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Groups') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Groups') ?></span>
         </div>
         <?php if (!$block->getIsReadOnly()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getAddGroupButton() ?>&nbsp;<?php /* @escapeNotVerified */ echo $block->getDeleteGroupButton() ?>
-            <p class="note-block"><?php /* @escapeNotVerified */ echo __('Double click on a group to rename it.') ?></p>
+            <?= /* @escapeNotVerified */ $block->getAddGroupButton() ?>&nbsp;<?= /* @escapeNotVerified */ $block->getDeleteGroupButton() ?>
+            <p class="note-block"><?= /* @escapeNotVerified */ __('Double click on a group to rename it.') ?></p>
         <?php endif; ?>
 
-        <?php echo $block->getSetsFilterHtml() ?>
-        <?php echo $block->getGroupTreeHtml() ?>
+        <?= $block->getSetsFilterHtml() ?>
+        <?= $block->getGroupTreeHtml() ?>
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Unassigned Attributes') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Unassigned Attributes') ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
         <script id="ie-deferred-loader" defer="defer" src="//:"></script>
@@ -58,8 +58,8 @@
                 ], function(jQuery, prompt, alert){
 
                 //<![CDATA[
-                var allowDragAndDrop = <?php /* @escapeNotVerified */ echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
-                var canEditGroups = <?php /* @escapeNotVerified */ echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
+                var allowDragAndDrop = <?= /* @escapeNotVerified */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
+                var canEditGroups = <?= /* @escapeNotVerified */ ($block->getIsReadOnly() ? 'false' : 'true') ?>;
 
                 var TreePanels = function() {
                     // shorthand
@@ -86,7 +86,7 @@
                             });
 
                             tree.setRootNode(this.root);
-                            buildCategoryTree(this.root, <?php /* @escapeNotVerified */ echo $block->getGroupTreeJson() ?>);
+                            buildCategoryTree(this.root, <?= /* @escapeNotVerified */ $block->getGroupTreeJson() ?>);
                             // render the tree
                             tree.render();
                             this.root.expand(false, false);
@@ -94,7 +94,7 @@
 
                             this.ge = new Ext.tree.TreeEditor(tree, {
                                 allowBlank:false,
-                                blankText:'<?php /* @escapeNotVerified */ echo __('A name is required.') ?>',
+                                blankText:'<?= /* @escapeNotVerified */ __('A name is required.') ?>',
                                 selectOnFocus:true,
                                 cls:'folder'
                             });
@@ -125,7 +125,7 @@
                                 id:'free'
                             });
                             tree2.setRootNode(this.root2);
-                            buildCategoryTree(this.root2, <?php /* @escapeNotVerified */ echo $block->getAttributeTreeJson() ?>);
+                            buildCategoryTree(this.root2, <?= /* @escapeNotVerified */ $block->getAttributeTreeJson() ?>);
 
                             this.root2.addListener('beforeinsert', editSet.rightBeforeInsert);
                             this.root2.addListener('beforeappend', editSet.rightBeforeAppend);
@@ -216,7 +216,7 @@
 
                             if( editSet.SystemNodesExists(editSet.currentNode) ) {
                                 alert({
-                                    content: '<?php echo $block->escapeJs(__('This group contains system attributes. Please move system attributes to another group and try again.')) ?>'
+                                    content: '<?= $block->escapeJs(__('This group contains system attributes. Please move system attributes to another group and try again.')) ?>'
                                 });
                                 return;
                             }
@@ -243,7 +243,7 @@
                         SystemNodesExists : function(currentNode) {
                             if (!currentNode) {
                                 alert({
-                                    content: '<?php echo $block->escapeJs(__('Please select a node.')) ?>'
+                                    content: '<?= $block->escapeJs(__('Please select a node.')) ?>'
                                 });
                                 return;
                             }
@@ -264,8 +264,8 @@
 
                         addGroup : function() {
                             prompt({
-                                title: "<?php /* @escapeNotVerified */ echo __('Add New Group') ?>",
-                                content: "<?php /* @escapeNotVerified */ echo __('Please enter a new group name.') ?>",
+                                title: "<?= /* @escapeNotVerified */ __('Add New Group') ?>",
+                                content: "<?= /* @escapeNotVerified */ __('Please enter a new group name.') ?>",
                                 value: "",
                                 validation: true,
                                 validationRules: ['required-entry'],
@@ -322,7 +322,7 @@
                             }
                             for (var i=0; i < TreePanels.root.childNodes.length; i++) {
                                 if (TreePanels.root.childNodes[i].text.toLowerCase() == name.toLowerCase() && TreePanels.root.childNodes[i].id != exceptNodeId) {
-                                    errorText = '<?php /* @escapeNotVerified */ echo __('An attribute group named "/name/" already exists.') ?>';
+                                    errorText = '<?= /* @escapeNotVerified */ __('An attribute group named "/name/" already exists.') ?>';
                                     alert({
                                         content: errorText.replace("/name/",name)
                                     });
@@ -350,7 +350,7 @@
                                 editSet.req.form_key = FORM_KEY;
                             }
                             var req = {data : Ext.util.JSON.encode(editSet.req)};
-                            var con = new Ext.lib.Ajax.request('POST', '<?php /* @escapeNotVerified */ echo $block->getMoveUrl() ?>', {success:editSet.success,failure:editSet.failure}, req);
+                            var con = new Ext.lib.Ajax.request('POST', '<?= /* @escapeNotVerified */ $block->getMoveUrl() ?>', {success:editSet.success,failure:editSet.failure}, req);
                         },
 
                         success : function(o) {
@@ -368,7 +368,7 @@
 
                         failure : function(o) {
                             alert({
-                                content: '<?php echo $block->escapeJs(__('Sorry, we\'re unable to complete this request.')) ?>'
+                                content: '<?= $block->escapeJs(__('Sorry, we\'re unable to complete this request.')) ?>'
                             });
                         },
 
@@ -385,7 +385,7 @@
                         rightBeforeAppend : function(tree, nodeThis, node, newParent) {
                             if (node.attributes.is_user_defined == 0) {
                                 alert({
-                                    content: '<?php echo $block->escapeJs(__('You can\'t remove attributes from this attribute set.')) ?>'
+                                    content: '<?= $block->escapeJs(__('You can\'t remove attributes from this attribute set.')) ?>'
                                 });
                                 return false;
                             } else {
@@ -401,7 +401,7 @@
 
                             if (node.attributes.is_unassignable == 0) {
                                 alert({
-                                    content: '<?php echo $block->escapeJs(__('You can\'t remove attributes from this attribute set.')) ?>'
+                                    content: '<?= $block->escapeJs(__('You can\'t remove attributes from this attribute set.')) ?>'
                                 });
                                 return false;
                             } else {
@@ -425,7 +425,7 @@
                         rightRemove : function(tree, nodeThis, node) {
                             if( nodeThis.firstChild == null && node.id != 'empty' ) {
                                 var newNode = new Ext.tree.TreeNode({
-                                    text : '<?php /* @escapeNotVerified */ echo __('Empty') ?>',
+                                    text : '<?= /* @escapeNotVerified */ __('Empty') ?>',
                                     id : 'empty',
                                     cls : 'folder',
                                     is_user_defined : 1,
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
index 099bd2cae6c5e..c1af14389fe59 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,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php echo $block->getFormHtml() ?>
+<?= $block->getFormHtml() ?>
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php /* @escapeNotVerified */ echo $block->getFormId();?>').mage('form').mage('validation');
+    jQuery('#<?= /* @escapeNotVerified */ $block->getFormId() ?>').mage('form').mage('validation');
 
 });
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
index bb3f69ead1c2d..902c6932f0ae1 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/main.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 3729ff56bf37e..75027d5e043fb 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
@@ -19,7 +19,7 @@
             <div id="product_composite_configure_form_confirmed" style="display:none;"></div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
-        <input type="hidden" name="form_key" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
+        <input type="hidden" name="form_key" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
     </form>
     <div id="product_composite_configure_confirmed" style="display:none;"></div>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options.phtml
index 6ead193769882..acc80fa6ea6b0 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
@@ -12,14 +12,14 @@
 <?php $options = $block->decorateArray($block->getOptions()); ?>
 <?php if (count($options)): ?>
 
-<?php echo $block->getChildHtml('options_js') ?>
+<?= $block->getChildHtml('options_js') ?>
 
-<fieldset id="product_composite_configure_fields_options" class="fieldset admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
+<fieldset id="product_composite_configure_fields_options" class="fieldset admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <legend class="legend admin__legend">
-        <span><?php /* @escapeNotVerified */ echo __('Custom Options') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Custom Options') ?></span>
     </legend><br>
     <?php foreach ($options as $option): ?>
-        <?php echo $block->getOptionHtml($option); ?>
+        <?= $block->getOptionHtml($option) ?>
     <?php endforeach;?>
 </fieldset>
 
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 db2bc2f45ce25..8e5583a6699b7 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
@@ -12,15 +12,15 @@
 <?php $_optionId = $_option->getId(); ?>
 <div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
   <label class="label admin__field-label">
-      <?php echo  $block->escapeHtml($_option->getTitle()) ?>
-      <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
+      <?= $block->escapeHtml($_option->getTitle()) ?>
+      <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
   </label>
   <div class="admin__field-control control">
 
   <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
       || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE): ?>
 
-      <?php echo $block->getDateHtml() ?>
+      <?= $block->getDateHtml() ?>
 
       <?php if (!$block->useCalendar()): ?>
       <script>
@@ -30,8 +30,8 @@ require([
 ], function(){
 
       window.dateOption = productConfigure.opConfig.dateOption;
-      Event.observe('options_<?php /* @escapeNotVerified */ echo $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
-      Event.observe('options_<?php /* @escapeNotVerified */ echo $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));      
+      Event.observe('options_<?= /* @escapeNotVerified */ $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
+      Event.observe('options_<?= /* @escapeNotVerified */ $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(dateOption));      
 });
 </script>
       <?php endif; ?>
@@ -40,10 +40,10 @@ require([
 
   <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
       || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME): ?>
-      <span class="time-picker"><?php echo $block->getTimeHtml() ?></span>
+      <span class="time-picker"><?= $block->getTimeHtml() ?></span>
   <?php endif; ?>
 
-    <input type="hidden" name="validate_datetime_<?php /* @escapeNotVerified */ echo $_optionId ?>" class="validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>" value="" />
+    <input type="hidden" name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>" class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>" value="" />
     <script>
 require([
   "jquery",
@@ -52,16 +52,16 @@ require([
 
     //<![CDATA[
 <?php if ($_option->getIsRequire()): ?>
-        jQuery.validator.addMethod('validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>', function(v) {
-            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?php /* @escapeNotVerified */ echo $_optionId ?>"]');
+        jQuery.validator.addMethod('validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>', function(v) {
+            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @escapeNotVerified */ $_optionId ?>"]');
             for (var i=0; i < dateTimeParts.length; i++) {
                 if (dateTimeParts[i].value == "") return false;
             }
             return true;
-        }, '<?php echo $block->escapeJs(__('This is a required option.')) ?>');
+        }, '<?= $block->escapeJs(__('This is a required option.')) ?>');
 <?php else: ?>
-        jQuery.validator.addMethod('validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>', function(v) {
-            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?php /* @escapeNotVerified */ echo $_optionId ?>"]');
+        jQuery.validator.addMethod('validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>', function(v) {
+            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?= /* @escapeNotVerified */ $_optionId ?>"]');
             var hasWithValue = false, hasWithNoValue = false;
             var pattern = /day_part$/i;
             for (var i=0; i < dateTimeParts.length; i++) {
@@ -74,7 +74,7 @@ require([
                 }
             }
             return hasWithValue ^ hasWithNoValue;
-        }, '<?php echo $block->escapeJs(__('The field isn\'t complete.')) ?>');
+        }, '<?= $block->escapeJs(__('The field isn\'t complete.')) ?>');
 <?php endif; ?>
     //]]>
     
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 b4488997d5d25..f6094c8e558a2 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
@@ -9,7 +9,7 @@
 <div class="admin__field field">
     <label class="admin__field-label label">
         <span>
-            <?php echo $block->escapeHtml($option->getTitle()) ?>
+            <?= $block->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 538541136e910..edf4f68afded7 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
@@ -20,11 +20,11 @@
 require(['prototype'], function(){
 
 //<![CDATA[
-    opFile<?php /* @escapeNotVerified */ echo $_rand; ?> = {
+    opFile<?= /* @escapeNotVerified */ $_rand ?> = {
         initializeFile: function(inputBox) {
-            this.inputFile = inputBox.select('input[name="<?php /* @escapeNotVerified */ echo $_fileName; ?>"]')[0];
-            this.inputFileAction = inputBox.select('input[name="<?php /* @escapeNotVerified */ echo $_fieldNameAction; ?>"]')[0];
-            this.fileNameBox = inputBox.up('dd').select('.<?php /* @escapeNotVerified */ echo $_fileNamed ?>')[0];
+            this.inputFile = inputBox.select('input[name="<?= /* @escapeNotVerified */ $_fileName ?>"]')[0];
+            this.inputFileAction = inputBox.select('input[name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>"]')[0];
+            this.fileNameBox = inputBox.up('dd').select('.<?= /* @escapeNotVerified */ $_fileNamed ?>')[0];
         },
 
         toggleFileChange: function(inputBox) {
@@ -63,40 +63,40 @@ require(['prototype'], function(){
 
 <div class="admin__field <?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="admin__field-label label">
-        <?php echo  $block->escapeHtml($_option->getTitle()) ?>
-        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
+        <?= $block->escapeHtml($_option->getTitle()) ?>
+        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
     </label>
     <div class="admin__field-control control">
         <?php if ($_fileExists): ?>
-            <span class="<?php /* @noEscape */ echo $_fileNamed ?>"><?php echo $block->escapeHtml($_fileInfo->getTitle()); ?></span>
-            <a href="javascript:void(0)" class="label" onclick="opFile<?php /* @escapeNotVerified */ echo $_rand; ?>.toggleFileChange($(this).next('.input-box'))">
-                <?php /* @escapeNotVerified */ echo __('Change') ?>
+            <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
+            <a href="javascript:void(0)" class="label" onclick="opFile<?= /* @escapeNotVerified */ $_rand ?>.toggleFileChange($(this).next('.input-box'))">
+                <?= /* @escapeNotVerified */ __('Change') ?>
             </a>&nbsp;
             <?php if (!$_option->getIsRequire()): ?>
-                <input type="checkbox" onclick="opFile<?php /* @escapeNotVerified */ echo $_rand; ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_option->getPrice(true)) ?>"/>
-                <span class="label"><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
+                <input type="checkbox" onclick="opFile<?= /* @escapeNotVerified */ $_rand ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>"/>
+                <span class="label"><?= /* @escapeNotVerified */ __('Delete') ?></span>
             <?php endif; ?>
         <?php endif; ?>
-        <div class="input-box" <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
+        <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="<?php /* @noEscape */ echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?>/>
-            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $_fieldNameAction; ?>" value="<?php /* @escapeNotVerified */ echo $_fieldValueAction; ?>" />
+            <input type="file" name="<?= /* @noEscape */ $_fileName ?>" class="product-custom-option<?= $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?= $_fileExists ? 'disabled="disabled"' : '' ?>/>
+            <input type="hidden" name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>" value="<?= /* @escapeNotVerified */ $_fieldValueAction ?>" />
 
             <?php if ($_option->getFileExtension()): ?>
                 <div class="admin__field-note">
-                    <span><?php /* @escapeNotVerified */ echo __('Compatible file extensions to upload')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getFileExtension() ?></strong></span>
+                    <span><?= /* @escapeNotVerified */ __('Compatible file extensions to upload') ?>: <strong><?= /* @escapeNotVerified */ $_option->getFileExtension() ?></strong></span>
                 </div>
             <?php endif; ?>
 
             <?php if ($_option->getImageSizeX() > 0): ?>
                 <div class="admin__field-note">
-                    <span><?php /* @escapeNotVerified */ echo __('Maximum image width')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeX() ?> <?php /* @escapeNotVerified */ echo __('px.')?></strong></span>
+                    <span><?= /* @escapeNotVerified */ __('Maximum image width') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeX() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong></span>
                 </div>
             <?php endif; ?>
 
             <?php if ($_option->getImageSizeY() > 0): ?>
                 <div class="admin__field-note">
-                    <span><?php /* @escapeNotVerified */ echo __('Maximum image height')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeY() ?> <?php /* @escapeNotVerified */ echo __('px.')?></strong></span>
+                    <span><?= /* @escapeNotVerified */ __('Maximum image height') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeY() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong></span>
                 </div>
             <?php endif; ?>
         </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/fieldset/options/type/select.phtml
index f80571c03cbff..af09bbe0acd9d 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
@@ -11,13 +11,13 @@
 <?php $_option = $block->getOption(); ?>
 <div class="admin__field field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="label admin__field-label">
-        <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control admin__field-control">
-        <?php echo $block->getValuesHtml() ?>
+        <?= $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-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></span>
+                <span id="options-<?= /* @escapeNotVerified */ $_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 7ed578688cc00..14e485c6445e0 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
@@ -11,18 +11,18 @@
 <?php $_option = $block->getOption(); ?>
 <div class="field admin__field<?php if ($_option->getIsRequire()) echo ' required _required' ?>">
     <label class="admin__field-label label">
-        <?php echo  $block->escapeHtml($_option->getTitle()) ?>
-        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
+        <?= $block->escapeHtml($_option->getTitle()) ?>
+        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
     </label>
     <div class="control admin__field-control">
         <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_FIELD): ?>
-            <input type="text" id="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text" class="input-text admin__control-text <?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php /* @escapeNotVerified */ echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]" value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>" price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
+            <input type="text" id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text" class="input-text admin__control-text <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= /* @escapeNotVerified */ $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]" value="<?= $block->escapeHtml($block->getDefaultValue()) ?>" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
         <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA): ?>
-            <textarea id="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text" class="admin__control-textarea <?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php /* @escapeNotVerified */ echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]" rows="5" cols="25" price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+            <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text" class="admin__control-textarea <?= $_option->getIsRequire() ? ' required-entry' : '' ?> <?= /* @escapeNotVerified */ $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]" rows="5" cols="25" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif;?>
 
         <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note"><?php /* @escapeNotVerified */ echo __('Maximum number of characters:')?> <strong><?php /* @escapeNotVerified */ echo $_option->getMaxCharacters() ?></strong></p>
+            <p class="note"><?= /* @escapeNotVerified */ __('Maximum number of characters:') ?> <strong><?= /* @escapeNotVerified */ $_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 7a9f35e4ef435..487c9b8e8f2b7 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
@@ -11,11 +11,11 @@
 <?php /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Composite\Fieldset\Qty */ ?>
 
 <fieldset id="product_composite_configure_fields_qty"
-          class="fieldset product-composite-qty-block admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
+          class="fieldset product-composite-qty-block admin__fieldset <?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <div class="field admin__field">
-        <label class="label admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Quantity') ?></span></label>
+        <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ __('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="<?php /* @escapeNotVerified */ echo $block->getQtyValue() * 1 ?>">
+            <input id="product_composite_configure_input_qty" class="input-text admin__control-text qty" type="text" name="qty" value="<?= /* @escapeNotVerified */ $block->getQtyValue() * 1 ?>">
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml
index ad8fe984d3fdc..7c25c3686eadc 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
@@ -17,11 +17,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><?php /* @escapeNotVerified */ echo $block->getAttributeSetName()?></span>
+                    <span><?= /* @escapeNotVerified */ $block->getAttributeSetName() ?></span>
                 </button>
                 <ul class="dropdown-menu">
                     <li><input type="text" id="product-template-suggest" class="search"
-                           placeholder="<?php /* @noEscape */ echo __('start typing to search template'); ?>"/></li>
+                           placeholder="<?= /* @noEscape */ __('start typing to search template') ?>"/></li>
                 </ul>
             </div>
         </div>
@@ -30,30 +30,30 @@
             <input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
             <label class="switcher-label"
                    for="product-online-switcher"
-                   data-text-on="<?php /* @escapeNotVerified */ echo __('Product online'); ?>"
-                   data-text-off="<?php /* @escapeNotVerified */ echo __('Product offline'); ?>"
-                   title="<?php /* @escapeNotVerified */ echo __('Product online status'); ?>"></label>
+                   data-text-on="<?= /* @escapeNotVerified */ __('Product online') ?>"
+                   data-text-off="<?= /* @escapeNotVerified */ __('Product offline') ?>"
+                   title="<?= /* @escapeNotVerified */ __('Product online status') ?>"></label>
         </div>
 
         <?php if ($block->getProductId()): ?>
-            <?php echo $block->getDeleteButtonHtml() ?>
+            <?= $block->getDeleteButtonHtml() ?>
         <?php endif; ?>
         <?php if ($block->getProductSetId()): ?>
-            <?php echo $block->getChangeAttributeSetButtonHtml() ?>
-            <?php echo $block->getSaveSplitButtonHtml(); ?>
+            <?= $block->getChangeAttributeSetButtonHtml() ?>
+            <?= $block->getSaveSplitButtonHtml() ?>
         <?php endif; ?>
-        <?php echo $block->getBackButtonHtml() ?>
+        <?= $block->getBackButtonHtml() ?>
     </div>
 </div>
 <?php if ($block->getUseContainer()): ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data"
-      data-form="edit-product" data-product-id="<?php /* @escapeNotVerified */ echo $block->getProduct()->getId()?>">
+<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data"
+      data-form="edit-product" data-product-id="<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>">
 <?php endif; ?>
-    <?php echo $block->getBlockHtml('formkey')?>
+    <?= $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') */?>
-    <?php echo $block->getChildHtml('product-type-tabs') ?>
-    <input type="hidden" id="product_type_id" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getTypeId()?>"/>
-    <input type="hidden" id="attribute_set_id" value="<?php /* @escapeNotVerified */ echo $block->getProduct()->getAttributeSetId()?>"/>
+    <?= $block->getChildHtml('product-type-tabs') ?>
+    <input type="hidden" id="product_type_id" value="<?= /* @escapeNotVerified */ $block->getProduct()->getTypeId() ?>"/>
+    <input type="hidden" id="attribute_set_id" value="<?= /* @escapeNotVerified */ $block->getProduct()->getAttributeSetId() ?>"/>
     <button type="submit" class="hidden"></button>
 <?php if ($block->getUseContainer()): ?>
 </form>
@@ -130,10 +130,10 @@ require([
             }
         }
     });
-    $form.mage('validation', {validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
+    $form.mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
 
-    var masks = <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getFieldsAutogenerationMasks())?>;
-    var availablePlaceholders = <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getAttributesAllowedForAutogeneration())?>;
+    var masks = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getFieldsAutogenerationMasks()) ?>;
+    var availablePlaceholders = <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getAttributesAllowedForAutogeneration()) ?>;
     var Autogenerator = function(masks) {
         this._masks = masks || {};
         this._fieldReverseIndex = this._buildReverseIndex(this._masks);
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/attribute.phtml
index bfd186c22dd6b..d1591d70945cf 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
@@ -8,14 +8,14 @@
 
 ?>
 
-<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
+    <?= $block->getBlockHtml('formkey') ?>
 </form>
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
     jQuery('#attributes-edit-form').mage('form')
-        .mage('validation', {validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
+        .mage('validation', {validationUrl: '<?= /* @escapeNotVerified */ $block->getValidationUrl() ?>'});
 
 });
 </script>
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 c6328b7b17274..efc06d675c369 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
@@ -33,326 +33,326 @@
 <div class="fieldset-wrapper form-inline advanced-inventory-edit">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?php /* @escapeNotVerified */ echo __('Advanced Inventory') ?></span>
+            <span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Manage Stock') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Manage Stock') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_manage_stock" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[manage_stock]"
+                        <select id="inventory_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[manage_stock]"
                                 class="select" disabled="disabled">
-                            <option value="1"><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
+                            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('No') ?></option>
+                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">
-                        <input name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
+                        <input name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
                                id="inventory_use_config_manage_stock" data-role="toggle-editability" value="1"
                                checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_manage_stock"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field required">
             <label class="label" for="inventory_qty">
-                <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text required-entry validate-number" id="inventory_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[qty]"
-                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[qty]"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_qty_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_qty_checkbox"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field with-addon">
             <label class="label" for="inventory_min_qty">
-                <span><?php /* @escapeNotVerified */ echo __('Out-of-Stock Threshold') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Out-of-Stock Threshold') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_min_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[min_qty]"
-                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_qty]"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_min_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_min_qty]" value="1"
+                               name="<?= /* @escapeNotVerified */ $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><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span>
+                            <span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_min_sale_qty">
-                <span><?php /* @escapeNotVerified */ echo __('Minimum Qty Allowed in Shopping Cart') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Minimum Qty Allowed in Shopping Cart') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[min_sale_qty]"
-                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('min_sale_qty') * 1 ?>"
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[min_sale_qty]"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('min_sale_qty') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_min_sale_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_min_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_min_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_min_sale_qty"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_max_sale_qty">
-                <span><?php /* @escapeNotVerified */ echo __('Maximum Qty Allowed in Shopping Cart') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Maximum Qty Allowed in Shopping Cart') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_max_sale_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[max_sale_qty]"
-                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[max_sale_qty]"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_max_sale_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_max_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_max_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_max_sale_qty"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_is_qty_decimal">
-                <span><?php /* @escapeNotVerified */ echo __('Qty Uses Decimals') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Qty Uses Decimals') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_is_qty_decimal"
-                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[is_qty_decimal]" class="select"
+                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[is_qty_decimal]" class="select"
                                 disabled="disabled">
-                            <option value="0"><?php /* @escapeNotVerified */ echo __('No') ?></option>
+                            <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
                             <option
-                                value="1"<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
+                                value="1"<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_is_qty_decimal_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_is_qty_decimal_checkbox"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_backorders">
-                <span><?php /* @escapeNotVerified */ echo __('Backorders') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Backorders') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_backorders" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[backorders]"
+                        <select id="inventory_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[backorders]"
                                 class="select" disabled="disabled">
                             <?php foreach ($block->getBackordersOption() as $option): ?>
                                 <?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ? ' selected="selected"' : '' ?>
                                 <option
-                                    value="<?php /* @escapeNotVerified */ echo $option['value'] ?>"<?php /* @escapeNotVerified */ echo $_selected ?>><?php /* @escapeNotVerified */ echo $option['label'] ?></option>
+                                    value="<?= /* @escapeNotVerified */ $option['value'] ?>"<?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
                             <?php endforeach; ?>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_backorders"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_backorders]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_backorders]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_backorders"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                        <label for="inventory_backorders_checkbox" class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
 
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_notify_stock_qty">
-                <span><?php /* @escapeNotVerified */ echo __('Notify for Quantity Below') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Notify for Quantity Below') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[notify_stock_qty]"
-                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[notify_stock_qty]"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_notify_stock_qty"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_notify_stock_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_notify_stock_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_notify_stock_qty"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_enable_qty_increments">
-                <span><?php /* @escapeNotVerified */ echo __('Enable Qty Increments') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Enable Qty Increments') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_enable_qty_increments"
-                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[enable_qty_increments]" class="select"
+                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[enable_qty_increments]" class="select"
                                 disabled="disabled">
-                            <option value="1"><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
+                            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('No') ?></option>
+                                value="0"<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_enable_qty_increments"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_enable_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_enable_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_enable_qty_increments"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_qty_increments">
-                <span><?php /* @escapeNotVerified */ echo __('Qty Increments') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Qty Increments') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <input type="text" class="input-text validate-number" id="inventory_qty_increments"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[qty_increments]"
-                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('qty_increments') * 1 ?>"
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[qty_increments]"
+                               value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('qty_increments') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_qty_increments"
-                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[use_config_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[use_config_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
                         <label for="inventory_use_config_qty_increments"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_stock_availability">
-                <span><?php /* @escapeNotVerified */ echo __('Stock Availability') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Stock Availability') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_stock_availability"
-                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[is_in_stock]" class="select"
+                                name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
                                 disabled="disabled">
-                            <option value="1"><?php /* @escapeNotVerified */ echo __('In Stock') ?></option>
+                            <option value="1"><?= /* @escapeNotVerified */ __('In Stock') ?></option>
                             <option
-                                value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0): ?> selected<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Out of Stock') ?></option>
+                                value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0): ?> selected<?php endif; ?>><?= /* @escapeNotVerified */ __('Out of Stock') ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_stock_availability_checkbox" data-role="toggle-editability-all"/>
                         <label for="inventory_stock_availability_checkbox"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?= /* @escapeNotVerified */ __('[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 d4404dbef5747..cd297a7bbf27b 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
@@ -11,24 +11,24 @@
 <div class="fieldset-wrapper" id="add-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?php /* @escapeNotVerified */ echo __('Add Product To Websites') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Add Product To Websites') ?></span>
         </legend>
         <br>
         <div class="store-scope">
             <div class="store-tree" id="add-products-to-website-content">
                 <?php foreach ($block->getWebsiteCollection() as $_website): ?>
                     <div class="website-name">
-                        <input name="add_website_ids[]" value="<?php /* @escapeNotVerified */ echo $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="add_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>" type="checkbox" />
-                        <label for="add_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>"><?php echo $block->escapeHtml($_website->getName()) ?></label>
+                        <input name="add_website_ids[]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox" />
+                        <label for="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
                     </div>
-                    <dl class="webiste-groups" id="add_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>_data">
+                    <dl class="webiste-groups" id="add_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
                         <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-                            <dt><?php echo $block->escapeHtml($_group->getName()) ?></dt>
+                            <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
                                 <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                                     <li>
-                                        <?php echo $block->escapeHtml($_store->getName()) ?>
+                                        <?= $block->escapeHtml($_store->getName()) ?>
                                     </li>
                                 <?php endforeach; ?>
                                 </ul>
@@ -44,29 +44,29 @@
 <div class="fieldset-wrapper" id="remove-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?php /* @escapeNotVerified */ echo __('Remove Product From Websites') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Remove Product From Websites') ?></span>
         </legend>
         <br>
         <div class="messages">
             <div class="message message-notice">
-                <div><?php /* @escapeNotVerified */ echo __('To hide an item in catalog or search results, set the status to "Disabled".') ?></div>
+                <div><?= /* @escapeNotVerified */ __('To hide an item in catalog or search results, set the status to "Disabled".') ?></div>
             </div>
         </div>
         <div class="store-scope">
             <div class="store-tree" id="remove-products-to-website-content">
                 <?php foreach ($block->getWebsiteCollection() as $_website): ?>
                     <div class="website-name">
-                        <input name="remove_website_ids[]" value="<?php /* @escapeNotVerified */ echo $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="remove_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>" type="checkbox" />
-                        <label for="remove_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>"><?php echo $block->escapeHtml($_website->getName()) ?></label>
+                        <input name="remove_website_ids[]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox" />
+                        <label for="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
                     </div>
-                    <dl class="webiste-groups" id="remove_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>_data">
+                    <dl class="webiste-groups" id="remove_product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
                         <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-                            <dt><?php echo $block->escapeHtml($_group->getName()) ?></dt>
+                            <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
                                 <ul>
                                 <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                                     <li>
-                                        <?php echo $block->escapeHtml($_store->getName()) ?>
+                                        <?= $block->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 be7fd11cda9e7..6a5f6c4648494 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
@@ -32,7 +32,7 @@
             }
         });
         $suggest
-            .mage('suggest',<?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
+            .mage('suggest',<?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions()) ?>)
             .on('suggestselect', function (e, ui) {
                 if (ui.item.id) {
                     $('[data-form=edit-product]').trigger('changeAttributeSet', ui.item);
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
index 95941f0be381d..84c3257840259 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/category/new/form.phtml
@@ -5,7 +5,7 @@
  */
 /* @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\NewCategory */
 ?>
-<div id="<?php /* @escapeNotVerified */ echo $block->getNameInLayout() ?>" style="display:none">
-    <?php echo $block->getFormHtml();?>
-    <?php echo $block->getAfterElementHtml();?>
+<div id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+    <?= $block->getFormHtml() ?>
+    <?= $block->getAfterElementHtml() ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options.phtml
index ed2c98072c991..2570a5d712675 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
@@ -12,7 +12,7 @@
 <div class="fieldset-wrapper" id="product-custom-options-wrapper" data-block="product-custom-options">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?php /* @escapeNotVerified */ echo __('Custom Options') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Custom Options') ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content" id="product-custom-options-content" data-role="product-custom-options-content">
@@ -20,19 +20,19 @@
             <div class="messages">
                 <div class="message message-error" id="dynamic-price-warning" style="display: none;">
                     <div class="message-inner">
-                        <div class="message-content"><?php /* @escapeNotVerified */ echo __('We can\'t save custom-defined options for bundles with dynamic pricing.') ?></div>
+                        <div class="message-content"><?= /* @escapeNotVerified */ __('We can\'t save custom-defined options for bundles with dynamic pricing.') ?></div>
                     </div>
                 </div>
             </div>
 
             <div id="product_options_container" class="sortable-wrapper">
                 <div id="product_options_container_top"></div>
-                <?php echo $block->getOptionsBoxHtml() ?>
+                <?= $block->getOptionsBoxHtml() ?>
             </div>
 
             <div class="actions">
-                <?php echo $block->getChildHtml('import_button') ?>
-                <?php echo $block->getAddButtonHtml() ?>
+                <?= $block->getChildHtml('import_button') ?>
+                <?= $block->getAddButtonHtml() ?>
             </div>
         </fieldset>
     </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 20ece37b5dd8b..d2bca5ce17321 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
@@ -8,7 +8,7 @@
 
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Option */ ?>
-<?php echo $block->getTemplatesHtml() ?>
+<?= $block->getTemplatesHtml() ?>
 <script id="custom-option-base-template" type="text/x-magento-template">
     <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="option_<%- data.id %>">
         <div class="fieldset-wrapper-title">
@@ -19,30 +19,30 @@
                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
             </strong>
             <div class="actions">
-                <button type="button" title="<?php /* @escapeNotVerified */ echo __('Delete Custom Option'); ?>" class="action-delete" id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_delete">
-                    <span><?php /* @escapeNotVerified */ echo __('Delete Custom Option'); ?></span>
+                <button type="button" title="<?= /* @escapeNotVerified */ __('Delete Custom Option') ?>" class="action-delete" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_delete">
+                    <span><?= /* @escapeNotVerified */ __('Delete Custom Option') ?></span>
                 </button>
             </div>
-            <div id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_move" data-role="draggable-handle" class="draggable-handle"
-                 title="<?php /* @escapeNotVerified */ echo __('Sort Custom Options'); ?>"></div>
+            <div id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_move" data-role="draggable-handle" class="draggable-handle"
+                 title="<?= /* @escapeNotVerified */ __('Sort Custom Options') ?>"></div>
         </div>
         <div class="fieldset-wrapper-content in collapse" id="<%- data.id %>-content">
             <fieldset class="fieldset">
-                <fieldset class="fieldset-alt" id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>">
-                    <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_is_delete" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][is_delete]" type="hidden" value=""/>
-                    <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_previous_type" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][previous_type]" type="hidden" value="<%- data.type %>"/>
-                    <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_previous_group" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][previous_group]" type="hidden" value=""/>
-                    <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_id" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][id]" type="hidden" value="<%- data.id %>"/>
-                    <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_option_id" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][option_id]" type="hidden" value="<%- data.option_id %>"/>
-                    <input name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][sort_order]" type="hidden" value="<%- data.sort_order %>"/>
+                <fieldset class="fieldset-alt" id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>">
+                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_is_delete" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][is_delete]" type="hidden" value=""/>
+                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_previous_type" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][previous_type]" type="hidden" value="<%- data.type %>"/>
+                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_previous_group" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][previous_group]" type="hidden" value=""/>
+                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_id" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][id]" type="hidden" value="<%- data.id %>"/>
+                    <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_option_id" name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][option_id]" type="hidden" value="<%- data.option_id %>"/>
+                    <input name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][sort_order]" type="hidden" value="<%- data.sort_order %>"/>
 
                     <div class="field field-option-title required">
-                        <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?php /* @escapeNotVerified */ echo __('Option Title') ?>
+                        <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title">
+                            <?= /* @escapeNotVerified */ __('Option Title') ?>
                         </label>
                         <div class="control">
-                            <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_title"
-                                   name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][title]"
+                            <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title"
+                                   name="<?= /* @escapeNotVerified */ $block->getFieldName() ?>[<%- data.id %>][title]"
                                    class="required-entry input-text"
                                    type="text"
                                    value="<%- data.title %>"
@@ -54,21 +54,21 @@
                     </div>
 
                     <div class="field field-option-input-type required">
-                        <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?php /* @escapeNotVerified */ echo __('Input Type') ?>
+                        <label class="label" for="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_title">
+                            <?= /* @escapeNotVerified */ __('Input Type') ?>
                         </label>
                         <div class="control opt-type">
-                            <?php echo $block->getTypeSelectHtml() ?>
+                            <?= $block->getTypeSelectHtml() ?>
                         </div>
                     </div>
 
                     <div class="field field-option-req">
                         <div class="control">
-                            <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_required" class="is-required" type="checkbox" checked="checked"/>
+                            <input id="<?= /* @escapeNotVerified */ $block->getFieldId() ?>_<%- data.id %>_required" class="is-required" type="checkbox" checked="checked"/>
                             <label for="field-option-req">
-                                <?php /* @escapeNotVerified */ echo __('Required')?>
+                                <?= /* @escapeNotVerified */ __('Required') ?>
                             </label>
-                            <span style="display:none"><?php echo $block->getRequireSelectHtml() ?></span>
+                            <span style="display:none"><?= $block->getRequireSelectHtml() ?></span>
                         </div>
                     </div>
                 </fieldset>
@@ -103,7 +103,7 @@ jQuery(function ($) {
     //adding data to templates
     <?php /** @var $_value \Magento\Framework\DataObject */ ?>
     <?php foreach ($block->getOptionValues() as $_value): ?>
-        fieldSet.customOptions('addOption', <?php /* @escapeNotVerified */ echo $_value->toJson() ?>);
+        fieldSet.customOptions('addOption', <?= /* @escapeNotVerified */ $_value->toJson() ?>);
     <?php endforeach; ?>
 });
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/date.phtml
index fe5092a1ab1f5..07ce6e5d86256 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
@@ -14,10 +14,10 @@
             <thead>
             <tr class="headings">
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
+                <th><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th><?= /* @escapeNotVerified */ __('Price Type') ?></th>
                 <?php endif; ?>
-                <th><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
+                <th><?= /* @escapeNotVerified */ __('SKU') ?></th>
             </tr>
             </thead>
             <tr>
@@ -32,7 +32,7 @@
                         <?php endif; ?>>
                 </td>
                 <td class="opt-price-type">
-                    <?php echo $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %>
+                    <?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %>
                 </td>
                 <?php else : ?>
                 <input id="product_option_<%- data.option_id %>_price" name="product[options][<%- data.option_id %>][price]" type="hidden">
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 86fdd8705931d..693c98fc02cab 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
@@ -14,12 +14,12 @@
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th><?php /* @escapeNotVerified */ echo __('Price'); ?></th>
-                <th><?php /* @escapeNotVerified */ echo __('Price Type'); ?></th>
+                <th><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th><?= /* @escapeNotVerified */ __('Price Type') ?></th>
                 <?php endif; ?>
-                <th><?php /* @escapeNotVerified */ echo __('SKU'); ?></th>
-                <th><?php /* @escapeNotVerified */ echo __('Compatible File Extensions'); ?></th>
-                <th><?php /* @escapeNotVerified */ echo __('Maximum Image Size'); ?></th>
+                <th><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th><?= /* @escapeNotVerified */ __('Compatible File Extensions') ?></th>
+                <th><?= /* @escapeNotVerified */ __('Maximum Image Size') ?></th>
             </tr>
             </thead>
             <tr>
@@ -31,7 +31,7 @@
                            disabled="disabled"
                         <?php endif; ?>>
                 </td>
-                <td class="opt-price-type"><?php echo $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
+                <td class="opt-price-type"><?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
                 <?php else : ?>
                 <input name="product[options][<%- data.option_id %>][price]" type="hidden">
                 <input id="product_option_<%- data.option_id %>_price_type" name="product[options][<%- data.option_id %>][price_type]" type="hidden">
@@ -45,7 +45,7 @@
                 <td class="col-file"><?php /* @escapeNotVerified */ echo __('%1 <span>x</span> %2 <span>px.</span>',
                     '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_x]" value="<%- data.image_size_x %>">',
                     '<input class="input-text" type="text" name="product[options][<%- data.option_id %>][image_size_y]" value="<%- data.image_size_y %>">') ?>
-                    <div class="note"><?php /* @escapeNotVerified */ echo __('Please leave blank if it is not an image.') ?></div>
+                    <div class="note"><?= /* @escapeNotVerified */ __('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 2020e24432d4e..e8c398228a469 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
@@ -14,19 +14,19 @@
             <thead>
                 <tr>
                     <th class="col-draggable">&nbsp;</th>
-                    <th class="col-name required"><?php /* @escapeNotVerified */ echo __('Title') ?><span class="required">*</span></th>
+                    <th class="col-name required"><?= /* @escapeNotVerified */ __('Title') ?><span class="required">*</span></th>
                     <?php if ($block->getCanReadPrice() !== false) : ?>
-                    <th class="col-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                    <th class="col-price-type"><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
+                    <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                    <th class="col-price-type"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
                     <?php endif; ?>
-                    <th class="col-sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
+                    <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
                     <th class="col-actions">&nbsp;</th>
                 </tr>
             </thead>
             <tbody id="select_option_type_row_<%- data.option_id %>"></tbody>
             <tfoot>
                 <tr>
-                    <td colspan="6"><?php echo $block->getAddButtonHtml() ?>
+                    <td colspan="6"><?= $block->getAddButtonHtml() ?>
                         <input name="validation_<%- data.option_id %>_result" class="required-option-select-type-rows" type="hidden" value="">
                     </td>
                 </tr>
@@ -38,7 +38,7 @@
     <tr id="product_option_<%- data.id %>_select_<%- data.select_id %>">
         <td class="col-draggable">
             <div data-role="draggable-handle" class="draggable-handle"
-                 title="<?php /* @escapeNotVerified */ echo __('Sort Custom Option'); ?>"></div>
+                 title="<?= /* @escapeNotVerified */ __('Sort Custom Option') ?>"></div>
             <input name="product[options][<%- data.id %>][values][<%- data.select_id %>][sort_order]" type="hidden" value="<%- data.sort_order %>">
         </td>
         <td class="col-name select-opt-title">
@@ -58,7 +58,7 @@
                 <?php endif; ?>>
         </td>
         <td class="col-price-type select-opt-price-type">
-            <?php /* @escapeNotVerified */ echo $block->getPriceTypeSelectHtml('data-attr="price-type" <% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %>
+            <?= /* @escapeNotVerified */ $block->getPriceTypeSelectHtml('data-attr="price-type" <% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %>
         </td>
         <?php else : ?>
         <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_price" name="product[options][<%- data.id %>][values][<%- data.select_id %>][price]" type="hidden">
@@ -67,6 +67,6 @@
         <td class="col-sku">
             <input name="product[options][<%- data.id %>][values][<%- data.select_id %>][sku]" class="input-text" type="text" value="<%- data.sku %>">
         </td>
-        <td class="col-actions col-delete"> <?php echo $block->getDeleteButtonHtml() ?></td>
+        <td class="col-actions col-delete"> <?= $block->getDeleteButtonHtml() ?></td>
     </tr>
 </script>
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 dd61daa068ff4..c9d7190589ff5 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
@@ -14,11 +14,11 @@
             <thead>
             <tr>
                 <?php if ($block->getCanReadPrice() !== false) : ?>
-                <th class="type-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th class="type-type"><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
+                <th class="type-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th class="type-type"><?= /* @escapeNotVerified */ __('Price Type') ?></th>
                 <?php endif; ?>
-                <th class="type-sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                <th class="type-last last"><?php /* @escapeNotVerified */ echo __('Max Characters') ?></th>
+                <th class="type-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th class="type-last last"><?= /* @escapeNotVerified */ __('Max Characters') ?></th>
             </tr>
             </thead>
             <tr>
@@ -32,7 +32,7 @@
                            disabled="disabled"
                         <?php endif; ?>>
                 </td>
-                <td class="opt-price-type"><?php echo $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
+                <td class="opt-price-type"><?= $block->getPriceTypeSelectHtml('data-attr="price-type"') ?><%- data.checkboxScopePrice %></td>
                 <?php else : ?>
                 <input id="product_option_<%- data.option_id %>_price" name="product[options][<%- data.option_id %>][price]" type="hidden">
                 <input id="product_option_<%- data.option_id %>_price_type" name="product[options][<%- data.option_id %>][price_type]" type="hidden">
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 d5bffa6a39e88..57715744823d6 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
@@ -20,28 +20,28 @@ $element = $block->getElement();
 
 <?php $_showWebsite = $block->isShowWebsiteColumn(); ?>
 <?php $_showWebsite = $block->isMultiWebsites(); ?>
-<div class="field" id="attribute-<?php /* @escapeNotVerified */ echo $_htmlId?>-container" data-attribute-code="<?php /* @escapeNotVerified */ echo $_htmlId?>"
-     data-apply-to="<?php echo $block->escapeHtml(
+<div class="field" id="attribute-<?= /* @escapeNotVerified */ $_htmlId ?>-container" data-attribute-code="<?= /* @escapeNotVerified */ $_htmlId ?>"
+     data-apply-to="<?= $block->escapeHtml(
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
              $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
          )
      )?>">
-    <label class="label"><span><?php /* @escapeNotVerified */ echo $block->getElement()->getLabel() ?></span></label>
+    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
     <div class="control">
         <table class="admin__control-table tiers_table" id="tiers_table">
             <thead>
                 <tr>
-                    <th class="col-websites" <?php if (!$_showWebsite): ?>style="display:none"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Web Site') ?></th>
-                    <th class="col-customer-group"><?php /* @escapeNotVerified */ echo __('Customer Group') ?></th>
-                    <th class="col-qty required"><?php /* @escapeNotVerified */ echo __('Quantity') ?></th>
-                    <th class="col-price required"><?php /* @escapeNotVerified */ echo $block->getPriceColumnHeader(__('Item Price')) ?></th>
-                    <th class="col-delete"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
+                    <th class="col-websites" <?php if (!$_showWebsite): ?>style="display:none"<?php endif; ?>><?= /* @escapeNotVerified */ __('Web Site') ?></th>
+                    <th class="col-customer-group"><?= /* @escapeNotVerified */ __('Customer Group') ?></th>
+                    <th class="col-qty required"><?= /* @escapeNotVerified */ __('Quantity') ?></th>
+                    <th class="col-price required"><?= /* @escapeNotVerified */ $block->getPriceColumnHeader(__('Item Price')) ?></th>
+                    <th class="col-delete"><?= /* @escapeNotVerified */ __('Action') ?></th>
                 </tr>
             </thead>
-            <tbody id="<?php /* @escapeNotVerified */ echo $_htmlId ?>_container"></tbody>
+            <tbody id="<?= /* @escapeNotVerified */ $_htmlId ?>_container"></tbody>
             <tfoot>
                 <tr>
-                    <td colspan="<?php if (!$_showWebsite): ?>4<?php else: ?>5<?php endif; ?>" class="col-actions-add"><?php echo $block->getAddButtonHtml() ?></td>
+                    <td colspan="<?php if (!$_showWebsite): ?>4<?php else: ?>5<?php endif; ?>" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
                 </tr>
             </tfoot>
         </table>
@@ -56,24 +56,24 @@ require([
 //<![CDATA[
 var tierPriceRowTemplate = '<tr>'
     + '<td class="col-websites"<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
-    + '<select class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> required-entry" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
+    + '<select class="<?= /* @escapeNotVerified */ $_htmlClass ?> required-entry" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
     <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-    + '<option value="<?php /* @escapeNotVerified */ echo $_websiteId ?>"><?php echo $block->escapeJs($_info['name']) ?><?php if (!empty($_info['currency'])): ?> [<?php echo $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
+    + '<option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= $block->escapeJs($_info['name']) ?><?php if (!empty($_info['currency'])): ?> [<?= $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
     <?php endforeach ?>
     + '</select></td>'
-    + '<td class="col-customer-group"><select class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> custgroup required-entry" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
+    + '<td class="col-customer-group"><select class="<?= /* @escapeNotVerified */ $_htmlClass ?> custgroup required-entry" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
     <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName): ?>
-    + '<option value="<?php /* @escapeNotVerified */ echo $_groupId ?>"><?php echo $block->escapeJs($_groupName) ?></option>'
+    + '<option value="<?= /* @escapeNotVerified */ $_groupId ?>"><?= $block->escapeJs($_groupName) ?></option>'
     <?php endforeach ?>
     + '</select></td>'
     + '<td class="col-qty">'
-        + '<input class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
-        + '<span><?php /* @escapeNotVerified */ echo __("and above") ?></span>'
+        + '<input class="<?= /* @escapeNotVerified */ $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
+        + '<span><?= /* @escapeNotVerified */ __("and above") ?></span>'
     + '</td>'
-    + '<td class="col-price"><input class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> required-entry <?php /* @escapeNotVerified */ echo $_priceValueValidation ?>" type="text" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
-    + '<td class="col-delete"><input type="hidden" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
-    + '<button title="<?php /* @escapeNotVerified */ echo $block->escapeHtml(__('Delete Tier')); ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
-    + '<span><?php /* @escapeNotVerified */ echo __("Delete") ?></span></button></td>'
+    + '<td class="col-price"><input class="<?= /* @escapeNotVerified */ $_htmlClass ?> required-entry <?= /* @escapeNotVerified */ $_priceValueValidation ?>" type="text" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][price]" value="<%- data.price %>" id="tier_price_row_<%- data.index %>_price" /></td>'
+    + '<td class="col-delete"><input type="hidden" name="<?= /* @escapeNotVerified */ $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
+    + '<button title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete Tier')) ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="tier_price_row_<%- data.index %>_delete_button" onclick="return tierPriceControl.deleteItem(event);">'
+    + '<span><?= /* @escapeNotVerified */ __("Delete") ?></span></button></td>'
     + '</tr>';
 
 var tierPriceControl = {
@@ -86,8 +86,8 @@ var tierPriceControl = {
         }
         <?php endif; ?>
         var data = {
-            website_id: '<?php /* @escapeNotVerified */ echo $block->getDefaultWebsite() ?>',
-            group: '<?php /* @escapeNotVerified */ echo $block->getDefaultCustomerGroup() ?>',
+            website_id: '<?= /* @escapeNotVerified */ $block->getDefaultWebsite() ?>',
+            group: '<?= /* @escapeNotVerified */ $block->getDefaultCustomerGroup() ?>',
             qty: '',
             price: '',
             readOnly: false,
@@ -104,7 +104,7 @@ var tierPriceControl = {
             data.readOnly = arguments[4];
         }
 
-        Element.insert($('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container'), {
+        Element.insert($('<?= /* @escapeNotVerified */ $_htmlId ?>_container'), {
             bottom : this.template({
                 data: data
             })
@@ -129,10 +129,10 @@ var tierPriceControl = {
         }
 
         <?php if ($_readonly): ?>
-        $('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').select('input', 'select').each(this.disableElement);
-        $('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
+        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').select('input', 'select').each(this.disableElement);
+        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
         <?php else: ?>
-        $('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
+        $('<?= /* @escapeNotVerified */ $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
         <?php endif; ?>
     },
     disableElement: function(el) {
@@ -151,10 +151,10 @@ var tierPriceControl = {
     }
 };
 <?php foreach ($block->getValues() as $_item): ?>
-tierPriceControl.addItem('<?php /* @escapeNotVerified */ echo $_item['website_id'] ?>', '<?php /* @escapeNotVerified */ echo $_item['cust_group'] ?>', '<?php /* @escapeNotVerified */ echo $_item['price_qty']*1 ?>', '<?php /* @escapeNotVerified */ echo $_item['price'] ?>', <?php echo (int)!empty($_item['readonly'])?>);
+tierPriceControl.addItem('<?= /* @escapeNotVerified */ $_item['website_id'] ?>', '<?= /* @escapeNotVerified */ $_item['cust_group'] ?>', '<?= /* @escapeNotVerified */ $_item['price_qty']*1 ?>', '<?= /* @escapeNotVerified */ $_item['price'] ?>', <?= (int)!empty($_item['readonly']) ?>);
 <?php endforeach; ?>
 <?php if ($_readonly): ?>
-$('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').up('table').select('button')
+$('<?= /* @escapeNotVerified */ $_htmlId ?>_container').up('table').select('button')
     .each(tierPriceControl.disableElement);
 <?php endif; ?>
 
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/serializer.phtml
index 7b454561fbfb1..44fdb75cdac21 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
@@ -9,4 +9,4 @@
 ?>
 
 <?php $_id = 'id_' . md5(microtime()) ?>
-<input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getInputElementName()?>"  value="" id="<?php /* @escapeNotVerified */ echo $_id?>" />
+<input type="hidden" name="<?= /* @escapeNotVerified */ $block->getInputElementName() ?>"  value="" id="<?= /* @escapeNotVerified */ $_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 1905091487b5f..8f7f20f32d982 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
@@ -8,35 +8,35 @@
 
 ?>
 <fieldset id="grop_fields" class="fieldset">
-    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Product In Websites') ?></span></legend>
+    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Product In Websites') ?></span></legend>
     <br>
     <?php if ($block->getProductId()): ?>
     <div class="messages">
         <div class="message message-notice">
-            <?php /* @escapeNotVerified */ echo __('To hide an item in catalog or search results, set the status to "Disabled".') ?>
+            <?= /* @escapeNotVerified */ __('To hide an item in catalog or search results, set the status to "Disabled".') ?>
         </div>
     </div>
     <?php endif; ?>
     <div class="store-scope">
-        <?php echo $block->getHintHtml() ?>
+        <?= $block->getHintHtml() ?>
         <div class="store-tree">
             <?php $_websites = $block->getWebsiteCollection() ?>
             <?php foreach ($_websites as $_website): ?>
             <div class="website-name">
-                <input name="product[website_ids][]" value="<?php /* @escapeNotVerified */ echo $_website->getId() ?>" <?php if ($block->isReadonly()): ?>  disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>" type="checkbox"<?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1): ?> checked="checked"<?php endif; ?> />
-                <label for="product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>"><?php echo $block->escapeHtml($_website->getName()) ?></label>
+                <input name="product[website_ids][]" value="<?= /* @escapeNotVerified */ $_website->getId() ?>" <?php if ($block->isReadonly()): ?>  disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>" type="checkbox"<?php if ($block->hasWebsite($_website->getId()) || !$block->getProductId() && count($_websites) === 1): ?> checked="checked"<?php endif; ?> />
+                <label for="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>"><?= $block->escapeHtml($_website->getName()) ?></label>
             </div>
-            <dl class="webiste-groups" id="product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>_data">
+            <dl class="webiste-groups" id="product_website_<?= /* @escapeNotVerified */ $_website->getId() ?>_data">
                 <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
-                <dt><?php echo $block->escapeHtml($_group->getName()) ?></dt>
+                <dt><?= $block->escapeHtml($_group->getName()) ?></dt>
                 <dd>
                     <ul>
                         <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                         <li>
-                            <?php echo $block->escapeHtml($_store->getName()) ?>
+                            <?= $block->escapeHtml($_store->getName()) ?>
                             <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())): ?>
-                            <span class="website-<?php /* @escapeNotVerified */ echo $_website->getId() ?>-select" style="display:none">
-                            <?php echo __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)) ?>
+                            <span class="website-<?= /* @escapeNotVerified */ $_website->getId() ?>-select" style="display:none">
+                            <?= __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)) ?>
                             </span>
                             <?php endif; ?>
                         </li>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/helper/gallery.phtml
index 92cae89fbc718..574c9ee81af7d 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
@@ -10,67 +10,67 @@
 $elementName = $block->getElement()->getName() . '[images]';
 $formName = $block->getFormName();
 ?>
-<div id="<?php echo $block->getHtmlId() ?>"
+<div id="<?= $block->getHtmlId() ?>"
      class="gallery"
-     data-mage-init='{"productGallery":{"template":"#<?php echo $block->getHtmlId() ?>-template"}}'
-     data-parent-component="<?php echo $block->escapeHtml($block->getData('config/parentComponent')) ?>"
-     data-images="<?php echo $block->escapeHtml($block->getImagesJson()) ?>"
-     data-types="<?php echo $block->escapeHtml(
+     data-mage-init='{"productGallery":{"template":"#<?= $block->getHtmlId() ?>-template"}}'
+     data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
+     data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
+     data-types="<?= $block->escapeHtml(
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
      ) ?>"
     >
     <?php if (!$block->getElement()->getReadonly()) {?>
         <div class="image image-placeholder">
-            <?php echo $block->getUploaderHtml(); ?>
+            <?= $block->getUploaderHtml() ?>
             <div class="product-image-wrapper">
                 <p class="image-placeholder-text">
-                    <?php /* @escapeNotVerified */ echo __('Browse to find or drag image here'); ?>
+                    <?= /* @escapeNotVerified */ __('Browse to find or drag image here') ?>
                 </p>
             </div>
         </div>
     <?php } ?>
     <?php foreach ($block->getImageTypes() as $typeData) {
     ?>
-        <input name="<?php echo $block->escapeHtml($typeData['name']) ?>"
-               data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
-               class="image-<?php echo $block->escapeHtml($typeData['code']) ?>"
+        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
+               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                type="hidden"
-               value="<?php echo $block->escapeHtml($typeData['value']) ?>"/>
+               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
     <?php
 
 } ?>
 
-    <script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template">
+    <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
         <div class="image item<% if (data.disabled == 1) { %> hidden-for-front<% } %>"
              data-role="image">
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][position]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][position]"
                    value="<%- data.position %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    class="position"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][file]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][file]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value="<%- data.file %>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][value_id]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][value_id]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value="<%- data.value_id %>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][label]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value="<%- data.label %>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][disabled]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value="<%- data.disabled %>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][media_type]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value="image"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][removed]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][removed]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value=""
                    class="is-removed"/>
 
@@ -84,14 +84,14 @@ $formName = $block->getFormName();
                     <button type="button"
                             class="action-remove"
                             data-role="delete-button"
-                            title="<?php /* @escapeNotVerified */ echo __('Delete image') ?>">
+                            title="<?= /* @escapeNotVerified */ __('Delete image') ?>">
                     <span>
-                        <?php /* @escapeNotVerified */ echo __('Delete image') ?>
+                        <?= /* @escapeNotVerified */ __('Delete image') ?>
                     </span>
                     </button>
                     <div class="draggable-handle"></div>
                 </div>
-                <div class="image-fade"><span><?php /* @escapeNotVerified */ echo __('Hidden') ?></span></div>
+                <div class="image-fade"><span><?= /* @escapeNotVerified */ __('Hidden') ?></span></div>
             </div>
 
 
@@ -111,7 +111,7 @@ $formName = $block->getFormName();
                     ) ?>" class="item-role item-role-<?php /* @escapeNotVerified */ echo $block->escapeHtml(
                         $typeData['code']
                     ) ?>">
-                        <?php /* @escapeNotVerified */ echo $block->escapeHtml($typeData['label']) ?>
+                        <?= /* @escapeNotVerified */ $block->escapeHtml($typeData['label']) ?>
                     </li>
                     <?php
                 }
@@ -135,7 +135,7 @@ $formName = $block->getFormName();
                 <fieldset class="admin__fieldset fieldset-image-panel">
                     <div class="admin__field field-image-description">
                         <label class="admin__field-label" for="image-description">
-                            <span><?php /* @escapeNotVerified */ echo __('Alt Text')?></span>
+                            <span><?= /* @escapeNotVerified */ __('Alt Text') ?></span>
                         </label>
 
                         <div class="admin__field-control">
@@ -150,7 +150,7 @@ $formName = $block->getFormName();
 
                     <div class="admin__field field-image-role">
                         <label class="admin__field-label">
-                            <span><?php /* @escapeNotVerified */ echo __('Role')?></span>
+                            <span><?= /* @escapeNotVerified */ __('Role') ?></span>
                         </label>
                         <div class="admin__field-control">
                             <ul class="multiselect-alt">
@@ -161,7 +161,7 @@ $formName = $block->getFormName();
                                         <label>
                                             <input class="image-type"
                                                    data-role="type-selector"
-                                                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                                                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                                                    type="checkbox"
                                                    value="<?php /* @escapeNotVerified */ echo $block->escapeHtml(
                                                        $attribute->getAttributeCode()
@@ -181,16 +181,16 @@ $formName = $block->getFormName();
 
                     <div class="admin__field admin__field-inline field-image-size" data-role="size">
                         <label class="admin__field-label">
-                            <span><?php /* @escapeNotVerified */ echo __('Image Size') ?></span>
+                            <span><?= /* @escapeNotVerified */ __('Image Size') ?></span>
                         </label>
-                        <div class="admin__field-value" data-message="<?php /* @escapeNotVerified */ echo __('{size}') ?>"></div>
+                        <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{size}') ?>"></div>
                     </div>
 
                     <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                         <label class="admin__field-label">
-                            <span><?php /* @escapeNotVerified */ echo __('Image Resolution') ?></span>
+                            <span><?= /* @escapeNotVerified */ __('Image Resolution') ?></span>
                         </label>
-                        <div class="admin__field-value" data-message="<?php /* @escapeNotVerified */ echo __('{width}^{height} px') ?>"></div>
+                        <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{width}^{height} px') ?>"></div>
                     </div>
 
                     <div class="admin__field field-image-hide">
@@ -199,14 +199,14 @@ $formName = $block->getFormName();
                                 <input type="checkbox"
                                        id="hide-from-product-page"
                                        data-role="visibility-trigger"
-                                       data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                                       data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                                        value="1"
                                        class="admin__control-checkbox"
-                                       name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][disabled]"
+                                       name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
                                 <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                                 <label for="hide-from-product-page" class="admin__field-label">
-                                    <?php /* @escapeNotVerified */ echo __('Hide from Product Page')?>
+                                    <?= /* @escapeNotVerified */ __('Hide from Product Page') ?>
                                 </label>
                             </div>
                         </div>
@@ -214,7 +214,7 @@ $formName = $block->getFormName();
                 </fieldset>
             </div>
     </script>
-    <?php echo $block->getChildHtml('new-video'); ?>
+    <?= $block->getChildHtml('new-video') ?>
 </div>
 <script>
     jQuery('body').trigger('contentUpdated');
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 d17a71e5fa88b..4134392c0f52b 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
@@ -30,8 +30,8 @@ function registerTaxRecalcs() {
     Event.observe($('tax_class_id'), 'change', recalculateTax);
 }
 
-var priceFormat = <?php /* @escapeNotVerified */ echo $this->helper('Magento\Tax\Helper\Data')->getPriceFormat($block->getStore()); ?>;
-var taxRates = <?php /* @escapeNotVerified */ echo $block->getAllRatesByProductClassJson(); ?>;
+var priceFormat = <?= /* @escapeNotVerified */ $this->helper('Magento\Tax\Helper\Data')->getPriceFormat($block->getStore()) ?>;
+var taxRates = <?= /* @escapeNotVerified */ $block->getAllRatesByProductClassJson() ?>;
 
 function recalculateTax() {
     if (typeof dynamicTaxes == 'undefined') {
@@ -77,8 +77,8 @@ jQuery(document).on('tabsactivate', bindActiveProductTab);
 // bind active tab
 <?php if ($tabsBlock = $block->getLayout()->getBlock('product_tabs')): ?>
 jQuery(function () {
-    if (jQuery('#<?php /* @escapeNotVerified */ echo $tabsBlock->getId() ?>').length && jQuery('#<?php /* @escapeNotVerified */ echo $tabsBlock->getId() ?>').is(':mage-tabs')) {
-        var activeAnchor = jQuery('#<?php /* @escapeNotVerified */ echo $tabsBlock->getId() ?>').tabs('activeAnchor');
+    if (jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').length && jQuery('#<?= /* @escapeNotVerified */ $tabsBlock->getId() ?>').is(':mage-tabs')) {
+        var activeAnchor = jQuery('#<?= /* @escapeNotVerified */ $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 be000f42aa172..5b07121de49dc 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
@@ -12,9 +12,9 @@
  * Template for block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Alerts
  */
 ?>
-<div id="alert_messages_block"><?php echo $block->getMessageHtml() ?></div>
+<div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
 <div>
-    <h4 class="icon-head head-edit-form"><?php /* @escapeNotVerified */ echo __('Product Alerts') ?></h4>
+    <h4 class="icon-head head-edit-form"><?= /* @escapeNotVerified */ __('Product Alerts') ?></h4>
 </div>
 <div class="clear"></div>
-<?php echo $block->getAccordionHtml() ?>
+<?= $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 64bad0a7faa3a..15c33c56e3ac6 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
@@ -14,22 +14,22 @@
 <?php $_readonly = ''; ?>
 <?php endif; ?>
 <fieldset class="fieldset form-inline">
-<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Advanced Inventory') ?></span></legend>
+<legend class="legend"><span><?= /* @escapeNotVerified */ __('Advanced Inventory') ?></span></legend>
 <br>
 <div id="table_cataloginventory">
 <div class="field">
     <label class="label" for="inventory_manage_stock">
-        <span><?php /* @escapeNotVerified */ echo __('Manage Stock') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Manage Stock') ?></span>
     </label>
     <div class="control">
-        <select id="inventory_manage_stock" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <option value="1"><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
-            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('No') ?></option>
+        <select id="inventory_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>
+            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
         </select>
-        <input type="hidden" id="inventory_manage_stock_default" value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('manage_stock'); ?>">
+        <input type="hidden" id="inventory_manage_stock_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('manage_stock') ?>">
         <?php $_checked = ($block->getFieldValue('use_config_manage_stock') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-        <input type="checkbox" id="inventory_use_config_manage_stock" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-        <label for="inventory_use_config_manage_stock"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+        <input type="checkbox" id="inventory_use_config_manage_stock" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
+        <label for="inventory_use_config_manage_stock"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         <?php if (!$block->isReadonly()): ?>
         <script>
 require(['prototype'], function(){
@@ -39,37 +39,37 @@ toggleValueElements($('inventory_use_config_manage_stock'), $('inventory_use_con
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <?php if (!$block->getProduct()->isComposite()): ?>
 <div class="field">
     <label class="label" for="inventory_qty">
-        <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
     </label>
     <div class="control">
         <?php if (!$_readonly): ?>
-        <input type="hidden" id="original_inventory_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]" value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('qty') * 1 ?>">
+        <input type="hidden" id="original_inventory_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty') * 1 ?>">
         <?php endif;?>
-        <input type="text" class="input-text validate-number" id="inventory_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][qty]" value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('qty') * 1 ?>" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <input type="text" class="input-text validate-number" id="inventory_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_min_qty">
-        <span><?php /* @escapeNotVerified */ echo __('Out-of-Stock Threshold') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Out-of-Stock Threshold') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('min_qty') * 1 ?>" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
 
         <div class="control-inner-wrap">
             <?php $_checked = ($block->getFieldValue('use_config_min_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_min_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_min_qty"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_min_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_min_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
 
         <?php if (!$block->isReadonly()): ?>
@@ -81,22 +81,22 @@ toggleValueElements($('inventory_use_config_min_qty'), $('inventory_use_config_m
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_min_sale_qty">
-        <span><?php /* @escapeNotVerified */ echo __('Minimum Qty Allowed in Shopping Cart') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Minimum Qty Allowed in Shopping Cart') ?></span>
     </label>
     <div class="control">
         <input type="text" class="input-text validate-number" id="inventory_min_sale_qty"
-               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
-               value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('min_sale_qty') * 1 ?>" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+               name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
+               value="<?= /* @escapeNotVerified */ $block->getFieldValue('min_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
         <div class="control-inner-wrap">
         <?php $_checked = ($block->getFieldValue('use_config_min_sale_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_min_sale_qty"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_min_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_min_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
         <?php if (!$block->isReadonly()): ?>
         <script>
@@ -107,20 +107,20 @@ toggleValueElements($('inventory_use_config_min_sale_qty'), $('inventory_use_con
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_max_sale_qty">
-        <span><?php /* @escapeNotVerified */ echo __('Maximum Qty Allowed in Shopping Cart') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Maximum Qty Allowed in Shopping Cart') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_max_sale_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('max_sale_qty') * 1 ?>" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <input type="text" class="input-text validate-number" id="inventory_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('max_sale_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
         <?php $_checked = ($block->getFieldValue('use_config_max_sale_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
         <div class="control-inner-wrap">
-            <input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_max_sale_qty"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_max_sale_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_max_sale_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
         <?php if (!$block->isReadonly()): ?>
         <script>
@@ -131,39 +131,39 @@ toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_con
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
     <?php if ($block->canUseQtyDecimals()): ?>
     <div class="field">
         <label class="label" for="inventory_is_qty_decimal">
-            <span><?php /* @escapeNotVerified */ echo __('Qty Uses Decimals') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Qty Uses Decimals') ?></span>
         </label>
         <div class="control">
-            <select id="inventory_is_qty_decimal" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-                <option value="0"><?php /* @escapeNotVerified */ echo __('No') ?></option>
-                <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
+            <select id="inventory_is_qty_decimal" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?= /* @escapeNotVerified */ $_readonly ?>>
+                <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
+                <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
             </select>
         </div>
         <?php if (!$block->isSingleStoreMode()): ?>
-        <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+        <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
         <?php endif; ?>
     </div>
 
         <?php if (!$block->isVirtual()) : ?>
         <div class="field">
             <label class="label" for="inventory_is_decimal_divided">
-                <span><?php /* @escapeNotVerified */ echo __('Allow Multiple Boxes for Shipping') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Allow Multiple Boxes for Shipping') ?></span>
             </label>
             <div class="control">
-                <select id="inventory_is_decimal_divided" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-                    <option value="0"><?php /* @escapeNotVerified */ echo __('No') ?></option>
-                    <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
+                <select id="inventory_is_decimal_divided" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?= /* @escapeNotVerified */ $_readonly ?>>
+                    <option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>
+                    <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
                 </select>
             </div>
             <?php if (!$block->isSingleStoreMode()): ?>
-            <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+            <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
             <?php endif; ?>
         </div>
             <?php endif; ?>
@@ -171,20 +171,20 @@ toggleValueElements($('inventory_use_config_max_sale_qty'), $('inventory_use_con
 
 <div class="field">
     <label class="label" for="inventory_backorders">
-        <span><?php /* @escapeNotVerified */ echo __('Backorders') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Backorders') ?></span>
     </label>
     <div class="control">
-        <select id="inventory_backorders" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][backorders]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <select id="inventory_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][backorders]" <?= /* @escapeNotVerified */ $_readonly ?>>
             <?php foreach ($block->getBackordersOption() as $option): ?>
             <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
-            <option value="<?php /* @escapeNotVerified */ echo $option['value'] ?>" <?php /* @escapeNotVerified */ echo $_selected ?>><?php /* @escapeNotVerified */ echo $option['label'] ?></option>
+            <option value="<?= /* @escapeNotVerified */ $option['value'] ?>" <?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
             <?php endforeach; ?>
         </select>
 
         <div class="control-inner-wrap">
             <?php $_checked = ($block->getFieldValue('use_config_backorders') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_backorders" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_backorders"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_backorders" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_backorders"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
         <?php if (!$block->isReadonly()): ?>
         <script>
@@ -195,21 +195,21 @@ toggleValueElements($('inventory_use_config_backorders'), $('inventory_use_confi
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_notify_stock_qty">
-        <span><?php /* @escapeNotVerified */ echo __('Notify for Quantity Below') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Notify for Quantity Below') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('notify_stock_qty') * 1 ?>" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('notify_stock_qty') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
 
         <div class="control-inner-wrap">
             <?php $_checked = ($block->getFieldValue('use_config_notify_stock_qty') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_notify_stock_qty"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_notify_stock_qty" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_notify_stock_qty"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
         <?php if (!$block->isReadonly()): ?>
         <script>
@@ -220,27 +220,27 @@ toggleValueElements($('inventory_use_config_notify_stock_qty'), $('inventory_use
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
     <?php endif; ?>
 <div class="field">
     <label class="label" for="inventory_enable_qty_increments">
-        <span><?php /* @escapeNotVerified */ echo __('Enable Qty Increments') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Enable Qty Increments') ?></span>
     </label>
     <div class="control">
         <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
-        <select id="inventory_enable_qty_increments" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <option value="1"<?php if ($qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
-            <option value="0"<?php if (!$qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('No') ?></option>
+        <select id="inventory_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <option value="1"<?php if ($qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('Yes') ?></option>
+            <option value="0"<?php if (!$qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ __('No') ?></option>
         </select>
-        <input type="hidden" id="inventory_enable_qty_increments_default" value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('enable_qty_increments'); ?>">
+        <input type="hidden" id="inventory_enable_qty_increments_default" value="<?= /* @escapeNotVerified */ $block->getDefaultConfigValue('enable_qty_increments') ?>">
 
         <div class="control-inner-wrap">
             <?php $_checked = ($block->getFieldValue('use_config_enable_qty_inc') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_enable_qty_increments"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_enable_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_enable_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
         <?php if (!$block->isReadonly()): ?>
         <script>
@@ -251,20 +251,20 @@ toggleValueElements($('inventory_use_config_enable_qty_increments'), $('inventor
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_qty_increments">
-        <span><?php /* @escapeNotVerified */ echo __('Qty Increments') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Qty Increments') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?php /* @escapeNotVerified */ echo $block->getFieldValue('qty_increments') * 1 ?>" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?= /* @escapeNotVerified */ $block->getFieldValue('qty_increments') * 1 ?>" <?= /* @escapeNotVerified */ $_readonly ?>>
         <div class="control-inner-wrap">
             <?php $_checked = ($block->getFieldValue('use_config_qty_increments') || $block->IsNew()) ? 'checked="checked"' : '' ?>
-            <input type="checkbox" id="inventory_use_config_qty_increments" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?php /* @escapeNotVerified */ echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php /* @escapeNotVerified */ echo $_readonly;?>>
-            <label for="inventory_use_config_qty_increments"><?php /* @escapeNotVerified */ echo __('Use Config Settings') ?></label>
+            <input type="checkbox" id="inventory_use_config_qty_increments" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?= /* @escapeNotVerified */ $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?= /* @escapeNotVerified */ $_readonly ?>>
+            <label for="inventory_use_config_qty_increments"><?= /* @escapeNotVerified */ __('Use Config Settings') ?></label>
         </div>
         <?php if (!$block->isReadonly()): ?>
         <script>
@@ -275,24 +275,24 @@ toggleValueElements($('inventory_use_config_qty_increments'), $('inventory_use_c
         <?php endif; ?>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_stock_availability">
-        <span><?php /* @escapeNotVerified */ echo __('Stock Availability') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Stock Availability') ?></span>
     </label>
     <div class="control">
-        <select id="inventory_stock_availability" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
+        <select id="inventory_stock_availability" name="<?= /* @escapeNotVerified */ $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?= /* @escapeNotVerified */ $_readonly ?>>
             <?php foreach ($block->getStockOption() as $option): ?>
             <?php $_selected = ($block->getFieldValue('is_in_stock') !== null && $option['value'] == $block->getFieldValue('is_in_stock')) ? 'selected="selected"' : '' ?>
-            <option value="<?php /* @escapeNotVerified */ echo $option['value'] ?>" <?php /* @escapeNotVerified */ echo $_selected ?>><?php /* @escapeNotVerified */ echo $option['label'] ?></option>
+            <option value="<?= /* @escapeNotVerified */ $option['value'] ?>" <?= /* @escapeNotVerified */ $_selected ?>><?= /* @escapeNotVerified */ $option['label'] ?></option>
             <?php endforeach; ?>
         </select>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?= /* @escapeNotVerified */ __('[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 72c2b0adb6029..3ea964467a35d 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
@@ -12,6 +12,6 @@
  */
 ?>
 <div class="columns">
-    <div class="side-col"><?php echo $block->getTreeHtml() ?></div>
-    <div class="main-col"><?php echo $block->getGridHtml() ?></div>
+    <div class="side-col"><?= $block->getTreeHtml() ?></div>
+    <div class="main-col"><?= $block->getGridHtml() ?></div>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
index 3dd50649bdb17..1dac30a083a7c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/wysiwyg/js.phtml
@@ -28,7 +28,7 @@ var catalogWysiwygEditor = {
                 url: editorUrl,
                 data: {
                     element_id: elementId + '_editor',
-                    store_id: '<?php /* @escapeNotVerified */ echo $block->getStoreId() ?>'
+                    store_id: '<?= /* @escapeNotVerified */ $block->getStoreId() ?>'
                 },
                 showLoader: true,
                 dataType: 'html',
@@ -45,7 +45,7 @@ var catalogWysiwygEditor = {
             this.modal.html(jQuery(data).html());
         } else {
             this.modal = jQuery(data).modal({
-                title: '<?php /* @escapeNotVerified */ echo __('WYSIWYG Editor'); ?>',
+                title: '<?= /* @escapeNotVerified */ __('WYSIWYG Editor') ?>',
                 modalClass: 'magento',
                 type: 'slide',
                 firedElementId: elementId,
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml
index f98d2d3d92a9a..04ccfb5aee8d0 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
@@ -11,17 +11,17 @@
 <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><?php /* @escapeNotVerified */ echo __('Add Attribute') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Add Attribute') ?></span>
         </button>
         <div class="dropdown-menu">
             <input data-role="product-attribute-search"
-                   data-group="<?php echo $block->escapeHtml($block->getGroupCode()); ?>"
+                   data-group="<?= $block->escapeHtml($block->getGroupCode()) ?>"
                    class="search" type="text"
-                   placeholder="<?php /* @noEscape */ echo __('start typing to search attribute'); ?>" />
+                   placeholder="<?= /* @noEscape */ __('start typing to search attribute') ?>" />
         </div>
     </div>
 
-<script data-template-for="product-attribute-search-<?php /* @escapeNotVerified */ echo $block->getGroupId(); ?>" type="text/x-magento-template">
+<script data-template-for="product-attribute-search-<?= /* @escapeNotVerified */ $block->getGroupId() ?>" type="text/x-magento-template">
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
@@ -29,12 +29,12 @@
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
-    <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAttributeCreate()?></div>
+    <div class="actions"><?= /* @escapeNotVerified */ $block->getAttributeCreate() ?></div>
 </script>
 
 <script>
     require(["jquery","mage/mage","mage/backend/suggest"], function($) {
-        var $suggest = $('[data-role="product-attribute-search"][data-group="<?php echo $block->escapeHtml($block->getGroupCode()); ?>"]');
+        var $suggest = $('[data-role="product-attribute-search"][data-group="<?= $block->escapeHtml($block->getGroupCode()) ?>"]');
 
         $suggest.on('suggestclose', function(e) {
             $suggest.closest('.dropdown-menu').siblings('[data-toggle=dropdown]').trigger('close.dropdown');
@@ -51,13 +51,13 @@
             });
         });
 
-        $suggest.mage('suggest', <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
+        $suggest.mage('suggest', <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions()) ?>)
             .on('suggestselect', function (e, ui) {
                 $(this).val('');
                 var templateId = $('#attribute_set_id').val();
                 if (ui.item.id) {
                     $.ajax({
-                        url: '<?php /* @escapeNotVerified */ echo $block->getAddAttributeUrl()?>',
+                        url: '<?= /* @escapeNotVerified */ $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 a49083aae33c5..6a62f01f97b65 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
@@ -14,15 +14,15 @@
         \Magento\Catalog\Block\Adminhtml\Product\Edit\Tabs::ADVANCED_TAB_GROUP_CODE,
     ];?>
 
-    <div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>"
+    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>"
          data-mage-init='{"tabs":{
-        "active": "<?php /* @escapeNotVerified */ echo $block->getActiveTabId() ?>",
-        "destination": "#<?php /* @escapeNotVerified */ echo $block->getDestElementId() ?>",
-        "shadowTabs": "<?php /* @escapeNotVerified */ echo $block->getAllShadowTabs()?>",
-        "tabsBlockPrefix": "<?php /* @escapeNotVerified */ echo $block->getId() ?>_",
+        "active": "<?= /* @escapeNotVerified */ $block->getActiveTabId() ?>",
+        "destination": "#<?= /* @escapeNotVerified */ $block->getDestElementId() ?>",
+        "shadowTabs": "<?= /* @escapeNotVerified */ $block->getAllShadowTabs() ?>",
+        "tabsBlockPrefix": "<?= /* @escapeNotVerified */ $block->getId() ?>_",
         "tabIdArgument": "active_tab",
-        "tabPanelClass": "<?php /* @escapeNotVerified */ echo $block->getPanelsClass() ?>",
-        "excludedPanel": "<?php /* @escapeNotVerified */ echo $block->getExcludedPanel() ?>",
+        "tabPanelClass": "<?= /* @escapeNotVerified */ $block->getPanelsClass() ?>",
+        "excludedPanel": "<?= /* @escapeNotVerified */ $block->getExcludedPanel() ?>",
         "groups": "ul.tabs"
     }}'>
         <?php foreach ($tabGroups as $tabGroupCode): ?>
@@ -32,12 +32,12 @@
                 $activeCollapsible = $block->isAdvancedTabGroupActive() ? true : false;
             ?>
 
-            <div class="admin__page-nav <?php if (!$isBasic): ?> <?php echo '_collapsed';?> <?php endif;?>"
+            <div class="admin__page-nav <?php if (!$isBasic): ?> <?= '_collapsed' ?> <?php endif;?>"
                 data-role="container"
-                id="<?php /* @escapeNotVerified */ echo $tabGroupId ?>"
+                id="<?= /* @escapeNotVerified */ $tabGroupId ?>"
                 <?php if (!$isBasic): ?>
                     data-mage-init='{"collapsible":{
-                    "active": "<?php /* @escapeNotVerified */ echo $activeCollapsible; ?>",
+                    "active": "<?= /* @escapeNotVerified */ $activeCollapsible ?>",
                     "openedState": "_show",
                     "closedState": "_hide",
                     "animate": 200,
@@ -45,17 +45,17 @@
                     }}'
                 <?php endif;?>>
 
-                <div class="admin__page-nav-title-wrap" <?php /* @escapeNotVerified */ echo $block->getUiId('title') ?> data-role="title">
-                    <div class="admin__page-nav-title <?php if (!$isBasic): ?> <?php echo '_collapsible';?><?php endif;?>"
+                <div class="admin__page-nav-title-wrap" <?= /* @escapeNotVerified */ $block->getUiId('title') ?> data-role="title">
+                    <div class="admin__page-nav-title <?php if (!$isBasic): ?> <?= '_collapsible' ?><?php endif;?>"
                         data-role="trigger">
                         <strong>
-                            <?php /* @escapeNotVerified */ echo $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
+                            <?= /* @escapeNotVerified */ $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
                         </strong>
                         <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
                     </div>
                 </div>
 
-                <ul <?php /* @escapeNotVerified */ echo $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
+                <ul <?= /* @escapeNotVerified */ $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
                     <?php foreach ($tabs as $_tab): ?>
                         <?php /** @var $_tab \Magento\Backend\Block\Widget\Tab\TabInterface */ ?>
                         <?php if (!$block->canShowTab($_tab) || $_tab->getParentTab()
@@ -64,25 +64,25 @@
                         <?php $_tabClass = 'tab-item-link ' . $block->getTabClass($_tab) . ' ' . (preg_match('/\s?ajax\s?/', $_tab->getClass()) ? 'notloaded' : '') ?>
                         <?php $_tabType = (!preg_match('/\s?ajax\s?/', $_tabClass) && $block->getTabUrl($_tab) != '#') ? 'link' : '' ?>
                         <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' : $block->getTabUrl($_tab) ?>
-                        <li class="admin__page-nav-item <?php if ($block->getTabIsHidden($_tab)): ?> <?php echo "no-display"; ?> <?php endif; ?> " <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-                            <a href="<?php /* @escapeNotVerified */ echo $_tabHref ?>" id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>"
-                               name="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab, false) ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->getTabTitle($_tab) ?>"
-                               class="admin__page-nav-link <?php /* @escapeNotVerified */ echo $_tabClass;?>"
-                               data-tab-type="<?php /* @escapeNotVerified */ echo $_tabType;?>" <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'link', $_tab->getId()) ?>
+                        <li class="admin__page-nav-item <?php if ($block->getTabIsHidden($_tab)): ?> <?= "no-display" ?> <?php endif; ?> " <?= /* @escapeNotVerified */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
+                            <a href="<?= /* @escapeNotVerified */ $_tabHref ?>" id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>"
+                               name="<?= /* @escapeNotVerified */ $block->getTabId($_tab, false) ?>"
+                               title="<?= /* @escapeNotVerified */ $block->getTabTitle($_tab) ?>"
+                               class="admin__page-nav-link <?= /* @escapeNotVerified */ $_tabClass ?>"
+                               data-tab-type="<?= /* @escapeNotVerified */ $_tabType ?>" <?= /* @escapeNotVerified */ $block->getUiId('tab', 'link', $_tab->getId()) ?>
                             >
-                                <span><?php echo $block->escapeHtml($block->getTabLabel($_tab)); ?></span>
+                                <span><?= $block->escapeHtml($block->getTabLabel($_tab)) ?></span>
                                 <span class="admin__page-nav-item-messages" data-role="item-messages">
                                    <span class="admin__page-nav-item-message _changed">
                                        <span class="admin__page-nav-item-message-icon"></span>
                                        <span class="admin__page-nav-item-message-tooltip">
-                                           <?php /* @escapeNotVerified */ echo __('Changes have been made to this section that have not been saved.'); ?>
+                                           <?= /* @escapeNotVerified */ __('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">
-                                           <?php /* @escapeNotVerified */ echo __('This tab contains invalid data. Please resolve this before saving.'); ?>
+                                           <?= /* @escapeNotVerified */ __('This tab contains invalid data. Please resolve this before saving.') ?>
                                        </span>
                                    </span>
                                     <span class="admin__page-nav-item-message-loader">
@@ -93,12 +93,12 @@
                                    </span>
                                 </span>
                             </a>
-                            <div id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>_content" class="no-display"
+                            <div id="<?= /* @escapeNotVerified */ $block->getTabId($_tab) ?>_content" class="no-display"
                                  data-tab-panel="<?= /* @escapeNotVerified */ $_tab->getTabId() ?>"
-                                <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'content', $_tab->getId()) ?>
+                                <?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $_tab->getId()) ?>
                             >
-                                <?php /* @escapeNotVerified */ echo $block->getTabContent($_tab); ?>
-                                <?= /* @noEscape */ $block->getAccordion($_tab); ?>
+                                <?= /* @escapeNotVerified */ $block->getTabContent($_tab) ?>
+                                <?= /* @noEscape */ $block->getAccordion($_tab) ?>
                             </div>
                         </li>
                     <?php endforeach; ?>
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 9cf3913842c11..842ed17375f77 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
@@ -8,7 +8,7 @@
 
 /** @var $block \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\ChildTab */
 ?>
-<div class="fieldset-wrapper admin__collapsible-block-wrapper" data-tab="<?= /* @noEscape */ $block->getTabId()?>"
+<div class="fieldset-wrapper admin__collapsible-block-wrapper" data-tab="<?= /* @noEscape */ $block->getTabId() ?>"
      id="<?= /* @noEscape */ $block->getTabId() ?>-wrapper" data-mage-init='{"collapsible":{
                     "active": <?= /* @noEscape */ $block->isTabOpened() ? 'true' : 'false' ?>,
                     "openedState": "_show",
@@ -19,10 +19,10 @@
     >
     <div class="fieldset-wrapper-title" data-role="title">
         <strong class="admin__collapsible-title" data-role="trigger" >
-            <span><?= /* @noEscape */ $block->getTitle()?></span>
+            <span><?= /* @noEscape */ $block->getTitle() ?></span>
         </strong>
     </div>
-    <div class="fieldset-wrapper-content" data-role="content" id="<?= /* @noEscape */ $block->getTabId()?>-content">
-        <?= /* @noEscape */ $block->getContent()?>
+    <div class="fieldset-wrapper-content" data-role="content" id="<?= /* @noEscape */ $block->getTabId() ?>-content">
+        <?= /* @noEscape */ $block->getContent() ?>
     </div>
 </div>
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 39fbcf9ca0e07..8df3e32b0a2c3 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
@@ -7,77 +7,77 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
+<div id="<?= $block->getHtmlId() ?>" class="admin__grid-massaction">
     <?php if ($block->getHideFormElement() !== true):?>
-    <form action="" id="<?php echo $block->getHtmlId() ?>-form" method="post">
+    <form action="" id="<?= $block->getHtmlId() ?>-form" method="post">
     <?php endif ?>
         <div class="admin__grid-massaction-form">
-            <?php echo $block->getBlockHtml('formkey')?>
+            <?= $block->getBlockHtml('formkey') ?>
             <select
-                id="<?php echo $block->getHtmlId() ?>-select"
+                id="<?= $block->getHtmlId() ?>-select"
                 class="local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?php /* @escapeNotVerified */ echo __('Actions') ?></option>
+                <option class="admin__control-select-placeholder" value="" selected><?= /* @escapeNotVerified */ __('Actions') ?></option>
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php /* @escapeNotVerified */ echo $_item->getLabel() ?></option>
+                    <option value="<?= /* @escapeNotVerified */ $_item->getId() ?>"<?= ($_item->getSelected() ? ' selected="selected"' : '') ?>><?= /* @escapeNotVerified */ $_item->getLabel() ?></option>
                 <?php endforeach; ?>
             </select>
-            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
-            <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-additional"></span>
-            <?php echo $block->getApplyButtonHtml() ?>
+            <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-hiddens"></span>
+            <span class="outer-span" id="<?= $block->getHtmlId() ?>-form-additional"></span>
+            <?= $block->getApplyButtonHtml() ?>
         </div>
     <?php if ($block->getHideFormElement() !== true):?>
     </form>
     <?php endif ?>
     <div class="no-display">
     <?php foreach ($block->getItems() as $_item): ?>
-        <div id="<?php echo $block->getHtmlId() ?>-item-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-block">
-            <?php echo $_item->getAdditionalActionBlockHtml() ?>
+        <div id="<?= $block->getHtmlId() ?>-item-<?= /* @escapeNotVerified */ $_item->getId() ?>-block">
+            <?= $_item->getAdditionalActionBlockHtml() ?>
         </div>
     <?php endforeach; ?>
     </div>
 
     <div class="mass-select-wrap">
-        <select id="<?php echo $block->getHtmlId() ?>-mass-select" data-menu="grid-mass-select">
-            <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
+        <select id="<?= $block->getHtmlId() ?>-mass-select" data-menu="grid-mass-select">
+            <optgroup label="<?= /* @escapeNotVerified */ __('Mass Actions') ?>">
                 <option disabled selected></option>
                 <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
-                        <?php /* @escapeNotVerified */ echo __('Select All') ?>
+                        <?= /* @escapeNotVerified */ __('Select All') ?>
                     </option>
                     <option value="unselectAll">
-                        <?php /* @escapeNotVerified */ echo __('Unselect All') ?>
+                        <?= /* @escapeNotVerified */ __('Unselect All') ?>
                     </option>
                 <?php endif; ?>
                 <option value="selectVisible">
-                    <?php /* @escapeNotVerified */ echo __('Select Visible') ?>
+                    <?= /* @escapeNotVerified */ __('Select Visible') ?>
                 </option>
                 <option value="unselectVisible">
-                    <?php /* @escapeNotVerified */ echo __('Unselect Visible') ?>
+                    <?= /* @escapeNotVerified */ __('Unselect Visible') ?>
                 </option>
             </optgroup>
         </select>
-        <label for="<?php echo $block->getHtmlId() ?>-mass-select"></label>
+        <label for="<?= $block->getHtmlId() ?>-mass-select"></label>
     </div>
 
 <script>
     require(['jquery'], function($){
         'use strict';
-        $('#<?php echo $block->getHtmlId() ?>-mass-select').change(function () {
+        $('#<?= $block->getHtmlId() ?>-mass-select').change(function () {
             var massAction = $('option:selected', this).val();
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectAll();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectAll();
                     break
                 case 'unselectAll':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectAll();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectAll();
                     break
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectVisible();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.selectVisible();
                     break
                 case 'unselectVisible':
-                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
+                    return <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.unselectVisible();
                     break
             }
             this.blur();
@@ -86,7 +86,7 @@
     });
 
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setGridIds('<?php /* @escapeNotVerified */ echo $block->getGridIdsJson() ?>');
+        <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.setGridIds('<?= /* @escapeNotVerified */ $block->getGridIdsJson() ?>');
     <?php endif; ?>
 </script>
 </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/rss/grid/link.phtml
index e71349c859eaf..fb450d19312fa 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
@@ -9,5 +9,5 @@
 /** @var $block \Magento\Catalog\Block\Adminhtml\Rss\Grid\Link */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="link-feed"><?php /* @escapeNotVerified */ echo $block->getLabel() ?></a>
+<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="link-feed"><?= /* @escapeNotVerified */ $block->getLabel() ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/js/components.phtml b/app/code/Magento/Catalog/view/base/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Catalog/view/base/templates/js/components.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
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 885e034365995..86168c742c0f1 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
@@ -10,23 +10,23 @@
 
 <?php /** @var \Magento\Framework\Pricing\Render\Amount $block */ ?>
 
-<span class="price-container <?php /* @escapeNotVerified */ echo $block->getAdjustmentCssClasses() ?>"
-        <?php echo $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
+<span class="price-container <?= /* @escapeNotVerified */ $block->getAdjustmentCssClasses() ?>"
+        <?= $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
     <?php if ($block->getDisplayLabel()): ?>
-        <span class="price-label"><?php /* @escapeNotVerified */ echo $block->getDisplayLabel(); ?></span>
+        <span class="price-label"><?= /* @escapeNotVerified */ $block->getDisplayLabel() ?></span>
     <?php endif; ?>
-    <span <?php if ($block->getPriceId()): ?> id="<?php /* @escapeNotVerified */ echo $block->getPriceId() ?>"<?php endif;?>
-        <?php echo($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
-        data-price-amount="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>"
-        data-price-type="<?php /* @escapeNotVerified */ echo $block->getPriceType(); ?>"
-        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
-        <?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
+    <span <?php if ($block->getPriceId()): ?> id="<?= /* @escapeNotVerified */ $block->getPriceId() ?>"<?php endif;?>
+        <?= ($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
+        data-price-amount="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>"
+        data-price-type="<?= /* @escapeNotVerified */ $block->getPriceType() ?>"
+        class="price-wrapper <?= /* @escapeNotVerified */ $block->getPriceWrapperCss() ?>">
+        <?= /* @escapeNotVerified */ $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
     <?php if ($block->hasAdjustmentsHtml()): ?>
-        <?php echo $block->getAdjustmentsHtml() ?>
+        <?= $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
-        <meta itemprop="price" content="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>" />
-        <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $block->getDisplayCurrencyCode()?>" />
+        <meta itemprop="price" content="<?= /* @escapeNotVerified */ $block->getDisplayValue() ?>" />
+        <meta itemprop="priceCurrency" content="<?= /* @escapeNotVerified */ $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 99ee45e8e3b85..98b713be685d0 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
@@ -14,7 +14,7 @@ $priceLabel = ($block->getPriceLabel() !== null)
     : '';
 ?>
 <p class="price-as-configured">
-    <?php /* @escapeNotVerified */ echo $block->renderAmount($configuredPrice->getAmount(), [
+    <?= /* @escapeNotVerified */ $block->renderAmount($configuredPrice->getAmount(), [
         'display_label'     => $priceLabel,
         'price_id'          => $block->getPriceId('product-price-'),
         'price_type'        => 'finalPrice',
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 3c54b1a6f0173..72d9124173898 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
@@ -53,12 +53,12 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 
 <?php if ($block->showMinimalPrice()): ?>
     <?php if ($block->getUseLinkForAsLowAs()):?>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getSaleableItem()->getProductUrl(); ?>" class="minimal-price-link">
-            <?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?>
+        <a href="<?= /* @escapeNotVerified */ $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">
+            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
         </a>
     <?php else:?>
         <span class="minimal-price-link">
-            <?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?>
+            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
         </span>
     <?php endif?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/tier_prices.phtml
index 62bc60b0c6f67..f5cffb99d75dd 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
@@ -18,7 +18,7 @@ $msrpShowOnGesture = $block->getPriceType('msrp_price')->isShowPriceOnGesture();
 $product = $block->getSaleableItem();
 ?>
 <?php if (count($tierPrices)) : ?>
-    <ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices-tier items'); ?>">
+    <ul class="<?= /* @escapeNotVerified */ ($block->hasListClass() ? $block->getListClass() : 'prices-tier items') ?>">
     <?php foreach ($tierPrices as $index => $price) : ?>
         <li class="item">
             <?php
@@ -55,11 +55,11 @@ $product = $block->getSaleableItem();
                         $tierPriceData['qty'] = $price['price_qty'];
                     }
                 ?>
-                <?php /* @escapeNotVerified */ echo __('Buy %1 for: ', $price['price_qty']); ?>
+                <?= /* @escapeNotVerified */ __('Buy %1 for: ', $price['price_qty']) ?>
                 <a href="javascript:void(0);"
-                   id="<?php /* @escapeNotVerified */ echo($popupId);?>"
-                   data-tier-price="<?php echo $block->escapeHtml($block->jsonEncode($tierPriceData)); ?>">
-                    <?php /* @escapeNotVerified */ echo __('Click for price'); ?></a>
+                   id="<?= /* @escapeNotVerified */ ($popupId) ?>"
+                   data-tier-price="<?= $block->escapeHtml($block->jsonEncode($tierPriceData)) ?>">
+                    <?= /* @escapeNotVerified */ __('Click for price') ?></a>
                 <?php else:
                     $priceAmountBlock = $block->renderAmount(
                         $price['price'],
@@ -95,9 +95,9 @@ $product = $block->getSaleableItem();
                         "inputQty": "#qty",
                         "attr": "[data-tier-price]",
                         "productForm": "#product_addtocart_form",
-                        "productId": "<?php /* @escapeNotVerified */ echo $productId; ?>",
+                        "productId": "<?= /* @escapeNotVerified */ $productId ?>",
                         "productIdInput": "input[type=hidden][name=product]",
-                        "isSaleable": "<?php /* @escapeNotVerified */ echo $isSaleable; ?>"
+                        "isSaleable": "<?= /* @escapeNotVerified */ $isSaleable ?>"
                     }
                 }
             }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
index 992af539aaf05..3619ce94031c2 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/cms.phtml
@@ -16,6 +16,6 @@
 ?>
 <?php if ($block->isContentMode() || $block->isMixedMode()): ?>
     <div class="category-cms">
-        <?php echo $block->getCmsBlockHtml(); ?>
+        <?= $block->getCmsBlockHtml() ?>
     </div>
 <?php endif; ?>
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 b9ef9bf93b314..0efce1014f9c2 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/description.phtml
@@ -16,6 +16,6 @@
 ?>
 <?php if ($_description = $block->getCurrentCategory()->getDescription()): ?>
     <div class="category-description">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
     </div>
 <?php endif; ?>
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 1c7f669e13990..c521cf03ad156 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/products.phtml
@@ -15,5 +15,5 @@
  */
 ?>
 <?php if (!$block->isContentMode() || $block->isMixedMode()): ?>
-    <?php echo $block->getProductListHtml() ?>
+    <?= $block->getProductListHtml() ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
index 331b666e3d843..774aa8d839e87 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/rss.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink() && $block->isTopCategory()): ?>
-    <a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="action link rss"><span><?php /* @escapeNotVerified */ echo $block->getLabel() ?></span></a>
+    <a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="action link rss"><span><?= /* @escapeNotVerified */ $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 b79ad7ab1da62..2b0098be6545b 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
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-category-link">
-    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
index 467230ec3e37b..f53c1c1ed90d7 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
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 ?>
 <span class="widget block block-category-link-inline">
-    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </span>
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 f37b2d9e1c76a..fa70e15135578 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/navigation/left.phtml
@@ -20,19 +20,19 @@
 <?php if ($_count): ?>
     <div class="block filter">
         <div class="title">
-            <strong><?php /* @escapeNotVerified */ echo __('Shop By') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
         </div>
         <div class="content">
-            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('Shopping Options') ?></strong>
+            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
             <dl class="options" id="narrow-by-list2">
-                <dt><?php /* @escapeNotVerified */ echo __('Category') ?></dt>
+                <dt><?= /* @escapeNotVerified */ __('Category') ?></dt>
                 <dd>
                     <ol class="items">
                         <?php foreach ($_categories as $_category): ?>
                             <?php if ($_category->getIsActive()): ?>
                                 <li class="item">
-                                    <a href="<?php /* @escapeNotVerified */ echo $block->getCategoryUrl($_category) ?>"<?php if ($block->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $block->escapeHtml($_category->getName()) ?></a>
-                                    <span class="count"><?php /* @escapeNotVerified */ echo $_category->getProductCount() ?></span>
+                                    <a href="<?= /* @escapeNotVerified */ $block->getCategoryUrl($_category) ?>"<?php if ($block->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?= $block->escapeHtml($_category->getName()) ?></a>
+                                    <span class="count"><?= /* @escapeNotVerified */ $_category->getProductCount() ?></span>
                                 </li>
                             <?php endif; ?>
                         <?php endforeach ?>
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 c7ecc4e940bd1..b8595aae9d993 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
@@ -7,13 +7,13 @@
 // @codingStandardsIgnoreFile
 ?>
 <li class="item link compare" data-bind="scope: 'compareProducts'" data-role="compare-products-link">
-    <a class="action compare no-display" title="<?php /* @escapeNotVerified */ echo __('Compare Products') ?>"
+    <a class="action compare no-display" title="<?= /* @escapeNotVerified */ __('Compare Products') ?>"
        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
     >
-        <?php /* @escapeNotVerified */ echo __('Compare Products') ?>
+        <?= /* @escapeNotVerified */ __('Compare Products') ?>
         <span class="counter qty" data-bind="text: compareProducts().countCaption"></span>
     </a>
 </li>
 <script type="text/x-magento-init">
-{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>}}
+{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>}}
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
index 7ffc06d732644..6a2dd1f27d4a9 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
@@ -10,8 +10,8 @@
 ?>
 <?php $_total = $block->getItems()->getSize() ?>
 <?php if ($_total): ?>
-    <a href="#" class="action print" title="<?php /* @escapeNotVerified */ echo __('Print This Page') ?>">
-        <span><?php /* @escapeNotVerified */ echo __('Print This Page') ?></span>
+    <a href="#" class="action print" title="<?= /* @escapeNotVerified */ __('Print This Page') ?>">
+        <span><?= /* @escapeNotVerified */ __('Print This Page') ?></span>
     </a>
         <div class="table-wrapper comparison">
             <table class="data table table-comparison" id="product-comparison"
@@ -21,19 +21,19 @@
                     "selectors":{
                         "productAddToCartSelector":"button.action.tocart"}
                 }}'>
-                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Compare Products') ?></caption>
+                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Compare Products') ?></caption>
                 <thead>
                 <tr>
                     <?php $_i = 0 ?>
                     <?php foreach ($block->getItems() as $_item): ?>
                         <?php if ($_i++ == 0): ?>
-                            <th scope="row" class="cell label remove"><span><?php /* @escapeNotVerified */ echo __('Remove Product') ?></span></th>
+                            <th scope="row" class="cell label remove"><span><?= /* @escapeNotVerified */ __('Remove Product') ?></span></th>
                         <?php endif; ?>
                         <td class="cell remove product">
                             <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                            <a href="#" data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataRemove($_item); ?>'
-                               class="action delete" title="<?php /* @escapeNotVerified */ echo __('Remove Product') ?>">
-                                <span><?php /* @escapeNotVerified */ echo __('Remove Product') ?></span>
+                            <a href="#" data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataRemove($_item) ?>'
+                               class="action delete" title="<?= /* @escapeNotVerified */ __('Remove Product') ?>">
+                                <span><?= /* @escapeNotVerified */ __('Remove Product') ?></span>
                             </a>
                         </td>
                     <?php endforeach; ?>
@@ -46,40 +46,40 @@
                     <?php /** @var $_item \Magento\Catalog\Model\Product */ ?>
                     <?php foreach ($block->getItems() as $_item): ?>
                         <?php if ($_i++ == 0): ?>
-                            <th scope="row" class="cell label product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
+                            <th scope="row" class="cell label product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
                         <?php endif; ?>
-                        <td data-th="<?php echo $block->escapeHtml(__('Product')); ?>" class="cell product info">
-                            <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" title="<?php /* @escapeNotVerified */ echo $block->stripTags($_item->getName(), null, true) ?>">
-                                <?php echo $block->getImage($_item, 'product_comparison_list')->toHtml(); ?>
+                        <td data-th="<?= $block->escapeHtml(__('Product')) ?>" class="cell product info">
+                            <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_item->getName(), null, true) ?>">
+                                <?= $block->getImage($_item, 'product_comparison_list')->toHtml() ?>
                             </a>
                             <strong class="product-item-name">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" title="<?php /* @escapeNotVerified */ echo $block->stripTags($_item->getName(), null, true) ?>">
-                                    <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
+                                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_item->getName(), null, true) ?>">
+                                    <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getName(), 'name') ?>
                                 </a>
                             </strong>
-                            <?php echo $block->getReviewsSummaryHtml($_item, 'short') ?>
-                            <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item, '-compare-list-top') ?>
+                            <?= $block->getReviewsSummaryHtml($_item, 'short') ?>
+                            <?= /* @escapeNotVerified */ $block->getProductPrice($_item, '-compare-list-top') ?>
                             <div class="product-item-actions">
                                 <div class="actions-primary">
                                     <?php if ($_item->isSaleable()): ?>
-                                        <form data-role="tocart-form" action="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item); ?>" method="post">
-                                            <?php echo $block->getBlockHtml('formkey')?>
+                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item) ?>" method="post">
+                                            <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit" class="action tocart primary">
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart'); ?></span>
+                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                             </button>
                                         </form>
                                     <?php else: ?>
                                         <?php if ($_item->getIsSalable()): ?>
-                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                         <?php else: ?>
-                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
                                     <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
-                                        <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist">
-                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                        <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist">
+                                            <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                         </a>
                                     </div>
                                 <?php endif; ?>
@@ -96,7 +96,7 @@
                             <?php if ($_i++ == 0): ?>
                                 <th scope="row" class="cell label">
                                     <span class="attribute label">
-                                        <?php echo $block->escapeHtml($_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel())) ?>
+                                        <?= $block->escapeHtml($_attribute->getStoreLabel() ? $_attribute->getStoreLabel() : __($_attribute->getFrontendLabel())) ?>
                                     </span>
                                 </th>
                             <?php endif; ?>
@@ -115,7 +115,7 @@
                                             <?php $block->getImage($_item, 'product_small_image')->toHtml(); ?>
                                             <?php break;
                                         default: ?>
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $block->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
+                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $block->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
                                         <?php break;
                                     } ?>
                                 </div>
@@ -136,5 +136,5 @@
             </script>
         <?php endif; ?>
 <?php else: ?>
-    <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('You have no items to compare.') ?></div></div>
+    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('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 428d5787f50ab..8daa342454445 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
@@ -9,7 +9,7 @@
 ?>
 <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"><?php /* @escapeNotVerified */ echo __('Compare Products') ?></strong>
+        <strong id="block-compare-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Compare Products') ?></strong>
         <span class="counter qty no-display" data-bind="text: compareProducts().countCaption, css: {'no-display': !compareProducts().count}"></span>
     </div>
     <!-- ko if: compareProducts().count -->
@@ -20,29 +20,29 @@
                     <strong class="product-item-name">
                         <a data-bind="attr: {href: product_url}, html: name" class="product-item-link"></a>
                     </strong>
-                    <a href="#" data-bind="attr: {'data-post': remove_url}" title="<?php /* @escapeNotVerified */ echo __('Remove This Item') ?>" class="action delete">
-                        <span><?php /* @escapeNotVerified */ echo __('Remove This Item') ?></span>
+                    <a href="#" data-bind="attr: {'data-post': remove_url}" title="<?= /* @escapeNotVerified */ __('Remove This Item') ?>" class="action delete">
+                        <span><?= /* @escapeNotVerified */ __('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><?php /* @escapeNotVerified */ echo __('Compare') ?></span></a>
+                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?= /* @escapeNotVerified */ __('Compare') ?></span></a>
             </div>
             <div class="secondary">
                 <a id="compare-clear-all" href="#" class="action clear" data-post="<?=$block->escapeHtml(
                     $this->helper('Magento\Catalog\Helper\Product\Compare')->getPostDataClearList()
                 ) ?>">
-                    <span><?php /* @escapeNotVerified */ echo __('Clear All') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Clear All') ?></span>
                 </a>
             </div>
         </div>
     </div>
     <!-- /ko -->
     <!-- ko ifnot: compareProducts().count -->
-    <div class="empty"><?php /* @escapeNotVerified */ echo __('You have no items to compare.') ?></div>
+    <div class="empty"><?= /* @escapeNotVerified */ __('You have no items to compare.') ?></div>
     <!-- /ko -->
 </div>
 <script type="text/x-magento-init">
-{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>}}
+{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>}}
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
index 7c1ce31847859..6133d55d676c3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/gallery.phtml
@@ -9,20 +9,20 @@
 /** @var \Magento\Catalog\Block\Product\Gallery $block */
 ?>
 <?php $_width = $block->getImageWidth(); ?>
-<div class="product-image-popup" style="width:<?php /* @escapeNotVerified */ echo $_width; ?>px;">
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php /* @escapeNotVerified */ echo __('Close Window') ?></span></a></div>
+<div class="product-image-popup" style="width:<?= /* @escapeNotVerified */ $_width ?>px;">
+    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
     <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
         <div class="nav">
           <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
-              <a href="<?php /* @escapeNotVerified */ echo $_prevUrl ?>" class="prev">&laquo; <?php /* @escapeNotVerified */ echo __('Prev') ?></a>
+              <a href="<?= /* @escapeNotVerified */ $_prevUrl ?>" class="prev">&laquo; <?= /* @escapeNotVerified */ __('Prev') ?></a>
           <?php endif; ?>
           <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
-              <a href="<?php /* @escapeNotVerified */ echo $_nextUrl ?>" class="next"><?php /* @escapeNotVerified */ echo __('Next') ?> &raquo;</a>
+              <a href="<?= /* @escapeNotVerified */ $_nextUrl ?>" class="next"><?= /* @escapeNotVerified */ __('Next') ?> &raquo;</a>
           <?php endif; ?>
         </div>
     <?php endif; ?>
     <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())): ?>
-        <h1 class="image-label"><?php /* @escapeNotVerified */ echo $_imageTitle ?></h1>
+        <h1 class="image-label"><?= /* @escapeNotVerified */ $_imageTitle ?></h1>
     <?php endif; ?>
     <?php
         $imageUrl = $this->helper('Magento\Catalog\Helper\Image')
@@ -30,15 +30,15 @@
             ->setImageFile($block->getImageFile())
             ->getUrl();
     ?>
-    <img src="<?php /* @escapeNotVerified */ echo $imageUrl; ?>"<?php if ($_width): ?> width="<?php /* @escapeNotVerified */ echo $_width ?>"<?php endif; ?> alt="<?php echo $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" title="<?php echo $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" data-mage-init='{"catalogGallery":{}}'/>
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php /* @escapeNotVerified */ echo __('Close Window') ?></span></a></div>
+    <img src="<?= /* @escapeNotVerified */ $imageUrl ?>"<?php if ($_width): ?> width="<?= /* @escapeNotVerified */ $_width ?>"<?php endif; ?> alt="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" title="<?= $block->escapeHtml($block->getCurrentImage()->getLabel()) ?>" id="product-gallery-image" class="image" data-mage-init='{"catalogGallery":{}}'/>
+    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?= /* @escapeNotVerified */ __('Close Window') ?></span></a></div>
     <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
         <div class="nav">
           <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
-              <a href="<?php /* @escapeNotVerified */ echo $_prevUrl ?>" class="prev">&laquo; <?php /* @escapeNotVerified */ echo __('Prev') ?></a>
+              <a href="<?= /* @escapeNotVerified */ $_prevUrl ?>" class="prev">&laquo; <?= /* @escapeNotVerified */ __('Prev') ?></a>
           <?php endif; ?>
           <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
-              <a href="<?php /* @escapeNotVerified */ echo $_nextUrl ?>" class="next"><?php /* @escapeNotVerified */ echo __('Next') ?> &raquo;</a>
+              <a href="<?= /* @escapeNotVerified */ $_nextUrl ?>" class="next"><?= /* @escapeNotVerified */ __('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 1a9b9c54344af..d5d46172745c0 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image.phtml
@@ -7,8 +7,8 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <img class="photo image"
-     <?php /* @escapeNotVerified */ echo $block->getCustomAttributes(); ?>
-     src="<?php /* @escapeNotVerified */ echo $block->getImageUrl(); ?>"
-     width="<?php /* @escapeNotVerified */ echo $block->getWidth(); ?>"
-     height="<?php /* @escapeNotVerified */ echo $block->getHeight(); ?>"
-     alt="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getLabel(), null, true); ?>" />
+     <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
+     src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
+     width="<?= /* @escapeNotVerified */ $block->getWidth() ?>"
+     height="<?= /* @escapeNotVerified */ $block->getHeight() ?>"
+     alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>" />
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
index 6c64b3949f8ce..71fc8d54e9123 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/image_with_borders.phtml
@@ -7,13 +7,13 @@
 <?php /** @var $block \Magento\Catalog\Block\Product\Image */ ?>
 
 <span class="product-image-container"
-      style="width:<?php /* @escapeNotVerified */ echo $block->getWidth()?>px;">
+      style="width:<?= /* @escapeNotVerified */ $block->getWidth() ?>px;">
     <span class="product-image-wrapper"
-          style="padding-bottom: <?php /* @escapeNotVerified */ echo ($block->getRatio() * 100); ?>%;">
+          style="padding-bottom: <?= /* @escapeNotVerified */ ($block->getRatio() * 100) ?>%;">
         <img class="product-image-photo"
-             <?php /* @escapeNotVerified */ echo $block->getCustomAttributes(); ?>
-             src="<?php /* @escapeNotVerified */ echo $block->getImageUrl(); ?>"
-             width="<?php /* @escapeNotVerified */ echo $block->getResizedImageWidth(); ?>"
-             height="<?php /* @escapeNotVerified */ echo $block->getResizedImageHeight(); ?>"
-             alt="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getLabel(), null, true); ?>"/></span>
+             <?= /* @escapeNotVerified */ $block->getCustomAttributes() ?>
+             src="<?= /* @escapeNotVerified */ $block->getImageUrl() ?>"
+             width="<?= /* @escapeNotVerified */ $block->getResizedImageWidth() ?>"
+             height="<?= /* @escapeNotVerified */ $block->getResizedImageHeight() ?>"
+             alt="<?= /* @escapeNotVerified */ $block->stripTags($block->getLabel(), null, true) ?>"/></span>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
index f32c3847710dc..bdcfce204b185 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -20,10 +20,10 @@ $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
 <?php if (!$_productCollection->count()): ?>
-    <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('We can\'t find products matching the selection.') ?></div></div>
+    <div class="message info empty"><div><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></div></div>
 <?php else: ?>
-    <?php echo $block->getToolbarHtml() ?>
-    <?php echo $block->getAdditionalHtml() ?>
+    <?= $block->getToolbarHtml() ?>
+    <?= $block->getAdditionalHtml() ?>
     <?php
     if ($block->getMode() == 'grid') {
         $viewMode = 'grid';
@@ -41,12 +41,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
      */
     $pos = $block->getPositioned();
     ?>
-    <div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?> products-<?php /* @escapeNotVerified */ echo $viewMode; ?>">
+    <div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?> products-<?= /* @escapeNotVerified */ $viewMode ?>">
         <?php $iterator = 1; ?>
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
-                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
                 <div class="product-item-info" data-container="product-grid">
                     <?php
                     $productImage = $block->getImage($_product, $image);
@@ -56,8 +56,8 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                     }
                     ?>
                     <?php // Product Image ?>
-                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
-                        <?php echo $productImage->toHtml(); ?>
+                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
+                        <?= $productImage->toHtml() ?>
                     </a>
                     <div class="product details product-item-details">
                         <?php
@@ -65,58 +65,58 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                         ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
-                               href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>">
-                                <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
+                               href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>">
+                                <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
-                        <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_product) ?>
-                        <?php echo $block->getProductDetailsHtml($_product); ?>
+                        <?= $block->getReviewsSummaryHtml($_product, $templateType) ?>
+                        <?= /* @escapeNotVerified */ $block->getProductPrice($_product) ?>
+                        <?= $block->getProductDetailsHtml($_product) ?>
 
                         <div class="product-item-inner">
-                            <div class="product actions product-item-actions"<?php echo strpos($pos, $viewMode . '-actions') ? $position : ''; ?>>
-                                <div class="actions-primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position : ''; ?>>
+                            <div class="product actions product-item-actions"<?= strpos($pos, $viewMode . '-actions') ? $position : '' ?>>
+                                <div class="actions-primary"<?= strpos($pos, $viewMode . '-primary') ? $position : '' ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" action="<?php /* @escapeNotVerified */ echo $postParams['action']; ?>" method="post">
-                                            <input type="hidden" name="product" value="<?php /* @escapeNotVerified */ echo $postParams['data']['product']; ?>">
-                                            <input type="hidden" name="<?php /* @escapeNotVerified */ echo Action::PARAM_NAME_URL_ENCODED; ?>" value="<?php /* @escapeNotVerified */ echo $postParams['data'][Action::PARAM_NAME_URL_ENCODED]; ?>">
-                                            <?php echo $block->getBlockHtml('formkey')?>
+                                        <form data-role="tocart-form" action="<?= /* @escapeNotVerified */ $postParams['action'] ?>" method="post">
+                                            <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $postParams['data']['product'] ?>">
+                                            <input type="hidden" name="<?= /* @escapeNotVerified */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @escapeNotVerified */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
+                                            <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
-                                                    title="<?php echo $block->escapeHtml(__('Add to Cart')); ?>"
+                                                    title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
                                                     class="action tocart primary">
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                             </button>
                                         </form>
                                     <?php else: ?>
                                         <?php if ($_product->isAvailable()): ?>
-                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                            <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                         <?php else: ?>
-                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                            <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
-                                <div data-role="add-to-links" class="actions-secondary"<?php echo strpos($pos, $viewMode . '-secondary') ? $position : ''; ?>>
+                                <div data-role="add-to-links" class="actions-secondary"<?= strpos($pos, $viewMode . '-secondary') ? $position : '' ?>>
                                     <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
-                                        <?php echo $addToBlock->setProduct($_product)->getChildHtml(); ?>
+                                        <?= $addToBlock->setProduct($_product)->getChildHtml() ?>
                                     <?php endif; ?>
                                 </div>
                             </div>
                             <?php if ($showDescription):?>
                                 <div class="product description product-item-description">
-                                    <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" title="<?php /* @escapeNotVerified */ echo $_productNameStripped ?>"
-                                       class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                    <?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
+                                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $_productNameStripped ?>"
+                                       class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                 </div>
                             <?php endif; ?>
                         </div>
                     </div>
                 </div>
-                <?php echo($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
+                <?= ($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
         </ol>
     </div>
-    <?php echo $block->getToolbarHtml() ?>
+    <?= $block->getToolbarHtml() ?>
     <?php if (!$block->isRedirectToCartEnabled()) : ?>
         <script type="text/x-magento-init">
         {
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 b428c61b959f3..8798170e8c0b0 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
@@ -9,9 +9,9 @@
 ?>
 <a href="#"
    class="action tocompare"
-   title="<?php echo $block->escapeHtml(__('Add to Compare')); ?>"
-   aria-label="<?php echo $block->escapeHtml(__('Add to Compare')); ?>"
-   data-post='<?php /* @escapeNotVerified */ echo $block->getCompareHelper()->getPostDataParams($block->getProduct()); ?>'
+   title="<?= $block->escapeHtml(__('Add to Compare')) ?>"
+   aria-label="<?= $block->escapeHtml(__('Add to Compare')) ?>"
+   data-post='<?= /* @escapeNotVerified */ $block->getCompareHelper()->getPostDataParams($block->getProduct()) ?>'
    role="button">
-    <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+    <span><?= /* @escapeNotVerified */ __('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 08ed49e4bf3f1..1b9f014b7c27f 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
@@ -155,24 +155,24 @@ switch ($type = $block->getType()) {
 
     <?php if ($type == 'related' || $type == 'upsell'): ?>
         <?php if ($type == 'related'): ?>
-            <div class="block <?php /* @escapeNotVerified */ echo $class; ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?php /* @escapeNotVerified */ echo $limit; ?>" data-shuffle="<?php /* @escapeNotVerified */ echo $shuffle; ?>">
+            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
         <?php else: ?>
-            <div class="block <?php /* @escapeNotVerified */ echo $class; ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?php /* @escapeNotVerified */ echo $limit; ?>" data-shuffle="<?php /* @escapeNotVerified */ echo $shuffle; ?>">
+            <div class="block <?= /* @escapeNotVerified */ $class ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?= /* @escapeNotVerified */ $limit ?>" data-shuffle="<?= /* @escapeNotVerified */ $shuffle ?>">
         <?php endif; ?>
     <?php else: ?>
-        <div class="block <?php /* @escapeNotVerified */ echo $class; ?>">
+        <div class="block <?= /* @escapeNotVerified */ $class ?>">
     <?php endif; ?>
     <div class="block-title title">
-        <strong id="block-<?php /* @escapeNotVerified */ echo $class?>-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong id="block-<?= /* @escapeNotVerified */ $class ?>-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
-    <div class="block-content content" aria-labelledby="block-<?php /* @escapeNotVerified */ echo $class?>-heading">
+    <div class="block-content content" aria-labelledby="block-<?= /* @escapeNotVerified */ $class ?>-heading">
         <?php if ($type == 'related' && $canItemsAddToCart): ?>
         <div class="block-actions">
-            <?php /* @escapeNotVerified */ echo __('Check items to add to the cart or') ?>
-            <button type="button" class="action select" role="select-all"><span><?php /* @escapeNotVerified */ echo __('select all') ?></span></button>
+            <?= /* @escapeNotVerified */ __('Check items to add to the cart or') ?>
+            <button type="button" class="action select" role="select-all"><span><?= /* @escapeNotVerified */ __('select all') ?></span></button>
         </div>
         <?php endif; ?>
-        <div class="products wrapper grid products-grid products-<?php /* @escapeNotVerified */ echo $type; ?>">
+        <div class="products wrapper grid products-grid products-<?= /* @escapeNotVerified */ $type ?>">
             <ol class="products list items product-items">
                 <?php $iterator = 1; ?>
                 <?php foreach ($items as $_item): ?>
@@ -183,31 +183,31 @@ switch ($type = $block->getType()) {
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($type == 'related' || $type == 'upsell'): ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
+                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
                 <?php else: ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
                 <?php endif; ?>
-                <div class="product-item-info <?php /* @escapeNotVerified */ echo $available; ?>">
-                    <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product photo product-item-photo">
-                        <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                <div class="product-item-info <?= /* @escapeNotVerified */ $available ?>">
+                    <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+                    <a href="<?= /* @escapeNotVerified */ $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="<?php echo $block->escapeHtml($_item->getName()) ?>" href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>">
-                            <?php echo $block->escapeHtml($_item->getName()) ?></a>
+                        <strong class="product name product-item-name"><a class="product-item-link" title="<?= $block->escapeHtml($_item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>">
+                            <?= $block->escapeHtml($_item->getName()) ?></a>
                         </strong>
 
-                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item); ?>
+                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
 
                             <?php if ($templateType): ?>
-                                <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                             <?php endif; ?>
 
                             <?php if (!$_item->isComposite() && $_item->isSaleable() && $type == 'related'): ?>
                                 <?php if (!$_item->getRequiredOptions()): ?>
                                     <div class="field choice related">
-                                        <input type="checkbox" class="checkbox related" id="related-checkbox<?php /* @escapeNotVerified */ echo $_item->getId() ?>" name="related_products[]" value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>" />
-                                        <label class="label" for="related-checkbox<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span></label>
+                                        <input type="checkbox" class="checkbox related" id="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>" name="related_products[]" value="<?= /* @escapeNotVerified */ $_item->getId() ?>" />
+                                        <label class="label" for="related-checkbox<?= /* @escapeNotVerified */ $_item->getId() ?>"><span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span></label>
                                     </div>
                                 <?php endif; ?>
                             <?php endif; ?>
@@ -218,24 +218,24 @@ switch ($type = $block->getType()) {
                                         <div class="actions-primary">
                                             <?php if ($_item->isSaleable()): ?>
                                                 <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                    <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                    <button class="action tocart primary" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                     </button>
                                                 <?php else: ?>
                                                     <?php $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                                     $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                     ?>
                                                     <button class="action tocart primary"
-                                                            data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                            data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                     </button>
                                                 <?php endif; ?>
                                             <?php else: ?>
                                                 <?php if ($_item->getIsSalable()): ?>
-                                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                 <?php else: ?>
-                                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                 <?php endif; ?>
                                             <?php endif; ?>
                                         </div>
@@ -244,7 +244,7 @@ switch ($type = $block->getType()) {
                                     <?php if ($showAddTo): ?>
                                         <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
                                             <?php if ($addToBlock = $block->getChildBlock('addto')): ?>
-                                                <?php echo $addToBlock->setProduct($_item)->getChildHtml(); ?>
+                                                <?= $addToBlock->setProduct($_item)->getChildHtml() ?>
                                             <?php endif; ?>
                                         </div>
                                     <?php endif; ?>
@@ -252,7 +252,7 @@ switch ($type = $block->getType()) {
                             <?php endif; ?>
                         </div>
                     </div>
-                    <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                    <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                 <?php endforeach ?>
             </ol>
         </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
index 8927dfa5436ab..02a6e999ad51f 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
@@ -16,14 +16,14 @@
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <?php if ($block->getCollection()->getSize()): ?>
-    <div class="toolbar toolbar-products" data-mage-init='<?php /* @escapeNotVerified */ echo $block->getWidgetOptionsJson(); ?>'>
+    <div class="toolbar toolbar-products" data-mage-init='<?= /* @escapeNotVerified */ $block->getWidgetOptionsJson() ?>'>
         <?php if ($block->isExpanded()): ?>
             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
         <?php endif; ?>
 
         <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
 
-        <?php echo $block->getPagerHtml() ?>
+        <?= $block->getPagerHtml() ?>
 
         <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
 
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 280ad7a94922e..ec4541bde5ca6 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
@@ -17,17 +17,17 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="field limiter">
     <label class="label" for="limiter">
-        <span><?php /* @escapeNotVerified */ echo __('Show') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Show') ?></span>
     </label>
     <div class="control">
         <select id="limiter" data-role="limiter" class="limiter-options">
             <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
-                <option value="<?php /* @escapeNotVerified */ echo $_key ?>"<?php if ($block->isLimitCurrent($_key)): ?>
+                <option value="<?= /* @escapeNotVerified */ $_key ?>"<?php if ($block->isLimitCurrent($_key)): ?>
                     selected="selected"<?php endif ?>>
-                    <?php /* @escapeNotVerified */ echo $_limit ?>
+                    <?= /* @escapeNotVerified */ $_limit ?>
                 </option>
             <?php endforeach; ?>
         </select>
     </div>
-    <span class="limiter-text"><?php /* @escapeNotVerified */ echo __('per page') ?></span>
+    <span class="limiter-text"><?= /* @escapeNotVerified */ __('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 43cab9abe934f..92514c5b8ea50 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
@@ -16,25 +16,25 @@
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="toolbar-sorter sorter">
-    <label class="sorter-label" for="sorter"><?php /* @escapeNotVerified */ echo __('Sort By') ?></label>
+    <label class="sorter-label" for="sorter"><?= /* @escapeNotVerified */ __('Sort By') ?></label>
     <select id="sorter" data-role="sorter" class="sorter-options">
         <?php foreach ($block->getAvailableOrders() as $_key => $_order): ?>
-            <option value="<?php /* @escapeNotVerified */ echo $_key; ?>"
+            <option value="<?= /* @escapeNotVerified */ $_key ?>"
                 <?php if ($block->isOrderCurrent($_key)): ?>
                     selected="selected"
                 <?php endif; ?>
                 >
-                <?php echo $block->escapeHtml(__($_order)) ?>
+                <?= $block->escapeHtml(__($_order)) ?>
             </option>
         <?php endforeach; ?>
     </select>
     <?php if ($block->getCurrentDirection() == 'desc'): ?>
-        <a title="<?php /* @escapeNotVerified */ echo __('Set Ascending Direction') ?>" href="#" class="action sorter-action sort-desc" data-role="direction-switcher" data-value="asc">
-            <span><?php /* @escapeNotVerified */ echo __('Set Ascending Direction') ?></span>
+        <a title="<?= /* @escapeNotVerified */ __('Set Ascending Direction') ?>" href="#" class="action sorter-action sort-desc" data-role="direction-switcher" data-value="asc">
+            <span><?= /* @escapeNotVerified */ __('Set Ascending Direction') ?></span>
         </a>
     <?php else: ?>
-        <a title="<?php /* @escapeNotVerified */ echo __('Set Descending Direction') ?>" href="#" class="action sorter-action sort-asc" data-role="direction-switcher" data-value="desc">
-            <span><?php /* @escapeNotVerified */ echo __('Set Descending Direction') ?></span>
+        <a title="<?= /* @escapeNotVerified */ __('Set Descending Direction') ?>" href="#" class="action sorter-action sort-asc" data-role="direction-switcher" data-value="desc">
+            <span><?= /* @escapeNotVerified */ __('Set Descending Direction') ?></span>
         </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 60d8eb169b198..366dfba71b0d1 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
@@ -19,23 +19,23 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
 <div class="modes">
     <?php $_modes = $block->getModes(); ?>
     <?php if ($_modes && count($_modes) > 1): ?>
-    <strong class="modes-label" id="modes-label"><?php /* @escapeNotVerified */ echo __('View as') ?></strong>
+    <strong class="modes-label" id="modes-label"><?= /* @escapeNotVerified */ __('View as') ?></strong>
     <?php foreach ($block->getModes() as $_code => $_label): ?>
         <?php if ($block->isModeActive($_code)): ?>
-            <strong title="<?php /* @escapeNotVerified */ echo $_label ?>"
-                class="modes-mode active mode-<?php /* @escapeNotVerified */ echo strtolower($_code); ?>"
-                data-value="<?php /* @escapeNotVerified */ echo strtolower($_code); ?>">
-                <span><?php /* @escapeNotVerified */ echo $_label ?></span>
+            <strong title="<?= /* @escapeNotVerified */ $_label ?>"
+                class="modes-mode active mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
+                data-value="<?= /* @escapeNotVerified */ strtolower($_code) ?>">
+                <span><?= /* @escapeNotVerified */ $_label ?></span>
             </strong>
         <?php else: ?>
-            <a class="modes-mode mode-<?php /* @escapeNotVerified */ echo strtolower($_code); ?>"
-               title="<?php /* @escapeNotVerified */ echo $_label ?>"
+            <a class="modes-mode mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
+               title="<?= /* @escapeNotVerified */ $_label ?>"
                href="#"
                data-role="mode-switcher"
-               data-value="<?php /* @escapeNotVerified */ echo strtolower($_code); ?>"
-               id="mode-<?php /* @escapeNotVerified */ echo strtolower($_code); ?>"
-               aria-labelledby="modes-label mode-<?php /* @escapeNotVerified */ echo strtolower($_code); ?>">
-                <span><?php /* @escapeNotVerified */ echo $_label ?></span>
+               data-value="<?= /* @escapeNotVerified */ strtolower($_code) ?>"
+               id="mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>"
+               aria-labelledby="modes-label mode-<?= /* @escapeNotVerified */ strtolower($_code) ?>">
+                <span><?= /* @escapeNotVerified */ $_label ?></span>
             </a>
             <?php endif; ?>
         <?php endforeach; ?>
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 64b082cb8d9e0..5f437cc484ed4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -20,10 +20,10 @@ $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
 <?php if (!$_productCollection->count()): ?>
-<p class="message note"><?php /* @escapeNotVerified */ echo __('We can\'t find products matching the selection.') ?></p>
+<p class="message note"><?= /* @escapeNotVerified */ __('We can\'t find products matching the selection.') ?></p>
 <?php else: ?>
-<?php echo $block->getToolbarHtml() ?>
-<?php echo $block->getAdditionalHtml() ?>
+<?= $block->getToolbarHtml() ?>
+<?= $block->getAdditionalHtml() ?>
 <?php
     if ($block->getMode() == 'grid') {
         $viewMode = 'grid';
@@ -37,15 +37,15 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::FULL_VIEW;
     }
 ?>
-<div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?>">
+<div class="products wrapper <?= /* @escapeNotVerified */ $viewMode ?>">
     <?php $iterator = 1; ?>
     <ol class="products list items">
         <?php foreach ($_productCollection as $_product): ?>
-        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
             <div class="product">
                 <?php // Product Image ?>
-                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo">
-                    <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product photo">
+                    <?= $block->getImage($_product, $image)->toHtml() ?>
                 </a>
                 <div class="product details">
                 <?php
@@ -92,10 +92,10 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
 
                 </div>
             </div>
-        <?php echo($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
+        <?= ($iterator == count($_productCollection)+1) ? '</li>' : '' ?>
         <?php endforeach; ?>
     </ol>
 </div>
-<?php echo $block->getToolbarHtml() ?>
+<?= $block->getToolbarHtml() ?>
 <?php endif; ?>
-<?php /* @escapeNotVerified */ echo $time_taken = microtime(true) - $start; ?>
+<?= /* @escapeNotVerified */ $time_taken = microtime(true) - $start ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/additional.phtml
index daf9ca00c7da8..2d89e24cc7aac 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
@@ -8,5 +8,5 @@
 
 ?>
 <?php foreach ($block->getChildHtmlList() as $_html): ?>
-    <?php /* @escapeNotVerified */ echo $_html ?>
+    <?= /* @escapeNotVerified */ $_html ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml
index ff7bef7a69c0a..0893cfab0bbf8 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
@@ -9,5 +9,5 @@
 /** @var $block \Magento\Catalog\Block\Product\View*/
 ?>
 <div class="product-addto-links" data-role="add-to-links">
-    <?php echo $block->getChildHtml(); ?>
+    <?= $block->getChildHtml() ?>
 </div>
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 9b8245419045d..16a5147e13458 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
@@ -9,6 +9,6 @@
 /** @var $block \Magento\Catalog\Block\Catalog\Product\View\Addto\Compare */
 ?>
 
-<a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getPostDataParams();?>'
+<a href="#" data-post='<?= /* @escapeNotVerified */ $block->getPostDataParams() ?>'
         data-role="add-to-links"
-        class="action tocompare"><span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span></a>
+        class="action tocompare"><span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span></a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index 4ed3d9c25ac8b..c7f577107095f 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
@@ -15,27 +15,27 @@
     <div class="fieldset">
         <?php if ($block->shouldRenderQuantity()): ?>
         <div class="field qty">
-            <label class="label" for="qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
+            <label class="label" for="qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></label>
             <div class="control">
                 <input type="number"
                        name="qty"
                        id="qty"
-                       value="<?php /* @escapeNotVerified */ echo $block->getProductDefaultQty() * 1 ?>"
-                       title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+                       value="<?= /* @escapeNotVerified */ $block->getProductDefaultQty() * 1 ?>"
+                       title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                        class="input-text qty"
-                       data-validate="<?php echo $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
+                       data-validate="<?= $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
                        />
             </div>
         </div>
         <?php endif; ?>
         <div class="actions">
             <button type="submit"
-                    title="<?php /* @escapeNotVerified */ echo $buttonTitle ?>"
+                    title="<?= /* @escapeNotVerified */ $buttonTitle ?>"
                     class="action primary tocart"
                     id="product-addtocart-button">
-                <span><?php /* @escapeNotVerified */ echo $buttonTitle ?></span>
+                <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
             </button>
-            <?php echo $block->getChildHtml('', true) ?>
+            <?= $block->getChildHtml('', true) ?>
         </div>
     </div>
 </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 177b788f544ca..2f62315830308 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
@@ -33,8 +33,8 @@ if ($_attributeType && $_attributeType == 'text') {
 ?>
 
 <?php if ($_attributeValue): ?>
-<div class="product attribute <?php /* @escapeNotVerified */ echo $_className?>">
-    <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php /* @escapeNotVerified */ echo $_attributeLabel?></strong><?php endif; ?>
-    <div class="value" <?php /* @escapeNotVerified */ echo $_attributeAddAttribute;?>><?php /* @escapeNotVerified */ echo $_attributeValue; ?></div>
+<div class="product attribute <?= /* @escapeNotVerified */ $_className ?>">
+    <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?= /* @escapeNotVerified */ $_attributeLabel ?></strong><?php endif; ?>
+    <div class="value" <?= /* @escapeNotVerified */ $_attributeAddAttribute ?>><?= /* @escapeNotVerified */ $_attributeValue ?></div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml
index 827cb34e22d69..c930d2195a01b 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
@@ -19,12 +19,12 @@
 <?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"><?php /* @escapeNotVerified */ echo __('More Information') ?></caption>
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('More Information') ?></caption>
             <tbody>
             <?php foreach ($_additional as $_data): ?>
                 <tr>
-                    <th class="col label" scope="row"><?php echo $block->escapeHtml(__($_data['label'])) ?></th>
-                    <td class="col data" data-th="<?php echo $block->escapeHtml(__($_data['label'])) ?>"><?php /* @escapeNotVerified */ echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                    <th class="col label" scope="row"><?= $block->escapeHtml(__($_data['label'])) ?></th>
+                    <td class="col data" data-th="<?= $block->escapeHtml(__($_data['label'])) ?>"><?= /* @escapeNotVerified */ $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
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 6ecbf37cb87cc..b5cdd1a2a31ba 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
@@ -12,4 +12,4 @@
  * @var $block \Magento\Catalog\Block\Product\View\Description
  */
 ?>
-<?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description') ?>
+<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description') ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/details.phtml
index 91e9d8af1b169..b1af46b80552d 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
@@ -21,18 +21,18 @@
                     $label = $block->getChildData($alias, 'title');
                 ?>
                 <div class="data item title"
-                     aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title"
-                     data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>">
+                     aria-labeledby="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title"
+                     data-role="collapsible" id="tab-label-<?= /* @escapeNotVerified */ $alias ?>">
                     <a class="data switch"
                        tabindex="-1"
                        data-toggle="switch"
-                       href="#<?php /* @escapeNotVerified */ echo $alias; ?>"
-                       id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title">
-                        <?php /* @escapeNotVerified */ echo $label; ?>
+                       href="#<?= /* @escapeNotVerified */ $alias ?>"
+                       id="tab-label-<?= /* @escapeNotVerified */ $alias ?>-title">
+                        <?= /* @escapeNotVerified */ $label ?>
                     </a>
                 </div>
-                <div class="data item content" id="<?php /* @escapeNotVerified */ echo $alias; ?>" data-role="content">
-                    <?php /* @escapeNotVerified */ echo $html; ?>
+                <div class="data item content" id="<?= /* @escapeNotVerified */ $alias ?>" data-role="content">
+                    <?= /* @escapeNotVerified */ $html ?>
                 </div>
             <?php endforeach;?>
         </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
index 2946a8e1e97b2..bfc90bd8ca0ea 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
@@ -16,25 +16,25 @@
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
-    <form action="<?php /* @escapeNotVerified */ echo $block->getSubmitUrl($_product) ?>" method="post"
+    <form action="<?= /* @escapeNotVerified */ $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="<?php /* @escapeNotVerified */ echo $_product->getId() ?>" />
+        <input type="hidden" name="product" value="<?= /* @escapeNotVerified */ $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
-        <?php echo $block->getBlockHtml('formkey')?>
-        <?php echo $block->getChildHtml('form_top'); ?>
+        <?= $block->getBlockHtml('formkey') ?>
+        <?= $block->getChildHtml('form_top') ?>
         <?php if (!$block->hasOptions()):?>
-            <?php echo $block->getChildHtml('product_info_form_content'); ?>
+            <?= $block->getChildHtml('product_info_form_content') ?>
         <?php else:?>
             <?php if ($_product->isSaleable() && $block->getOptionsContainer() == 'container1'):?>
-                <?php echo $block->getChildChildHtml('options_container') ?>
+                <?= $block->getChildChildHtml('options_container') ?>
             <?php endif;?>
         <?php endif; ?>
 
         <?php if ($_product->isSaleable() && $block->hasOptions() && $block->getOptionsContainer() == 'container2'):?>
-            <?php echo $block->getChildChildHtml('options_container') ?>
+            <?= $block->getChildChildHtml('options_container') ?>
         <?php endif;?>
-        <?php echo $block->getChildHtml('form_bottom'); ?>
+        <?= $block->getChildHtml('form_bottom') ?>
     </form>
 </div>
 <script>
@@ -43,13 +43,13 @@
         'priceBox'
     ], function($){
         var dataPriceBoxSelector = '[data-role=priceBox]',
-            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($_product->getId())?>]',
+            dataProductIdSelector = '[data-product-id=<?= $block->escapeHtml($_product->getId()) ?>]',
             priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
         priceBoxes = priceBoxes.filter(function(index, elem){
             return !$(elem).find('.price-from').length;
         });
 
-        priceBoxes.priceBox({'priceConfig': <?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>});
+        priceBoxes.priceBox({'priceConfig': <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>});
     });
 </script>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index f81fbbca21b70..5a064b33355a4 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
@@ -15,19 +15,19 @@
 <div class="gallery-placeholder _block-content-loading" data-gallery-role="gallery-placeholder">
     <div data-role="loader" class="loading-mask">
         <div class="loader">
-            <img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
-                 alt="<?php /* @escapeNotVerified */ echo __('Loading...') ?>">
+            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
+                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>">
         </div>
     </div>
 </div>
 <!--Fix for jumping content. Loader must be the same size as gallery.-->
 <script>
     var config = {
-            "width": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
+            "width": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>,
             "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
-            "navtype": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/navtype"); ?>",
-            "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height'); ?>
+            "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
+            "height": <?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'height') ?>
         },
         thumbBarHeight = 0,
         loader = document.querySelectorAll('[data-gallery-role="gallery-placeholder"] [data-role="loader"]')[0];
@@ -43,27 +43,27 @@
         "[data-gallery-role=gallery-placeholder]": {
             "mage/gallery/gallery": {
                 "mixins":["magnifier/magnify"],
-                "magnifierOpts": <?php /* @escapeNotVerified */ echo $block->getMagnifier(); ?>,
-                "data": <?php /* @escapeNotVerified */ echo $block->getGalleryImagesJson(); ?>,
+                "magnifierOpts": <?= /* @escapeNotVerified */ $block->getMagnifier() ?>,
+                "data": <?= /* @escapeNotVerified */ $block->getGalleryImagesJson() ?>,
                 "options": {
-                    "nav": "<?php /* @escapeNotVerified */ echo $block->getVar("gallery/nav"); ?>",
+                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/nav") ?>",
                     <?php if (($block->getVar("gallery/loop"))): ?>
-                        "loop": <?php /* @escapeNotVerified */ echo $block->getVar("gallery/loop"); ?>,
+                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/loop") ?>,
                     <?php endif; ?>
                     <?php if (($block->getVar("gallery/keyboard"))): ?>
-                        "keyboard": <?php /* @escapeNotVerified */ echo $block->getVar("gallery/keyboard"); ?>,
+                        "keyboard": <?= /* @escapeNotVerified */ $block->getVar("gallery/keyboard") ?>,
                     <?php endif; ?>
                     <?php if (($block->getVar("gallery/arrows"))): ?>
-                        "arrows": <?php /* @escapeNotVerified */ echo $block->getVar("gallery/arrows"); ?>,
+                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/arrows") ?>,
                     <?php endif; ?>
                     <?php if (($block->getVar("gallery/allowfullscreen"))): ?>
-                        "allowfullscreen": <?php /* @escapeNotVerified */ echo $block->getVar("gallery/allowfullscreen"); ?>,
+                        "allowfullscreen": <?= /* @escapeNotVerified */ $block->getVar("gallery/allowfullscreen") ?>,
                     <?php endif; ?>
                     <?php if (($block->getVar("gallery/caption"))): ?>
-                        "showCaption": <?php /* @escapeNotVerified */ echo $block->getVar("gallery/caption"); ?>,
+                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/caption") ?>,
                     <?php endif; ?>
-                    "width": "<?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'width'); ?>",
-                    "thumbwidth": "<?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'width'); ?>",
+                    "width": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_medium', 'width') ?>",
+                    "thumbwidth": "<?= /* @escapeNotVerified */ $block->getImageAttribute('product_page_image_small', 'width') ?>",
                     <?php if ($block->getImageAttribute('product_page_image_small', 'height') || $block->getImageAttribute('product_page_image_small', 'width')): ?>
                         "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
@@ -73,37 +73,37 @@
                         ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/transition/duration")): ?>
-                        "transitionduration": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/transition/duration"); ?>,
+                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/transition/duration") ?>,
                     <?php endif; ?>
-                    "transition": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/transition/effect"); ?>",
+                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/transition/effect") ?>",
                     <?php if (($block->getVar("gallery/navarrows"))): ?>
-                        "navarrows": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/navarrows"); ?>,
+                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/navarrows") ?>,
                     <?php endif; ?>
-                    "navtype": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/navtype"); ?>",
-                    "navdir": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/navdir"); ?>"
+                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navtype") ?>",
+                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/navdir") ?>"
                 },
                 "fullscreen": {
-                    "nav": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/nav"); ?>",
+                    "nav": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/nav") ?>",
                     <?php if ($block->getVar("gallery/fullscreen/loop")): ?>
-                        "loop": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/loop"); ?>,
+                        "loop": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/loop") ?>,
                     <?php endif; ?>
-                    "navdir": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/navdir"); ?>",
+                    "navdir": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navdir") ?>",
                     <?php if ($block->getVar("gallery/transition/navarrows")): ?>
-                        "navarrows": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/navarrows"); ?>,
+                        "navarrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navarrows") ?>,
                     <?php endif; ?>
-                    "navtype": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/navtype"); ?>",
+                    "navtype": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/navtype") ?>",
                     <?php if ($block->getVar("gallery/fullscreen/arrows")): ?>
-                        "arrows": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/arrows"); ?>,
+                        "arrows": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/arrows") ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/caption")): ?>
-                        "showCaption": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/caption"); ?>,
+                        "showCaption": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/caption") ?>,
                     <?php endif; ?>
                     <?php if ($block->getVar("gallery/fullscreen/transition/duration")): ?>
-                        "transitionduration": <?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/transition/duration"); ?>,
+                        "transitionduration": <?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/duration") ?>,
                     <?php endif; ?>
-                    "transition": "<?php /* @escapeNotVerified */  echo $block->getVar("gallery/fullscreen/transition/effect"); ?>"
+                    "transition": "<?= /* @escapeNotVerified */ $block->getVar("gallery/fullscreen/transition/effect") ?>"
                 },
-                "breakpoints": <?php /* @escapeNotVerified */ echo $block->getBreakpoints(); ?>
+                "breakpoints": <?= /* @escapeNotVerified */ $block->getBreakpoints() ?>
             }
         }
     }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/mailto.phtml
index 2f34226f4c53c..d52b594ededdf 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
@@ -9,6 +9,6 @@
 ?>
 <?php $_product = $block->getProduct() ?>
 <?php if ($block->canEmailToFriend()): ?>
-    <a href="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
-       class="action mailto friend"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></a>
+    <a href="<?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
+       class="action mailto friend"><span><?= /* @escapeNotVerified */ __('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 0e6c0962cffa8..87655797f40e5 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
@@ -8,4 +8,4 @@
 
 /** @var $block \Magento\Directory\Block\Currency */
 ?>
-<meta property="product:price:currency" content="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getCurrentCurrencyCode()); ?>"/>
+<meta property="product:price:currency" content="<?= /* @escapeNotVerified */ $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 445950c637b7d..b1e46776af465 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
@@ -10,11 +10,11 @@
 ?>
 
 <meta property="og:type" content="og:product" />
-<meta property="og:title" content="<?php echo $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())); ?>" />
-<meta property="og:image" content="<?php echo $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()); ?>" />
-<meta property="og:description" content="<?php echo $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())); ?>" />
-<meta property="og:url" content="<?php echo $block->escapeUrl($block->getProduct()->getProductUrl()); ?>" />
+<meta property="og:title" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getName())) ?>" />
+<meta property="og:image" content="<?= $block->escapeUrl($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()) ?>" />
+<meta property="og:description" content="<?= $block->escapeHtmlAttr($block->stripTags($block->getProduct()->getShortDescription())) ?>" />
+<meta property="og:url" content="<?= $block->escapeUrl($block->getProduct()->getProductUrl()) ?>" />
 <?php if ($priceAmount = $block->getProduct()->getFinalPrice()):?>
-    <meta property="product:price:amount" content="<?php /* @escapeNotVerified */ echo $priceAmount; ?>"/>
-    <?php echo $block->getChildHtml('meta.currency'); ?>
+    <meta property="product:price:amount" content="<?= /* @escapeNotVerified */ $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 9ac6c24f27f0d..3ebfa76860950 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
@@ -16,14 +16,14 @@
     {
         "#product_addtocart_form": {
             "priceOptions": {
-                "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
+                "optionConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
                 "controlContainer": ".field",
-                "priceHolderSelector": "[data-product-id='<?php echo $block->escapeHtml($_productId)?>'][data-role=priceBox]"
+                "priceHolderSelector": "[data-product-id='<?= $block->escapeHtml($_productId) ?>'][data-role=priceBox]"
             }
         }
     }
 </script>
     <?php foreach ($_options as $_option): ?>
-        <?php echo $block->getOptionHtml($_option) ?>
+        <?= $block->getOptionHtml($_option) ?>
     <?php endforeach; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
index 31f6627455b2b..3420512977aad 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
@@ -10,38 +10,38 @@
 <?php $_option = $block->getOption() ?>
 <?php $_optionId = $_option->getId() ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-<div class="field date<?php /* @escapeNotVerified */ echo $class; ?>"
+<div class="field date<?= /* @escapeNotVerified */ $class ?>"
     data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
-    <fieldset class="fieldset fieldset-product-options-inner<?php /* @escapeNotVerified */ echo $class; ?>">
+    <fieldset class="fieldset fieldset-product-options-inner<?= /* @escapeNotVerified */ $class ?>">
         <legend class="legend">
-            <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
-            <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
+            <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+            <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
         </legend>
         <div class="control">
             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
                 || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE): ?>
 
-                <?php echo $block->getDateHtml() ?>
+                <?= $block->getDateHtml() ?>
 
             <?php endif; ?>
 
             <?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_DATE_TIME
                 || $_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_TIME): ?>
-                <?php echo $block->getTimeHtml() ?>
+                <?= $block->getTimeHtml() ?>
             <?php endif; ?>
 
             <?php if ($_option->getIsRequire()): ?>
                 <input type="hidden"
-                       name="validate_datetime_<?php /* @escapeNotVerified */ echo $_optionId ?>"
-                       class="validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>"
+                       name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>"
+                       class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>"
                        value=""
-                       data-validate="{'validate-required-datetime':<?php /* @escapeNotVerified */ echo $_optionId?>}"/>
+                       data-validate="{'validate-required-datetime':<?= /* @escapeNotVerified */ $_optionId ?>}"/>
             <?php else: ?>
                 <input type="hidden"
-                       name="validate_datetime_<?php /* @escapeNotVerified */ echo $_optionId ?>"
-                       class="validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>"
+                       name="validate_datetime_<?= /* @escapeNotVerified */ $_optionId ?>"
+                       class="validate-datetime-<?= /* @escapeNotVerified */ $_optionId ?>"
                        value=""
-                       data-validate="{'validate-optional-datetime':<?php /* @escapeNotVerified */ echo $_optionId?>}"/>
+                       data-validate="{'validate-optional-datetime':<?= /* @escapeNotVerified */ $_optionId ?>}"/>
             <?php endif; ?>
             <script type="text/x-magento-init">
             {
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/default.phtml
index 5859c5f5edb59..2006bf6e9f414 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
@@ -9,5 +9,5 @@
 ?>
 <?php $_option = $block->getOption() ?>
 <div class="field">
-    <label class="label"><span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span></label>
+    <label class="label"><span><?= $block->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 522ae9cf997bd..3ceba2eebd214 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
@@ -16,51 +16,51 @@
 <?php $_fileNamed = $_fileName . '_name'; ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
 
-<div class="field file<?php /* @escapeNotVerified */ echo $class; ?>">
-    <label class="label" for="<?php /* @noEscape */ echo $_fileName; ?>" id="<?php /* @noEscape */ echo $_fileName; ?>-label">
-        <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
-        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
+<div class="field file<?= /* @escapeNotVerified */ $class ?>">
+    <label class="label" for="<?= /* @noEscape */ $_fileName ?>" id="<?= /* @noEscape */ $_fileName ?>-label">
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
     </label>
     <?php if ($_fileExists): ?>
     <div class="control">
-        <span class="<?php /* @noEscape */ echo $_fileNamed ?>"><?php echo $block->escapeHtml($_fileInfo->getTitle()); ?></span>
-        <a href="javascript:void(0)" class="label" id="change-<?php /* @noEscape */ echo $_fileName ?>" >
-            <?php /* @escapeNotVerified */ echo __('Change') ?>
+        <span class="<?= /* @noEscape */ $_fileNamed ?>"><?= $block->escapeHtml($_fileInfo->getTitle()) ?></span>
+        <a href="javascript:void(0)" class="label" id="change-<?= /* @noEscape */ $_fileName ?>" >
+            <?= /* @escapeNotVerified */ __('Change') ?>
         </a>
         <?php if (!$_option->getIsRequire()): ?>
-            <input type="checkbox" id="delete-<?php /* @escapeNotVerified */ echo $_fileName ?>" />
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
+            <input type="checkbox" id="delete-<?= /* @escapeNotVerified */ $_fileName ?>" />
+            <span class="label"><?= /* @escapeNotVerified */ __('Delete') ?></span>
         <?php endif; ?>
     </div>
     <?php endif; ?>
-    <div class="control" id="input-box-<?php /* @escapeNotVerified */ echo $_fileName ?>"
+    <div class="control" id="input-box-<?= /* @escapeNotVerified */ $_fileName ?>"
              data-mage-init='{"priceOptionFile":{
-                "fileName":"<?php /* @noEscape */ echo $_fileName ?>",
-                "fileNamed":"<?php /* @noEscape */ echo $_fileNamed ?>",
-                "fieldNameAction":"<?php /* @escapeNotVerified */ echo $_fieldNameAction ?>",
-                "changeFileSelector":"#change-<?php /* @escapeNotVerified */ echo $_fileName ?>",
-                "deleteFileSelector":"#delete-<?php /* @escapeNotVerified */ echo $_fileName ?>"}
+                "fileName":"<?= /* @noEscape */ $_fileName ?>",
+                "fileNamed":"<?= /* @noEscape */ $_fileNamed ?>",
+                "fieldNameAction":"<?= /* @escapeNotVerified */ $_fieldNameAction ?>",
+                "changeFileSelector":"#change-<?= /* @escapeNotVerified */ $_fileName ?>",
+                "deleteFileSelector":"#delete-<?= /* @escapeNotVerified */ $_fileName ?>"}
              }'
-            <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
+            <?= $_fileExists ? 'style="display:none"' : '' ?>>
         <input type="file"
-               name="<?php /* @escapeNotVerified */ echo $_fileName; ?>"
-               id="<?php /* @escapeNotVerified */ echo $_fileName; ?>"
-               class="product-custom-option<?php echo $_option->getIsRequire() ? ' required' : '' ?>"
-               <?php echo $_fileExists ? 'disabled="disabled"' : '' ?> />
-        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $_fieldNameAction; ?>" value="<?php /* @escapeNotVerified */ echo $_fieldValueAction; ?>" />
+               name="<?= /* @escapeNotVerified */ $_fileName ?>"
+               id="<?= /* @escapeNotVerified */ $_fileName ?>"
+               class="product-custom-option<?= $_option->getIsRequire() ? ' required' : '' ?>"
+               <?= $_fileExists ? 'disabled="disabled"' : '' ?> />
+        <input type="hidden" name="<?= /* @escapeNotVerified */ $_fieldNameAction ?>" value="<?= /* @escapeNotVerified */ $_fieldValueAction ?>" />
         <?php if ($_option->getFileExtension()): ?>
             <p class="note">
-                <?php /* @escapeNotVerified */ echo __('Compatible file extensions to upload')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getFileExtension() ?></strong>
+                <?= /* @escapeNotVerified */ __('Compatible file extensions to upload') ?>: <strong><?= /* @escapeNotVerified */ $_option->getFileExtension() ?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeX() > 0): ?>
             <p class="note">
-                <?php /* @escapeNotVerified */ echo __('Maximum image width')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeX() ?> <?php /* @escapeNotVerified */ echo __('px.')?></strong>
+                <?= /* @escapeNotVerified */ __('Maximum image width') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeX() ?> <?= /* @escapeNotVerified */ __('px.') ?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeY() > 0): ?>
             <p class="note">
-                <?php /* @escapeNotVerified */ echo __('Maximum image height')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeY() ?> <?php /* @escapeNotVerified */ echo __('px.')?></strong>
+                <?= /* @escapeNotVerified */ __('Maximum image height') ?>: <strong><?= /* @escapeNotVerified */ $_option->getImageSizeY() ?> <?= /* @escapeNotVerified */ __('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 eddebf774cba4..980b78f917cf2 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
@@ -13,15 +13,15 @@
 $_option = $block->getOption();
 $class = ($_option->getIsRequire()) ? ' required' : '';
 ?>
-<div class="field<?php /* @escapeNotVerified */ echo $class; ?>">
-    <label class="label" for="select_<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
-        <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
+<div class="field<?= /* @escapeNotVerified */ $class ?>">
+    <label class="label" for="select_<?= /* @escapeNotVerified */ $_option->getId() ?>">
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
-        <?php echo $block->getValuesHtml() ?>
+        <?= $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-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></span>
+                <span id="options-<?= /* @escapeNotVerified */ $_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 8eb4678fd27db..79dc8591fd724 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
@@ -14,10 +14,10 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
 
 <div class="field<?php if ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA) {
     echo ' textarea';
-} ?><?php /* @escapeNotVerified */ echo $class ?>">
-    <label class="label" for="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text">
-        <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
-        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
+} ?><?= /* @escapeNotVerified */ $class ?>">
+    <label class="label" for="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text">
+        <span><?= $block->escapeHtml($_option->getTitle()) ?></span>
+        <?= /* @escapeNotVerified */ $block->getFormatedPrice() ?>
     </label>
 
     <div class="control">
@@ -31,14 +31,14 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             }
             ?>
             <input type="text"
-                   id="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text"
+                   id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
                    class="input-text product-custom-option"
                    <?php if (!empty($_textValidate)) {?>
-                   data-validate="<?php echo  $block->escapeHtml(json_encode($_textValidate));?>"
+                   data-validate="<?= $block->escapeHtml(json_encode($_textValidate)) ?>"
                    <?php } ?>
-                   name="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   data-selector="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                   value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>"/>
+                   name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                   value="<?= $block->escapeHtml($block->getDefaultValue()) ?>"/>
         <?php elseif ($_option->getType() == \Magento\Catalog\Api\Data\ProductCustomOptionInterface::OPTION_TYPE_AREA): ?>
             <?php $_textAreaValidate = null;
             if ($_option->getIsRequire()) {
@@ -48,19 +48,19 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
                 $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
             }
             ?>
-            <textarea id="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text"
+            <textarea id="options_<?= /* @escapeNotVerified */ $_option->getId() ?>_text"
                       class="product-custom-option"
                     <?php if (!empty($_textAreaValidate)) {?>
-                        data-validate="<?php echo $block->escapeHtml(json_encode($_textAreaValidate));?>"
+                        data-validate="<?= $block->escapeHtml(json_encode($_textAreaValidate)) ?>"
                     <?php } ?>
-                      name="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
-                      data-selector="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                      name="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
+                      data-selector="options[<?= /* @escapeNotVerified */ $_option->getId() ?>]"
                       rows="5"
-                      cols="25"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+                      cols="25"><?= $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif; ?>
         <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note"><?php /* @escapeNotVerified */ echo __('Maximum number of characters:') ?>
-                <strong><?php /* @escapeNotVerified */ echo $_option->getMaxCharacters() ?></strong></p>
+            <p class="note"><?= /* @escapeNotVerified */ __('Maximum number of characters:') ?>
+                <strong><?= /* @escapeNotVerified */ $_option->getMaxCharacters() ?></strong></p>
         <?php endif; ?>
     </div>
 </div>
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 b1e4ab96205c8..ca6960a215a7a 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
@@ -10,8 +10,8 @@ if ($block->hasRequiredOptions()) {
     $required = ' data-hasrequired="' . __('* Required Fields') . '"';
 }
 ?>
-<div class="product-options-wrapper" id="product-options-wrapper"<?php /* @escapeNotVerified */ echo $required; ?>>
+<div class="product-options-wrapper" id="product-options-wrapper"<?= /* @escapeNotVerified */ $required ?>>
     <div class="fieldset" tabindex="0">
-        <?php echo $block->getChildHtml('', true);?>
+        <?= $block->getChildHtml('', true) ?>
     </div>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml
index 871c29a09ff65..c95560ba2be77 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/wrapper/bottom.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <div class="product-options-bottom">
-    <?php echo $block->getChildHtml('', true);?>
+    <?= $block->getChildHtml('', true) ?>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/price_clone.phtml
index 45e5aa9b18e97..e8c0b32fd7692 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
@@ -9,7 +9,7 @@
 ?>
 <?php /** @var \Magento\Catalog\Block\Product\AbstractProduct $block */ ?>
 <?php $_product = $block->getProduct() ?>
-<?php echo $block->getProductPriceHtml(
+<?= $block->getProductPriceHtml(
     $_product,
     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
     \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW,
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 d8d51410fa576..5575d00df7457 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
@@ -8,4 +8,4 @@
 
 ?>
 <?php /** @var $block \Magento\Catalog\Block\Product\AbstractProduct */ ?>
-<?php echo $block->getReviewsSummaryHtml($block->getProduct(), false, true)?>
+<?= $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 443323e68d629..7e522b4f88306 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
@@ -12,12 +12,12 @@
 
 <?php if ($block->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable()): ?>
-        <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-            <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+        <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
         </div>
     <?php else: ?>
-        <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-            <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+        <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+            <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
         </div>
     <?php endif; ?>
 <?php endif; ?>
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 43b9fa8b19554..2ec671b8de3ab 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
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-product-link">
-    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
index 313d6faa0372a..373eda1117455 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
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 ?>
 <span class="widget block block-product-link-inline">
-    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?= /* @escapeNotVerified */ $block->getLinkAttributes() ?>><span><?= $block->escapeHtml($block->getLabel()) ?></span></a>
 </span>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
index 48bda50534319..9f6576f61ee7f 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
@@ -10,55 +10,55 @@
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
     <div class="block widget block-new-products-list">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
             <?php $iterator = 1; ?>
-            <ol class="product-items" id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>">
+            <ol class="product-items" id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>">
                 <?php foreach ($_products->getItems() as $_product): ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                     <div class="product-item-info">
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                            <?php echo $block->getImage($_product, 'side_column_widget_product_thumbnail')->toHtml(); ?>
+                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                           title="<?= /* @escapeNotVerified */ $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="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                                   title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
-                                    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                                   title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
+                                    <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                                 </a>
                             </strong>
-                            <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
+                            <?= /* @escapeNotVerified */ $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
                             <div class="product-item-actions">
                                 <div class="actions-primary">
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
-                                            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                            <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                                     class="action tocart primary"
-                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'>
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                    data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'>
+                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                             </button>
                                         <?php else: ?>
                                             <?php
                                                 $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
                                         ?>
-                                            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                            <button type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                                     class="action tocart primary"
-                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
-                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                    data-post='<?= /* @escapeNotVerified */ $postData ?>'>
+                                                <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                             </button>
                                         <?php endif; ?>
                                     <?php else: ?>
                                         <?php if ($_product->getIsSalable()): ?>
-                                            <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                                                <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+                                            <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                                                <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
                                             </div>
                                         <?php else: ?>
-                                            <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                                                <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+                                            <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                                                <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
                                             </div>
                                         <?php endif; ?>
                                     <?php endif; ?>
@@ -66,10 +66,10 @@
                             </div>
                         </div>
                     </div>
-                    <?php echo($iterator == count($_products->getItems())+1) ? '</li>' : '' ?>
+                    <?= ($iterator == count($_products->getItems())+1) ? '</li>' : '' ?>
                 <?php endforeach; ?>
             </ol>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?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 acd859ec81213..2c40f9f7d63dc 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
@@ -10,22 +10,22 @@
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
     <div class="block widget block-new-products-images">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
+            <ol id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
                 <?php foreach ($_products->getItems() as $_product): ?>
                     <li class="product-item">
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
+                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                           title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
                             <?php /* new_products_images_only_widget */ ?>
-                            <?php echo $block->getImage($_product, 'new_products_images_only_widget')->toHtml(); ?>
+                            <?= $block->getImage($_product, 'new_products_images_only_widget')->toHtml() ?>
                         </a>
                     </li>
                 <?php endforeach; ?>
             </ol>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif; ?>
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 f483fdbe1a899..c0fb12df91137 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
@@ -10,24 +10,24 @@
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
     <div class="block widget block-new-products-names">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-names">
+            <ol id="widget-new-products-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
                 <?php foreach ($_products->getItems() as $_product): ?>
                     <li class="product-item">
                         <strong class="product-item-name">
-                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)"
+                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)"
                                class="product-item-link">
-                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
                     </li>
                 <?php endforeach; ?>
             </ol>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif; ?>
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 3c38623ebb987..e600a571b5b30 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
@@ -31,27 +31,27 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-new-products <?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
                                        class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php
@@ -59,7 +59,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                 ?>
 
                                 <?php if ($templateType): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
@@ -69,9 +69,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -79,16 +79,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -97,18 +97,18 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -117,11 +117,11 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
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 a84c9c2052052..c83140d9342ce 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
@@ -32,33 +32,33 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-new-products <?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-new-products <?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
                                        class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php echo $block->getProductPriceHtml($_item, $type); ?>
+                                <?= $block->getProductPriceHtml($_item, $type) ?>
 
                                 <?php if ($templateType): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
@@ -68,9 +68,9 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl":{"url":"<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -78,16 +78,16 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -96,18 +96,18 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
                                                     <a href="#" class="action tocompare"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'>
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>"
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'>
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -116,19 +116,19 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                 <?php endif; ?>
                                 <?php if ($description):?>
                                     <div class="product-item-description">
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                           class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
index b8edebb82bbe9..8e0dbf1278ed2 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
@@ -12,6 +12,6 @@
 ?>
 <?php if ($block->getProductQtyIncrements()) : ?>
     <div class="product pricing">
-        <?php /* @escapeNotVerified */ echo __('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements()) ?>
+        <?= /* @escapeNotVerified */ __('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements()) ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
index c77271f2f137a..481ed1297a801 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/composite.phtml
@@ -13,21 +13,21 @@
 <?php if ($block->isMsgVisible()): ?>
     <div class="availability only">
         <a href="#"
-           data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?php /* @escapeNotVerified */ echo $block->getDetailsPlaceholderId() ?>"}}'
-           id="<?php /* @escapeNotVerified */ echo $block->getPlaceholderId() ?>"
-           title="<?php /* @escapeNotVerified */ echo __('Only %1 left', ($block->getStockQtyLeft())) ?>"
+           data-mage-init='{"toggleAdvanced": {"selectorsToggleClass": "active", "baseToggleClass": "expanded", "toggleContainers": "#<?= /* @escapeNotVerified */ $block->getDetailsPlaceholderId() ?>"}}'
+           id="<?= /* @escapeNotVerified */ $block->getPlaceholderId() ?>"
+           title="<?= /* @escapeNotVerified */ __('Only %1 left', ($block->getStockQtyLeft())) ?>"
            class="action show">
-            <?php /* @escapeNotVerified */ echo __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
+            <?= /* @escapeNotVerified */ __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
         </a>
     </div>
-    <div class="availability only detailed" id="<?php /* @escapeNotVerified */ echo $block->getDetailsPlaceholderId() ?>">
+    <div class="availability only detailed" id="<?= /* @escapeNotVerified */ $block->getDetailsPlaceholderId() ?>">
         <div class="table-wrapper">
             <table class="data table">
-                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Product availability'); ?></caption>
+                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Product availability') ?></caption>
                 <thead>
                 <tr>
-                    <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                    <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                    <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                    <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -35,8 +35,8 @@
                     <?php $childProductStockQty = $block->getProductStockQty($childProduct); ?>
                     <?php if ($childProductStockQty > 0) : ?>
                         <tr>
-                            <td data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>" class="col item"><?php /* @escapeNotVerified */ echo $childProduct->getName() ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Qty')); ?>" class="col qty"><?php /* @escapeNotVerified */ echo $childProductStockQty ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item"><?= /* @escapeNotVerified */ $childProduct->getName() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty"><?= /* @escapeNotVerified */ $childProductStockQty ?></td>
                         </tr>
                     <?php endif ?>
                 <?php endforeach ?>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
index c33ede8087198..43fb697de2621 100644
--- a/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
+++ b/app/code/Magento/CatalogInventory/view/frontend/templates/stockqty/default.phtml
@@ -11,7 +11,7 @@
  */
 ?>
 <?php if ($block->isMsgVisible()): ?>
-    <div class="availability only" title="<?php /* @escapeNotVerified */ echo __('Only %1 left', ($block->getStockQtyLeft())) ?>">
-        <?php /* @escapeNotVerified */ echo __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
+    <div class="availability only" title="<?= /* @escapeNotVerified */ __('Only %1 left', ($block->getStockQtyLeft())) ?>">
+        <?= /* @escapeNotVerified */ __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
index 0f8144dd4629e..1798b1112426c 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
@@ -11,16 +11,16 @@
 <?php $_element = $block->getElement() ?>
 <?php $_jsObjectName = $block->getFieldSetId() != null ? $block->getFieldSetId() : $_element->getHtmlId() ?>
 <div class="rule-tree">
-    <fieldset id="<?php /* @escapeNotVerified */ echo $_jsObjectName ?>" <?php /* @escapeNotVerified */ echo $_element->serialize(['class']) ?> class="fieldset">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo $_element->getLegend() ?></span></legend>
+    <fieldset id="<?= /* @escapeNotVerified */ $_jsObjectName ?>" <?= /* @escapeNotVerified */ $_element->serialize(['class']) ?> class="fieldset">
+        <legend class="legend"><span><?= /* @escapeNotVerified */ $_element->getLegend() ?></span></legend>
         <br>
     <?php if ($_element->getComment()): ?>
         <div class="messages">
-            <div class="message message-notice"><?php echo $block->escapeHtml($_element->getComment()) ?></div>
+            <div class="message message-notice"><?= $block->escapeHtml($_element->getComment()) ?></div>
         </div>
     <?php endif; ?>
     <div class="rule-tree-wrapper">
-        <?php echo $_element->getChildrenHtml() ?>
+        <?= $_element->getChildrenHtml() ?>
     </div>
     </fieldset>
 </div>
@@ -30,9 +30,9 @@ require([
     "prototype"
 ], function(VarienRulesForm){
 
-window.<?php /* @escapeNotVerified */ echo $_jsObjectName ?> = new VarienRulesForm('<?php /* @escapeNotVerified */ echo $_jsObjectName ?>', '<?php /* @escapeNotVerified */ echo $block->getNewChildUrl() ?>');
+window.<?= /* @escapeNotVerified */ $_jsObjectName ?> = new VarienRulesForm('<?= /* @escapeNotVerified */ $_jsObjectName ?>', '<?= /* @escapeNotVerified */ $block->getNewChildUrl() ?>');
 <?php if ($_element->getReadonly()): ?>
-    <?php echo $_element->getHtmlId() ?>.setReadonly(true);
+    <?= $_element->getHtmlId() ?>.setReadonly(true);
 <?php endif; ?>
 
 });
diff --git a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
index 43f7629b50210..1572c8f0d4e48 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/form.phtml
@@ -8,6 +8,6 @@
 
 ?>
 <div class="entry-edit rule-tree">
-<?php echo $block->getFormHtml() ?>
+<?= $block->getFormHtml() ?>
 </div>
 
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
index a6564f7cd2fec..53a301022873b 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -15,14 +15,14 @@
  */
 ?>
 <?php $maxQueryLength = $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<form class="form search advanced" action="<?php /* @escapeNotVerified */ echo $block->getSearchPostUrl() ?>" method="get" id="form-validate">
+<form class="form search advanced" action="<?= /* @escapeNotVerified */ $block->getSearchPostUrl() ?>" method="get" id="form-validate">
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Search Settings') ?></span></legend><br />
+    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Search Settings') ?></span></legend><br />
     <?php foreach ($block->getSearchableAttributes() as $_attribute): ?>
     <?php $_code = $_attribute->getAttributeCode() ?>
-        <div class="field <?php /* @escapeNotVerified */ echo $_code ?>">
-            <label class="label" for="<?php /* @escapeNotVerified */ echo $_code ?>">
-                <span><?php echo $block->escapeHtml(__($block->getAttributeLabel($_attribute))) ?></span>
+        <div class="field <?= /* @escapeNotVerified */ $_code ?>">
+            <label class="label" for="<?= /* @escapeNotVerified */ $_code ?>">
+                <span><?= $block->escapeHtml(__($block->getAttributeLabel($_attribute))) ?></span>
             </label>
             <div class="control">
             <?php switch ($block->getAttributeInputType($_attribute)):
@@ -31,25 +31,25 @@
                     <div class="field no-label">
                         <div class="control">
                             <input type="text"
-                                   name="<?php /* @escapeNotVerified */ echo $_code ?>[from]"
-                                   value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
-                                   id="<?php /* @escapeNotVerified */ echo $_code ?>"
-                                   title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
+                                   name="<?= /* @escapeNotVerified */ $_code ?>[from]"
+                                   value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
+                                   id="<?= /* @escapeNotVerified */ $_code ?>"
+                                   title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
-                                   maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>_to'}" />
+                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>_to'}" />
                         </div>
                     </div>
                     <div class="field no-label">
                         <div class="control">
                             <input type="text"
-                                   name="<?php /* @escapeNotVerified */ echo $_code ?>[to]"
-                                   value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
-                                   id="<?php /* @escapeNotVerified */ echo $_code ?>_to"
-                                   title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
+                                   name="<?= /* @escapeNotVerified */ $_code ?>[to]"
+                                   value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
+                                   id="<?= /* @escapeNotVerified */ $_code ?>_to"
+                                   title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
-                                   maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
-                                   data-validate="{number:true, 'greater-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>'}" />
+                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
+                                   data-validate="{number:true, 'greater-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>'}" />
                         </div>
                     </div>
                 </div>
@@ -58,30 +58,30 @@
                 <div class="range price fields group group-2">
                     <div class="field no-label">
                         <div class="control">
-                            <input name="<?php /* @escapeNotVerified */ echo $_code ?>[from]"
-                                   value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
-                                   id="<?php /* @escapeNotVerified */ echo $_code ?>"
-                                   title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
+                            <input name="<?= /* @escapeNotVerified */ $_code ?>[from]"
+                                   value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
+                                   id="<?= /* @escapeNotVerified */ $_code ?>"
+                                   title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
                                    type="text"
-                                   maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>_to'}" />
+                                   maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>_to'}" />
                         </div>
                     </div>
                     <div class="field with-addon no-label">
                         <div class="control">
                             <div class="addon">
-                                <input name="<?php /* @escapeNotVerified */ echo $_code ?>[to]"
-                                       value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
-                                       id="<?php /* @escapeNotVerified */ echo $_code ?>_to"
-                                       title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
+                                <input name="<?= /* @escapeNotVerified */ $_code ?>[to]"
+                                       value="<?= $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
+                                       id="<?= /* @escapeNotVerified */ $_code ?>_to"
+                                       title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                        class="input-text"
                                        type="text"
-                                       maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
-                                       data-validate="{number:true, 'greater-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>'}" />
+                                       maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>"
+                                       data-validate="{number:true, 'greater-than-equals-to':'#<?= /* @escapeNotVerified */ $_code ?>'}" />
                                 <label class="addafter"
-                                       for="<?php /* @escapeNotVerified */ echo $_code ?>_to">
-                                    <?php /* @escapeNotVerified */ echo $block->getCurrency($_attribute); ?>
+                                       for="<?= /* @escapeNotVerified */ $_code ?>_to">
+                                    <?= /* @escapeNotVerified */ $block->getCurrency($_attribute) ?>
                                 </label>
                             </div>
                         </div>
@@ -89,33 +89,33 @@
                 </div>
                 <?php break;
                 case 'select': ?>
-                    <?php /* @escapeNotVerified */ echo $block->getAttributeSelectElement($_attribute) ?>
+                    <?= /* @escapeNotVerified */ $block->getAttributeSelectElement($_attribute) ?>
                 <?php break;
                 case 'yesno': ?>
-                    <?php /* @escapeNotVerified */ echo $block->getAttributeYesNoElement($_attribute) ?>
+                    <?= /* @escapeNotVerified */ $block->getAttributeYesNoElement($_attribute) ?>
                 <?php break;
                 case 'date': ?>
                 <div class="range dates fields group group-2">
                     <div class="field date no-label">
                         <div class="control">
-                            <?php /* @escapeNotVerified */ echo $block->getDateInput($_attribute, 'from') ?>
+                            <?= /* @escapeNotVerified */ $block->getDateInput($_attribute, 'from') ?>
                         </div>
                     </div>
                     <div class="field date no-label">
                         <div class="control">
-                            <?php /* @escapeNotVerified */ echo $block->getDateInput($_attribute, 'to') ?>
+                            <?= /* @escapeNotVerified */ $block->getDateInput($_attribute, 'to') ?>
                         </div>
                     </div>
                 </div>
                 <?php break;
                 default: ?>
                 <input type="text"
-                       name="<?php /* @escapeNotVerified */ echo $_code ?>"
-                       id="<?php /* @escapeNotVerified */ echo $_code ?>"
-                       value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute)) ?>"
-                       title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
-                       class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass($_attribute) ?>"
-                       maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>" />
+                       name="<?= /* @escapeNotVerified */ $_code ?>"
+                       id="<?= /* @escapeNotVerified */ $_code ?>"
+                       value="<?= $block->escapeHtml($block->getAttributeValue($_attribute)) ?>"
+                       title="<?= $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
+                       class="input-text <?= /* @escapeNotVerified */ $block->getAttributeValidationClass($_attribute) ?>"
+                       maxlength="<?= /* @escapeNotVerified */ $maxQueryLength ?>" />
             <?php endswitch; ?>
             </div>
         </div>
@@ -125,8 +125,8 @@
   <div class="primary">
     <button type="submit"
             class="action search primary"
-            title="<?php echo $block->escapeHtml(__('Search')) ?>">
-        <span><?php /* @escapeNotVerified */ echo __('Search') ?></span>
+            title="<?= $block->escapeHtml(__('Search')) ?>">
+        <span><?= /* @escapeNotVerified */ __('Search') ?></span>
     </button>
   </div>
 </div>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
index e9532146daeb5..09098b1ccd003 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/link.phtml
@@ -10,7 +10,7 @@
 $helper = $this->helper('Magento\CatalogSearch\Helper\Data');
 ?>
 <div class="nested">
-    <a class="action advanced" href="<?php /* @escapeNotVerified */ echo $helper->getAdvancedSearchUrl(); ?>" data-action="advanced-search">
-        <?php /* @escapeNotVerified */ echo __('Advanced Search'); ?>
+    <a class="action advanced" href="<?= /* @escapeNotVerified */ $helper->getAdvancedSearchUrl() ?>" data-action="advanced-search">
+        <?= /* @escapeNotVerified */ __('Advanced Search') ?>
     </a>
 </div>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
index e5ca39f29f1bd..83808df5b95e4 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/result.phtml
@@ -15,15 +15,15 @@
 <?php if ($results = $block->getResultCount()): ?>
     <div class="search found">
         <?php if ($results == 1) : ?>
-            <?php /* @escapeNotVerified */ echo __('<strong>%1 item</strong> were found using the following search criteria', $results); ?>
+            <?= /* @escapeNotVerified */ __('<strong>%1 item</strong> were found using the following search criteria', $results) ?>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo __('<strong>%1 items</strong> were found using the following search criteria', $results); ?>
+            <?= /* @escapeNotVerified */ __('<strong>%1 items</strong> were found using the following search criteria', $results) ?>
         <?php endif; ?>
     </div>
 <?php else: ?>
     <div role="alert" class="message error">
         <div>
-            <?php /* @escapeNotVerified */ echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
+            <?= /* @escapeNotVerified */ __('We can\'t find any items matching these search criteria.') ?> <a href="<?= /* @escapeNotVerified */ $block->getFormUrl() ?>"><?= /* @escapeNotVerified */ __('Modify your search.') ?></a>
         </div>
     </div>
 <?php endif; ?>
@@ -34,7 +34,7 @@
         <?php if (@$searchCriterias[$side]): ?>
             <ul class="items">
                 <?php foreach ($searchCriterias[$side] as $criteria): ?>
-                    <li class="item"><strong><?php echo $block->escapeHtml(__($criteria['name'])); ?>:</strong> <?php echo $block->escapeHtml($criteria['value']); ?></li>
+                    <li class="item"><strong><?= $block->escapeHtml(__($criteria['name'])) ?>:</strong> <?= $block->escapeHtml($criteria['value']) ?></li>
                 <?php endforeach; ?>
             </ul>
         <?php endif; ?>
@@ -43,12 +43,12 @@
 <?php if ($block->getResultCount()): ?>
     <div class="message notice">
         <div>
-            <?php /* @escapeNotVerified */ echo __("Don't see what you're looking for?"); ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getFormUrl(); ?>"><?php /* @escapeNotVerified */ echo __('Modify your search.'); ?></a>
+            <?= /* @escapeNotVerified */ __("Don't see what you're looking for?") ?>
+            <a href="<?= /* @escapeNotVerified */ $block->getFormUrl() ?>"><?= /* @escapeNotVerified */ __('Modify your search.') ?></a>
         </div>
     </div>
 <?php endif; ?>
 <?php if ($block->getResultCount()): ?>
-    <div class="search results"><?php echo $block->getProductListHtml() ?></div>
+    <div class="search results"><?= $block->getProductListHtml() ?></div>
 <?php endif; ?>
 <?php $block->getSearchCriterias(); ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
index fe5af014cd9b6..2757ae3b5f7ed 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
@@ -8,28 +8,28 @@
 
 ?>
 <?php if ($block->getResultCount()): ?>
-<?php echo $block->getChildHtml('tagged_product_list_rss_link'); ?>
+<?= $block->getChildHtml('tagged_product_list_rss_link') ?>
 <div class="search results">
     <?php if ($messages = $block->getNoteMessages()):?>
     <div class="message notice">
         <div>
             <?php foreach ($messages as $message):?>
-                <?php /* @escapeNotVerified */ echo $message?><br />
+                <?= /* @escapeNotVerified */ $message ?><br />
             <?php endforeach;?>
         </div>
     </div>
     <?php endif; ?>
-    <?php echo $block->getProductListHtml() ?>
+    <?= $block->getProductListHtml() ?>
 </div>
 <?php else: ?>
 
 <div class="message notice">
     <div>
-        <?php /* @escapeNotVerified */ echo($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?>
-        <?php echo $block->getAdditionalHtml() ?>
+        <?= /* @escapeNotVerified */ ($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?>
+        <?= $block->getAdditionalHtml() ?>
         <?php if ($messages = $block->getNoteMessages()):?>
             <?php foreach ($messages as $message):?>
-                <br /><?php /* @escapeNotVerified */ echo $message?>
+                <br /><?= /* @escapeNotVerified */ $message ?>
             <?php endforeach;?>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
index 7bb4875465dbf..d40cc3dc6d9ba 100644
--- a/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
+++ b/app/code/Magento/CatalogWidget/view/adminhtml/templates/product/widget/conditions.phtml
@@ -16,12 +16,12 @@ $fieldClass .= $element->getRequired() ? ' required' : '';
 $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     . $block->getUiId('form-field', $block->escapeHtmlAttr($element->getId()));
 ?>
-<div<?php /* @noEscape */ echo $fieldAttributes ?>>
-    <?php echo $element->getLabelHtml() ?>
+<div<?= /* @noEscape */ $fieldAttributes ?>>
+    <?= $element->getLabelHtml() ?>
     <div class="control admin__field-control">
         <div class="rule-tree">
             <div class="rule-tree-wrapper">
-                <?php echo $block->getInputHtml() ?>
+                <?= $block->getInputHtml() ?>
             </div>
         </div>
     </div>
@@ -33,6 +33,6 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
         "Magento_Rule/rules",
         "prototype"
     ], function(VarienRulesForm){
-        window.<?php echo $block->escapeJs($block->getHtmlId()) ?> = new VarienRulesForm('<?php echo $block->escapeJs($block->getHtmlId()) ?>', '<?php echo $block->escapeUrl($block->getNewChildUrl()) ?>');
+        window.<?= $block->escapeJs($block->getHtmlId()) ?> = new VarienRulesForm('<?= $block->escapeJs($block->getHtmlId()) ?>', '<?= $block->escapeUrl($block->getNewChildUrl()) ?>');
     });
 </script>
diff --git a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
index 39094d32862d3..201d6ffe4c683 100644
--- a/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
+++ b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -23,30 +23,30 @@
     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
     $description = false;
 ?>
-    <div class="block widget block-products-list <?php /* @noEscape */ echo $mode; ?>">
+    <div class="block widget block-products-list <?= /* @noEscape */ $mode ?>">
         <?php if ($block->getTitle()): ?>
         <div class="block-title">
-            <strong><?php echo $block->escapeHtml(__($block->getTitle())); ?></strong>
+            <strong><?= $block->escapeHtml(__($block->getTitle())) ?></strong>
         </div>
         <?php endif ?>
         <div class="block-content">
-            <?php /* @noEscape */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @noEscape */ echo $mode; ?> <?php /* @noEscape */ echo $mode; ?>">
-                <ol class="product-items <?php /* @noEscape */ echo $type; ?>">
+            <?= /* @noEscape */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @noEscape */ $mode ?> <?= /* @noEscape */ $mode ?>">
+                <ol class="product-items <?= /* @noEscape */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
                         <?php if ($iterator++ != 1): ?></li><?php endif ?>
                         <li class="product-item">
                         <div class="product-item-info">
-                            <a href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php echo $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
                                        class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php
@@ -54,7 +54,7 @@
                                 ?>
 
                                 <?php if ($templateType): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
 
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
@@ -63,23 +63,23 @@
                                             <div class="actions-primary">
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?php echo $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                        <button class="action tocart primary" data-mage-init='{"redirectUrl":{"url":"<?= $block->escapeUrl($block->getAddToCartUrl($_item)) ?>"}}' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
                                                             $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
-                                                        <button class="action tocart primary" data-post='<?php /* @noEscape */ echo $postData; ?>' type="button" title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>">
-                                                            <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                        <button class="action tocart primary" data-post='<?= /* @noEscape */ $postData ?>' type="button" title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>">
+                                                            <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo $block->escapeHtml(__('In stock')) ?></span></div>
+                                                        <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                        <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -88,14 +88,14 @@
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist" title="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                        <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                                       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
-                                                    <a href="#" class="action tocompare" data-post='<?php /* @noEscape */ echo $compareHelper->getPostDataParams($_item);?>' title="<?php echo $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                        <span><?php echo $block->escapeHtml(__('Add to Compare')) ?></span>
+                                                    <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                        <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -104,11 +104,11 @@
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
index c2526301cf6c0..e2bcd76cba35b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/button.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
@@ -10,6 +10,6 @@
 <?php /** @var $block \Magento\Checkout\Block\Onepage\Success */ ?>
 
 <?php if ($block->getCanViewOrder() && $block->getCanPrintOrder()) :?>
-    <?php /* @escapeNotVerified */ echo __('<a href="%1" onclick="this.target=\'_blank\'" class="print">Print receipt</a>', $block->getPrintUrl()) ?>
-    <?php echo $block->getChildHtml() ?>
+    <?= /* @escapeNotVerified */ __('<a href="%1" onclick="this.target=\'_blank\'" class="print">Print receipt</a>', $block->getPrintUrl()) ?>
+    <?= $block->getChildHtml() ?>
 <?php endif;?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
index 954eb67c81800..b224c96f07e9b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -9,34 +9,34 @@
 ?>
 <div class="block discount" id="block-discount" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
     <div class="title" data-role="title">
-        <strong id="block-discount-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Apply Discount Code') ?></strong>
+        <strong id="block-discount-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Apply Discount Code') ?></strong>
     </div>
     <div class="content" data-role="content" aria-labelledby="block-discount-heading">
         <form id="discount-coupon-form"
-              action="<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart/couponPost') ?>"
+              action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/couponPost') ?>"
               method="post"
               data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
                                                "removeCouponSelector": "#remove-coupon",
                                                "applyButton": "button.action.apply",
                                                "cancelButton": "button.action.cancel"}}'>
-            <div class="fieldset coupon<?php echo strlen($block->getCouponCode()) ? ' applied' : ''?>">
+            <div class="fieldset coupon<?= strlen($block->getCouponCode()) ? ' applied' : '' ?>">
                 <input type="hidden" name="remove" id="remove-coupon" value="0" />
                 <div class="field">
-                    <label for="coupon_code" class="label"><span><?php /* @escapeNotVerified */ echo __('Enter discount code') ?></span></label>
+                    <label for="coupon_code" class="label"><span><?= /* @escapeNotVerified */ __('Enter discount code') ?></span></label>
                     <div class="control">
-                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?php echo $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?php echo $block->escapeHtml(__('Enter discount code'));?>" />
+                        <input type="text" class="input-text" id="coupon_code" name="coupon_code" value="<?= $block->escapeHtml($block->getCouponCode()) ?>" placeholder="<?= $block->escapeHtml(__('Enter discount code')) ?>" />
                     </div>
                 </div>
                 <div class="actions-toolbar">
                     <?php if (!strlen($block->getCouponCode())): ?>
                     <div class="primary">
-                        <button class="action apply primary" type="button" value="<?php /* @escapeNotVerified */ echo __('Apply Discount') ?>">
-                            <span><?php /* @escapeNotVerified */ echo __('Apply Discount') ?></span>
+                        <button class="action apply primary" type="button" value="<?= /* @escapeNotVerified */ __('Apply Discount') ?>">
+                            <span><?= /* @escapeNotVerified */ __('Apply Discount') ?></span>
                         </button>
                     </div>
                     <?php else: ?>
                         <div class="primary">
-                            <button  type="button" class="action cancel primary" value="<?php /* @escapeNotVerified */ echo __('Cancel Coupon') ?>"><span><?php /* @escapeNotVerified */ echo __('Cancel Coupon') ?></span></button>
+                            <button  type="button" class="action cancel primary" value="<?= /* @escapeNotVerified */ __('Cancel Coupon') ?>"><span><?= /* @escapeNotVerified */ __('Cancel Coupon') ?></span></button>
                         </div>
                     <?php endif; ?>
                 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
index 1167e901c8c1b..4940cd7f26747 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -9,65 +9,65 @@
 /**  @var $block \Magento\Checkout\Block\Cart\Grid */
 ?>
 <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
-<?php echo $block->getChildHtml('form_before') ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart/updatePost') ?>"
+<?= $block->getChildHtml('form_before') ?>
+<form action="<?= /* @escapeNotVerified */ $block->getUrl('checkout/cart/updatePost') ?>"
           method="post"
           id="form-validate"
           data-mage-init='{"validation":{}}'
           class="form form-cart">
-    <?php echo $block->getBlockHtml('formkey'); ?>
-    <div class="cart table-wrapper<?php echo $mergedCells == 2 ? ' detailed' : ''; ?>">
+    <?= $block->getBlockHtml('formkey') ?>
+    <div class="cart table-wrapper<?= $mergedCells == 2 ? ' detailed' : '' ?>">
         <?php if ($block->getPagerHtml()): ?>
-            <div class="cart-products-toolbar cart-products-toolbar-top toolbar" data-attribute="cart-products-toolbar-top"><?php echo $block->getPagerHtml(); ?></div>
+            <div class="cart-products-toolbar cart-products-toolbar-top toolbar" data-attribute="cart-products-toolbar-top"><?= $block->getPagerHtml() ?></div>
         <?php endif ?>
         <table id="shopping-cart-table"
                class="cart items data table"
                data-mage-init='{"shoppingCart":{"emptyCartButton": "action.clear",
                "updateCartActionContainer": "#update_cart_action_container"}}'>
-            <caption role="heading" aria-level="2" class="table-caption"><?php /* @escapeNotVerified */ echo __('Shopping Cart Items') ?></caption>
+            <caption role="heading" aria-level="2" class="table-caption"><?= /* @escapeNotVerified */ __('Shopping Cart Items') ?></caption>
             <thead>
                 <tr>
-                    <th class="col item" scope="col"><span><?php /* @escapeNotVerified */ echo __('Item') ?></span></th>
-                    <th class="col price" scope="col"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                    <th class="col qty" scope="col"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
-                    <th class="col subtotal" scope="col"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
+                    <th class="col item" scope="col"><span><?= /* @escapeNotVerified */ __('Item') ?></span></th>
+                    <th class="col price" scope="col"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                    <th class="col qty" scope="col"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                    <th class="col subtotal" scope="col"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
                 </tr>
             </thead>
             <?php foreach ($block->getItems() as $_item): ?>
-                <?php echo $block->getItemHtml($_item) ?>
+                <?= $block->getItemHtml($_item) ?>
             <?php endforeach ?>
         </table>
         <?php if ($block->getPagerHtml()): ?>
-            <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar" data-attribute="cart-products-toolbar-bottom"><?php echo $block->getPagerHtml(); ?></div>
+            <div class="cart-products-toolbar cart-products-toolbar-bottom toolbar" data-attribute="cart-products-toolbar-bottom"><?= $block->getPagerHtml() ?></div>
         <?php endif ?>
     </div>
     <div class="cart main actions">
         <?php if ($block->getContinueShoppingUrl()): ?>
             <a class="action continue"
-               href="<?php echo $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
-               title="<?php echo $block->escapeHtml(__('Continue Shopping')); ?>">
-                <span><?php /* @escapeNotVerified */ echo __('Continue Shopping') ?></span>
+               href="<?= $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
+               title="<?= $block->escapeHtml(__('Continue Shopping')) ?>">
+                <span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span>
             </a>
         <?php endif; ?>
         <button type="submit"
                 name="update_cart_action"
                 data-cart-empty=""
                 value="empty_cart"
-                title="<?php echo $block->escapeHtml(__('Clear Shopping Cart')); ?>"
+                title="<?= $block->escapeHtml(__('Clear Shopping Cart')) ?>"
                 class="action clear" id="empty_cart_button">
-            <span><?php /* @escapeNotVerified */ echo __('Clear Shopping Cart'); ?></span>
+            <span><?= /* @escapeNotVerified */ __('Clear Shopping Cart') ?></span>
         </button>
         <button type="submit"
                 name="update_cart_action"
                 data-cart-item-update=""
                 value="update_qty"
-                title="<?php echo $block->escapeHtml(__('Update Shopping Cart')); ?>"
+                title="<?= $block->escapeHtml(__('Update Shopping Cart')) ?>"
                 class="action update">
-            <span><?php /* @escapeNotVerified */ echo __('Update Shopping Cart'); ?></span>
+            <span><?= /* @escapeNotVerified */ __('Update Shopping Cart') ?></span>
         </button>
         <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
     </div>
 </form>
-<?php echo $block->getChildHtml('checkout.cart.order.actions') ?>
-<?php echo $block->getChildHtml('shopping.cart.table.after'); ?>
+<?= $block->getChildHtml('checkout.cart.order.actions') ?>
+<?= $block->getChildHtml('shopping.cart.table.after') ?>
 
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
index 9e7a3b7366abb..b41d548e95b99 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml
@@ -15,13 +15,13 @@
         <fieldset class="fieldset">
             <?php if ($block->shouldRenderQuantity()): ?>
             <div class="field qty">
-                <label class="label" for="qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
+                <label class="label" for="qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></label>
                 <div class="control">
                     <input type="number"
                            name="qty"
                            id="qty"
                            value=""
-                           title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+                           title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                            class="input-text qty"
                            data-validate="{'required-number':true,digits:true}"/>
                 </div>
@@ -29,12 +29,12 @@
             <?php endif; ?>
             <div class="actions">
                 <button type="submit"
-                        title="<?php /* @escapeNotVerified */ echo $buttonTitle ?>"
+                        title="<?= /* @escapeNotVerified */ $buttonTitle ?>"
                         class="action primary tocart"
                         id="product-updatecart-button">
-                    <span><?php /* @escapeNotVerified */ echo $buttonTitle ?></span>
+                    <span><?= /* @escapeNotVerified */ $buttonTitle ?></span>
                 </button>
-                <?php echo $block->getChildHtml('', true) ?>
+                <?= $block->getChildHtml('', true) ?>
             </div>
         </fieldset>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
index 405adb0c8c67f..02c969f849074 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml
@@ -17,16 +17,16 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
 ?>
 <tbody class="cart item">
     <tr class="item-info">
-        <td data-th="<?php echo $block->escapeHtml(__('Item')); ?>" class="col item">
+        <td data-th="<?= $block->escapeHtml(__('Item')) ?>" class="col item">
             <?php if ($block->hasProductUrl()):?>
-                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"
-                   title="<?php echo $block->escapeHtml($block->getProductName()) ?>"
+                <a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"
+                   title="<?= $block->escapeHtml($block->getProductName()) ?>"
                    tabindex="-1"
                    class="product-item-photo">
             <?php else:?>
                 <span class="product-item-photo">
             <?php endif;?>
-            <?php echo $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?>
+            <?= $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?>
             <?php if ($block->hasProductUrl()):?>
                 </a>
             <?php else: ?>
@@ -35,21 +35,21 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
             <div class="product-item-details">
                 <strong class="product-item-name">
                     <?php if ($block->hasProductUrl()):?>
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a>
+                        <a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a>
                     <?php else: ?>
-                        <?php echo $block->escapeHtml($block->getProductName()) ?>
+                        <?= $block->escapeHtml($block->getProductName()) ?>
                     <?php endif; ?>
                 </strong>
                 <?php if ($_options = $block->getOptionList()):?>
                     <dl class="item-options">
                         <?php foreach ($_options as $_option) : ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                             <dd>
                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
+                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
                                 <?php else: ?>
-                                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>
@@ -57,44 +57,44 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                 <?php endif;?>
                 <?php if ($messages = $block->getMessages()): ?>
                     <?php foreach ($messages as $message): ?>
-                        <div class="cart item message <?php /* @escapeNotVerified */ echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div>
+                        <div class="cart item message <?= /* @escapeNotVerified */ $message['type'] ?>"><div><?= $block->escapeHtml($message['text']) ?></div></div>
                     <?php endforeach; ?>
                 <?php endif; ?>
                 <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
                 <?php if ($addInfoBlock): ?>
-                    <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
+                    <?= $addInfoBlock->setItem($_item)->toHtml() ?>
                 <?php endif;?>
             </div>
         </td>
 
         <?php if ($canApplyMsrp): ?>
-            <td class="col msrp" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
+            <td class="col msrp" data-th="<?= $block->escapeHtml(__('Price')) ?>">
                 <span class="pricing msrp">
-                    <span class="msrp notice"><?php /* @escapeNotVerified */ echo __('See price before order confirmation.'); ?></span>
+                    <span class="msrp notice"><?= /* @escapeNotVerified */ __('See price before order confirmation.') ?></span>
                     <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
-                    <a href="#" class="action help map" id="<?php /* @escapeNotVerified */ echo($helpLinkId); ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php /* @escapeNotVerified */ echo $helpLinkId;?>","productName": "<?php /* @escapeNotVerified */ echo $product->getName(); ?>","showAddToCart": false}}'>
-                        <span><?php /* @escapeNotVerified */ echo __("What's this?"); ?></span>
+                    <a href="#" class="action help map" id="<?= /* @escapeNotVerified */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @escapeNotVerified */ $helpLinkId ?>","productName": "<?= /* @escapeNotVerified */ $product->getName() ?>","showAddToCart": false}}'>
+                        <span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
                     </a>
                 </span>
             </td>
         <?php else: ?>
-            <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-                <?php echo $block->getUnitPriceHtml($_item); ?>
+            <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+                <?= $block->getUnitPriceHtml($_item) ?>
             </td>
         <?php endif; ?>
-        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
+        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
             <div class="field qty">
-                <label class="label" for="cart-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-qty">
-                    <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
+                <label class="label" for="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty">
+                    <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
                 </label>
                 <div class="control qty">
-                    <input id="cart-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-qty"
-                           name="cart[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][qty]"
-                           data-cart-item-id="<?php /* @escapeNotVerified */ echo $_item->getSku() ?>"
-                           value="<?php /* @escapeNotVerified */ echo $block->getQty() ?>"
+                    <input id="cart-<?= /* @escapeNotVerified */ $_item->getId() ?>-qty"
+                           name="cart[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
+                           data-cart-item-id="<?= /* @escapeNotVerified */ $_item->getSku() ?>"
+                           value="<?= /* @escapeNotVerified */ $block->getQty() ?>"
                            type="number"
                            size="4"
-                           title="<?php echo $block->escapeHtml(__('Qty')); ?>"
+                           title="<?= $block->escapeHtml(__('Qty')) ?>"
                            class="input-text qty"
                            data-validate="{required:true,'validate-greater-than-zero':true}"
                            data-role="cart-item-qty"/>
@@ -102,18 +102,18 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
             </div>
         </td>
 
-        <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal'));?>">
+        <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
             <?php if ($canApplyMsrp): ?>
                 <span class="cart msrp subtotal">--</span>
             <?php else: ?>
-                <?php echo $block->getRowTotalHtml($_item); ?>
+                <?= $block->getRowTotalHtml($_item) ?>
             <?php endif; ?>
         </td>
     </tr>
     <tr class="item-actions">
         <td colspan="100">
             <div class="actions-toolbar">
-                <?php /* @escapeNotVerified */ echo $block->getActions($_item) ?>
+                <?= /* @escapeNotVerified */ $block->getActions($_item) ?>
             </div>
         </td>
     </tr>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
index 0de05cc5c1341..d7a625695b476 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/price/sidebar.phtml
@@ -10,6 +10,6 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <div class="price-container">
-    <span class="price-label"><?php /* @escapeNotVerified */ echo __('Price')?></span>
-    <span class="price-wrapper"><?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?></span>
+    <span class="price-label"><?= /* @escapeNotVerified */ __('Price') ?></span>
+    <span class="price-wrapper"><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?></span>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
index fc9b6b5ff941b..1876cf2edb786 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/edit.phtml
@@ -10,10 +10,10 @@
 ?>
 <?php if ($block->isProductVisibleInSiteVisibility()): ?>
     <a class="action action-edit"
-       href="<?php /* @escapeNotVerified */ echo $block->getConfigureUrl() ?>"
-       title="<?php echo $block->escapeHtml(__('Edit item parameters')); ?>">
+       href="<?= /* @escapeNotVerified */ $block->getConfigureUrl() ?>"
+       title="<?= $block->escapeHtml(__('Edit item parameters')) ?>">
         <span>
-            <?php /* @escapeNotVerified */ echo __('Edit') ?>
+            <?= /* @escapeNotVerified */ __('Edit') ?>
         </span>
    </a>
 <?php endif ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
index 80ffa1053315d..445721ca5d0c2 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/item/renderer/actions/remove.phtml
@@ -9,10 +9,10 @@
 /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer\Actions\Remove */
 ?>
 <a href="#"
-   title="<?php echo $block->escapeHtml(__('Remove item')); ?>"
+   title="<?= $block->escapeHtml(__('Remove item')) ?>"
    class="action action-delete"
-   data-post='<?php /* @escapeNotVerified */ echo $block->getDeletePostJson(); ?>'>
+   data-post='<?= /* @escapeNotVerified */ $block->getDeletePostJson() ?>'>
     <span>
-        <?php /* @escapeNotVerified */ echo __('Remove item')?>
+        <?= /* @escapeNotVerified */ __('Remove item') ?>
     </span>
 </a>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
index 6bf8ee6774115..5530f7661bb1b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/methods.phtml
@@ -15,7 +15,7 @@
 <ul class="checkout methods items checkout-methods-items">
 <?php foreach ($methods as $method): ?>
     <?php if ($methodHtml = $block->getMethodHtml($method)): ?>
-    <li class="item"><?php /* @escapeNotVerified */ echo $methodHtml; ?></li>
+    <li class="item"><?= /* @escapeNotVerified */ $methodHtml ?></li>
     <?php endif; ?>
 <?php endforeach; ?>
 </ul>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index 10f6c491349a6..af652e6f556b9 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -10,9 +10,9 @@
 ?>
 
 <div data-block="minicart" class="minicart-wrapper">
-    <a class="action showcart" href="<?php /* @escapeNotVerified */ echo $block->getShoppingCartUrl(); ?>"
+    <a class="action showcart" href="<?= /* @escapeNotVerified */ $block->getShoppingCartUrl() ?>"
        data-bind="scope: 'minicart_content'">
-        <span class="text"><?php /* @escapeNotVerified */ echo __('My Cart'); ?></span>
+        <span class="text"><?= /* @escapeNotVerified */ __('My Cart') ?></span>
         <span class="counter qty empty"
               data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
             <span class="counter-number"><!-- ko text: getCartParam('summary_count') --><!-- /ko --></span>
@@ -39,19 +39,19 @@
             <div id="minicart-content-wrapper" data-bind="scope: 'minicart_content'">
                 <!-- ko template: getTemplate() --><!-- /ko -->
             </div>
-            <?php echo $block->getChildHtml('minicart.addons'); ?>
+            <?= $block->getChildHtml('minicart.addons') ?>
         </div>
     <?php endif ?>
     <script>
-        window.checkout = <?php /* @escapeNotVerified */ echo $block->getSerializedConfig(); ?>;
+        window.checkout = <?= /* @escapeNotVerified */ $block->getSerializedConfig() ?>;
     </script>
     <script type="text/x-magento-init">
     {
         "[data-block='minicart']": {
-            "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+            "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
         },
         "*": {
-            "Magento_Ui/js/block-loader": "<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
+            "Magento_Ui/js/block-loader": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
         }
     }
     </script>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
index ad85b3e8ac16d..1c0c221a550cd 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
@@ -7,9 +7,9 @@
 /**  @var $block \Magento\Checkout\Block\Cart */
 ?>
 <div class="cart-empty">
-    <?php echo $block->getChildHtml('checkout_cart_empty_widget'); ?>
-    <p><?php /* @escapeNotVerified */ echo __('You have no items in your shopping cart.') ?></p>
+    <?= $block->getChildHtml('checkout_cart_empty_widget') ?>
+    <p><?= /* @escapeNotVerified */ __('You have no items in your shopping cart.') ?></p>
     <p><?php /* @escapeNotVerified */ echo __('Click <a href="%1">here</a> to continue shopping.',
             $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
-    <?php echo $block->getChildHtml('shopping.cart.table.after'); ?>
+    <?= $block->getChildHtml('shopping.cart.table.after') ?>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index 7352ae4f2a59d..b5ddb8446ba05 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -12,7 +12,7 @@
 <div id="block-shipping" class="block shipping" data-mage-init='{"collapsible":{"openedState": "active", "saveState": true}}'>
     <div class="title" data-role="title">
         <strong id="block-shipping-heading" role="heading" aria-level="2">
-            <?php /* @escapeNotVerified */ echo $block->getQuote()->isVirtual() ? __('Estimate Tax') : __('Estimate Shipping and Tax') ?>
+            <?= /* @escapeNotVerified */ $block->getQuote()->isVirtual() ? __('Estimate Tax') : __('Estimate Shipping and Tax') ?>
         </strong>
     </div>
     <div id="block-summary" data-bind="scope:'block-summary'" class="content" data-role="content" aria-labelledby="block-shipping-heading">
@@ -20,20 +20,20 @@
         <script type="text/x-magento-init">
             {
                 "#block-summary": {
-                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
                 }
             }
         </script>
         <script>
-            window.checkoutConfig = <?php /* @escapeNotVerified */ echo $block->getSerializedCheckoutConfig(); ?>;
+            window.checkoutConfig = <?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>;
             window.customerData = window.checkoutConfig.customerData;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             require([
                 'mage/url',
                 'Magento_Ui/js/block-loader'
             ], function(url, blockLoader) {
-                blockLoader("<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>");
-                return url.setBaseUrl('<?php /* @escapeNotVerified */ echo $block->getBaseUrl();?>');
+                blockLoader("<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>");
+                return url.setBaseUrl('<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>');
             })
         </script>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
index 37a90b9953ba6..f39b70df98424 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/totals.phtml
@@ -15,7 +15,7 @@
     <script type="text/x-magento-init">
             {
                 "#cart-totals": {
-                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
                 }
             }
     </script>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
index 5901e32305622..37a945b238d30 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/row.phtml
@@ -10,8 +10,8 @@
 
 $_item = $block->getItem();
 ?>
-<span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax'));?>">
+<span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
index 33e706f0fb32f..45a6ef48e36d6 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/item/price/unit.phtml
@@ -10,8 +10,8 @@
 
 $_item = $block->getItem();
 ?>
-<span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+<span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 1592b49e3964f..47a56e8f333bc 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -9,8 +9,8 @@
 <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
     <div id="checkout-loader" data-role="checkout-loader" class="loading-mask" data-mage-init='{"checkoutLoader": {}}'>
         <div class="loader">
-            <img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
-                 alt="<?php /* @escapeNotVerified */ echo __('Loading...'); ?>"
+            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>"
+                 alt="<?= /* @escapeNotVerified */ __('Loading...') ?>"
                  style="position: absolute;">
         </div>
     </div>
@@ -18,12 +18,12 @@
     <script type="text/x-magento-init">
         {
             "#checkout": {
-                "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+                "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
             }
         }
     </script>
     <script>
-        window.checkoutConfig = <?php /* @escapeNotVerified */ echo $block->getSerializedCheckoutConfig(); ?>;
+        window.checkoutConfig = <?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>;
         // Create aliases for customer.js model from customer module
         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
         window.customerData = window.checkoutConfig.customerData;
@@ -33,8 +33,8 @@
             'mage/url',
             'Magento_Ui/js/block-loader'
         ], function(url, blockLoader) {
-            blockLoader("<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>");
-            return url.setBaseUrl('<?php /* @escapeNotVerified */ echo $block->getBaseUrl();?>');
+            blockLoader("<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>");
+            return url.setBaseUrl('<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>');
         })
     </script>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
index 0ab7fa0752c0e..43791ef496745 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/failure.phtml
@@ -7,6 +7,6 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php if ($block->getRealOrderId()) : ?><p><?php /* @escapeNotVerified */ echo __('Order #') . $block->getRealOrderId() ?></p><?php endif ?>
-<?php if ($error = $block->getErrorMessage()) : ?><p><?php /* @escapeNotVerified */ echo $error ?></p><?php endif ?>
-<p><?php /* @escapeNotVerified */ echo __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
+<?php if ($block->getRealOrderId()) : ?><p><?= /* @escapeNotVerified */ __('Order #') . $block->getRealOrderId() ?></p><?php endif ?>
+<?php if ($error = $block->getErrorMessage()) : ?><p><?= /* @escapeNotVerified */ $error ?></p><?php endif ?>
+<p><?= /* @escapeNotVerified */ __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
index d9a71e0c2b5a4..53a1fe8783509 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/link.phtml
@@ -9,10 +9,10 @@
 <?php if ($block->isPossibleOnepageCheckout()):?>
     <button type="button"
             data-role="proceed-to-checkout"
-            title="<?php /* @escapeNotVerified */ echo __('Proceed to Checkout') ?>"
-            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?php /* @escapeNotVerified */ echo $block->getCheckoutUrl(); ?>"}}'
-            class="action primary checkout<?php echo($block->isDisabled()) ? ' disabled' : ''; ?>"
+            title="<?= /* @escapeNotVerified */ __('Proceed to Checkout') ?>"
+            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"}}'
+            class="action primary checkout<?= ($block->isDisabled()) ? ' disabled' : '' ?>"
             <?php if ($block->isDisabled()):?>disabled="disabled"<?php endif; ?>>
-        <span><?php /* @escapeNotVerified */ echo __('Proceed to Checkout') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Proceed to Checkout') ?></span>
     </button>
 <?php endif?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
index ff01a430d50dc..2428cc010779d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml
@@ -12,54 +12,54 @@ $_item = $block->getItem();
 ?>
 <tbody class="cart item">
     <tr>
-        <td class="col item" data-th="<?php echo $block->escapeHtml(__('Product Name'));?>">
+        <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
             <span class="product-item-photo">
-                <?php echo $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?>
+                <?= $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml() ?>
             </span>
             <div class="product-item-details">
-                <strong class="product name product-item-name"><?php echo $block->escapeHtml($block->getProductName()) ?></strong>
+                <strong class="product name product-item-name"><?= $block->escapeHtml($block->getProductName()) ?></strong>
                 <?php if ($_options = $block->getOptionList()):?>
                 <dl class="item-options">
                     <?php foreach ($_options as $_option) : ?>
                     <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                    <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                     <dd>
                         <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
+                            <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
                         <?php else: ?>
-                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                         <?php endif; ?>
                     </dd>
                     <?php endforeach; ?>
                 </dl>
                 <?php endif;?>
                 <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()):?>
-                    <?php echo $addtInfoBlock->setItem($_item)->toHtml() ?>
+                    <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
                 <?php endif;?>
             </div>
         </td>
-        <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price'));?>">
+        <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax'));?>">
-                    <?php echo $block->getUnitPriceInclTaxHtml($_item); ?>
+                <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+                    <?= $block->getUnitPriceInclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax'));?>">
-                    <?php echo $block->getUnitPriceExclTaxHtml($_item); ?>
+                <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+                    <?= $block->getUnitPriceExclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
         </td>
-        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><span class="qty"><?php /* @escapeNotVerified */ echo $_item->getQty() ?></span></td>
-        <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal'));?>">
+        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><span class="qty"><?= /* @escapeNotVerified */ $_item->getQty() ?></span></td>
+        <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax'));?>">
-                    <?php echo $block->getRowTotalInclTaxHtml($_item); ?>
+                <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+                    <?= $block->getRowTotalInclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax'));?>">
-                    <?php echo $block->getRowTotalExclTaxHtml($_item); ?>
+                <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+                    <?= $block->getRowTotalExclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
         </td>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
index c3e44cb6775f6..7ee3e416b9ade 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_excl_tax.phtml
@@ -11,5 +11,5 @@
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
index 37ff28b1fcb98..2f364aafbbcc0 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/row_incl_tax.phtml
@@ -12,5 +12,5 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
 <span class="cart-price">
-    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
index 42364034a431a..a1ec004c2a886 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_excl_tax.phtml
@@ -11,5 +11,5 @@
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
index bfec8c6aca656..0ed3c05ee6d1f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/item/price/unit_incl_tax.phtml
@@ -12,5 +12,5 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
 <span class="cart-price">
-    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+    <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
index 741760617521c..f239fbd47dec2 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
@@ -17,8 +17,8 @@
                         "registration": {
                             "component": "Magento_Checkout/js/view/registration",
                             "config": {
-                                "registrationUrl": "<?php /* @escapeNotVerified */ echo $block->getCreateAccountUrl(); ?>",
-                                "email": "<?php /* @escapeNotVerified */ echo $block->getEmailAddress(); ?>"
+                                "registrationUrl": "<?= /* @escapeNotVerified */ $block->getCreateAccountUrl() ?>",
+                                "email": "<?= /* @escapeNotVerified */ $block->getEmailAddress() ?>"
                             },
                             "children": {
                                 "errors": {
diff --git a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
index 77a78eabdeb68..892b7926525f3 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/shipping/price.phtml
@@ -10,4 +10,4 @@
 <?php /** @var $block \Magento\Checkout\Block\Shipping\Price */ ?>
 
 <?php $shippingPrice = $block->getShippingPrice(); ?>
-<?php /* @escapeNotVerified */ echo $shippingPrice; ?>
+<?= /* @escapeNotVerified */ $shippingPrice ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index 76568697922d3..b3517eab8a5d3 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -11,18 +11,18 @@
 <div class="checkout-success">
     <?php if ($block->getOrderId()):?>
         <?php if ($block->getCanViewOrder()) :?>
-            <p><?php echo __('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeHtml($block->getViewOrderUrl()), $block->escapeHtml($block->getOrderId()))) ?></p>
+            <p><?= __('Your order number is: %1.', sprintf('<a href="%s" class="order-number"><strong>%s</strong></a>', $block->escapeHtml($block->getViewOrderUrl()), $block->escapeHtml($block->getOrderId()))) ?></p>
         <?php  else :?>
-            <p><?php echo __('Your order # is: <span>%1</span>.', $block->escapeHtml($block->getOrderId())) ?></p>
+            <p><?= __('Your order # is: <span>%1</span>.', $block->escapeHtml($block->getOrderId())) ?></p>
         <?php endif;?>
-            <p><?php /* @escapeNotVerified */ echo __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
+            <p><?= /* @escapeNotVerified */ __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
     <?php endif;?>
 
-    <?php echo $block->getAdditionalInfoHtml() ?>
+    <?= $block->getAdditionalInfoHtml() ?>
 
     <div class="actions-toolbar">
         <div class="primary">
-            <a class="action primary continue" href="<?php /* @escapeNotVerified */ echo $block->getContinueUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Continue Shopping') ?></span></a>
+            <a class="action primary continue" href="<?= /* @escapeNotVerified */ $block->getContinueUrl() ?>"><span><?= /* @escapeNotVerified */ __('Continue Shopping') ?></span></a>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
index 6db702801d750..2ea1cdd7f53f5 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -8,14 +8,14 @@
 
 ?>
 <tr class="totals">
-    <th colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="mark" scope="row">
+    <th colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="mark" scope="row">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
+    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <span><?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></span>
+            <span><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></span>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
 </tr>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
index 0ce68afedfa7d..663cae4debcfa 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
@@ -40,7 +40,7 @@ $agreementJson = json_encode($agreementMappedArray);
                 "components": {
                     "checkout-agreements-component-scope": {
                         "component": "Magento_CheckoutAgreements/js/view/checkout-agreements",
-                        "agreements": <?php /* @noEscape */ echo $agreementJson; ?>,
+                        "agreements": <?= /* @noEscape */ $agreementJson ?>,
                         "isVisible": true
                     }
                 }
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
index 76d032817a0eb..b0c6384bcc9fe 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -19,28 +19,28 @@
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
     <?php foreach ($block->getAgreements() as $agreement): ?>
         <li class="item">
-            <div class="checkout-agreement-item-content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
+            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
                 <?php if ($agreement->getIsHtml()):?>
-                    <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
+                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
                 <?php else:?>
-                    <?php echo nl2br($block->escapeHtml($agreement->getContent())) ?>
+                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <form id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree required">
+            <form id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
                 <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
                 <input type="checkbox"
-                       id="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>"
-                       name="agreement[<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>]"
+                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
+                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
                        value="1"
-                       title="<?php echo $block->escapeHtml($agreement->getCheckboxText()) ?>"
+                       title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox"
                        data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>">
-                    <span><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
+                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
                 </label>
                 <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
-                <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree">
-                    <span><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
+                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
                 </div>
                 <?php endif; ?>
             </form>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
index 9495cb40924d3..3400770f5cee8 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -19,29 +19,29 @@
     <?php /** @var \Magento\CheckoutAgreements\Api\Data\AgreementInterface $agreement */ ?>
     <?php foreach ($block->getAgreements() as $agreement): ?>
         <li class="item">
-            <div class="checkout-agreement-item-content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
+            <div class="checkout-agreement-item-content"<?= ($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '') ?>>
                 <?php if ($agreement->getIsHtml()):?>
-                    <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
+                    <?= /* @escapeNotVerified */ $agreement->getContent() ?>
                 <?php else:?>
-                    <?php echo nl2br($block->escapeHtml($agreement->getContent())) ?>
+                    <?= nl2br($block->escapeHtml($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
             <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-            <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree required">
+            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree required">
                 <input type="checkbox"
-                       id="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>"
-                       name="agreement[<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>]"
+                       id="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>"
+                       name="agreement[<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>]"
                        value="1"
-                       title="<?php echo $block->escapeHtml($agreement->getCheckboxText()) ?>"
+                       title="<?= $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox"
                        data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>">
-                    <span><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+                <label class="label" for="agreement-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>">
+                    <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
                 </label>
             </div>
             <?php elseif($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_AUTO): ?>
-            <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree">
-                <span><?php echo $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
+            <div id="checkout-agreements-form-<?= /* @escapeNotVerified */ $agreement->getAgreementId() ?>" class="field choice agree">
+                <span><?= $agreement->getIsHtml() ? $agreement->getCheckboxText() : $block->escapeHtml($agreement->getCheckboxText()) ?></span>
             </div>
             <?php endif; ?>
         </li>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
index 33babfa12eedf..af71e0839243d 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
@@ -9,19 +9,19 @@
  /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content */
 ?>
 
-<div data-mage-init='{"mediabrowser": <?php echo $block->escapeHtml($block->getFilebrowserSetupObject()); ?>}'>
-    <div class="side-col"><?php echo $block->getChildHtml('wysiwyg_images.tree') ?></div>
+<div data-mage-init='{"mediabrowser": <?= $block->escapeHtml($block->getFilebrowserSetupObject()) ?>}'>
+    <div class="side-col"><?= $block->getChildHtml('wysiwyg_images.tree') ?></div>
     <div class="main-col">
         <div class="insert-title" id="content_header">
             <div class="insert-title-inner">
                 <div class="insert-actions">
-                    <?php echo $block->getButtonsHtml() ?>
+                    <?= $block->getButtonsHtml() ?>
                 </div>
-                <div class="title"><?php echo $block->escapeHtml($block->getHeaderText()) ?></div>
+                <div class="title"><?= $block->escapeHtml($block->getHeaderText()) ?></div>
             </div>
         </div>
         <div id="error-message" data-action="show-error"></div>
-        <div id="contents-uploader" class="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_images.uploader') ?></div>
+        <div id="contents-uploader" class="contents-uploader"><?= $block->getChildHtml('wysiwyg_images.uploader') ?></div>
         <div id="contents"></div>
     </div>
 </div>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
index 29a24783a7015..a4c570f9d65a1 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/files.phtml
@@ -14,18 +14,18 @@ $_height = $block->getImagesHeight();
 ?>
 <?php if ($block->getFilesCount() > 0): ?>
     <?php foreach ($block->getFiles() as $file): ?>
-    <div data-row="file" class="filecnt" id="<?php echo $block->escapeHtmlAttr($block->getFileId($file)) ?>">
-        <p class="nm" style="height:<?php echo $block->escapeHtmlAttr($_height) ?>px;width:<?php echo $block->escapeHtmlAttr($_width) ?>px;">
+    <div data-row="file" class="filecnt" id="<?= $block->escapeHtmlAttr($block->getFileId($file)) ?>">
+        <p class="nm" style="height:<?= $block->escapeHtmlAttr($_height) ?>px;width:<?= $block->escapeHtmlAttr($_width) ?>px;">
         <?php if ($block->getFileThumbUrl($file)):?>
-            <img src="<?php echo $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?php echo $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
+            <img src="<?= $block->escapeHtmlAttr($block->getFileThumbUrl($file)) ?>" alt="<?= $block->escapeHtmlAttr($block->getFileName($file)) ?>"/>
         <?php endif; ?>
         </p>
         <?php if ($block->getFileWidth($file)): ?>
-            <small><?php echo $block->escapeHtml($block->getFileWidth($file)) ?>x<?php echo $block->escapeHtml($block->getFileHeight($file)) ?> <?php echo $block->escapeHtml(__('px.')) ?></small><br/>
+            <small><?= $block->escapeHtml($block->getFileWidth($file)) ?>x<?= $block->escapeHtml($block->getFileHeight($file)) ?> <?= $block->escapeHtml(__('px.')) ?></small><br/>
         <?php endif; ?>
-        <small><?php echo $block->escapeHtml($block->getFileShortName($file)); ?></small>
+        <small><?= $block->escapeHtml($block->getFileShortName($file)) ?></small>
     </div>
     <?php endforeach; ?>
 <?php else: ?>
-    <div class="empty"><?php echo $block->escapeHtml(__('No files found')) ?></div>
+    <div class="empty"><?= $block->escapeHtml(__('No files found')) ?></div>
 <?php endif; ?>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index e9d0562855a1a..3b3b6dd4a6ca8 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -9,13 +9,13 @@
 /** @var $block \Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content\Uploader */
 ?>
 
-<div id="<?php echo $block->getHtmlId() ?>" class="uploader">
+<div id="<?= $block->getHtmlId() ?>" class="uploader">
     <span class="fileinput-button form-buttons">
-        <span><?php echo $block->escapeHtml(__('Browse Files...')) ?></span>
-        <input class="fileupload" type="file" name="<?php echo $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>" data-url="<?php echo $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
+        <span><?= $block->escapeHtml(__('Browse Files...')) ?></span>
+        <input class="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>" data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
     </span>
     <div class="clear"></div>
-    <script type="text/x-magento-template" id="<?php echo $block->getHtmlId() ?>-template">
+    <script type="text/x-magento-template" id="<?= $block->getHtmlId() ?>-template">
         <div id="<%- data.id %>" class="file-row">
             <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
             <div class="progressbar-container">
@@ -32,7 +32,7 @@ require([
     'domReady!',
     'mage/translate'
 ], function ($, mageTemplate) {
-    $('#<?php echo $block->getHtmlId() ?> .fileupload').fileupload({
+    $('#<?= $block->getHtmlId() ?> .fileupload').fileupload({
         dataType: 'json',
         formData: {
             isAjax: 'true',
@@ -40,9 +40,9 @@ require([
         },
         sequentialUploads: true,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-        maxFileSize: <?php  echo $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?>,
+        maxFileSize: <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?>,
         add: function (e, data) {
-            var progressTmpl = mageTemplate('#<?php echo $block->getHtmlId(); ?>-template'),
+            var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
                 fileSize,
                 tmpl;
 
@@ -61,7 +61,7 @@ require([
                     }
                 });
 
-                $(tmpl).data('image', data).appendTo('#<?php echo $block->getHtmlId() ?>');
+                $(tmpl).data('image', data).appendTo('#<?= $block->getHtmlId() ?>');
             });
 
             $(this).fileupload('process', data).done(function () {
@@ -94,15 +94,15 @@ require([
         }
     });
 
-    $('#<?php echo $block->getHtmlId() ?> .fileupload').fileupload('option', {
+    $('#<?= $block->getHtmlId() ?> .fileupload').fileupload('option', {
         process: [{
             action: 'load',
             fileTypes: /^image\/(gif|jpeg|png)$/,
-            maxFileSize: <?php echo (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
+            maxFileSize: <?= (int) $block->getFileSizeService()->getMaxFileSize() ?> * 10
         }, {
             action: 'resize',
-            maxWidth: <?php echo (float) \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
-            maxHeight: <?php echo (float) \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
+            maxWidth: <?= (float) \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
+            maxHeight: <?= (float) \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
         }, {
             action: 'save'
         }]
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
index 2dcde4bdb587f..4f0ba000c1d12 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -11,11 +11,11 @@
 <div class="tree-panel" >
     <div class="categories-side-col">
         <div class="tree-actions">
-            <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?php echo $block->escapeHtml(__('Collapse All')) ?></a>
+            <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?= $block->escapeHtml(__('Collapse All')) ?></a>
             <span class="separator">|</span>
-            <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?php echo $block->escapeHtml(__('Expand All')) ?></a>
+            <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?= $block->escapeHtml(__('Expand All')) ?></a>
         </div>
     </div>
-    <div data-role="tree" data-mage-init='<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getTreeWidgetOptions())); ?>'>
+    <div data-role="tree" data-mage-init='<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getTreeWidgetOptions())) ?>'>
     </div>
 </div>
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml b/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
index fa4808893542f..c773750e5d6c6 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/page/edit/form/renderer/content.phtml
@@ -11,6 +11,6 @@
 
 <?php if (!$_element->getNoDisplay()): ?>
 <div class="cms-manage-content-actions">
-    <?php echo trim($_element->getElementHtml()) ?>
+    <?= trim($_element->getElementHtml()) ?>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Cms/view/frontend/templates/content.phtml b/app/code/Magento/Cms/view/frontend/templates/content.phtml
index 661081a3d9bd4..d3baf14444762 100644
--- a/app/code/Magento/Cms/view/frontend/templates/content.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/content.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php /* @noEscape */ echo $pageData->getPageContent(); ?>
+<?= /* @noEscape */ $pageData->getPageContent() ?>
diff --git a/app/code/Magento/Cms/view/frontend/templates/meta.phtml b/app/code/Magento/Cms/view/frontend/templates/meta.phtml
index b687e6d1ada93..3c03fa7d9ae67 100644
--- a/app/code/Magento/Cms/view/frontend/templates/meta.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/meta.phtml
@@ -8,8 +8,8 @@
 
 ?>
 <?php if ($pageData->getPageMetaKeywords()): ?>
-    <meta name="keywords" content="<?php /* @noEscape */ echo $pageData->getPageMetaKeywords() ?>"/>
+    <meta name="keywords" content="<?= /* @noEscape */ $pageData->getPageMetaKeywords() ?>"/>
 <?php endif; ?>
 <?php if ($pageData->getPageMetaDescription()): ?>
-    <meta name="description" content="<?php /* @noEscape */ echo $pageData->getPageMetaDescription() ?>"/>
+    <meta name="description" content="<?= /* @noEscape */ $pageData->getPageMetaDescription() ?>"/>
 <?php endif; ?>
diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
index e15cbc3658c1a..7c6e6d1b8bfce 100644
--- a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_block.phtml
@@ -9,7 +9,7 @@
  */
 ?>
 <div class="widget block block-cms-link">
-    <a <?php /* @noEscape */ echo $block->getLinkAttributes() ?>>
-        <span><?php echo $block->escapeHtml($block->getLabel()) ?></span>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>>
+        <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </a>
 </div>
diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
index 6a62f8ae7bfb1..ddab6a239ecb6 100644
--- a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml
@@ -9,7 +9,7 @@
  */
 ?>
 <span class="widget block block-cms-link-inline">
-    <a <?php /* @noEscape */ echo $block->getLinkAttributes() ?>>
-        <span><?php echo $block->escapeHtml($block->getLabel()) ?></span>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>>
+        <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </a>
 </span>
diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml
index cbe8d06f20e23..d813c2894a045 100644
--- a/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml
+++ b/app/code/Magento/Cms/view/frontend/templates/widget/static_block/default.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <div class="widget block block-static-block">
-    <?php /* @noEscape */ echo $block->getText(); ?>
+    <?= /* @noEscape */ $block->getText() ?>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
index a10aa7506f0f1..e8082dae94d98 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/page/system/config/robots/reset.phtml
@@ -26,4 +26,4 @@ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data');
     });
 </script>
 
-<?php echo $block->getButtonHtml(); ?>
+<?= $block->getButtonHtml() ?>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index 3dd996db26709..9bdca2bdfd280 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -16,10 +16,10 @@
  *  getForm() - html
  */
 ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
+    <?= $block->getBlockHtml('formkey') ?>
     <div class="accordion">
-        <?php echo $block->getChildHtml('form') ?>
+        <?= $block->getChildHtml('form') ?>
     </div>
 </form>
 <script>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index d610f712ef5ca..93af2cfa653f8 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -13,30 +13,30 @@ $_htmlId = $block->getHtmlId() ? $block->getHtmlId() : '_' . uniqid();
 $_colspan = $block->isAddAfter() ? 2 : 1;
 ?>
 
-<div class="design_theme_ua_regexp" id="grid<?php /* @escapeNotVerified */ echo $_htmlId; ?>">
+<div class="design_theme_ua_regexp" id="grid<?= /* @escapeNotVerified */ $_htmlId ?>">
     <div class="admin__control-table-wrapper">
-        <table class="admin__control-table" id="<?php /* @escapeNotVerified */ echo $block->getElement()->getId(); ?>">
+        <table class="admin__control-table" id="<?= /* @escapeNotVerified */ $block->getElement()->getId() ?>">
             <thead>
             <tr>
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                    <th><?php /* @escapeNotVerified */ echo $column['label']; ?></th>
+                    <th><?= /* @escapeNotVerified */ $column['label'] ?></th>
                 <?php endforeach;?>
-                <th class="col-actions" colspan="<?php /* @escapeNotVerified */ echo $_colspan; ?>">Action</th>
+                <th class="col-actions" colspan="<?= /* @escapeNotVerified */ $_colspan ?>">Action</th>
             </tr>
             </thead>
             <tfoot>
             <tr>
-                <td colspan="<?php echo count($block->getColumns())+$_colspan; ?>" class="col-actions-add">
-                    <button id="addToEndBtn<?php /* @escapeNotVerified */ echo $_htmlId; ?>" class="action-add" title="<?php /* @escapeNotVerified */ echo __('Add'); ?>" type="button">
-                        <span><?php /* @escapeNotVerified */ echo $block->getAddButtonLabel(); ?></span>
+                <td colspan="<?= count($block->getColumns())+$_colspan ?>" class="col-actions-add">
+                    <button id="addToEndBtn<?= /* @escapeNotVerified */ $_htmlId ?>" class="action-add" title="<?= /* @escapeNotVerified */ __('Add') ?>" type="button">
+                        <span><?= /* @escapeNotVerified */ $block->getAddButtonLabel() ?></span>
                     </button>
                 </td>
             </tr>
             </tfoot>
-            <tbody id="addRow<?php /* @escapeNotVerified */ echo $_htmlId; ?>"></tbody>
+            <tbody id="addRow<?= /* @escapeNotVerified */ $_htmlId ?>"></tbody>
         </table>
     </div>
-    <input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName(); ?>[__empty]" value="" />
+    <input type="hidden" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[__empty]" value="" />
 
     <script>
         require([
@@ -44,22 +44,22 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             'prototype'
         ], function (mageTemplate) {
         // create row creator
-        window.arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?> = {
+        window.arrayRow<?= /* @escapeNotVerified */ $_htmlId ?> = {
 
             // define row prototypeJS template
             template: mageTemplate(
                     '<tr id="<%- _id %>">'
                     <?php foreach ($block->getColumns() as $columnName => $column): ?>
                             + '<td>'
-                            + '<?php /* @escapeNotVerified */ echo $block->renderCellTemplate($columnName)?>'
+                            + '<?= /* @escapeNotVerified */ $block->renderCellTemplate($columnName) ?>'
                             + '<\/td>'
                         <?php endforeach; ?>
 
                     <?php if ($block->isAddAfter()): ?>
-                            + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span><?php /* @escapeNotVerified */ echo __('Add after'); ?><\/span><\/button><\/td>'
+                            + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span><?= /* @escapeNotVerified */ __('Add after') ?><\/span><\/button><\/td>'
                         <?php endif; ?>
 
-                            + '<td class="col-actions"><button onclick="arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?>.del(\'<%- _id %>\')" class="action-delete" type="button"><span><?php /* @escapeNotVerified */ echo __('Delete'); ?><\/span><\/button><\/td>'
+                            + '<td class="col-actions"><button onclick="arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>.del(\'<%- _id %>\')" class="action-delete" type="button"><span><?= /* @escapeNotVerified */ __('Delete') ?><\/span><\/button><\/td>'
                             +'<\/tr>'
             ),
 
@@ -74,7 +74,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                     var d = new Date();
                     templateValues = {
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                    <?php /* @escapeNotVerified */ echo $columnName ?>: '',
+                    <?= /* @escapeNotVerified */ $columnName ?>: '',
                         'option_extra_attrs': {},
                     <?php endforeach; ?>
                         _id: '_' + d.getTime() + '_' + d.getMilliseconds()
@@ -85,7 +85,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             if (insertAfterId) {
             Element.insert($(insertAfterId), {after: this.template(templateValues)});
         } else {
-            Element.insert($('addRow<?php /* @escapeNotVerified */ echo $_htmlId ?>'), {bottom: this.template(templateValues)});
+            Element.insert($('addRow<?= /* @escapeNotVerified */ $_htmlId ?>'), {bottom: this.template(templateValues)});
         }
 
         // Fill controls with data
@@ -110,7 +110,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
         }
 
         // bind add action to "Add" button in last row
-        Event.observe('addToEndBtn<?php /* @escapeNotVerified */ echo $_htmlId ?>', 'click', arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?>.add.bind(arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?>, false, false));
+        Event.observe('addToEndBtn<?= /* @escapeNotVerified */ $_htmlId ?>', 'click', arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>.add.bind(arrayRow<?= /* @escapeNotVerified */ $_htmlId ?>, false, false));
 
         // add existing rows
         <?php
@@ -121,7 +121,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
 
         // Toggle the grid availability, if element is disabled (depending on scope)
         <?php if ($block->getElement()->getDisabled()):?>
-        toggleValueElements({checked: true}, $('grid<?php /* @escapeNotVerified */ echo $_htmlId; ?>').parentNode);
+        toggleValueElements({checked: true}, $('grid<?= /* @escapeNotVerified */ $_htmlId ?>').parentNode);
             <?php endif;?>
         });
     </script>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
index cbf8445e08faf..b703641acadb8 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/js.phtml
@@ -71,7 +71,7 @@ originModel.prototype = {
     {
         this.reload = false;
         this.loader = new varienLoader(true);
-        this.regionsUrl = "<?php /* @escapeNotVerified */ echo $block->getUrl('directory/json/countryRegion') ?>";
+        this.regionsUrl = "<?= /* @escapeNotVerified */ $block->getUrl('directory/json/countryRegion') ?>";
 
         this.bindCountryRegionRelation();
     },
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
index b8bdfc80c57a2..6677b80076478 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/switcher.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php /* @var $block \Magento\Backend\Block\Template */ ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Current Configuration Scope:') ?></label>
+    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Current Configuration Scope:') ?></label>
     <div class="control">
         <select id="store_switcher" class="system-config-store-switcher" onchange="location.href=this.options[this.selectedIndex].getAttribute('url')">
         <?php foreach ($block->getStoreSelectOptions() as $_value => $_option): ?>
@@ -17,20 +17,20 @@
             <?php if ($_option['is_close']): ?>
                 </optgroup>
             <?php else: ?>
-                <optgroup label="<?php echo $block->escapeHtml($_option['label']) ?>" style="<?php /* @escapeNotVerified */ echo $_option['style'] ?>">
+                <optgroup label="<?= $block->escapeHtml($_option['label']) ?>" style="<?= /* @escapeNotVerified */ $_option['style'] ?>">
             <?php endif; ?>
             <?php continue ?>
         <?php endif; ?>
-          <option value="<?php echo $block->escapeHtml($_value) ?>" url="<?php /* @escapeNotVerified */ echo $_option['url'] ?>" <?php echo $_option['selected'] ? 'selected="selected"' : '' ?> style="<?php /* @escapeNotVerified */ echo $_option['style'] ?>">
-              <?php echo $block->escapeHtml($_option['label']) ?>
+          <option value="<?= $block->escapeHtml($_value) ?>" url="<?= /* @escapeNotVerified */ $_option['url'] ?>" <?= $_option['selected'] ? 'selected="selected"' : '' ?> style="<?= /* @escapeNotVerified */ $_option['style'] ?>">
+              <?= $block->escapeHtml($_option['label']) ?>
           </option>
         <?php endforeach ?>
         </select>
     </div>
-    <?php echo $block->getHintHtml() ?>
+    <?= $block->getHintHtml() ?>
     <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
         <div class="actions">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl('*/system_store') ?>"><?php /* @escapeNotVerified */ echo __('Stores') ?></a>
+            <a href="<?= /* @escapeNotVerified */ $block->getUrl('*/system_store') ?>"><?= /* @escapeNotVerified */ __('Stores') ?></a>
         </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
index 48cdbe102daf7..d7000f28b5ef3 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/tabs.phtml
@@ -10,7 +10,7 @@
 ?>
 
 <?php if ($block->getTabs()): ?>
-    <div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>" class="config-nav">
+    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>" class="config-nav">
         <?php
         /** @var $_tab \Magento\Config\Model\Config\Structure\Element\Tab */
         foreach ($block->getTabs() as $_tab):
@@ -27,15 +27,15 @@
 
             <div class="config-nav-block admin__page-nav _collapsed
                 <?php if ($_tab->getClass()): ?>
-                    <?php /* @escapeNotVerified */ echo $_tab->getClass() ?>
+                    <?= /* @escapeNotVerified */ $_tab->getClass() ?>
                 <?php endif ?>"
-                 data-mage-init='{"collapsible":{"active": "<?php /* @escapeNotVerified */ echo $activeCollapsible;?>",
+                 data-mage-init='{"collapsible":{"active": "<?= /* @escapeNotVerified */ $activeCollapsible ?>",
                  "openedState": "_show",
                  "closedState": "_hide",
                  "collapsible": true,
                  "animate": 200}}'>
                 <div class="admin__page-nav-title title _collapsible" data-role="title">
-                    <strong><?php /* @escapeNotVerified */ echo $_tab->getLabel() ?></strong>
+                    <strong><?= /* @escapeNotVerified */ $_tab->getLabel() ?></strong>
                 </div>
 
                 <ul class="admin__page-nav-items items" data-role="content">
@@ -44,12 +44,12 @@
                     /** @var $_section \Magento\Config\Model\Config\Structure\Element\Section */
                     foreach ($_tab->getChildren() as $_section): ?>
                         <li class="admin__page-nav-item item
-                            <?php /* @escapeNotVerified */ echo $_section->getClass() ?>
+                            <?= /* @escapeNotVerified */ $_section->getClass() ?>
                             <?php if ($block->isSectionActive($_section)): ?> _active<?php endif ?>
-                            <?php echo $_tab->getChildren()->isLast($_section) ? ' _last' : '' ?>">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getSectionUrl($_section) ?>"
+                            <?= $_tab->getChildren()->isLast($_section) ? ' _last' : '' ?>">
+                            <a href="<?= /* @escapeNotVerified */ $block->getSectionUrl($_section) ?>"
                                class="admin__page-nav-link item-nav">
-                               <span><?php /* @escapeNotVerified */ echo $_section->getLabel() ?></span>
+                               <span><?= /* @escapeNotVerified */ $_section->getLabel() ?></span>
                             </a>
                         </li>
                         <?php $_iterator++; ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
index 12eb2c15981ee..110defd5248b9 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml
@@ -8,7 +8,7 @@
 <script>
 (function ($) {
 
-    var data = <?php /* @escapeNotVerified */ echo $block->getAttributesBlockJson() ?>;
+    var data = <?= /* @escapeNotVerified */ $block->getAttributesBlockJson() ?>;
     var set = data.set || {id: $('#attribute_set_id').val()};
     if (data.tab == 'variations') {
         $('[data-role=product-variations-matrix]').trigger('add', data.attribute);
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
index 30335ee318686..9c4612c972d96 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/set/js.phtml
@@ -29,7 +29,7 @@ editSet.submit = editSet.submit.wrap(function(original) {
     if (editSet.currentNode){
         if (ConfigurableNodeExists(editSet.currentNode)) {
             alert({
-                content: '<?php echo $block->escapeJs(__('This group contains attributes used in configurable products. Please move these attributes to another group and try again.')) ?>'
+                content: '<?= $block->escapeJs(__('This group contains attributes used in configurable products. Please move these attributes to another group and try again.')) ?>'
             });
             return;
         }
@@ -40,7 +40,7 @@ editSet.submit = editSet.submit.wrap(function(original) {
 editSet.rightBeforeAppend = editSet.rightBeforeAppend.wrap(function(original, tree, nodeThis, node, newParent) {
     if (node.attributes.is_configurable == 1) {
         alert({
-            content: '<?php echo $block->escapeJs(__('This attribute is used in configurable products. You cannot remove it from the attribute set.')) ?>'
+            content: '<?= $block->escapeJs(__('This attribute is used in configurable products. You cannot remove it from the attribute set.')) ?>'
         });
         return false;
     }
@@ -50,7 +50,7 @@ editSet.rightBeforeAppend = editSet.rightBeforeAppend.wrap(function(original, tr
 editSet.rightBeforeInsert = editSet.rightBeforeInsert.wrap(function(original, tree, nodeThis, node, newParent) {
     if (node.attributes.is_configurable == 1) {
         alert({
-            content: '<?php echo $block->escapeJs(__('This attribute is used in configurable products. You cannot remove it from the attribute set.')) ?>'
+            content: '<?= $block->escapeJs(__('This attribute is used in configurable products. You cannot remove it from the attribute set.')) ?>'
         });
         return false;
     }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index 1e251a5970565..a8712cdc183de 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -15,7 +15,7 @@
 <?php if (($_product->isSaleable() || $_skipSaleableCheck) && count($_attributes)):?>
 <fieldset id="catalog_product_composite_configure_fields_configurable" class="fieldset admin__fieldset">
     <legend class="legend admin__legend">
-        <span><?php /* @escapeNotVerified */ echo __('Associated Products') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Associated Products') ?></span>
     </legend>
     <div class="product-options">
         <div class="field admin__field _required required">
@@ -28,10 +28,10 @@
                     if ($_attribute->getDecoratedIsLast()):
                         ?> last<?php
                     endif; ?>">
-                    <select name="super_attribute[<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>]"
-                            id="attribute<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>"
+                    <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
+                            id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
                             class="admin__control-select required-entry super-attribute-select">
-                        <option><?php /* @escapeNotVerified */ echo __('Choose an Option...') ?></option>
+                        <option><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
                     </select>
                 </div>
             <?php endforeach; ?>
@@ -44,7 +44,7 @@ require([
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(){
 
-    var config = <?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>;
+    var config = <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>;
     if (window.productConfigure) {
         config.containerId = window.productConfigure.blockFormFields.id;
         if (window.productConfigure.restorePhase) {
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
index 301a31950ee88..cc25474049190 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -8,12 +8,12 @@
 
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
 ?>
-<div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName()?>'">
-    <h2 class="steps-wizard-title"><?php echo $block->escapeHtml(
+<div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
+    <h2 class="steps-wizard-title"><?= $block->escapeHtml(
             __('Step 2: Attribute Values')
         ); ?></h2>
     <div class="steps-wizard-info">
-        <span><?php echo $block->escapeHtml(
+        <span><?= $block->escapeHtml(
                 __('Select values from each attribute to include in this product. Each unique combination of values creates a unique product SKU.')
             );?></span>
     </div>
@@ -29,7 +29,7 @@
                     <div class="attribute-entity-title" data-bind="text: label"></div>
                     <div class="attribute-options-block">
                         (<span class="attribute-length" data-bind="text: $data.options().length"></span>
-                        <?php echo $block->escapeHtml(
+                        <?= $block->escapeHtml(
                             __('Options')
                         ); ?>)
                     </div>
@@ -40,7 +40,7 @@
                             class="action-select-all action-tertiary"
                             data-bind="click: $parent.selectAllAttributes"
                             title="<?= $block->escapeHtml(__('Select All')) ?>">
-                        <span><?php echo $block->escapeHtml(
+                        <span><?= $block->escapeHtml(
                                 __('Select All')
                             ); ?></span>
                     </button>
@@ -48,7 +48,7 @@
                             class="action-deselect-all action-tertiary"
                             data-bind="click: $parent.deSelectAllAttributes"
                             title="<?= $block->escapeHtml(__('Deselect All')) ?>">
-                        <span><?php echo $block->escapeHtml(
+                        <span><?= $block->escapeHtml(
                                 __('Deselect All')
                             ); ?></span>
                     </button>
@@ -56,7 +56,7 @@
                             class="action-remove-all action-tertiary"
                             data-bind="click: $parent.removeAttribute.bind($parent)"
                             title="<?= $block->escapeHtml(__('Remove Attribute')) ?>">
-                        <span><?php echo $block->escapeHtml(
+                        <span><?= $block->escapeHtml(
                                 __('Remove Attribute')
                             ); ?></span>
                     </button>
@@ -86,7 +86,7 @@
                                     title="<?= $block->escapeHtml(__('Save Option')) ?>"
                                     data-action="save"
                                     data-bind="click: $parents[1].saveOption.bind($parent)">
-                                <span><?php echo $block->escapeHtml(
+                                <span><?= $block->escapeHtml(
                                         __('Save Option')
                                     ); ?></span>
                             </button>
@@ -95,7 +95,7 @@
                                     title="<?= $block->escapeHtml(__('Remove Option')) ?>"
                                     data-action="remove"
                                     data-bind="click: $parents[1].removeOption.bind($parent)">
-                                <span><?php echo $block->escapeHtml(
+                                <span><?= $block->escapeHtml(
                                         __('Remove Option')
                                     ); ?></span>
                             </button>
@@ -107,7 +107,7 @@
                     type="button"
                     data-action="addOption"
                     data-bind="click: $parent.createOption, visible: canCreateOption">
-                <span><?php echo $block->escapeHtml(
+                <span><?= $block->escapeHtml(
                         __('Create New Value')
                     ); ?></span>
             </button>
@@ -119,11 +119,11 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= /* @noEscape */  $block->getComponentName()?>": {
+                    "<?= /* @noEscape */  $block->getComponentName() ?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/attributes_values",
-                        "appendTo": "<?= /* @noEscape */  $block->getParentComponentName()?>",
-                        "optionsUrl": "<?= /* @noEscape */  $block->getUrl('catalog/product_attribute/getAttributes')?>",
-                        "createOptionsUrl": "<?= /* @noEscape */  $block->getUrl('catalog/product_attribute/createOptions')?>"
+                        "appendTo": "<?= /* @noEscape */  $block->getParentComponentName() ?>",
+                        "optionsUrl": "<?= /* @noEscape */  $block->getUrl('catalog/product_attribute/getAttributes') ?>",
+                        "createOptionsUrl": "<?= /* @noEscape */  $block->getUrl('catalog/product_attribute/createOptions') ?>"
                     }
                 }
             }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
index 26857e65a6ab7..9d144b0f569e0 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml
@@ -9,16 +9,16 @@
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk */
 ?>
 
-<div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName()?>'" data-role="bulk-step">
-    <h2 class="steps-wizard-title"><?php echo $block->escapeHtml(__('Step 3: Bulk Images, Price and Quantity')); ?></h2>
+<div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'" data-role="bulk-step">
+    <h2 class="steps-wizard-title"><?= $block->escapeHtml(__('Step 3: Bulk Images, Price and Quantity')) ?></h2>
     <div class="steps-wizard-info">
-        <?php /* @escapeNotVerified */ echo __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
+        <?= /* @escapeNotVerified */ __('Based on your selections %1 new products will be created. Use this step to customize images and price for your new products.', '<span class="new-products-count" data-bind="text:countVariations"></span>') ?>
     </div>
 
     <div data-bind="with: sections().images" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-            <span><?php echo $block->escapeHtml(
+            <span><?= $block->escapeHtml(
                     __('Images')
                 ); ?></span>
             </div>
@@ -32,7 +32,7 @@
                                value="single"
                                data-bind="checked:type">
                         <label for="apply-single-set-radio" class="admin__field-label">
-                        <span><?php echo $block->escapeHtml(
+                        <span><?= $block->escapeHtml(
                                 __('Apply single set of images to all SKUs')
                             ); ?></span>
                         </label>
@@ -46,7 +46,7 @@
                                value="each"
                                data-bind="checked:type">
                         <label for="apply-unique-images-radio" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Apply unique images by attribute to each SKU')) ?></span>
+                            <span><?= $block->escapeHtml(__('Apply unique images by attribute to each SKU')) ?></span>
                         </label>
                     </div>
                 </li>
@@ -59,7 +59,7 @@
                                checked
                                data-bind="checked:type">
                         <label for="skip-images-uploading-radio" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Skip image uploading at this time')) ?></span>
+                            <span><?= $block->escapeHtml(__('Skip image uploading at this time')) ?></span>
                         </label>
                     </div>
                 </li>
@@ -71,14 +71,14 @@
                 <div data-role="gallery"
                      class="gallery"
                      data-images="[]"
-                     data-types="<?php echo $block->escapeHtml(
+                     data-types="<?= $block->escapeHtml(
                          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
                      ) ?>"
                 >
                     <div class="image image-placeholder">
                         <div data-role="uploader" class="uploader">
                             <div class="image-browse">
-                                <span><?php echo $block->escapeHtml(__('Browse Files...')) ?></span>
+                                <span><?= $block->escapeHtml(__('Browse Files...')) ?></span>
                                 <input type="file"
                                        id=""
                                        name="image"
@@ -88,16 +88,16 @@
                             </div>
                         </div>
                         <div class="product-image-wrapper">
-                            <p class="image-placeholder-text"><?php echo $block->escapeHtml(__('Browse to find or drag image here')) ?></p>
+                            <p class="image-placeholder-text"><?= $block->escapeHtml(__('Browse to find or drag image here')) ?></p>
                         </div>
                     </div>
 
                     <?php foreach ($block->getImageTypes() as $typeData):
                         ?>
-                        <input name="<?php echo $block->escapeHtml($typeData['name']) ?>"
-                               class="image-<?php echo $block->escapeHtml($typeData['code']) ?>"
+                        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
+                               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                                type="hidden"
-                               value="<?php echo $block->escapeHtml($typeData['value']) ?>"/>
+                               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
                         <?php
                     endforeach;
                     ?>
@@ -142,11 +142,11 @@
                                             class="action-remove"
                                             data-role="delete-button"
                                             title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                        <span><?php echo $block->escapeHtml(__('Remove image')) ?></span>
+                                        <span><?= $block->escapeHtml(__('Remove image')) ?></span>
                                     </button>
                                     <div class="draggable-handle"></div>
                                 </div>
-                                <div class="image-fade"><span><?php echo $block->escapeHtml(__('Hidden')) ?></span></div>
+                                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
                             </div>
                             <div class="item-description">
                                 <div class="item-title" data-role="img-title"><%- data.label %></div>
@@ -158,12 +158,12 @@
                                 <?php
                                 foreach ($block->getMediaAttributes() as $attribute):
                                     ?>
-                                    <li data-role-code="<?php echo $block->escapeHtml(
+                                    <li data-role-code="<?= $block->escapeHtml(
                                         $attribute->getAttributeCode()
-                                    ) ?>" class="item-role item-role-<?php echo $block->escapeHtml(
+                                    ) ?>" class="item-role item-role-<?= $block->escapeHtml(
                                         $attribute->getAttributeCode()
                                     ) ?>">
-                                        <?php /* @noEscape */ echo $attribute->getFrontendLabel() ?>
+                                        <?= /* @noEscape */ $attribute->getFrontendLabel() ?>
                                     </li>
                                     <?php
                                 endforeach;
@@ -186,13 +186,13 @@
                                             class="action-remove"
                                             data-role="delete-button"
                                             title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                        <span><?php echo $block->escapeHtml(__('Remove image')) ?></span>
+                                        <span><?= $block->escapeHtml(__('Remove image')) ?></span>
                                     </button>
 
                                     <div class="draggable-handle"></div>
                                 </div>
 
-                                <div class="image-fade"><span><?php echo $block->escapeHtml(__('Hidden')) ?></span></div>
+                                <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
                             </div>
                             <!--<ul class="item-roles">
                                 <li class="item-role item-role-base">Base</li>
@@ -215,7 +215,7 @@
                             <fieldset class="admin__fieldset fieldset-image-panel">
                                 <div class="admin__field field-image-description">
                                     <label class="admin__field-label" for="image-description">
-                                        <span><?php echo $block->escapeHtml(__('Alt Text')) ?></span>
+                                        <span><?= $block->escapeHtml(__('Alt Text')) ?></span>
                                     </label>
 
                                     <div class="admin__field-control">
@@ -229,7 +229,7 @@
 
                                 <div class="admin__field field-image-role">
                                     <label class="admin__field-label">
-                                    <span><?php echo $block->escapeHtml(
+                                    <span><?= $block->escapeHtml(
                                             __('Role')
                                         ); ?></span>
                                     </label>
@@ -243,11 +243,11 @@
                                                         <input class="image-type"
                                                                data-role="type-selector"
                                                                type="checkbox"
-                                                               value="<?php echo $block->escapeHtml(
+                                                               value="<?= $block->escapeHtml(
                                                                    $attribute->getAttributeCode()
                                                                ) ?>"
                                                         />
-                                                        <?php echo $block->escapeHtml(
+                                                        <?= $block->escapeHtml(
                                                             $attribute->getFrontendLabel()
                                                         ); ?>
                                                     </label>
@@ -261,22 +261,22 @@
 
                                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
                                     <label class="admin__field-label">
-                                    <span><?php echo $block->escapeHtml(
+                                    <span><?= $block->escapeHtml(
                                             __('Image Size')
                                         ); ?></span>
                                     </label>
-                                    <div class="admin__field-value" data-message="<?php echo $block->escapeHtml(
+                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(
                                         __('{size}')
                                     );?>"></div>
                                 </div>
 
                                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                                     <label class="admin__field-label">
-                                    <span><?php echo $block->escapeHtml(
+                                    <span><?= $block->escapeHtml(
                                             __('Image Resolution')
                                         ); ?></span>
                                     </label>
-                                    <div class="admin__field-value" data-message="<?php echo $block->escapeHtml(
+                                    <div class="admin__field-value" data-message="<?= $block->escapeHtml(
                                         __('{width}^{height} px')
                                     );?>"></div>
                                 </div>
@@ -293,7 +293,7 @@
                                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                                             <label for="hide-from-product-page" class="admin__field-label">
-                                                <?php echo $block->escapeHtml(
+                                                <?= $block->escapeHtml(
                                                     __('Hide from Product Page')
                                                 ); ?>
                                             </label>
@@ -310,7 +310,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label class="admin__field-label" for="apply-images-attributes">
-                        <span><?php echo $block->escapeHtml(
+                        <span><?= $block->escapeHtml(
                                 __('Select attribute')
                             ); ?></span>
                         </label>
@@ -322,7 +322,7 @@
                                 options: $parent.attributes,
                                 optionsText: 'label',
                                 value: attribute,
-                                optionsCaption: '<?php echo $block->escapeHtml(
+                                optionsCaption: '<?= $block->escapeHtml(
                                     __("Select")
                                 ); ?>'
                                 ">
@@ -341,14 +341,14 @@
                         <div data-role="gallery"
                              class="gallery"
                              data-images="[]"
-                             data-types="<?php  echo $block->escapeHtml(
+                             data-types="<?= $block->escapeHtml(
                                  $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
                              ) ?>"
                         >
                             <div class="image image-placeholder">
                                 <div data-role="uploader" class="uploader">
                                     <div class="image-browse">
-                                    <span><?php echo $block->escapeHtml(
+                                    <span><?= $block->escapeHtml(
                                             __('Browse Files...')
                                         ); ?></span>
                                         <input type="file" name="image" multiple="multiple"
@@ -356,7 +356,7 @@
                                     </div>
                                 </div>
                                 <div class="product-image-wrapper">
-                                    <p class="image-placeholder-text"><?php echo $block->escapeHtml(
+                                    <p class="image-placeholder-text"><?= $block->escapeHtml(
                                             __('Browse to find or drag image here')
                                         ); ?></p>
                                 </div>
@@ -368,10 +368,10 @@
 
                             <?php foreach ($block->getImageTypes() as $typeData):
                                 ?>
-                                <input name="<?php echo $block->escapeHtml($typeData['name']) ?>"
-                                       class="image-<?php echo $block->escapeHtml($typeData['code']) ?>"
+                                <input name="<?= $block->escapeHtml($typeData['name']) ?>"
+                                       class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                                        type="hidden"
-                                       value="<?php echo $block->escapeHtml($typeData['value']) ?>"/>
+                                       value="<?= $block->escapeHtml($typeData['value']) ?>"/>
                                 <?php
                             endforeach;
                             ?>
@@ -418,13 +418,13 @@
                                                     class="action-remove"
                                                     data-role="delete-button"
                                                     title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                            <span><?php echo $block->escapeHtml(
+                                            <span><?= $block->escapeHtml(
                                                     __('Remove image')
                                                 ); ?></span>
                                             </button>
                                             <div class="draggable-handle"></div>
                                         </div>
-                                        <div class="image-fade"><span><?php echo $block->escapeHtml(
+                                        <div class="image-fade"><span><?= $block->escapeHtml(
                                                     __('Hidden')
                                                 ); ?></span></div>
                                     </div>
@@ -438,12 +438,12 @@
                                         <?php
                                         foreach ($block->getMediaAttributes() as $attribute):
                                             ?>
-                                            <li data-role-code="<?php echo $block->escapeHtml(
+                                            <li data-role-code="<?= $block->escapeHtml(
                                                 $attribute->getAttributeCode()
-                                            ) ?>" class="item-role item-role-<?php echo $block->escapeHtml(
+                                            ) ?>" class="item-role item-role-<?= $block->escapeHtml(
                                                 $attribute->getAttributeCode()
                                             ) ?>">
-                                                <?php echo $block->escapeHtml($attribute->getFrontendLabel()) ?>
+                                                <?= $block->escapeHtml($attribute->getFrontendLabel()) ?>
                                             </li>
                                             <?php
                                         endforeach;
@@ -465,11 +465,11 @@
                                                     class="action-remove"
                                                     data-role="delete-button"
                                                     title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                                <span><?php echo $block->escapeHtml(__('Remove image')) ?></span>
+                                                <span><?= $block->escapeHtml(__('Remove image')) ?></span>
                                             </button>
                                             <div class="draggable-handle"></div>
                                         </div>
-                                        <div class="image-fade"><span><?php echo $block->escapeHtml(__('Hidden')) ?></span></div>
+                                        <div class="image-fade"><span><?= $block->escapeHtml(__('Hidden')) ?></span></div>
                                     </div>
                                     <!--<ul class="item-roles">
                                         <li class="item-role item-role-base">Base</li>
@@ -492,7 +492,7 @@
                                     <fieldset class="admin__fieldset fieldset-image-panel">
                                         <div class="admin__field field-image-description">
                                             <label class="admin__field-label" for="image-description">
-                                            <span><?php echo $block->escapeHtml(
+                                            <span><?= $block->escapeHtml(
                                                     __('Alt Text')
                                                 );?></span>
                                             </label>
@@ -508,7 +508,7 @@
 
                                         <div class="admin__field field-image-role">
                                             <label class="admin__field-label">
-                                            <span><?php echo $block->escapeHtml(
+                                            <span><?= $block->escapeHtml(
                                                     __('Role')
                                                 );?></span>
                                             </label>
@@ -522,11 +522,11 @@
                                                                 <input class="image-type"
                                                                        data-role="type-selector"
                                                                        type="checkbox"
-                                                                       value="<?php echo $block->escapeHtml(
+                                                                       value="<?= $block->escapeHtml(
                                                                            $attribute->getAttributeCode()
                                                                        ) ?>"
                                                                 />
-                                                                <?php echo $block->escapeHtml(
+                                                                <?= $block->escapeHtml(
                                                                     $attribute->getFrontendLabel()
                                                                 ) ?>
                                                             </label>
@@ -540,22 +540,22 @@
 
                                         <div class="admin__field admin__field-inline field-image-size" data-role="size">
                                             <label class="admin__field-label">
-                                            <span><?php echo $block->escapeHtml(
+                                            <span><?= $block->escapeHtml(
                                                     __('Image Size')
                                                 ); ?></span>
                                             </label>
-                                            <div class="admin__field-value" data-message="<?php echo $block->escapeHtml(
+                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(
                                                 __('{size}')
                                             ); ?>"></div>
                                         </div>
 
                                         <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                                             <label class="admin__field-label">
-                                            <span><?php echo $block->escapeHtml(
+                                            <span><?= $block->escapeHtml(
                                                     __('Image Resolution')
                                                 ); ?></span>
                                             </label>
-                                            <div class="admin__field-value" data-message="<?php echo $block->escapeHtml(
+                                            <div class="admin__field-value" data-message="<?= $block->escapeHtml(
                                                 __('{width}^{height} px')
                                             ); ?>"></div>
                                         </div>
@@ -572,7 +572,7 @@
                                                     <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                                                     <label for="hide-from-product-page" class="admin__field-label">
-                                                        <?php echo $block->escapeHtml(
+                                                        <?= $block->escapeHtml(
                                                             __('Hide from Product Page')
                                                         ); ?>
                                                     </label>
@@ -593,7 +593,7 @@
     <div data-bind="with: sections().price" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-                <span><?php echo $block->escapeHtml(
+                <span><?= $block->escapeHtml(
                         __('Price')
                     ); ?></span>
             </div>
@@ -607,7 +607,7 @@
                                data-bind="checked:type" />
                         <label for="apply-single-price-radio"
                                class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(
+                            <span><?= $block->escapeHtml(
                                     __('Apply single price to all SKUs')
                                 ); ?></span>
                         </label>
@@ -622,7 +622,7 @@
                                data-bind="checked:type" />
                         <label for="apply-unique-prices-radio"
                                class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(
+                            <span><?= $block->escapeHtml(
                                     __('Apply unique prices by attribute to each SKU')
                                 ); ?></span>
                         </label>
@@ -637,7 +637,7 @@
                                checked
                                data-bind="checked:type" />
                         <label for="skip-pricing-radio" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(
+                            <span><?= $block->escapeHtml(
                                     __('Skip price at this time')
                                 ); ?></span>
                         </label>
@@ -648,7 +648,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values" data-bind="visible: type() == 'single'">
                     <div class="admin__field _required">
                         <label for="apply-single-price-input" class="admin__field-label">
-                        <span><?php echo $block->escapeHtml(
+                        <span><?= $block->escapeHtml(
                                 __('Price')
                             ); ?></span>
                         </label>
@@ -667,7 +667,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label for="select-each-price" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(
+                            <span><?= $block->escapeHtml(
                                     __('Select attribute')
                                 ); ?></span>
                         </label>
@@ -708,7 +708,7 @@
     <div data-bind="with: sections().quantity" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-                <span><?php echo $block->escapeHtml(__('Quantity')) ?></span>
+                <span><?= $block->escapeHtml(__('Quantity')) ?></span>
             </div>
             <ul class="steps-wizard-section-list">
                 <li>
@@ -719,7 +719,7 @@
                                value="single"
                                data-bind="checked: type" />
                         <label for="apply-single-inventory-radio" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Apply single quantity to each SKUs')) ?></span>
+                            <span><?= $block->escapeHtml(__('Apply single quantity to each SKUs')) ?></span>
                         </label>
                     </div>
                 </li>
@@ -731,7 +731,7 @@
                                value="each"
                                data-bind="checked: type" />
                         <label for="apply-unique-inventory-radio" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Apply unique quantity by attribute to each SKU')) ?></span>
+                            <span><?= $block->escapeHtml(__('Apply unique quantity by attribute to each SKU')) ?></span>
                         </label>
                     </div>
                 </li>
@@ -744,7 +744,7 @@
                                checked
                                data-bind="checked: type" />
                         <label for="skip-inventory-radio" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Skip quantity at this time')) ?></span>
+                            <span><?= $block->escapeHtml(__('Skip quantity at this time')) ?></span>
                         </label>
                     </div>
                 </li>
@@ -754,7 +754,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values" data-bind="visible: type() == 'single'">
                     <div class="admin__field _required">
                         <label for="apply-single-inventory-input" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Quantity')) ?></span>
+                            <span><?= $block->escapeHtml(__('Quantity')) ?></span>
                         </label>
                         <div class="admin__field-control">
                             <input type="text"
@@ -770,7 +770,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label for="apply-single-price-input-qty" class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(__('Select attribute')) ?></span>
+                            <span><?= $block->escapeHtml(__('Select attribute')) ?></span>
                         </label>
                         <div class="admin__field-control">
                             <select id="apply-single-price-input-qty" class="admin__control-select" data-bind="
@@ -809,9 +809,9 @@
     "*": {
         "Magento_Ui/js/core/app": {
             "components": {
-                "<?= /* @noEscape */  $block->getComponentName()?>": {
+                "<?= /* @noEscape */  $block->getComponentName() ?>": {
                     "component": "Magento_ConfigurableProduct/js/variations/steps/bulk",
-                    "appendTo": "<?= /* @noEscape */  $block->getParentComponentName()?>",
+                    "appendTo": "<?= /* @noEscape */  $block->getParentComponentName() ?>",
                     "noImage": "<?= /* @noEscape */  $block->getNoImageUrl() ?>",
                     "variationsComponent": "<?= /* @noEscape */ $block->getData('config/form') ?>.configurableVariations"
                 }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
index ab0b66f46b13e..cfb742e80f719 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/select_attributes.phtml
@@ -10,29 +10,29 @@
 ?>
 <div class="select-attributes-block <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-role="select-attributes-step">
     <div class="select-attributes-actions" data-type="skipKO">
-        <?= /* @noEscape */  $block->getAddNewAttributeButton(); ?>
+        <?= /* @noEscape */  $block->getAddNewAttributeButton() ?>
     </div>
-    <h2 class="steps-wizard-title"><?php echo $block->escapeHtml(
+    <h2 class="steps-wizard-title"><?= $block->escapeHtml(
             __('Step 1: Select Attributes')
         ); ?></h2>
-    <div class="selected-attributes" data-bind="scope: '<?= /* @noEscape */  $block->getComponentName()?>'">
-        <?php echo $block->escapeHtml(
+    <div class="selected-attributes" data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
+        <?= $block->escapeHtml(
             __('Selected Attributes:')
         ); ?>
         <span data-bind="text: selectedAttributes() || '--'"></span>
     </div>
 </div>
-<?= $block->getChildHtml(); ?>
+<?= $block->getChildHtml() ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= /* @noEscape */  $block->getComponentName()?>": {
+                    "<?= /* @noEscape */  $block->getComponentName() ?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/select_attributes",
                         "multiselectName": "<?= /* @noEscape */ $block->getData('config/multiselectName') ?>",
                         "providerName": "<?= /* @noEscape */ $block->getData('config/providerName') ?>",
-                        "appendTo": "<?= /* @noEscape */  $block->getParentComponentName()?>"
+                        "appendTo": "<?= /* @noEscape */  $block->getParentComponentName() ?>"
                     }
                 }
             }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
index 99f712dba82ae..2ded3aa1079a9 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/summary.phtml
@@ -8,8 +8,8 @@
 
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Summary */
 ?>
-<div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName()?>'">
-    <h2 class="steps-wizard-title"><?php echo $block->escapeHtml(
+<div data-bind="scope: '<?= /* @noEscape */  $block->getComponentName() ?>'">
+    <h2 class="steps-wizard-title"><?= $block->escapeHtml(
             __('Step 4: Summary')
         ); ?></h2>
 
@@ -51,9 +51,9 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= /* @noEscape */  $block->getComponentName()?>": {
+                    "<?= /* @noEscape */  $block->getComponentName() ?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/summary",
-                        "appendTo": "<?= /* @noEscape */  $block->getParentComponentName()?>",
+                        "appendTo": "<?= /* @noEscape */  $block->getParentComponentName() ?>",
                         "variationsComponent": "<?= /* @noEscape */ $block->getData('config/form') ?>.configurableVariations",
                         "modalComponent": "<?= /* @noEscape */ $block->getData('config/form') ?>.configurableModal"
                     }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
index f56319687bd7a..07f4e39e43de6 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/config.phtml
@@ -8,7 +8,7 @@
 
  /** @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Edit\Tab\Variations\Config */
 ?>
-<div class="entry-edit form-inline" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>" data-panel="product-variations">
+<div class="entry-edit form-inline" id="<?= /* @escapeNotVerified */ $block->getId() ?>" data-panel="product-variations">
     <div data-bind="scope: 'variation-steps-wizard'" class="product-create-configuration">
         <div class="product-create-configuration-info">
             <div class="note" data-role="product-create-configuration-info">
@@ -31,13 +31,13 @@
             <div class="product-create-configuration-action" data-bind="scope: 'configurableProductGrid'">
                 <button class="action-tertiary action-menu-item" type="button" data-action="choose"
                         data-bind="click: showManuallyGrid, visible: button">
-                    <?= /* @noEscape */ __('Add Products Manually');?>
+                    <?= /* @noEscape */ __('Add Products Manually') ?>
                 </button>
             </div>
         </div>
     </div>
     <div class="fieldset">
-        <?php echo $block->getChildHtml('matrix'); ?>
+        <?= $block->getChildHtml('matrix') ?>
 
         <!-- Select Associated Product popup -->
         <div data-grid-id="associated-products-container">
@@ -66,14 +66,14 @@
                         "productsProvider": "configurable_associated_product_listing.data_source",
                         "productsMassAction": "configurable_associated_product_listing.configurable_associated_product_listing.product_columns.ids",
                         "productsColumns": "configurable_associated_product_listing.configurable_associated_product_listing.product_columns",
-                        "productsGridUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/associated_grid', ['componentJson' => true])?>",
+                        "productsGridUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/associated_grid', ['componentJson' => true]) ?>",
                         "configurableVariations": "configurableVariations"
                     }
                 }
             },
             "Magento_ConfigurableProduct/js/configurable-type-handler": {
-                "blockId": "#<?= /* @noEscape */ $block->getId()?>",
-                "tabId": "<?= /* @noEscape */ $block->getTabId()?>",
+                "blockId": "#<?= /* @noEscape */ $block->getId() ?>",
+                "tabId": "<?= /* @noEscape */ $block->getTabId() ?>",
                 "hasVariations": <?= /* @noEscape */ $block->isHasVariations() ? 'true' : 'false' ?>
             }
         }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
index 70c905752a6cf..230e0fd14ccb6 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/matrix.phtml
@@ -17,7 +17,7 @@ $currencySymbol = $block->getCurrencySymbol();
 <div id="product-variations-matrix" data-role="product-variations-matrix">
     <div data-bind="scope: 'configurableVariations'">
         <h3 class="hidden" data-bind="css: {hidden: !showVariations() }" class="title">
-            <?php /* @escapeNotVerified */ echo __('Current Variations'); ?>
+            <?= /* @escapeNotVerified */ __('Current Variations') ?>
         </h3>
 
         <script data-template-for="variation-image" type="text/x-magento-template">
@@ -47,22 +47,22 @@ $currencySymbol = $block->getCurrencySymbol();
                         <thead>
                             <tr>
                                 <th class="data-grid-th data-grid-thumbnail-cell col-image" data-column="image">
-                                    <?= /* @escapeNotVerified */  __('Image'); ?>
+                                    <?= /* @escapeNotVerified */  __('Image') ?>
                                 </th>
                                 <th class="data-grid-th col-name" data-column="name">
-                                    <?= /* @escapeNotVerified */  __('Name'); ?>
+                                    <?= /* @escapeNotVerified */  __('Name') ?>
                                 </th>
                                 <th class="data-grid-th col-sku" data-column="sku">
-                                    <?= /* @escapeNotVerified */  __('SKU'); ?>
+                                    <?= /* @escapeNotVerified */  __('SKU') ?>
                                 </th>
                                 <th class="data-grid-th col-price" data-column="price">
-                                    <?= /* @escapeNotVerified */  __('Price'); ?>
+                                    <?= /* @escapeNotVerified */  __('Price') ?>
                                 </th>
                                 <th class="data-grid-th col-qty" data-column="qty">
-                                    <?= /* @escapeNotVerified */  __('Quantity'); ?>
+                                    <?= /* @escapeNotVerified */  __('Quantity') ?>
                                 </th>
                                 <th class="data-grid-th col-weight" data-column="weight">
-                                    <?= /* @escapeNotVerified */  __('Weight'); ?>
+                                    <?= /* @escapeNotVerified */  __('Weight') ?>
                                 </th>
                                 <!-- ko foreach: getAttributesOptions() -->
                                     <th data-bind="attr: {class:'data-grid-th col-' + $data.attribute_code},
@@ -70,7 +70,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                     </th>
                                 <!-- /ko -->
                                 <th class="data-grid-th">
-                                    <?= /* @escapeNotVerified */  __('Actions'); ?>
+                                    <?= /* @escapeNotVerified */  __('Actions') ?>
                                 </th>
                             </tr>
                         </thead>
@@ -88,10 +88,10 @@ $currencySymbol = $block->getCurrencySymbol();
                                                 <input type="hidden" data-bind="
                                                     attr: {id: $parent.getRowId(variation, 'image'),
                                                     name: $parent.getVariationRowName(variation, 'image')}"/>
-                                                <span><?= /* @escapeNotVerified */  __('Upload Image'); ?></span>
+                                                <span><?= /* @escapeNotVerified */  __('Upload Image') ?></span>
                                                 <input name="image" type="file"
                                                        data-url="<?= $block->escapeHtml($block->getImageUploadUrl()) ?>"
-                                                       title="<?= $block->escapeHtml(__('Upload image')); ?>"/>
+                                                       title="<?= $block->escapeHtml(__('Upload image')) ?>"/>
                                             <!-- /ko -->
                                         </div>
                                         <!-- ko if: variation.editable -->
@@ -102,11 +102,11 @@ $currencySymbol = $block->getCurrencySymbol();
                                         <!-- /ko -->
                                         <button type="button" class="action toggle no-display" data-toggle="dropdown"
                                                 data-mage-init='{"dropdown":{}}'>
-                                            <span><?= /* @escapeNotVerified */  __('Select'); ?></span>
+                                            <span><?= /* @escapeNotVerified */  __('Select') ?></span>
                                         </button>
                                         <ul class="dropdown">
                                             <li>
-                                                <a class="item" data-action="no-image"><?= /* @escapeNotVerified */  __('No Image'); ?></a>
+                                                <a class="item" data-action="no-image"><?= /* @escapeNotVerified */  __('No Image') ?></a>
                                             </li>
                                         </ul>
                                     </div>
@@ -208,7 +208,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                                     "
                                                    data-action="choose"
                                                    href="#">
-                                                    <?= /* @escapeNotVerified */  __('Choose a different Product');?>
+                                                    <?= /* @escapeNotVerified */  __('Choose a different Product') ?>
                                                 </a>
                                             </li>
                                             <li>
@@ -219,7 +219,7 @@ $currencySymbol = $block->getCurrencySymbol();
                                             </li>
                                             <li>
                                                 <a class="action-menu-item" data-bind="click: $parent.removeProduct.bind($parent, $index())">
-                                                    <?= /* @escapeNotVerified */  __('Remove Product');?>
+                                                    <?= /* @escapeNotVerified */  __('Remove Product') ?>
                                                 </a>
                                             </li>
                                         </ul>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
index fe4d600d5c734..2e38633218652 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard-ajax.phtml
@@ -20,9 +20,9 @@ $attributes = $block->getProductAttributes();
 <script>
     require(['jquery', 'uiRegistry', 'underscore'], function ($, registry, _) {
         $('body').trigger('contentUpdated');
-        $('.<?= /* @noEscape */ $block->getData('config/dataScope')?>[data-role=steps-wizard-main]').applyBindings();
+        $('.<?= /* @noEscape */ $block->getData('config/dataScope') ?>[data-role=steps-wizard-main]').applyBindings();
 
-        registry.async('<?= /* @noEscape */ $block->getData('config/nameStepWizard')?>')(function (component) {
+        registry.async('<?= /* @noEscape */ $block->getData('config/nameStepWizard') ?>')(function (component) {
             _.delay(component.open.bind(component), 500); // TODO: MAGETWO-50246
         })
     });
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
index bb5b165c28d69..3a23257cbbf9b 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/wizard.phtml
@@ -26,7 +26,7 @@ $currencySymbol = $block->getCurrencySymbol();
                 "components": {
                     "<?= /* @noEscape */ $block->getData('config/form') ?>.<?= /* @noEscape */ $block->getModal() ?>": {
                         "component": "Magento_ConfigurableProduct/js/components/modal-configurable",
-                        "options": {"type": "slide", "title": "<?php echo $block->escapeHtml(__('Create Product Configurations')); ?>"},
+                        "options": {"type": "slide", "title": "<?= $block->escapeHtml(__('Create Product Configurations')) ?>"},
                         "formName": "<?= /* @noEscape */ $block->getForm() ?>",
                         "isTemplate": false,
                         "stepWizard": "<?= /* @noEscape */ $block->getData('config/nameStepWizard') ?>",
@@ -47,7 +47,7 @@ $currencySymbol = $block->getCurrencySymbol();
                         "formName": "<?= /* @noEscape */ $block->getForm() ?>",
                         "attributeSetHandler": "<?= /* @noEscape */ $block->getForm() ?>.configurable_attribute_set_handler_modal",
                         "wizardModalButtonName": "<?= /* @noEscape */ $block->getForm() ?>.configurable.configurable_products_button_set.create_configurable_products_button",
-                        "wizardModalButtonTitle": "<?php echo $block->escapeHtml(__('Edit Configurations')); ?>",
+                        "wizardModalButtonTitle": "<?= $block->escapeHtml(__('Edit Configurations')) ?>",
                         "productAttributes": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
                         "productUrl": "<?= /* @noEscape */ $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
                         "variations": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
index de41bc3436cd7..6c993b243da23 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/form.phtml
@@ -9,5 +9,5 @@
 /* @var $block \Magento\Framework\View\Element\Template */
 ?>
 <div data-role="affected-attribute-set-selector" class="no-display affected-attribute-set">
-    <?= $block->getChildHtml('affected-attribute-set-form'); ?>
+    <?= $block->getChildHtml('affected-attribute-set-form') ?>
 </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
index c0694b74ac6d4..d70576d975ac3 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml
@@ -48,12 +48,12 @@
 
         $form
             .modal({
-                title: '<?php /* @escapeNotVerified */ echo __('Choose Affected Attribute Set'); ?>',
+                title: '<?= /* @escapeNotVerified */ __('Choose Affected Attribute Set') ?>',
                 closed: function () {
                     resetValidation();
                 },
                 buttons: [{
-                    text: '<?php /* @escapeNotVerified */ echo __('Confirm'); ?>',
+                    text: '<?= /* @escapeNotVerified */ __('Confirm') ?>',
                     attr: {
                         'data-action': 'confirm'
                     },
@@ -77,12 +77,12 @@
 
                         $.ajax({
                             type: 'POST',
-                            url: '<?php /* @escapeNotVerified */ echo $block->getAttributeSetCreationUrl()?>',
+                            url: '<?= /* @escapeNotVerified */ $block->getAttributeSetCreationUrl() ?>',
                             data: {
                                 gotoEdit: 1,
                                 attribute_set_name: $form.find('input[name=new-attribute-set-name]').val(),
                                 skeleton_set: $('#attribute_set_id').val(),
-                                form_key: '<?php /* @escapeNotVerified */ echo $block->getFormKey()?>',
+                                form_key: '<?= /* @escapeNotVerified */ $block->getFormKey() ?>',
                                 return_session_messages_only: 1
                             },
                             dataType: 'json',
@@ -101,8 +101,8 @@
                         return false;
                     }
                 },{
-                    text: '<?php /* @escapeNotVerified */ echo __('Cancel'); ?>',
-                    id: '<?php /* @escapeNotVerified */ echo $block->getJsId('close-button') ?>',
+                    text: '<?= /* @escapeNotVerified */ __('Cancel') ?>',
+                    id: '<?= /* @escapeNotVerified */ $block->getJsId('close-button') ?>',
                     'class': 'action-close',
                     click: function() {
                         $form.modal('closeModal');
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
index d39f76d2a21bb..98abb906f69d6 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/final_price.phtml
@@ -49,12 +49,12 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 
 <?php if ($block->showMinimalPrice()): ?>
     <?php if ($block->getUseLinkForAsLowAs()):?>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getSaleableItem()->getProductUrl(); ?>" class="minimal-price-link">
-            <?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?>
+        <a href="<?= /* @escapeNotVerified */ $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">
+            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
         </a>
     <?php else:?>
         <span class="minimal-price-link">
-            <?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?>
+            <?= /* @escapeNotVerified */ $block->renderAmountMinimal() ?>
         </span>
     <?php endif?>
 <?php endif; ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
index 57f24c7450230..9b8e2c0c8c0bd 100644
--- a/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/frontend/templates/product/view/type/options/configurable.phtml
@@ -16,16 +16,16 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
 <?php if ($_product->isSaleable() && count($_attributes)):?>
     <?php foreach ($_attributes as $_attribute): ?>
         <div class="field configurable required">
-            <label class="label" for="attribute<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>">
-                <span><?php echo $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
+            <label class="label" for="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>">
+                <span><?= $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
             </label>
             <div class="control">
-                <select name="super_attribute[<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>]"
-                        data-selector="super_attribute[<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>]"
+                <select name="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
+                        data-selector="super_attribute[<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>]"
                         data-validate="{required:true}"
-                        id="attribute<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>"
+                        id="attribute<?= /* @escapeNotVerified */ $_attribute->getAttributeId() ?>"
                         class="super-attribute-select">
-                    <option value=""><?php /* @escapeNotVerified */ echo __('Choose an Option...') ?></option>
+                    <option value=""><?= /* @escapeNotVerified */ __('Choose an Option...') ?></option>
                 </select>
             </div>
         </div>
@@ -34,7 +34,7 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
         {
             "#product_addtocart_form": {
                 "configurable": {
-                    "spConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>,
+                    "spConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>,
                     "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                         'Magento_ConfigurableProduct') ?: 'replace'; ?>"
                 }
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index ba62a06e10097..d64a991bcafad 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -8,45 +8,45 @@
 /** @var \Magento\Contact\Block\ContactForm $block */
 ?>
 <form class="form contact"
-      action="<?php echo $block->escapeUrl($block->getFormAction()); ?>"
+      action="<?= $block->escapeUrl($block->getFormAction()) ?>"
       id="contact-form"
       method="post"
-      data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>"
+      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"
       data-mage-init='{"validation":{}}'>
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Write Us')) ?></span></legend><br />
-        <div class="field note no-label"><?php echo $block->escapeHtml(__('Jot us a note and we’ll get back to you as quickly as possible.')) ?></div>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Write Us')) ?></span></legend><br />
+        <div class="field note no-label"><?= $block->escapeHtml(__('Jot us a note and we’ll get back to you as quickly as possible.')) ?></div>
         <div class="field name required">
-            <label class="label" for="name"><span><?php echo $block->escapeHtml(__('Name')) ?></span></label>
+            <label class="label" for="name"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
             <div class="control">
-                <input name="name" id="name" title="<?php echo $block->escapeHtmlAttr(__('Name')) ?>" value="<?php echo $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('name') ?: $this->helper('Magento\Contact\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
+                <input name="name" id="name" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('name') ?: $this->helper('Magento\Contact\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
             </div>
         </div>
         <div class="field email required">
-            <label class="label" for="email"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+            <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input name="email" id="email" title="<?php echo $block->escapeHtmlAttr(__('Email')) ?>" value="<?php echo $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('email') ?: $this->helper('Magento\Contact\Helper\Data')->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
+                <input name="email" id="email" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('email') ?: $this->helper('Magento\Contact\Helper\Data')->getUserEmail()) ?>" class="input-text" type="email" data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
         <div class="field telephone">
-            <label class="label" for="telephone"><span><?php echo $block->escapeHtml(__('Phone Number')) ?></span></label>
+            <label class="label" for="telephone"><span><?= $block->escapeHtml(__('Phone Number')) ?></span></label>
             <div class="control">
-                <input name="telephone" id="telephone" title="<?php echo $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?php echo $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('telephone')) ?>" class="input-text" type="text" />
+                <input name="telephone" id="telephone" title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>" value="<?= $block->escapeHtmlAttr($this->helper('Magento\Contact\Helper\Data')->getPostValue('telephone')) ?>" class="input-text" type="text" />
             </div>
         </div>
         <div class="field comment required">
-            <label class="label" for="comment"><span><?php echo $block->escapeHtml(__('What’s on your mind?')) ?></span></label>
+            <label class="label" for="comment"><span><?= $block->escapeHtml(__('What’s on your mind?')) ?></span></label>
             <div class="control">
-                <textarea name="comment" id="comment" title="<?php echo $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?php echo $block->escapeHtml($this->helper('Magento\Contact\Helper\Data')->getPostValue('comment')) ?></textarea>
+                <textarea name="comment" id="comment" title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"><?= $block->escapeHtml($this->helper('Magento\Contact\Helper\Data')->getPostValue('comment')) ?></textarea>
             </div>
         </div>
-        <?php echo $block->getChildHtml('form.additional.info'); ?>
+        <?= $block->getChildHtml('form.additional.info') ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
             <input type="hidden" name="hideit" id="hideit" value="" />
-            <button type="submit" title="<?php echo $block->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary">
-                <span><?php echo $block->escapeHtml(__('Submit')) ?></span>
+            <button type="submit" title="<?= $block->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary">
+                <span><?= $block->escapeHtml(__('Submit')) ?></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
index d9ecaf99de8b6..c5cfda8cd7d15 100644
--- a/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml
@@ -16,13 +16,13 @@
          style="display: none;">
         <div role="document" class="content" tabindex="0">
             <p>
-                <strong><?php echo $block->escapeHtml(__('We use cookies to make your experience better.')) ?></strong>
-                <span><?php echo $block->escapeHtml(__('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.')) ?></span>
-                <?php echo $block->escapeHtml(__('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()), ['a']) ?>
+                <strong><?= $block->escapeHtml(__('We use cookies to make your experience better.')) ?></strong>
+                <span><?= $block->escapeHtml(__('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.')) ?></span>
+                <?= $block->escapeHtml(__('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()), ['a']) ?>
             </p>
             <div class="actions">
                 <button id="btn-cookie-allow" class="action allow primary">
-                    <span><?php echo $block->escapeHtml(__('Allow Cookies')); ?></span>
+                    <span><?= $block->escapeHtml(__('Allow Cookies')) ?></span>
                 </button>
             </div>
         </div>
@@ -32,10 +32,10 @@
             "#notice-cookie-block": {
                 "cookieNotices": {
                     "cookieAllowButtonSelector": "#btn-cookie-allow",
-                    "cookieName": "<?php /* @noEscape */ echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
-                    "cookieValue": <?php /* @noEscape */ echo $this->helper(\Magento\Cookie\Helper\Cookie::class)->getAcceptedSaveCookiesWebsiteIds() ?>,
-                    "cookieLifetime": <?php /* @noEscape */ echo $this->helper(\Magento\Cookie\Helper\Cookie::class)->getCookieRestrictionLifetime()?>,
-                    "noCookiesUrl": "<?php echo $block->escapeJs($block->escapeUrl($block->getUrl('cookie/index/noCookies'))) ?>"
+                    "cookieName": "<?= /* @noEscape */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
+                    "cookieValue": <?= /* @noEscape */ $this->helper(\Magento\Cookie\Helper\Cookie::class)->getAcceptedSaveCookiesWebsiteIds() ?>,
+                    "cookieLifetime": <?= /* @noEscape */ $this->helper(\Magento\Cookie\Helper\Cookie::class)->getCookieRestrictionLifetime() ?>,
+                    "noCookiesUrl": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('cookie/index/noCookies'))) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Cookie/view/frontend/templates/require_cookie.phtml b/app/code/Magento/Cookie/view/frontend/templates/require_cookie.phtml
index b8cf74ab4f977..8e26f5aec687a 100644
--- a/app/code/Magento/Cookie/view/frontend/templates/require_cookie.phtml
+++ b/app/code/Magento/Cookie/view/frontend/templates/require_cookie.phtml
@@ -9,7 +9,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "requireCookie": <?php /* @noEscape */ echo $block->getScriptOptions(); ?>
+            "requireCookie": <?= /* @noEscape */ $block->getScriptOptions() ?>
         }
     }
 </script>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 76f2fe99013f7..7dca29263bae3 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
@@ -15,29 +15,29 @@
 
 <?php $block->getCurrencySymbolsData();?>
 
-<form id="currency-symbols-form" action="<?php /* @escapeNotVerified */ echo $block->getFormActionUrl() ?>" method="post">
-    <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
+<form id="currency-symbols-form" action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" method="post">
+    <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
     <fieldset class="admin__fieldset">
         <?php foreach ($block->getCurrencySymbolsData() as $code => $data): ?>
         <div class="admin__field _required">
-            <label class="admin__field-label" for="custom_currency_symbol<?php /* @escapeNotVerified */ echo $code; ?>">
-                <span><?php /* @escapeNotVerified */ echo $code; ?> (<?php /* @escapeNotVerified */ echo $data['displayName']; ?>)</span>
+            <label class="admin__field-label" for="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>">
+                <span><?= /* @escapeNotVerified */ $code ?> (<?= /* @escapeNotVerified */ $data['displayName'] ?>)</span>
             </label>
             <div class="admin__field-control">
-                <input id="custom_currency_symbol<?php /* @escapeNotVerified */ echo $code; ?>"
+                <input id="custom_currency_symbol<?= /* @escapeNotVerified */ $code ?>"
                        class="required-entry admin__control-text"
                        type="text"
-                       value="<?php echo $block->escapeHtmlAttr($data['displaySymbol']); ?>"
-                       <?php echo $data['inherited'] ? ' disabled="disabled"' : '';?>
-                       name="custom_currency_symbol[<?php /* @escapeNotVerified */ echo $code; ?>]">
+                       value="<?= $block->escapeHtmlAttr($data['displaySymbol']) ?>"
+                       <?= $data['inherited'] ? ' disabled="disabled"' : '' ?>
+                       name="custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
                 <div class="admin__field admin__field-option">
-                    <input id="custom_currency_symbol_inherit<?php /* @escapeNotVerified */ echo $code; ?>"
+                    <input id="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"
                            class="admin__control-checkbox" type="checkbox"
-                           onclick="toggleUseDefault(<?php /* @escapeNotVerified */ echo '\'' . $code . '\',\'' . $block->escapeJs($data['parentSymbol']) . '\''; ?>)"
-                            <?php echo $data['inherited'] ? ' checked="checked"' : ''; ?>
+                           onclick="toggleUseDefault(<?= /* @escapeNotVerified */ '\'' . $code . '\',\'' . $block->escapeJs($data['parentSymbol']) . '\'' ?>)"
+                            <?= $data['inherited'] ? ' checked="checked"' : '' ?>
                            value="1"
-                           name="inherit_custom_currency_symbol[<?php /* @escapeNotVerified */ echo $code; ?>]">
-                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?php /* @escapeNotVerified */ echo $code; ?>"><span><?php /* @escapeNotVerified */ echo $block->getInheritText(); ?></span></label>
+                           name="inherit_custom_currency_symbol[<?= /* @escapeNotVerified */ $code ?>]">
+                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?= /* @escapeNotVerified */ $code ?>"><span><?= /* @escapeNotVerified */ $block->getInheritText() ?></span></label>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
index 363be2feb89bc..8e0abcb319764 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/matrix.phtml
@@ -18,17 +18,17 @@ $_newRates = $block->getNewRates();
 $_rates = ($_newRates) ? $_newRates : $_oldRates;
 ?>
 <?php if (empty($_rates)): ?>
-    <div class="message message-warning warning"><p><?php /* @escapeNotVerified */ echo __('You must first configure currency options before being able to see currency rates.');?></p></div>
+    <div class="message message-warning warning"><p><?= /* @escapeNotVerified */ __('You must first configure currency options before being able to see currency rates.') ?></p></div>
 <?php else: ?>
-    <form name="rateForm" id="rate-form" method="post" action="<?php /* @escapeNotVerified */ echo $block->getRatesFormAction(); ?>">
-        <?php echo $block->getBlockHtml('formkey')?>
+    <form name="rateForm" id="rate-form" method="post" action="<?= /* @escapeNotVerified */ $block->getRatesFormAction() ?>">
+        <?= $block->getBlockHtml('formkey') ?>
         <div class="admin__control-table-wrapper">
             <table class="admin__control-table">
                 <thead>
                     <tr>
                         <th>&nbsp;</th>
                         <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
-                            <th><span><?php /* @escapeNotVerified */ echo $_currencyCode ?></span></th>
+                            <th><span><?= /* @escapeNotVerified */ $_currencyCode ?></span></th>
                         <?php endforeach; ?>
                     </tr>
                 </thead>
@@ -37,26 +37,26 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
                     <?php if (isset($_rates[$_currencyCode]) && is_array($_rates[$_currencyCode])): ?>
                         <?php foreach ($_rates[$_currencyCode] as $_rate => $_value): ?>
                             <?php if (++$_j == 1): ?>
-                                <td><span class="admin__control-support-text"><?php /* @escapeNotVerified */ echo $_currencyCode ?></span></td>
+                                <td><span class="admin__control-support-text"><?= /* @escapeNotVerified */ $_currencyCode ?></span></td>
                                 <td>
                                     <input type="text"
-                                           name="rate[<?php /* @escapeNotVerified */ echo $_currencyCode ?>][<?php /* @escapeNotVerified */ echo $_rate ?>]"
-                                           value="<?php echo($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
+                                           name="rate[<?= /* @escapeNotVerified */ $_currencyCode ?>][<?= /* @escapeNotVerified */ $_rate ?>]"
+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
                                            class="admin__control-text"
-                                            <?php echo($_currencyCode == $_rate) ? ' disabled' : '' ?> />
+                                            <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
                                     <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <div class="admin__field-note"><?php /* @escapeNotVerified */ echo __('Old rate:') ?> <b><?php /* @escapeNotVerified */ echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
                                     <?php endif; ?>
                                 </td>
                             <?php else: ?>
                                 <td>
                                     <input type="text"
-                                           name="rate[<?php /* @escapeNotVerified */ echo $_currencyCode ?>][<?php /* @escapeNotVerified */ echo $_rate ?>]"
-                                           value="<?php echo($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
+                                           name="rate[<?= /* @escapeNotVerified */ $_currencyCode ?>][<?= /* @escapeNotVerified */ $_rate ?>]"
+                                           value="<?= ($_currencyCode == $_rate) ? '1.0000' : ($_value>0 ? $_value : (isset($_oldRates[$_currencyCode][$_rate]) ? $_oldRates[$_currencyCode][$_rate] : '')) ?>"
                                            class="admin__control-text"
-                                           <?php echo($_currencyCode == $_rate) ? ' disabled' : '' ?> />
+                                           <?= ($_currencyCode == $_rate) ? ' disabled' : '' ?> />
                                     <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                    <div class="admin__field-note"><?php /* @escapeNotVerified */ echo __('Old rate:') ?> <b><?php /* @escapeNotVerified */ echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                    <div class="admin__field-note"><?= /* @escapeNotVerified */ __('Old rate:') ?> <b><?= /* @escapeNotVerified */ $_oldRates[$_currencyCode][$_rate] ?></b></div>
                                     <?php endif; ?>
                                 </td>
                             <?php endif; ?>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
index cc8c2378197e5..985831c5de79f 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rate/services.phtml
@@ -13,8 +13,8 @@
  */
 ?>
 <div class="admin__field">
-    <label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Import Service') ?></span></label>
+    <label class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Service') ?></span></label>
     <div class="admin__field-control">
-        <?php echo $block->getChildHtml('import_services') ?>
+        <?= $block->getChildHtml('import_services') ?>
     </div>
 </div>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
index 1c424a5d905cd..42b2affa2c176 100644
--- a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
+++ b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
@@ -13,13 +13,13 @@
  */
 ?>
 
-<form action="<?php /* @escapeNotVerified */ echo $block->getImportFormAction() ?>" method="post" class="import-service">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= /* @escapeNotVerified */ $block->getImportFormAction() ?>" method="post" class="import-service">
+    <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset admin__fieldset-import-service">
-        <?php echo $block->getServicesHtml() ?>
-        <?php echo $block->getImportButtonHtml() ?>
+        <?= $block->getServicesHtml() ?>
+        <?= $block->getImportButtonHtml() ?>
     </fieldset>
 </form>
-<?php echo $block->getResetButtonHtml() ?>
-<?php echo $block->getSaveButtonHtml() ?>
-<?php echo $block->getRatesMatrixHtml() ?>
+<?= $block->getResetButtonHtml() ?>
+<?= $block->getSaveButtonHtml() ?>
+<?= $block->getRatesMatrixHtml() ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
index b85a55c00e5b7..f55562682d9be 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/sales/order/create/address/form/renderer/vat.phtml
@@ -16,18 +16,18 @@ $_validateButton = $block->getValidateButton();
 <?php if (!$_element->getNoDisplay()): ?>
 <div class="admin__field field-vat-number">
     <?php if ($_element->getType() == 'hidden'): ?>
-    <div class="hidden"><?php echo $_element->getElementHtml(); ?></div>
+    <div class="hidden"><?= $_element->getElementHtml() ?></div>
     <?php else: ?>
-    <?php echo $_element->getLabelHtml(); ?>
-    <div class="admin__field-control <?php /* @noEscape */ echo $_element->hasValueClass() ? $block->escapeHtmlAttr($_element->getValueClass()) : 'value'; ?><?php echo $_class ? $block->escapeHtmlAttr($_class) . '-value' : ''; ?>">
-        <?php echo $_element->getElementHtml(); ?>
+    <?= $_element->getLabelHtml() ?>
+    <div class="admin__field-control <?= /* @noEscape */ $_element->hasValueClass() ? $block->escapeHtmlAttr($_element->getValueClass()) : 'value' ?><?= $_class ? $block->escapeHtmlAttr($_class) . '-value' : '' ?>">
+        <?= $_element->getElementHtml() ?>
         <?php if ($_note): ?>
-            <div class="admin__field-note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php echo $block->escapeHtmlAttr($_element->getId()); ?>">
-                <span><?php echo $block->escapeHtml($_note); ?></span>
+            <div class="admin__field-note<?= $_class ? " {$_class}-note" : '' ?>" id="note_<?= $block->escapeHtmlAttr($_element->getId()) ?>">
+                <span><?= $block->escapeHtml($_note) ?></span>
             </div>
         <?php endif; ?>
         <div class="actions">
-            <?php echo $_validateButton->toHtml(); ?>
+            <?= $_validateButton->toHtml() ?>
         </div>
     </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
index 175528825a2ab..8eb3057d0a390 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/system/config/validatevat.phtml
@@ -16,14 +16,14 @@ require(['prototype'], function(){
         var validationMessage = $('validation_result');
 
         params = {
-            country: $('<?php echo $block->escapeJs($block->getMerchantCountryField()); ?>').value,
-            vat: $('<?php echo $block->escapeJs($block->getMerchantVatNumberField()); ?>').value
+            country: $('<?= $block->escapeJs($block->getMerchantCountryField()) ?>').value,
+            vat: $('<?= $block->escapeJs($block->getMerchantVatNumberField()) ?>').value
         };
 
-        new Ajax.Request('<?php echo $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>', {
+        new Ajax.Request('<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>', {
             parameters: params,
             onSuccess: function(response) {
-                var result = '<?php echo $block->escapeJs($block->escapeHtml(__('Error during VAT Number verification.'))) ?>';
+                var result = '<?= $block->escapeJs($block->escapeHtml(__('Error during VAT Number verification.'))) ?>';
                 try {
                     if (response.responseText.isJSON()) {
                         response = response.responseText.evalJSON();
@@ -49,7 +49,7 @@ require(['prototype'], function(){
 </script>
 <div class="actions actions-validate-vat">
     <div id="validation_result" class="message-validation hidden"></div>
-    <button onclick="javascript:validateVat(); return false;" class="action-validate-vat" type="button" id="<?php echo $block->escapeHtmlAttr($block->getHtmlId()) ?>">
-        <span><?php echo $block->escapeHtml($block->getButtonLabel()) ?></span>
+    <button onclick="javascript:validateVat(); return false;" class="action-validate-vat" type="button" id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>">
+        <span><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
     </button>
 </div>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
index 12a27edb45cf3..76fa53c12548d 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
@@ -12,12 +12,12 @@
 <div class="content-header skip-header">
     <table>
         <tr>
-            <td style="width:50%;"><h4><?php echo $block->escapeHtml($block->getCartHeader()); ?></h4></td>
+            <td style="width:50%;"><h4><?= $block->escapeHtml($block->getCartHeader()) ?></h4></td>
         </tr>
     </table>
 </div>
 <?php endif ?>
-<?php echo $block->getGridParentHtml() ?>
+<?= $block->getGridParentHtml() ?>
 <?php if ($block->canDisplayContainer()) : ?>
 <?php
     $listType = $block->getJsObjectName();
@@ -29,19 +29,19 @@ require([
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(alert, confirm){
 
-<?php echo $block->escapeJs($block->getJsObjectName()) ?>cartControl = {
+<?= $block->escapeJs($block->getJsObjectName()) ?>cartControl = {
     reload: function (params) {
         if (!params) {
             params = {};
         }
-        <?php echo $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = params;
-        <?php echo $block->escapeJs($block->getJsObjectName()) ?>.reload();
-        <?php echo $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = {};
+        <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = params;
+        <?= $block->escapeJs($block->getJsObjectName()) ?>.reload();
+        <?= $block->escapeJs($block->getJsObjectName()) ?>.reloadParams = {};
     },
 
     configureItem: function (itemId) {
-        productConfigure.setOnLoadIFrameCallback('<?php echo $block->escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this));
-        productConfigure.showItemConfiguration('<?php echo $block->escapeJs($listType) ?>', itemId);
+        productConfigure.setOnLoadIFrameCallback('<?= $block->escapeJs($listType) ?>', this.cbOnLoadIframe.bind(this));
+        productConfigure.showItemConfiguration('<?= $block->escapeJs($listType) ?>', itemId);
         return false;
     },
 
@@ -57,14 +57,14 @@ require([
 
         if (!itemId) {
             alert({
-                content: '<?php echo $block->escapeJs(__('No item specified.')) ?>'
+                content: '<?= $block->escapeJs(__('No item specified.')) ?>'
             });
 
             return false;
         }
 
         confirm({
-            content: '<?php echo $block->escapeJs(__('Are you sure you want to remove this item?')) ?>',
+            content: '<?= $block->escapeJs(__('Are you sure you want to remove this item?')) ?>',
             actions: {
                 confirm: function(){
                     self.reload({'delete':itemId});
@@ -81,10 +81,10 @@ $params = [
 ];
 ?>
 productConfigure.addListType(
-    '<?php echo $block->escapeJs($listType) ?>',
+    '<?= $block->escapeJs($listType) ?>',
     {
-        urlFetch: '<?php echo $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>',
-        urlConfirm: '<?php echo $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>'
+        urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/configure', $params))) ?>',
+        urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/cart_product_composite_cart/update', $params))) ?>'
     }
 );
 
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
index 732ce93c6d1ed..30acb16c158d2 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/newsletter.phtml
@@ -8,6 +8,6 @@
 
 ?>
 <div class="entry-edit">
-<?php echo $block->getForm()->getHtml() ?>
+<?= $block->getForm()->getHtml() ?>
 </div>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
index 9ff7ce3f42150..c385a3ede3906 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view.phtml
@@ -9,4 +9,5 @@
  */
 
 /** @var $block \Magento\Customer\Block\Adminhtml\Edit\Tab\View */
-echo $block->getChildHtml();
+?>
+<?= $block->getChildHtml();
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
index 76b757f5a1876..f43cb8ab5f0de 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml
@@ -16,52 +16,52 @@ $createDateStore = $block->getStoreCreateDate();
 ?>
 <div class="fieldset-wrapper customer-information">
     <div class="fieldset-wrapper-title">
-        <span class="title"><?php echo $block->escapeHtml(__('Personal Information')) ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Personal Information')) ?></span>
     </div>
     <table class="admin__table-secondary">
         <tbody>
-        <?php echo $block->getChildHtml(); ?>
+        <?= $block->getChildHtml() ?>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Last Logged In:')) ?></th>
-            <td><?php echo $block->escapeHtml($lastLoginDateAdmin) ?> (<?php echo $block->escapeHtml($block->getCurrentStatus()) ?>)</td>
+            <th><?= $block->escapeHtml(__('Last Logged In:')) ?></th>
+            <td><?= $block->escapeHtml($lastLoginDateAdmin) ?> (<?= $block->escapeHtml($block->getCurrentStatus()) ?>)</td>
         </tr>
         <?php if ($lastLoginDateAdmin != $lastLoginDateStore): ?>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone())) ?></th>
-            <td><?php echo $block->escapeHtml($lastLoginDateStore) ?> (<?php echo $block->escapeHtml($block->getCurrentStatus()) ?>)</td>
+            <th><?= $block->escapeHtml(__('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone())) ?></th>
+            <td><?= $block->escapeHtml($lastLoginDateStore) ?> (<?= $block->escapeHtml($block->getCurrentStatus()) ?>)</td>
         </tr>
         <?php endif; ?>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Account Lock:')) ?></th>
-            <td><?php echo $block->escapeHtml($block->getAccountLock()) ?></td>
+            <th><?= $block->escapeHtml(__('Account Lock:')) ?></th>
+            <td><?= $block->escapeHtml($block->getAccountLock()) ?></td>
         </tr>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Confirmed email:')) ?></th>
-            <td><?php echo $block->escapeHtml($block->getIsConfirmedStatus()) ?></td>
+            <th><?= $block->escapeHtml(__('Confirmed email:')) ?></th>
+            <td><?= $block->escapeHtml($block->getIsConfirmedStatus()) ?></td>
         </tr>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Account Created:')) ?></th>
-            <td><?php echo $block->escapeHtml($createDateAdmin) ?></td>
+            <th><?= $block->escapeHtml(__('Account Created:')) ?></th>
+            <td><?= $block->escapeHtml($createDateAdmin) ?></td>
         </tr>
         <?php if ($createDateAdmin != $createDateStore): ?>
             <tr>
-                <th><?php echo $block->escapeHtml(__('Account Created on (%1):', $block->getStoreCreateDateTimezone())) ?></th>
-                <td><?php echo $block->escapeHtml($createDateStore) ?></td>
+                <th><?= $block->escapeHtml(__('Account Created on (%1):', $block->getStoreCreateDateTimezone())) ?></th>
+                <td><?= $block->escapeHtml($createDateStore) ?></td>
             </tr>
         <?php endif; ?>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Account Created in:')) ?></th>
-            <td><?php echo $block->escapeHtml($block->getCreatedInStore()) ?></td>
+            <th><?= $block->escapeHtml(__('Account Created in:')) ?></th>
+            <td><?= $block->escapeHtml($block->getCreatedInStore()) ?></td>
         </tr>
         <tr>
-            <th><?php echo $block->escapeHtml(__('Customer Group:')) ?></th>
-            <td><?php echo $block->escapeHtml($block->getGroupName()) ?></td>
+            <th><?= $block->escapeHtml(__('Customer Group:')) ?></th>
+            <td><?= $block->escapeHtml($block->getGroupName()) ?></td>
         </tr>
         </tbody>
     </table>
     <address>
-        <strong><?php echo $block->escapeHtml(__('Default Billing Address')) ?></strong><br/>
-        <?php echo $block->getBillingAddressHtml() ?>
+        <strong><?= $block->escapeHtml(__('Default Billing Address')) ?></strong><br/>
+        <?= $block->getBillingAddressHtml() ?>
     </address>
 
 </div>
diff --git a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
index 720ddcf9261b7..12eae5cac9b1a 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/view/sales.phtml
@@ -13,27 +13,27 @@ $singleStoreMode = $block->isSingleStoreMode();
 <div class="entry-edit fieldset-wrapper">
 
     <div class="fieldset-wrapper-title">
-        <span class="title"><?php echo $block->escapeHtml(__('Sales Statistics')) ?></span>
+        <span class="title"><?= $block->escapeHtml(__('Sales Statistics')) ?></span>
     </div>
 
     <table class="data-table">
         <thead>
         <tr>
             <?php if (!$singleStoreMode): ?>
-            <th><?php echo $block->escapeHtml(__('Web Site')) ?></th>
-            <th><?php echo $block->escapeHtml(__('Store')) ?></th>
-            <th><?php echo $block->escapeHtml(__('Store View')) ?></th>
+            <th><?= $block->escapeHtml(__('Web Site')) ?></th>
+            <th><?= $block->escapeHtml(__('Store')) ?></th>
+            <th><?= $block->escapeHtml(__('Store View')) ?></th>
             <?php endif; ?>
-            <th><?php echo $block->escapeHtml(__('Lifetime Sales')) ?></th>
-            <th class="last"><?php echo $block->escapeHtml(__('Average Sale')) ?></th>
+            <th><?= $block->escapeHtml(__('Lifetime Sales')) ?></th>
+            <th class="last"><?= $block->escapeHtml(__('Average Sale')) ?></th>
         </tr>
         </thead>
         <?php if (!$singleStoreMode): ?>
         <tfoot>
         <tr>
-            <td colspan="3"><strong><?php echo $block->escapeHtml(__('All Store Views')) ?></strong></td>
-            <td class="emph"><strong><?php echo $block->escapeHtml($block->formatCurrency($block->getTotals()->getBaseLifetime())) ?></strong></td>
-            <td class="emph last"><strong><?php echo $block->escapeHtml($block->formatCurrency($block->getTotals()->getAvgsale())) ?></strong></td>
+            <td colspan="3"><strong><?= $block->escapeHtml(__('All Store Views')) ?></strong></td>
+            <td class="emph"><strong><?= $block->escapeHtml($block->formatCurrency($block->getTotals()->getBaseLifetime())) ?></strong></td>
+            <td class="emph last"><strong><?= $block->escapeHtml($block->formatCurrency($block->getTotals()->getAvgsale())) ?></strong></td>
         </tr>
         </tfoot>
         <?php endif; ?>
@@ -47,24 +47,24 @@ $singleStoreMode = $block->isSingleStoreMode();
                 <?php foreach ($_stores as $_row): ?>
                     <?php if (!$singleStoreMode): ?>
                         <?php if ($_row->getStoreId() == 0): ?>
-                        <td colspan="3"><?php echo $block->escapeHtml($_row->getStoreName()) ?></td>
+                        <td colspan="3"><?= $block->escapeHtml($_row->getStoreName()) ?></td>
                             <?php else: ?>
-                    <tr<?php echo($_i++ % 2 ? ' class="even"' : '') ?>>
+                    <tr<?= ($_i++ % 2 ? ' class="even"' : '') ?>>
                             <?php if (!$_websiteRow): ?>
-                                <td rowspan="<?php echo $block->escapeHtmlAttr($block->getWebsiteCount($_websiteId)) ?>"><?php echo $block->escapeHtml($_row->getWebsiteName()) ?></td>
+                                <td rowspan="<?= $block->escapeHtmlAttr($block->getWebsiteCount($_websiteId)) ?>"><?= $block->escapeHtml($_row->getWebsiteName()) ?></td>
                                 <?php $_websiteRow = true; ?>
                                 <?php endif; ?>
                             <?php if (!$_groupRow): ?>
-                                <td rowspan="<?php echo count($_stores) ?>"><?php echo $block->escapeHtml($_row->getGroupName()) ?></td>
+                                <td rowspan="<?= count($_stores) ?>"><?= $block->escapeHtml($_row->getGroupName()) ?></td>
                                 <?php $_groupRow = true; ?>
                                 <?php endif; ?>
-                            <td><?php echo $block->escapeHtml($_row->getStoreName()) ?></td>
+                            <td><?= $block->escapeHtml($_row->getStoreName()) ?></td>
                             <?php endif; ?>
                         <?php else: ?>
                     <tr>
                         <?php endif; ?>
-                    <td><?php echo $block->escapeHtml($block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId())) ?></td>
-                    <td><?php echo $block->escapeHtml($block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId())) ?></td>
+                    <td><?= $block->escapeHtml($block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId())) ?></td>
+                    <td><?= $block->escapeHtml($block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId())) ?></td>
                     </tr>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
@@ -72,7 +72,7 @@ $singleStoreMode = $block->isSingleStoreMode();
         </tbody>
         <?php else: ?>
         <tbody>
-        <tr class="hidden"><td colspan="<?php /* @noEscape */ echo $singleStoreMode ? 2 : 5; ?>"></td></tr>
+        <tr class="hidden"><td colspan="<?= /* @noEscape */ $singleStoreMode ? 2 : 5 ?>"></td></tr>
         </tbody>
         <?php endif; ?>
     </table>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
index 79baa6f70885e..ca7393f2129e0 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
@@ -10,16 +10,16 @@
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup'" style="display: none;">
     <script>
-        window.authenticationPopup = <?php /* @noEscape */ echo $block->getSerializedConfig(); ?>;
+        window.authenticationPopup = <?= /* @noEscape */ $block->getSerializedConfig() ?>;
     </script>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {
             "#authenticationPopup": {
-                "Magento_Ui/js/core/app": <?php /* @noEscape */ echo $block->getJsLayout();?>
+                "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
             },
             "*": {
-                "Magento_Ui/js/block-loader": "<?php echo $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))); ?>"
+                "Magento_Ui/js/block-loader": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('images/loader-1.gif'))) ?>"
             }
         }
     </script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
index 4ed309bf92a0c..2bdb6ac044a92 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
@@ -21,7 +21,7 @@
                     class="action switch"
                     tabindex="-1"
                     data-action="customer-menu-toggle">
-                <span><?php echo $block->escapeHtml(__('Change'))?></span>
+                <span><?= $block->escapeHtml(__('Change')) ?></span>
             </button>
         </span>
         <script type="text/x-magento-init">
@@ -39,7 +39,7 @@
         </script>
         <?php if($block->getChildHtml()):?>
         <div class="customer-menu" data-target="dropdown">
-            <?php echo $block->getChildHtml();?>
+            <?= $block->getChildHtml() ?>
         </div>
         <?php endif; ?>
     </li>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
index 0b2763826064c..8186bae50940c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/address.phtml
@@ -10,34 +10,34 @@
 ?>
 <div class="block block-dashboard-addresses">
     <div class="block-title">
-        <strong><?php echo $block->escapeHtml(__('Address Book')) ?></strong>
-        <a class="action edit" href="<?php echo $block->escapeUrl($block->getAddressBookUrl()) ?>"><span><?php echo $block->escapeHtml(__('Manage Addresses')) ?></span></a>
+        <strong><?= $block->escapeHtml(__('Address Book')) ?></strong>
+        <a class="action edit" href="<?= $block->escapeUrl($block->getAddressBookUrl()) ?>"><span><?= $block->escapeHtml(__('Manage Addresses')) ?></span></a>
     </div>
     <div class="block-content">
         <div class="box box-billing-address">
             <strong class="box-title">
-                <span><?php echo $block->escapeHtml(__('Default Billing Address')) ?></span>
+                <span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
             </strong>
             <div class="box-content">
                 <address>
-                    <?php echo $block->getPrimaryBillingAddressHtml() ?>
+                    <?= $block->getPrimaryBillingAddressHtml() ?>
                 </address>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?php echo $block->escapeUrl($block->getPrimaryBillingAddressEditUrl()) ?>" data-ui-id="default-billing-edit-link"><span><?php echo $block->escapeHtml(__('Edit Address')) ?></span></a>
+                <a class="action edit" href="<?= $block->escapeUrl($block->getPrimaryBillingAddressEditUrl()) ?>" data-ui-id="default-billing-edit-link"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
             </div>
         </div>
         <div class="box box-shipping-address">
             <strong class="box-title">
-                <span><?php echo $block->escapeHtml(__('Default Shipping Address')) ?></span>
+                <span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
             </strong>
             <div class="box-content">
                 <address>
-                    <?php echo $block->getPrimaryShippingAddressHtml() ?>
+                    <?= $block->getPrimaryShippingAddressHtml() ?>
                 </address>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?php echo $block->escapeUrl($block->getPrimaryShippingAddressEditUrl()) ?>" data-ui-id="default-shipping-edit-link"><span><?php echo $block->escapeHtml(__('Edit Address')) ?></span></a>
+                <a class="action edit" href="<?= $block->escapeUrl($block->getPrimaryShippingAddressEditUrl()) ?>" data-ui-id="default-shipping-edit-link"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
index da5842d91615a..7881b7e857fd9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/dashboard/info.phtml
@@ -9,45 +9,45 @@
 /** @var \Magento\Customer\Block\Account\Dashboard\Info $block */
 ?>
 <div class="block block-dashboard-info">
-    <div class="block-title"><strong><?php echo $block->escapeHtml(__('Account Information')) ?></strong></div>
+    <div class="block-title"><strong><?= $block->escapeHtml(__('Account Information')) ?></strong></div>
     <div class="block-content">
         <div class="box box-information">
             <strong class="box-title">
-                <span><?php echo $block->escapeHtml(__('Contact Information')) ?></span>
+                <span><?= $block->escapeHtml(__('Contact Information')) ?></span>
             </strong>
             <div class="box-content">
                 <p>
-                    <?php echo $block->escapeHtml($block->getName()) ?><br>
-                    <?php echo $block->escapeHtml($block->getCustomer()->getEmail()) ?><br>
+                    <?= $block->escapeHtml($block->getName()) ?><br>
+                    <?= $block->escapeHtml($block->getCustomer()->getEmail()) ?><br>
                 </p>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?php echo $block->escapeUrl($block->getUrl('customer/account/edit')) ?>">
-                    <span><?php echo $block->escapeHtml(__('Edit')) ?></span>
+                <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/account/edit')) ?>">
+                    <span><?= $block->escapeHtml(__('Edit')) ?></span>
                 </a>
-                <a href="<?php echo $block->escapeUrl($block->getChangePasswordUrl()) ?>" class="action change-password">
-                    <?php echo $block->escapeHtml(__('Change Password')) ?>
+                <a href="<?= $block->escapeUrl($block->getChangePasswordUrl()) ?>" class="action change-password">
+                    <?= $block->escapeHtml(__('Change Password')) ?>
                 </a>
             </div>
         </div>
         <?php if ($block->isNewsletterEnabled()): ?>
             <div class="box box-newsletter">
                 <strong class="box-title">
-                    <span><?php echo $block->escapeHtml(__('Newsletters')) ?></span>
+                    <span><?= $block->escapeHtml(__('Newsletters')) ?></span>
                 </strong>
                 <div class="box-content">
                     <p>
                         <?php if ($block->getIsSubscribed()): ?>
-                            <?php echo $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
+                            <?= $block->escapeHtml(__('You are subscribed to "General Subscription".')) ?>
                         <?php else: ?>
-                            <?php echo $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
+                            <?= $block->escapeHtml(__('You aren\'t subscribed to our newsletter.')) ?>
                         <?php endif; ?>
                     </p>
                     <?php /* Extensions placeholder */ ?>
-                    <?php echo $block->getChildHtml('customer.account.dashboard.info.extra')?>
+                    <?= $block->getChildHtml('customer.account.dashboard.info.extra') ?>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?php echo $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?php echo $block->escapeHtml(__('Edit')) ?></span></a>
+                    <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('newsletter/manage')) ?>"><span><?= $block->escapeHtml(__('Edit')) ?></span></a>
                 </div>
             </div>
         <?php endif; ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
index 1b045a0cc3c15..10223df489e90 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
@@ -13,8 +13,8 @@ if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="authorization-link" data-label="<?php echo $block->escapeHtmlAttr(__('or')); ?>">
-    <a <?php /* @noEscape */ echo $block->getLinkAttributes(); ?><?php /* @noEscape */ echo $dataPostParam; ?>>
-        <?php echo $block->escapeHtml($block->getLabel()); ?>
+<li class="authorization-link" data-label="<?= $block->escapeHtmlAttr(__('or')) ?>">
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
+        <?= $block->escapeHtml($block->getLabel()) ?>
     </a>
 </li>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
index 85b3f181bd73d..20638b798d728 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/link/back.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <div class="actions-toolbar">
-    <div class="secondary"><a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo $block->escapeHtml(__('Back')) ?></span></a></div>
+    <div class="secondary"><a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a></div>
 </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
index 13311f26db406..b766093d21b3e 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
@@ -8,12 +8,12 @@
 ?>
 <div class="block account-nav">
     <div class="title">
-        <strong><?php echo $block->escapeHtml(__('My Account')); ?></strong>
+        <strong><?= $block->escapeHtml(__('My Account')) ?></strong>
     </div>
     <div class="content">
         <nav class="account-nav">
             <ul class="nav items">
-                <?php echo $block->getChildHtml(); ?>
+                <?= $block->getChildHtml() ?>
             </ul>
         </nav>
     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
index 364baa40bb253..45c13d9357425 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -9,29 +9,29 @@
 /** @var \Magento\Customer\Block\Address\Book $block */
 ?>
 <div class="block block-addresses-default">
-    <div class="block-title"><strong><?php echo $block->escapeHtml(__('Default Addresses')) ?></strong></div>
+    <div class="block-title"><strong><?= $block->escapeHtml(__('Default Addresses')) ?></strong></div>
     <div class="block-content">
         <?php if ($_pAddsses = $block->getDefaultBilling()): ?>
             <div class="box box-address-billing">
                 <strong class="box-title">
-                    <span><?php echo $block->escapeHtml(__('Default Billing Address')) ?></span>
+                    <span><?= $block->escapeHtml(__('Default Billing Address')) ?></span>
                 </strong>
                 <div class="box-content">
                     <address>
-                        <?php echo $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
+                        <?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
                     </address>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?php echo $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
-                        <span><?php echo $block->escapeHtml(__('Change Billing Address')) ?></span>
+                    <a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
+                        <span><?= $block->escapeHtml(__('Change Billing Address')) ?></span>
                     </a>
                 </div>
             </div>
         <?php else: ?>
             <div class="box box-billing-address">
-                <strong class="box-title"><span><?php echo $block->escapeHtml(__('Default Billing Address')) ?></span></strong>
+                <strong class="box-title"><span><?= $block->escapeHtml(__('Default Billing Address')) ?></span></strong>
                 <div class="box-content">
-                    <p><?php echo $block->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
+                    <p><?= $block->escapeHtml(__('You have no default billing address in your address book.')) ?></p>
                 </div>
             </div>
         <?php endif ?>
@@ -39,24 +39,24 @@
         <?php if ($_pAddsses = $block->getDefaultShipping()): ?>
             <div class="box box-address-shipping">
                 <strong class="box-title">
-                    <span><?php echo $block->escapeHtml(__('Default Shipping Address')) ?></span>
+                    <span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span>
                 </strong>
                 <div class="box-content">
                     <address>
-                        <?php echo $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
+                        <?= $block->getAddressHtml($block->getAddressById($_pAddsses)) ?>
                     </address>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?php echo $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
-                        <span><?php echo $block->escapeHtml(__('Change Shipping Address')) ?></span>
+                    <a class="action edit" href="<?= $block->escapeUrl($block->getAddressEditUrl($_pAddsses)) ?>">
+                        <span><?= $block->escapeHtml(__('Change Shipping Address')) ?></span>
                     </a>
                 </div>
             </div>
         <?php else: ?>
             <div class="box box-shipping-address">
-                <strong class="box-title"><span><?php echo $block->escapeHtml(__('Default Shipping Address')) ?></span></strong>
+                <strong class="box-title"><span><?= $block->escapeHtml(__('Default Shipping Address')) ?></span></strong>
                 <div class="box-content">
-                    <p><?php echo $block->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
+                    <p><?= $block->escapeHtml(__('You have no default shipping address in your address book.')) ?></p>
                 </div>
             </div>
         <?php endif ?>
@@ -64,34 +64,34 @@
 </div>
 
 <div class="block block-addresses-list">
-    <div class="block-title"><strong><?php echo $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
+    <div class="block-title"><strong><?= $block->escapeHtml(__('Additional Address Entries')) ?></strong></div>
     <div class="block-content">
         <?php if ($_pAddsses = $block->getAdditionalAddresses()): ?>
             <ol class="items addresses">
                 <?php foreach ($_pAddsses as $_address): ?>
                     <li class="item">
                         <address>
-                            <?php echo $block->getAddressHtml($_address) ?><br />
+                            <?= $block->getAddressHtml($_address) ?><br />
                         </address>
                         <div class="item actions">
-                            <a class="action edit" href="<?php echo $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $_address->getId()])) ?>"><span><?php echo $block->escapeHtml(__('Edit Address')) ?></span></a>
-                            <a class="action delete" href="#" role="delete-address" data-address="<?php echo $block->escapeHtmlAttr($_address->getId()) ?>"><span><?php echo $block->escapeHtml(__('Delete Address')) ?></span></a>
+                            <a class="action edit" href="<?= $block->escapeUrl($block->getUrl('customer/address/edit', ['id' => $_address->getId()])) ?>"><span><?= $block->escapeHtml(__('Edit Address')) ?></span></a>
+                            <a class="action delete" href="#" role="delete-address" data-address="<?= $block->escapeHtmlAttr($_address->getId()) ?>"><span><?= $block->escapeHtml(__('Delete Address')) ?></span></a>
                         </div>
                     </li>
                 <?php endforeach; ?>
             </ol>
         <?php else: ?>
-            <p class="empty"><?php echo $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
+            <p class="empty"><?= $block->escapeHtml(__('You have no other address entries in your address book.')) ?></p>
         <?php endif ?>
     </div>
 </div>
 
 <div class="actions-toolbar">
     <div class="primary">
-        <button type="button" role="add-address" title="<?php echo $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?php echo $block->escapeHtml(__('Add New Address')) ?></span></button>
+        <button type="button" role="add-address" title="<?= $block->escapeHtmlAttr(__('Add New Address')) ?>" class="action primary add"><span><?= $block->escapeHtml(__('Add New Address')) ?></span></button>
     </div>
     <div class="secondary">
-        <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo $block->escapeHtml(__('Back')) ?></span></a>
+        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
     </div>
 </div>
 <script type="text/x-magento-init">
@@ -99,9 +99,9 @@
         ".page-main": {
             "address": {
                 "deleteAddress": "li.item a[role='delete-address']",
-                "deleteUrlPrefix": "<?php echo $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
+                "deleteUrlPrefix": "<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>id/",
                 "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?php echo $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
+                "addAddressLocation": "<?= $block->escapeJs($block->escapeUrl($block->getAddAddressUrl())) ?>"
             }
         }
     }
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 7df7fc5ffc28d..1f1f078504524 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -12,58 +12,58 @@
 <?php $_telephone = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Telephone') ?>
 <?php $_fax = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Fax') ?>
 <form class="form-address-edit"
-      action="<?php echo $block->escapeUrl($block->getSaveUrl()) ?>"
+      action="<?= $block->escapeUrl($block->getSaveUrl()) ?>"
       method="post"
       id="form-validate"
       enctype="multipart/form-data"
-      data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Contact Information')) ?></span></legend><br>
-        <?php echo $block->getBlockHtml('formkey')?>
-        <input type="hidden" name="success_url" value="<?php echo $block->escapeUrl($block->getSuccessUrl()) ?>">
-        <input type="hidden" name="error_url" value="<?php echo $block->escapeUrl($block->getErrorUrl()) ?>">
-        <?php echo $block->getNameBlockHtml() ?>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Contact Information')) ?></span></legend><br>
+        <?= $block->getBlockHtml('formkey') ?>
+        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
+        <?= $block->getNameBlockHtml() ?>
 
         <?php if ($_company->isEnabled()): ?>
-            <?php echo $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
+            <?= $_company->setCompany($block->getAddress()->getCompany())->toHtml() ?>
         <?php endif ?>
 
         <?php if ($_telephone->isEnabled()): ?>
-            <?php echo $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
+            <?= $_telephone->setTelephone($block->getAddress()->getTelephone())->toHtml() ?>
         <?php endif ?>
 
         <?php if ($_fax->isEnabled()): ?>
-            <?php echo $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
+            <?= $_fax->setFax($block->getAddress()->getFax())->toHtml() ?>
         <?php endif ?>
 
     </fieldset>
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Address')) ?></span></legend><br>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Address')) ?></span></legend><br>
         <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
         <div class="field street required">
             <label for="street_1" class="label">
-                <span><?php echo $block->escapeHtml(__('Street Address')) ?></span>
+                <span><?= $block->escapeHtml(__('Street Address')) ?></span>
             </label>
             <div class="control">
                 <input type="text"
                        name="street[]"
-                       value="<?php echo $block->escapeHtmlAttr($block->getStreetLine(1)) ?>"
-                       title="<?php echo $block->escapeHtmlAttr(__('Street Address')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getStreetLine(1)) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Street Address')) ?>"
                        id="street_1"
-                       class="input-text <?php echo $block->escapeHtmlAttr($_streetValidationClass) ?>"/>
+                       class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>"/>
                 <div class="nested">
                     <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
                     <?php for ($_i = 1, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i < $_n; $_i++): ?>
                         <div class="field additional">
-                            <label class="label" for="street_<?php /* @noEscape */ echo $_i + 1 ?>">
-                                <span><?php echo $block->escapeHtml(__('Street Address %1', $_i + 1)) ?></span>
+                            <label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
+                                <span><?= $block->escapeHtml(__('Street Address %1', $_i + 1)) ?></span>
                             </label>
                             <div class="control">
                                 <input type="text" name="street[]"
-                                       value="<?php echo $block->escapeHtmlAttr($block->getStreetLine($_i + 1)) ?>"
-                                       title="<?php echo $block->escapeHtmlAttr(__('Street Address %1', $_i + 1)) ?>"
-                                       id="street_<?php /* @noEscape */ echo $_i + 1 ?>"
-                                       class="input-text <?php echo $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                                       value="<?= $block->escapeHtmlAttr($block->getStreetLine($_i + 1)) ?>"
+                                       title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i + 1)) ?>"
+                                       id="street_<?= /* @noEscape */ $_i + 1 ?>"
+                                       class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -74,76 +74,76 @@
         <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
             <div class="field taxvat">
                 <label class="label" for="vat_id">
-                    <span><?php echo $block->escapeHtml(__('VAT Number')) ?></span>
+                    <span><?= $block->escapeHtml(__('VAT Number')) ?></span>
                 </label>
                 <div class="control">
                     <input type="text"
                            name="vat_id"
-                           value="<?php echo $block->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
-                           title="<?php echo $block->escapeHtmlAttr(__('VAT Number')) ?>"
-                           class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id')) ?>"
+                           value="<?= $block->escapeHtmlAttr($block->getAddress()->getVatId()) ?>"
+                           title="<?= $block->escapeHtmlAttr(__('VAT Number')) ?>"
+                           class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id')) ?>"
                            id="vat_id">
                 </div>
             </div>
         <?php endif; ?>
         <div class="field city required">
-            <label class="label" for="city"><span><?php echo $block->escapeHtml(__('City')) ?></span></label>
+            <label class="label" for="city"><span><?= $block->escapeHtml(__('City')) ?></span></label>
             <div class="control">
                 <input type="text"
                        name="city"
-                       value="<?php echo $block->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr(__('City')) ?>"
-                       class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getAddress()->getCity()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('City')) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>"
                        id="city">
             </div>
         </div>
         <div class="field region required">
             <label class="label" for="region_id">
-                <span><?php echo $block->escapeHtml(__('State/Province')) ?></span>
+                <span><?= $block->escapeHtml(__('State/Province')) ?></span>
             </label>
             <div class="control">
                 <select id="region_id" name="region_id"
-                        title="<?php echo $block->escapeHtmlAttr(__('State/Province')) ?>"
-                        class="validate-select" <?php /* @noEscape */ echo !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : ''; ?>>
-                    <option value=""><?php echo $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
+                        title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>"
+                        class="validate-select" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
+                    <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                 </select>
                 <input type="text"
                        id="region"
                        name="region"
-                       value="<?php echo $block->escapeHtmlAttr($block->getRegion()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr(__('State/Province')) ?>"
-                       class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>"<?php echo !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : ''; ?>/>
+                       value="<?= $block->escapeHtmlAttr($block->getRegion()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>"<?= !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>/>
             </div>
         </div>
         <div class="field zip required">
             <label class="label" for="zip">
-                <span><?php echo $block->escapeHtml(__('Zip/Postal Code')) ?></span>
+                <span><?= $block->escapeHtml(__('Zip/Postal Code')) ?></span>
             </label>
             <div class="control">
                 <input type="text"
                        name="postcode"
-                       value="<?php echo $block->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getAddress()->getPostcode()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>"
                        id="zip"
-                       class="input-text validate-zip-international <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+                       class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
             </div>
         </div>
         <div class="field country required">
-            <label class="label" for="country"><span><?php echo $block->escapeHtml(__('Country')) ?></span></label>
+            <label class="label" for="country"><span><?= $block->escapeHtml(__('Country')) ?></span></label>
             <div class="control">
-                <?php echo $block->getCountryHtmlSelect() ?>
+                <?= $block->getCountryHtmlSelect() ?>
             </div>
         </div>
 
         <?php if ($block->isDefaultBilling()): ?>
             <div class="message info">
-                <span><?php echo $block->escapeHtml(__("It's a default billing address.")) ?></span>
+                <span><?= $block->escapeHtml(__("It's a default billing address.")) ?></span>
             </div>
         <?php elseif ($block->canSetAsDefaultBilling()): ?>
             <div class="field choice set billing">
                 <input type="checkbox" id="primary_billing" name="default_billing" value="1" class="checkbox">
                 <label class="label" for="primary_billing">
-                    <span><?php echo $block->escapeHtml(__('Use as my default billing address')) ?></span>
+                    <span><?= $block->escapeHtml(__('Use as my default billing address')) ?></span>
                 </label>
             </div>
         <?php else: ?>
@@ -152,13 +152,13 @@
 
         <?php if ($block->isDefaultShipping()): ?>
             <div class="message info">
-                <span><?php echo $block->escapeHtml(__("It's a default shipping address.")) ?></span>
+                <span><?= $block->escapeHtml(__("It's a default shipping address.")) ?></span>
             </div>
         <?php elseif ($block->canSetAsDefaultShipping()): ?>
             <div class="field choice set shipping">
                 <input type="checkbox" id="primary_shipping" name="default_shipping" value="1" class="checkbox">
                 <label class="label" for="primary_shipping">
-                    <span><?php echo $block->escapeHtml(__('Use as my default shipping address')) ?></span>
+                    <span><?= $block->escapeHtml(__('Use as my default shipping address')) ?></span>
                 </label>
             </div>
         <?php else: ?>
@@ -170,13 +170,13 @@
             <button type="submit"
                     class="action save primary"
                     data-action="save-address"
-                    title="<?php echo $block->escapeHtmlAttr(__('Save Address')) ?>">
-                <span><?php echo $block->escapeHtml(__('Save Address')) ?></span>
+                    title="<?= $block->escapeHtmlAttr(__('Save Address')) ?>">
+                <span><?= $block->escapeHtml(__('Save Address')) ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?php echo $block->escapeHtml(__('Go back')) ?></span>
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
+                <span><?= $block->escapeHtml(__('Go back')) ?></span>
             </a>
         </div>
     </div>
@@ -188,14 +188,14 @@
         },
         "#country": {
             "regionUpdater": {
-                "optionalRegionAllowed": <?php /* @noEscape */ echo $block->getConfig('general/region/display_all') ? 'true' : 'false'; ?>,
+                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?php /* @noEscape */ echo $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?php echo (int) $block->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php /* @noEscape */ echo $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
+                "defaultRegion": "<?= (int) $block->getRegionId() ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
             }
         }
     }
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
index 04ff907db84b6..0de3d94334970 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
@@ -9,21 +9,21 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <form action="" method="post" id="form-validate" class="form send confirmation" data-mage-init='{"validation":{}}'>
-    <fieldset class="fieldset" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-        <p class="field note"><?php echo $block->escapeHtml(__('Please enter your email below and we will send you the confirmation link.')) ?></p>
+    <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <p class="field note"><?= $block->escapeHtml(__('Please enter your email below and we will send you the confirmation link.')) ?></p>
         <div class="field email required">
-            <label for="email_address" class="label"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+            <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" id="email_address" class="input-text" value="<?php echo $block->escapeHtmlAttr($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action send primary"><span><?php echo $block->escapeHtml(__('Send confirmation link')) ?></span></button>
+            <button type="submit" class="action send primary"><span><?= $block->escapeHtml(__('Send confirmation link')) ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php echo $block->escapeUrl($block->getLoginUrl()) ?>" class="action back"><span><?php echo $block->escapeHtml(__('Back to Sign In')) ?></span></a>
+            <a href="<?= $block->escapeUrl($block->getLoginUrl()) ?>" class="action back"><span><?= $block->escapeHtml(__('Back to Sign In')) ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index c694136c8301e..75c7d9cffedbe 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -8,69 +8,69 @@
 
 /** @var \Magento\Customer\Block\Form\Edit $block */
 ?>
-<form class="form form-edit-account" action="<?php echo $block->escapeUrl($block->getUrl('customer/account/editPost')) ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>" autocomplete="off">
+<form class="form form-edit-account" action="<?= $block->escapeUrl($block->getUrl('customer/account/editPost')) ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" autocomplete="off">
     <fieldset class="fieldset info">
-        <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Account Information')) ?></span></legend><br>
-        <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getCustomer())->toHtml() ?>
+        <?= $block->getBlockHtml('formkey') ?>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Account Information')) ?></span></legend><br>
+        <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getCustomer())->toHtml() ?>
 
         <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
         <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
         <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
         <?php if ($_dob->isEnabled()): ?>
-            <?php echo $_dob->setDate($block->getCustomer()->getDob())->toHtml() ?>
+            <?= $_dob->setDate($block->getCustomer()->getDob())->toHtml() ?>
         <?php endif ?>
         <?php if ($_taxvat->isEnabled()): ?>
-            <?php echo $_taxvat->setTaxvat($block->getCustomer()->getTaxvat())->toHtml() ?>
+            <?= $_taxvat->setTaxvat($block->getCustomer()->getTaxvat())->toHtml() ?>
         <?php endif ?>
         <?php if ($_gender->isEnabled()): ?>
-            <?php echo $_gender->setGender($block->getCustomer()->getGender())->toHtml() ?>
+            <?= $_gender->setGender($block->getCustomer()->getGender())->toHtml() ?>
         <?php endif ?>
         <div class="field choice">
-            <input type="checkbox" name="change_email" id="change-email" data-role="change-email" value="1" title="<?php echo $block->escapeHtmlAttr(__('Change Email')) ?>" class="checkbox" />
-            <label class="label" for="change-email"><span><?php echo $block->escapeHtml(__('Change Email')) ?></span></label>
+            <input type="checkbox" name="change_email" id="change-email" data-role="change-email" value="1" title="<?= $block->escapeHtmlAttr(__('Change Email')) ?>" class="checkbox" />
+            <label class="label" for="change-email"><span><?= $block->escapeHtml(__('Change Email')) ?></span></label>
         </div>
         <div class="field choice">
-            <input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1" title="<?php echo $block->escapeHtmlAttr(__('Change Password')) ?>"<?php if ($block->getChangePassword()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label class="label" for="change-password"><span><?php echo $block->escapeHtml(__('Change Password')) ?></span></label>
+            <input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1" title="<?= $block->escapeHtmlAttr(__('Change Password')) ?>"<?php if ($block->getChangePassword()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+            <label class="label" for="change-password"><span><?= $block->escapeHtml(__('Change Password')) ?></span></label>
         </div>
     </fieldset>
 
     <fieldset class="fieldset password" data-container="change-email-password">
-        <legend class="legend"><span data-title="change-email-password"><?php echo $block->escapeHtml(__('Change Email and Password')) ?></span></legend><br>
+        <legend class="legend"><span data-title="change-email-password"><?= $block->escapeHtml(__('Change Email and Password')) ?></span></legend><br>
         <div class="field email required" data-container="change-email">
-            <label class="label" for="email"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+            <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" id="email" autocomplete="email" data-input="change-email" value="<?php echo $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
+                <input type="email" name="email" id="email" autocomplete="email" data-input="change-email" value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}" />
             </div>
         </div>
         <div class="field password current required">
-            <label class="label" for="current-password"><span><?php echo $block->escapeHtml(__('Current Password')) ?></span></label>
+            <label class="label" for="current-password"><span><?= $block->escapeHtml(__('Current Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="current_password" id="current-password" data-input="current-password" autocomplete="off" />
             </div>
         </div>
         <div class="field new password required" data-container="new-password">
-            <label class="label" for="password"><span><?php echo $block->escapeHtml(__('New Password')) ?></span></label>
+            <label class="label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password" id="password"
-                    data-password-min-length="<?php echo $block->escapeHtml($block->getMinimumPasswordLength()) ?>"
-                    data-password-min-character-sets="<?php echo $block->escapeHtml($block->getRequiredCharacterClassesNumber()) ?>"
+                    data-password-min-length="<?= $block->escapeHtml($block->getMinimumPasswordLength()) ?>"
+                    data-password-min-character-sets="<?= $block->escapeHtml($block->getRequiredCharacterClassesNumber()) ?>"
                     data-input="new-password"
                     data-validate="{required:true, 'validate-customer-password':true}"
                     autocomplete="off" />
                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
-                        <?php echo $block->escapeHtml(__('Password Strength')); ?>:
+                        <?= $block->escapeHtml(__('Password Strength')) ?>:
                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
-                            <?php echo $block->escapeHtml(__('No Password')); ?>
+                            <?= $block->escapeHtml(__('No Password')) ?>
                         </span>
                     </div>
                 </div>
             </div>
         </div>
         <div class="field confirm password required" data-container="confirm-password">
-            <label class="label" for="password-confirmation"><span><?php echo $block->escapeHtml(__('Confirm New Password')) ?></span></label>
+            <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation"
                     data-input="confirm-password"
@@ -78,13 +78,13 @@
             </div>
         </div>
     </fieldset>
-    <?php echo $block->getChildHtml('form_additional_info'); ?>
+    <?= $block->getChildHtml('form_additional_info') ?>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action save primary" title="<?php echo $block->escapeHtmlAttr(__('Save')) ?>"><span><?php echo $block->escapeHtml(__('Save')) ?></span></button>
+            <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"><span><?= $block->escapeHtml(__('Save')) ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo $block->escapeHtml(__('Go back')) ?></span></a>
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
         </div>
     </div>
 </form>
@@ -94,7 +94,7 @@
         "mage/mage"
     ], function($){
         var dataForm = $('#form-validate');
-        var ignore = <?php /* @noEscape */ echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
+        var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
         
         dataForm.mage('validation', {
         <?php if ($_dob->isEnabled()): ?>
@@ -122,9 +122,9 @@
     {
         "[data-role=change-email], [data-role=change-password]": {
             "changeEmailPassword": {
-                "titleChangeEmail": "<?php echo $block->escapeJs($block->escapeHtml(__('Change Email'))) ?>",
-                "titleChangePassword": "<?php echo $block->escapeJs($block->escapeHtml(__('Change Password'))) ?>",
-                "titleChangeEmailAndPassword": "<?php echo $block->escapeJs($block->escapeHtml(__('Change Email and Password'))) ?>"
+                "titleChangeEmail": "<?= $block->escapeJs($block->escapeHtml(__('Change Email'))) ?>",
+                "titleChangePassword": "<?= $block->escapeJs($block->escapeHtml(__('Change Password'))) ?>",
+                "titleChangeEmailAndPassword": "<?= $block->escapeJs($block->escapeHtml(__('Change Email and Password'))) ?>"
             }
         },
         "[data-container=new-password]": {
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
index a83248361ea1d..5bc4a929d6d94 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
@@ -11,26 +11,26 @@
 /** @var \Magento\Customer\Block\Account\Forgotpassword $block */
 ?>
 <form class="form password forget"
-      action="<?php echo $block->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>"
+      action="<?= $block->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>"
       method="post"
       id="form-validate"
       data-mage-init='{"validation":{}}'>
-    <fieldset class="fieldset" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-        <div class="field note"><?php echo $block->escapeHtml(__('Please enter your email address below to receive a password reset link.')); ?></div>
+    <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <div class="field note"><?= $block->escapeHtml(__('Please enter your email address below to receive a password reset link.')) ?></div>
         <div class="field email required">
-            <label for="email_address" class="label"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+            <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?php echo $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
-        <?php echo $block->getChildHtml('form_additional_info'); ?>
+        <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary"><span><?php echo $block->escapeHtml(__('Reset My Password')) ?></span></button>
+            <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Reset My Password')) ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getLoginUrl()) ?>"><span><?php echo $block->escapeHtml(__('Go back')) ?></span></a>
+            <a class="action back" href="<?= $block->escapeUrl($block->getLoginUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
index 6efead8317b24..16206525aa53b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -10,33 +10,33 @@
 ?>
 <div class="block block-customer-login">
     <div class="block-title">
-        <strong id="block-customer-login-heading" role="heading" aria-level="2"><?php echo $block->escapeHtml(__('Registered Customers')) ?></strong>
+        <strong id="block-customer-login-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('Registered Customers')) ?></strong>
     </div>
     <div class="block-content" aria-labelledby="block-customer-login-heading">
         <form class="form form-login"
-              action="<?php echo $block->escapeUrl($block->getPostActionUrl()) ?>"
+              action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>"
               method="post"
               id="login-form"
               data-mage-init='{"validation":{}}'>
-            <?php echo $block->getBlockHtml('formkey'); ?>
-            <fieldset class="fieldset login" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-                <div class="field note"><?php echo $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div>
+            <?= $block->getBlockHtml('formkey') ?>
+            <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+                <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div>
                 <div class="field email required">
-                    <label class="label" for="email"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+                    <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
                     <div class="control">
-                        <input name="login[username]" value="<?php echo $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?php echo $block->escapeHtmlAttr(__('Email')) ?>" data-validate="{required:true, 'validate-email':true}">
+                        <input name="login[username]" value="<?= $block->escapeHtmlAttr($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" data-validate="{required:true, 'validate-email':true}">
                     </div>
                 </div>
                 <div class="field password required">
-                    <label for="pass" class="label"><span><?php echo $block->escapeHtml(__('Password')) ?></span></label>
+                    <label for="pass" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
                     <div class="control">
-                        <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?php echo $block->escapeHtmlAttr(__('Password')) ?>" data-validate="{required:true}">
+                        <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()): ?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?= $block->escapeHtmlAttr(__('Password')) ?>" data-validate="{required:true}">
                     </div>
                 </div>
-                <?php echo $block->getChildHtml('form_additional_info'); ?>
+                <?= $block->getChildHtml('form_additional_info') ?>
                 <div class="actions-toolbar">
-                    <div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php echo $block->escapeHtml(__('Sign In')) ?></span></button></div>
-                    <div class="secondary"><a class="action remind" href="<?php echo $block->escapeUrl($block->getForgotPasswordUrl()) ?>"><span><?php echo $block->escapeHtml(__('Forgot Your Password?')) ?></span></a></div>
+                    <div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?= $block->escapeHtml(__('Sign In')) ?></span></button></div>
+                    <div class="secondary"><a class="action remind" href="<?= $block->escapeUrl($block->getForgotPasswordUrl()) ?>"><span><?= $block->escapeHtml(__('Forgot Your Password?')) ?></span></a></div>
                 </div>
             </fieldset>
         </form>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
index 15788708c7376..f7b7217a9b477 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
@@ -8,22 +8,22 @@
 
 /** @var \Magento\Customer\Block\Newsletter $block */
 ?>
-<?php echo $block->getChildHtml('form_before')?>
-    <form class="form form-newsletter-manage" action="<?php echo $block->escapeUrl($block->getAction()) ?>" method="post" id="form-validate">
+<?= $block->getChildHtml('form_before') ?>
+    <form class="form form-newsletter-manage" action="<?= $block->escapeUrl($block->getAction()) ?>" method="post" id="form-validate">
         <fieldset class="fieldset">
-            <?php echo $block->getBlockHtml('formkey')?>
-            <legend class="legend"><span><?php echo $block->escapeHtml(__('Subscription option')) ?></span></legend><br>
+            <?= $block->getBlockHtml('formkey') ?>
+            <legend class="legend"><span><?= $block->escapeHtml(__('Subscription option')) ?></span></legend><br>
             <div class="field choice">
-                <input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo $block->escapeHtmlAttr(__('General Subscription')) ?>"<?php if ($block->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-                <label for="subscription" class="label"><span><?php echo $block->escapeHtml(__('General Subscription')) ?></span></label>
+                <input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?= $block->escapeHtmlAttr(__('General Subscription')) ?>"<?php if ($block->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
+                <label for="subscription" class="label"><span><?= $block->escapeHtml(__('General Subscription')) ?></span></label>
             </div>
             <?php /* Extensions placeholder */ ?>
-            <?php echo $block->getChildHtml('customer.form.newsletter.extra')?>
+            <?= $block->getChildHtml('customer.form.newsletter.extra') ?>
         </fieldset>
         <div class="actions-toolbar">
-            <div class="primary"><button type="submit" title="<?php echo $block->escapeHtmlAttr(__('Save')) ?>" class="action save primary"><span><?php echo $block->escapeHtml(__('Save')) ?></span></button></div>
-            <div class="secondary"><a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo $block->escapeHtml(__('Back')) ?></span></a></div>
+            <div class="primary"><button type="submit" title="<?= $block->escapeHtmlAttr(__('Save')) ?>" class="action save primary"><span><?= $block->escapeHtml(__('Save')) ?></span></button></div>
+            <div class="secondary"><a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a></div>
         </div>
     </form>
 <?php /* Extensions placeholder */ ?>
-<?php echo $block->getChildHtml('customer.form.newsletter.extra2')?>
+<?= $block->getChildHtml('customer.form.newsletter.extra2') ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 451d282073915..70ffef4ce86a6 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -8,74 +8,74 @@
 
 /** @var \Magento\Customer\Block\Form\Register $block */
 ?>
-<?php echo $block->getChildHtml('form_fields_before')?>
+<?= $block->getChildHtml('form_fields_before') ?>
 <?php /* Extensions placeholder */ ?>
-<?php echo $block->getChildHtml('customer.form.register.extra')?>
-<form class="form create account form-create-account" action="<?php echo $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
+<?= $block->getChildHtml('customer.form.register.extra') ?>
+<form class="form create account form-create-account" action="<?= $block->escapeUrl($block->getPostActionUrl()) ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
     <fieldset class="fieldset create info">
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
-        <input type="hidden" name="success_url" value="<?php echo $block->escapeUrl($block->getSuccessUrl()) ?>">
-        <input type="hidden" name="error_url" value="<?php echo $block->escapeUrl($block->getErrorUrl()) ?>">
-        <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Personal Information')) ?></span></legend><br>
+        <input type="hidden" name="success_url" value="<?= $block->escapeUrl($block->getSuccessUrl()) ?>">
+        <input type="hidden" name="error_url" value="<?= $block->escapeUrl($block->getErrorUrl()) ?>">
+        <?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
         <?php if ($block->isNewsletterEnabled()): ?>
             <div class="field choice newsletter">
-                <input type="checkbox" name="is_subscribed" title="<?php echo $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-                <label for="is_subscribed" class="label"><span><?php echo $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
+                <input type="checkbox" name="is_subscribed" title="<?= $block->escapeHtmlAttr(__('Sign Up for Newsletter')) ?>" value="1" id="is_subscribed"<?php if ($block->getFormData()->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
+                <label for="is_subscribed" class="label"><span><?= $block->escapeHtml(__('Sign Up for Newsletter')) ?></span></label>
             </div>
             <?php /* Extensions placeholder */ ?>
-            <?php echo $block->getChildHtml('customer.form.register.newsletter')?>
+            <?= $block->getChildHtml('customer.form.register.newsletter') ?>
         <?php endif ?>
 
         <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
         <?php if ($_dob->isEnabled()): ?>
-            <?php echo $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
+            <?= $_dob->setDate($block->getFormData()->getDob())->toHtml() ?>
         <?php endif ?>
 
         <?php $_taxvat = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Taxvat') ?>
         <?php if ($_taxvat->isEnabled()): ?>
-            <?php echo $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
+            <?= $_taxvat->setTaxvat($block->getFormData()->getTaxvat())->toHtml() ?>
         <?php endif ?>
 
         <?php $_gender = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Gender') ?>
         <?php if ($_gender->isEnabled()): ?>
-            <?php echo $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
+            <?= $_gender->setGender($block->getFormData()->getGender())->toHtml() ?>
         <?php endif ?>
     </fieldset>
     <?php if ($block->getShowAddressFields()): ?>
         <fieldset class="fieldset address">
-            <legend class="legend"><span><?php echo $block->escapeHtml(__('Address Information')) ?></span></legend><br>
+            <legend class="legend"><span><?= $block->escapeHtml(__('Address Information')) ?></span></legend><br>
             <input type="hidden" name="create_address" value="1" />
 
             <?php $_company = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Company') ?>
             <?php if ($_company->isEnabled()): ?>
-                <?php echo $_company->setCompany($block->getFormData()->getCompany())->toHtml() ?>
+                <?= $_company->setCompany($block->getFormData()->getCompany())->toHtml() ?>
             <?php endif ?>
 
             <?php $_telephone = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Telephone') ?>
             <?php if ($_telephone->isEnabled()): ?>
-                <?php echo $_telephone->setTelephone($block->getFormData()->getTelephone())->toHtml() ?>
+                <?= $_telephone->setTelephone($block->getFormData()->getTelephone())->toHtml() ?>
             <?php endif ?>
 
             <?php $_fax = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Fax') ?>
             <?php if ($_fax->isEnabled()): ?>
-                <?php echo $_fax->setFax($block->getFormData()->getFax())->toHtml() ?>
+                <?= $_fax->setFax($block->getFormData()->getFax())->toHtml() ?>
             <?php endif ?>
 
             <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
 
             <div class="field street required">
-                <label for="street_1" class="label"><span><?php echo $block->escapeHtml(__('Street Address')) ?></span></label>
+                <label for="street_1" class="label"><span><?= $block->escapeHtml(__('Street Address')) ?></span></label>
                 <div class="control">
-                    <input type="text" name="street[]" value="<?php echo $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?php echo $block->escapeHtmlAttr(__('Street Address')) ?>" id="street_1" class="input-text <?php echo $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                    <input type="text" name="street[]" value="<?= $block->escapeHtmlAttr($block->getFormData()->getStreet(0)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address')) ?>" id="street_1" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
                     <div class="nested">
                         <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
                         <?php for ($_i = 2, $_n = $this->helper('Magento\Customer\Helper\Address')->getStreetLines(); $_i <= $_n; $_i++): ?>
                             <div class="field additional">
-                                <label class="label" for="street_<?php /* @noEscape */ echo $_i ?>">
-                                    <span><?php echo $block->escapeHtml(__('Address')) ?></span>
+                                <label class="label" for="street_<?= /* @noEscape */ $_i ?>">
+                                    <span><?= $block->escapeHtml(__('Address')) ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?php echo $block->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?php /* @noEscape */ echo $_i ?>" class="input-text <?php echo $block->escapeHtmlAttr($_streetValidationClass) ?>">
+                                    <input type="text" name="street[]" value="<?= $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?= $block->escapeHtmlAttr(__('Street Address %1', $_i)) ?>" id="street_<?= /* @noEscape */ $_i ?>" class="input-text <?= $block->escapeHtmlAttr($_streetValidationClass) ?>">
                                 </div>
                             </div>
                         <?php endfor; ?>
@@ -84,33 +84,33 @@
             </div>
 
             <div class="field required">
-                <label for="city" class="label"><span><?php echo $block->escapeHtml(__('City')) ?></span></label>
+                <label for="city" class="label"><span><?= $block->escapeHtml(__('City')) ?></span></label>
                 <div class="control">
-                    <input type="text" name="city" value="<?php echo $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?php echo $block->escapeHtmlAttr(__('City')) ?>" class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
+                    <input type="text" name="city" value="<?= $block->escapeHtmlAttr($block->getFormData()->getCity()) ?>" title="<?= $block->escapeHtmlAttr(__('City')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city')) ?>" id="city">
                 </div>
             </div>
 
             <div class="field region required">
-                <label for="region_id" class="label"><span><?php echo $block->escapeHtml(__('State/Province')) ?></span></label>
+                <label for="region_id" class="label"><span><?= $block->escapeHtml(__('State/Province')) ?></span></label>
                 <div class="control">
-                    <select id="region_id" name="region_id" title="<?php echo $block->escapeHtmlAttr(__('State/Province')) ?>" class="validate-select" style="display:none;">
-                        <option value=""><?php echo $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
+                    <select id="region_id" name="region_id" title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>" class="validate-select" style="display:none;">
+                        <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                     </select>
-                    <input type="text" id="region" name="region" value="<?php echo $block->escapeHtml($block->getRegion()) ?>" title="<?php echo $block->escapeHtmlAttr(__('State/Province')) ?>" class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
+                    <input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= $block->escapeHtmlAttr(__('State/Province')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">
                 </div>
             </div>
 
             <div class="field zip required">
-                <label for="zip" class="label"><span><?php echo $block->escapeHtml(__('Zip/Postal Code')) ?></span></label>
+                <label for="zip" class="label"><span><?= $block->escapeHtml(__('Zip/Postal Code')) ?></span></label>
                 <div class="control">
-                    <input type="text" name="postcode" value="<?php echo $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
+                    <input type="text" name="postcode" value="<?= $block->escapeHtmlAttr($block->getFormData()->getPostcode()) ?>" title="<?= $block->escapeHtmlAttr(__('Zip/Postal Code')) ?>" id="zip" class="input-text validate-zip-international <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode')) ?>">
                 </div>
             </div>
 
             <div class="field country required">
-                <label for="country" class="label"><span><?php echo $block->escapeHtml(__('Country')) ?></span></label>
+                <label for="country" class="label"><span><?= $block->escapeHtml(__('Country')) ?></span></label>
                 <div class="control">
-                    <?php echo $block->getCountryHtmlSelect() ?>
+                    <?= $block->getCountryHtmlSelect() ?>
                 </div>
             </div>
             <?php $addressAttributes = $block->getChildBlock('customer_form_address_user_attributes');?>
@@ -118,36 +118,36 @@
                 <?php $addressAttributes->setEntityType('customer_address'); ?>
                 <?php $addressAttributes->setFieldIdFormat('address:%1$s')->setFieldNameFormat('address[%1$s]');?>
                 <?php $block->restoreSessionData($addressAttributes->getMetadataForm(), 'address');?>
-                <?php echo $addressAttributes->setShowContainer(false)->toHtml()?>
+                <?= $addressAttributes->setShowContainer(false)->toHtml() ?>
             <?php endif;?>
             <input type="hidden" name="default_billing" value="1">
             <input type="hidden" name="default_shipping" value="1">
         </fieldset>
 
     <?php endif; ?>
-    <fieldset class="fieldset create account" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>">
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
+    <fieldset class="fieldset create account" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <legend class="legend"><span><?= $block->escapeHtml(__('Sign-in Information')) ?></span></legend><br>
         <div class="field required">
-            <label for="email_address" class="label"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+            <label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input type="email" name="email" autocomplete="email" id="email_address" value="<?php echo $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" autocomplete="email" id="email_address" value="<?= $block->escapeHtmlAttr($block->getFormData()->getEmail()) ?>" title="<?= $block->escapeHtmlAttr(__('Email')) ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <div class="field password required">
-            <label for="password" class="label"><span><?php echo $block->escapeHtml(__('Password')) ?></span></label>
+            <label for="password" class="label"><span><?= $block->escapeHtml(__('Password')) ?></span></label>
             <div class="control">
                 <input type="password" name="password" id="password"
-                       title="<?php echo $block->escapeHtmlAttr(__('Password')) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Password')) ?>"
                        class="input-text"
-                       data-password-min-length="<?php echo $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
-                       data-password-min-character-sets="<?php echo $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
+                       data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
+                       data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
                        data-validate="{required:true, 'validate-customer-password':true}"
                        autocomplete="off">
                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
-                        <?php echo $block->escapeHtml(__('Password Strength')); ?>:
+                        <?= $block->escapeHtml(__('Password Strength')) ?>:
                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
-                            <?php echo $block->escapeHtml(__('No Password')); ?>
+                            <?= $block->escapeHtml(__('No Password')) ?>
                         </span>
                     </div>
                 </div>
@@ -155,19 +155,19 @@
 
         </div>
         <div class="field confirmation required">
-            <label for="password-confirmation" class="label"><span><?php echo $block->escapeHtml(__('Confirm Password')) ?></span></label>
+            <label for="password-confirmation" class="label"><span><?= $block->escapeHtml(__('Confirm Password')) ?></span></label>
             <div class="control">
-                <input type="password" name="password_confirmation" title="<?php echo $block->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
+                <input type="password" name="password_confirmation" title="<?= $block->escapeHtmlAttr(__('Confirm Password')) ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}" autocomplete="off">
             </div>
         </div>
-        <?php echo $block->getChildHtml('form_additional_info'); ?>
+        <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary" title="<?php echo $block->escapeHtmlAttr(__('Create an Account')) ?>"><span><?php echo $block->escapeHtml(__('Create an Account')) ?></span></button>
+            <button type="submit" class="action submit primary" title="<?= $block->escapeHtmlAttr(__('Create an Account')) ?>"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo $block->escapeHtml(__('Back')) ?></span></a>
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
         </div>
     </div>
 </form>
@@ -178,7 +178,7 @@ require([
 ], function($){
 
     var dataForm = $('#form-validate');
-    var ignore = <?php /* @noEscape */ echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
+    var ignore = <?= /* @noEscape */ $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null' ?>;
 
     dataForm.mage('validation', {
     <?php if ($_dob->isEnabled()): ?>
@@ -207,14 +207,14 @@ require([
     {
         "#country": {
             "regionUpdater": {
-                "optionalRegionAllowed": <?php /* @noEscape */ echo $block->getConfig('general/region/display_all') ? 'true' : 'false'; ?>,
+                "optionalRegionAllowed": <?= /* @noEscape */ $block->getConfig('general/region/display_all') ? 'true' : 'false' ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?php /* @noEscape */ echo $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
-                "defaultRegion": "<?php echo (int) $block->getFormData()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php /* @noEscape */ echo $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getRegionJson() ?>,
+                "defaultRegion": "<?= (int) $block->getFormData()->getRegionId() ?>",
+                "countriesWithOptionalZip": <?= /* @noEscape */ $this->helper(\Magento\Directory\Helper\Data::class)->getCountriesWithOptionalZip(true) ?>
             }
         }
     }
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
index 7a346b30e641c..15e570da04beb 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -8,33 +8,33 @@
 
 /** @var \Magento\Customer\Block\Account\Resetpassword $block */
 ?>
-<form action="<?php echo $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['id' => $block->getCustomerId(), 'token' => $block->getResetPasswordLinkToken()]])); ?>"
+<form action="<?= $block->escapeUrl($block->getUrl('*/*/resetpasswordpost', ['_query' => ['id' => $block->getCustomerId(), 'token' => $block->getResetPasswordLinkToken()]])) ?>"
       method="post"
       <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?>
       id="form-validate"
       class="form password reset"
       data-mage-init='{"validation":{}}'>
-    <fieldset class="fieldset" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')); ?>">
+    <fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
         <div class="field password required" data-mage-init='{"passwordStrengthIndicator": {}}'>
-            <label class="label" for="password"><span><?php echo $block->escapeHtml(__('New Password')); ?></span></label>
+            <label class="label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password" id="password"
-                       data-password-min-length="<?php echo $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
-                       data-password-min-character-sets="<?php echo $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
+                       data-password-min-length="<?= $block->escapeHtmlAttr($block->getMinimumPasswordLength()) ?>"
+                       data-password-min-character-sets="<?= $block->escapeHtmlAttr($block->getRequiredCharacterClassesNumber()) ?>"
                        data-validate="{required:true, 'validate-customer-password':true}"
                        autocomplete="off">
                 <div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
                     <div id="password-strength-meter" class="password-strength-meter">
-                        <?php echo $block->escapeHtml(__('Password Strength')); ?>:
+                        <?= $block->escapeHtml(__('Password Strength')) ?>:
                         <span id="password-strength-meter-label" data-role="password-strength-meter-label">
-                            <?php echo $block->escapeHtml(__('No Password')); ?>
+                            <?= $block->escapeHtml(__('No Password')) ?>
                         </span>
                     </div>
                 </div>
             </div>
         </div>
         <div class="field confirmation required">
-            <label class="label" for="password-confirmation"><span><?php echo $block->escapeHtml(__('Confirm New Password')); ?></span></label>
+            <label class="label" for="password-confirmation"><span><?= $block->escapeHtml(__('Confirm New Password')) ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation" data-validate="{required:true,equalTo:'#password'}" autocomplete="off">
             </div>
@@ -42,7 +42,7 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary"><span><?php echo $block->escapeHtml(__('Set a New Password')); ?></span></button>
+            <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Set a New Password')) ?></span></button>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
index 2317e9ae3e3c7..2d453fcbe1274 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml
@@ -7,8 +7,7 @@
 /** @var \Magento\Customer\Block\CustomerData $block */
 ?>
 <script type="text/x-magento-init">
-<?php
-    /* @noEscape */ echo $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
+<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
         '*' => ['Magento_Customer/js/customer-data' => [
             'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'),
             'cookieLifeTime' => $block->getCookieLifeTime(),
diff --git a/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml b/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml
index 96bd89da22cc1..94ab4757898cf 100644
--- a/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml
@@ -7,8 +7,7 @@
 /** @var \Magento\Customer\Block\SectionConfig $block */
 ?>
 <script type="text/x-magento-init">
-<?php
-    /* @noEscape */ echo $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
+<?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode([
         '*' => ['Magento_Customer/js/section-config' => [
             'sections' => $block->getSections(),
             'clientSideSections' => $block->getClientSideSections(),
diff --git a/app/code/Magento/Customer/view/frontend/templates/logout.phtml b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
index a68350dec9553..43665045ce3e2 100644
--- a/app/code/Magento/Customer/view/frontend/templates/logout.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
@@ -6,14 +6,14 @@
 
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
-<p><?php echo $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p>
+<p><?= $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p>
 <script>
 require([
     "jquery",
     "mage/mage"
 ], function($){
 
-    $($.mage.redirect("<?php echo $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000));
+    $($.mage.redirect("<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000));
 
 });
 </script>
diff --git a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
index 731ea8c4ccf27..83c803ac8d79c 100644
--- a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
@@ -11,13 +11,13 @@
 <?php if ($block->getRegistration()->isAllowed()): ?>
 <div class="block block-new-customer">
     <div class="block-title">
-        <strong id="block-new-customer-heading" role="heading" aria-level="2"><?php echo $block->escapeHtml(__('New Customers')) ?></strong>
+        <strong id="block-new-customer-heading" role="heading" aria-level="2"><?= $block->escapeHtml(__('New Customers')) ?></strong>
     </div>
     <div class="block-content" aria-labelledby="block-new-customer-heading">
-        <p><?php echo $block->escapeHtml(__('Creating an account has many benefits: check out faster, keep more than one address, track orders and more.')) ?></p>
+        <p><?= $block->escapeHtml(__('Creating an account has many benefits: check out faster, keep more than one address, track orders and more.')) ?></p>
         <div class="actions-toolbar">
             <div class="primary">
-                <a href="<?php echo $block->escapeUrl($block->getCreateAccountUrl()) ?>" class="action create primary"><span><?php echo $block->escapeHtml(__('Create an Account')) ?></span></a>
+                <a href="<?= $block->escapeUrl($block->getCreateAccountUrl()) ?>" class="action create primary"><span><?= $block->escapeHtml(__('Create an Account')) ?></span></a>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml
index 3698498837d8b..001a4107d9405 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/company.phtml
@@ -8,10 +8,10 @@
 
 /** @var \Magento\Customer\Block\Widget\Company $block */
 ?>
-<div class="field company <?php echo $block->isRequired() ? 'required' : '' ?>">
+<div class="field company <?= $block->isRequired() ? 'required' : '' ?>">
     <label for="company" class="label">
         <span>
-            <?php echo $block->escapeHtml(__('Company')) ?>
+            <?= $block->escapeHtml(__('Company')) ?>
         </span>
     </label>
     <div class="control">
@@ -24,9 +24,9 @@
         <input type="text"
                name="company"
                id="company"
-               value="<?php echo $block->escapeHtmlAttr($block->getCompany()) ?>"
-               title="<?php echo $block->escapeHtmlAttr(__('Company')) ?>"
-               class="input-text <?php echo $_validationClass ?: '' ?>"
+               value="<?= $block->escapeHtmlAttr($block->getCompany()) ?>"
+               title="<?= $block->escapeHtmlAttr(__('Company')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>"
          >
     </div>
 </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index 334a1c2e6a6c2..0a37896b810c4 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -9,13 +9,13 @@
 /** @var \Magento\Customer\Block\Widget\Dob $block */
 
 /*
-<?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
+<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
    ->setDate($block->getCustomer()->getDob())
    ->toHtml() ?>
 
 For checkout/onepage/billing.phtml:
 
-<?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
+<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob')
    ->setDate($block->getCustomer()->getDob())
    ->setFieldIdFormat('billing:%s')
    ->setFieldNameFormat('billing[%s]')
@@ -28,12 +28,12 @@ automatically using block input parameters.
 $fieldCssClass = 'field date field-' . $block->getHtmlId();
 $fieldCssClass .= $block->isRequired() ? ' required' : '';
 ?>
-<div class="<?php echo $block->escapeHtmlAttr($fieldCssClass); ?>">
-    <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></label>
+<div class="<?= $block->escapeHtmlAttr($fieldCssClass) ?>">
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?= $block->escapeHtml($block->getLabel()) ?></span></label>
     <div class="control customer-dob">
-        <?php echo $block->getFieldHtml(); ?>
+        <?= $block->getFieldHtml() ?>
         <?php if ($_message = $block->getAdditionalDescription()) : ?>
-            <div class="note"><?php echo $block->escapeHtml($_message); ?></div>
+            <div class="note"><?= $block->escapeHtml($_message) ?></div>
         <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml
index 50759dab5704e..d7a1eb280a0e9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/fax.phtml
@@ -9,10 +9,10 @@
 /** @var \Magento\Customer\Block\Widget\Fax $block */
 ?>
 
-<div class="field fax <?php echo $block->isRequired() ? 'required' : '' ?>">
+<div class="field fax <?= $block->isRequired() ? 'required' : '' ?>">
     <label for="fax" class="label">
         <span>
-            <?php echo $block->escapeHtml(__('Fax')) ?>
+            <?= $block->escapeHtml(__('Fax')) ?>
         </span>
     </label>
     <div class="control">
@@ -25,9 +25,9 @@
         <input type="text"
                name="fax"
                id="fax"
-               value="<?php echo $block->escapeHtmlAttr($block->getFax()) ?>"
-               title="<?php echo $block->escapeHtmlAttr(__('Fax')) ?>"
-               class="input-text <?php echo $_validationClass ?: '' ?>"
+               value="<?= $block->escapeHtmlAttr($block->getFax()) ?>"
+               title="<?= $block->escapeHtmlAttr(__('Fax')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>"
         >
     </div>
 </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
index 0167165d2f119..d60f0968ad4fe 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
@@ -9,13 +9,13 @@
 /** @var \Magento\Customer\Block\Widget\Gender $block */
 ?>
 <div class="field gender<?php if ($block->isRequired()) echo ' required' ?>">
-    <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?php echo $block->escapeHtml(__('Gender')) ?></span></label>
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>"><span><?= $block->escapeHtml(__('Gender')) ?></span></label>
     <div class="control">
-        <select id="<?php echo $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?php echo $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?php echo $block->escapeHtmlAttr(__('Gender')) ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
+        <select id="<?= $block->escapeHtmlAttr($block->getFieldId('gender')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('gender')) ?>" title="<?= $block->escapeHtmlAttr(__('Gender')) ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?>>
             <?php $options = $block->getGenderOptions(); ?>
             <?php $value = $block->getGender();?>
             <?php foreach ($options as $option):?>
-                <option value="<?php echo $block->escapeHtmlAttr($option->getValue()) ?>"<?php if ($option->getValue() == $value) echo ' selected="selected"' ?>><?php echo $block->escapeHtml(__($option->getLabel())) ?></option>
+                <option value="<?= $block->escapeHtmlAttr($option->getValue()) ?>"<?php if ($option->getValue() == $value) echo ' selected="selected"' ?>><?= $block->escapeHtml(__($option->getLabel())) ?></option>
             <?php endforeach;?>
         </select>
     </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
index 313e6c5600d84..73e9c4fa34bb3 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
@@ -9,13 +9,13 @@
 /** @var \Magento\Customer\Block\Widget\Name $block */
 
 /*
-<?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
+<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
    ->setObject($block->getAddress())
    ->toHtml() ?>
 
 For checkout/onepage/shipping.phtml:
 
-<?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
+<?= $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')
    ->setObject($block->getAddress())
    ->setFieldIdFormat('shipping:%s')
    ->setFieldNameFormat('shipping[%s]')
@@ -27,9 +27,9 @@ $middle = $block->showMiddlename();
 $suffix = $block->showSuffix();
 ?>
 <?php if (($prefix || $middle || $suffix) && !$block->getNoWrap()): ?>
-<div class="field required fullname <?php echo $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
-    <label for="<?php echo $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
-        <span><?php echo $block->escapeHtml(__('Name')) ?></span>
+<div class="field required fullname <?= $block->escapeHtmlAttr($block->getContainerClassName()) ?>">
+    <label for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>" class="label">
+        <span><?= $block->escapeHtml(__('Name')) ?></span>
     </label>
     <div class="control">
         <fieldset class="fieldset fieldset-fullname">
@@ -38,25 +38,25 @@ $suffix = $block->showSuffix();
 
     <?php if ($prefix): ?>
         <div class="field field-name-prefix<?php if ($block->isPrefixRequired()) echo ' required' ?>">
-            <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
-                <span><?php echo $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>">
+                <span><?= $block->escapeHtml($block->getStoreLabel('prefix')) ?></span>
             </label>
 
             <div class="control">
                 <?php if ($block->getPrefixOptions() === false): ?>
-                    <input type="text" id="<?php echo $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
-                           name="<?php echo $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
-                           value="<?php echo $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
-                           title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
-                           class="input-text <?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?>>
+                    <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
+                           name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
+                           value="<?= $block->escapeHtmlAttr($block->getObject()->getPrefix()) ?>"
+                           title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
+                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?>>
                 <?php else: ?>
-                    <select id="<?php echo $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
-                            name="<?php echo $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
-                            title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
-                            class="<?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
+                    <select id="<?= $block->escapeHtmlAttr($block->getFieldId('prefix')) ?>"
+                            name="<?= $block->escapeHtmlAttr($block->getFieldName('prefix')) ?>"
+                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('prefix')) ?>"
+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('prefix')) ?>" <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
                         <?php foreach ($block->getPrefixOptions() as $_option): ?>
-                            <option value="<?php echo $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option): ?> selected="selected"<?php endif; ?>>
-                                <?php echo $block->escapeHtml(__($_option)) ?>
+                            <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getPrefix() == $_option): ?> selected="selected"<?php endif; ?>>
+                                <?= $block->escapeHtml(__($_option)) ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -65,68 +65,68 @@ $suffix = $block->showSuffix();
         </div>
     <?php endif; ?>
         <div class="field field-name-firstname required">
-            <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
-                <span><?php echo $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>">
+                <span><?= $block->escapeHtml($block->getStoreLabel('firstname')) ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="<?php echo $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
-                       name="<?php echo $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
-                       value="<?php echo $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
-                       class="input-text <?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?php if ($block->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
+                <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('firstname')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('firstname')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getObject()->getFirstname()) ?>"
+                       title="<?= $block->escapeHtmlAttr($block->getStoreLabel('firstname')) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('firstname')) ?>" <?php if ($block->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
             </div>
         </div>
     <?php if ($middle): ?>
         <?php $isMiddlenameRequired = $block->isMiddlenameRequired(); ?>
-        <div class="field field-name-middlename<?php echo $isMiddlenameRequired ? ' required' : '' ?>">
-            <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
-                <span><?php echo $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
+        <div class="field field-name-middlename<?= $isMiddlenameRequired ? ' required' : '' ?>">
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>">
+                <span><?= $block->escapeHtml($block->getStoreLabel('middlename')) ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="<?php echo $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
-                       name="<?php echo $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
-                       value="<?php echo $block->escapeHtmlAttr($block->getObject()->getMiddlename()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('middlename')) ?>"
-                       class="input-text <?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('middlename')) ?>" <?php echo $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
+                <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('middlename')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('middlename')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getObject()->getMiddlename()) ?>"
+                       title="<?= $block->escapeHtmlAttr($block->getStoreLabel('middlename')) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('middlename')) ?>" <?= $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
             </div>
         </div>
     <?php endif; ?>
         <div class="field field-name-lastname required">
-            <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
-                <span><?php echo $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>">
+                <span><?= $block->escapeHtml($block->getStoreLabel('lastname')) ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="<?php echo $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
-                       name="<?php echo $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
-                       value="<?php echo $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
-                       class="input-text <?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?php if ($block->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
+                <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('lastname')) ?>"
+                       name="<?= $block->escapeHtmlAttr($block->getFieldName('lastname')) ?>"
+                       value="<?= $block->escapeHtmlAttr($block->getObject()->getLastname()) ?>"
+                       title="<?= $block->escapeHtmlAttr($block->getStoreLabel('lastname')) ?>"
+                       class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('lastname')) ?>" <?php if ($block->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
             </div>
         </div>
     <?php if ($suffix): ?>
         <div class="field field-name-suffix<?php if ($block->isSuffixRequired()) echo ' required' ?>">
-            <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
-                <span><?php echo $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
+            <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>">
+                <span><?= $block->escapeHtml($block->getStoreLabel('suffix')) ?></span>
             </label>
 
             <div class="control">
                 <?php if ($block->getSuffixOptions() === false): ?>
-                    <input type="text" id="<?php echo $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
-                           name="<?php echo $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
-                           value="<?php echo $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
-                           title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
-                           class="input-text <?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
+                    <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
+                           name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
+                           value="<?= $block->escapeHtmlAttr($block->getObject()->getSuffix()) ?>"
+                           title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
+                           class="input-text <?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
                 <?php else: ?>
-                    <select id="<?php echo $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
-                            name="<?php echo $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
-                            title="<?php echo $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
-                            class="<?php echo $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
+                    <select id="<?= $block->escapeHtmlAttr($block->getFieldId('suffix')) ?>"
+                            name="<?= $block->escapeHtmlAttr($block->getFieldName('suffix')) ?>"
+                            title="<?= $block->escapeHtmlAttr($block->getStoreLabel('suffix')) ?>"
+                            class="<?= $block->escapeHtmlAttr($block->getAttributeValidationClass('suffix')) ?>" <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
                         <?php foreach ($block->getSuffixOptions() as $_option): ?>
-                            <option value="<?php echo $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option): ?> selected="selected"<?php endif; ?>>
-                                <?php echo $block->escapeHtml(__($_option)) ?>
+                            <option value="<?= $block->escapeHtmlAttr($_option) ?>"<?php if ($block->getObject()->getSuffix() == $_option): ?> selected="selected"<?php endif; ?>>
+                                <?= $block->escapeHtml(__($_option)) ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
index ba03d0d048992..4b3681d4d8fd3 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
@@ -9,8 +9,8 @@
 /** @var \Magento\Customer\Block\Widget\Taxvat $block */
 ?>
 <div class="field taxvat<?php if ($block->isRequired()) echo ' required'; ?>">
-    <label class="label" for="<?php echo $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?php echo $block->escapeHtml(__('Tax/VAT number')) ?></span></label>
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>"><span><?= $block->escapeHtml(__('Tax/VAT number')) ?></span></label>
     <div class="control">
-        <input type="text" id="<?php echo $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?php echo $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?php echo $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?php echo $block->escapeHtmlAttr(__('Tax/VAT number')) ?>" class="input-text <?php echo $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
+        <input type="text" id="<?= $block->escapeHtmlAttr($block->getFieldId('taxvat')) ?>" name="<?= $block->escapeHtmlAttr($block->getFieldName('taxvat')) ?>" value="<?= $block->escapeHtmlAttr($block->getTaxvat()) ?>" title="<?= $block->escapeHtmlAttr(__('Tax/VAT number')) ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat')) ?>" <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
     </div>
 </div>
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
index 5bbb638246e48..1b61dc45573b3 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
@@ -9,10 +9,10 @@
 /** @var \Magento\Customer\Block\Widget\Telephone $block */
 ?>
 
-<div class="field telephone <?php echo $block->isRequired() ? 'required' : '' ?>">
+<div class="field telephone <?= $block->isRequired() ? 'required' : '' ?>">
     <label for="telephone" class="label">
         <span>
-            <?php echo $block->escapeHtml(__('Phone Number')) ?>
+            <?= $block->escapeHtml(__('Phone Number')) ?>
         </span>
     </label>
     <div class="control">
@@ -25,9 +25,9 @@
         <input type="text"
                name="telephone"
                id="telephone"
-               value="<?php echo $block->escapeHtmlAttr($block->getTelephone()) ?>"
-               title="<?php echo $block->escapeHtmlAttr(__('Phone Number')) ?>"
-               class="input-text <?php echo $_validationClass ?: '' ?>"
+               value="<?= $block->escapeHtmlAttr($block->getTelephone()) ?>"
+               title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
+               class="input-text <?= $_validationClass ?: '' ?>"
         >
     </div>
 </div>
diff --git a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
index f0a11eb0c7b43..36ff8138f3955 100644
--- a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
+++ b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
@@ -11,18 +11,18 @@
     //<![CDATA[
     require(["prototype"], function(){
         function changeDimensions() {
-            var dimensionUnit = "(<?php echo $block->escapeHtml($block->getInch()); ?>)";
-            var dhlUnitOfMeasureNote = "<?php echo $block->escapeHtml($block->getDivideOrderWeightNoteLbp()); ?>";
+            var dimensionUnit = "(<?= $block->escapeHtml($block->getInch()) ?>)";
+            var dhlUnitOfMeasureNote = "<?= $block->escapeHtml($block->getDivideOrderWeightNoteLbp()) ?>";
             if ($("carriers_dhl_unit_of_measure").value == "K") {
-                dimensionUnit = "(<?php echo $block->escapeHtml($block->getCm()); ?>)";
-                dhlUnitOfMeasureNote = "<?php echo $block->escapeHtml($block->getDivideOrderWeightNoteKg()); ?>";
+                dimensionUnit = "(<?= $block->escapeHtml($block->getCm()) ?>)";
+                dhlUnitOfMeasureNote = "<?= $block->escapeHtml($block->getDivideOrderWeightNoteKg()) ?>";
             }
-            $$('[for="carriers_dhl_height"]')[0].innerHTML = "<?php
-                echo $block->escapeHtml($block->getHeight()); ?> " + dimensionUnit;
-            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "<?php
-                echo $block->escapeHtml($block->getDepth()); ?> " + dimensionUnit;
-            $$('[for="carriers_dhl_width"]')[0].innerHTML = "<?php
-                echo $block->escapeHtml($block->getWidth()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_height"]')[0].innerHTML = "<?=
+                $block->escapeHtml($block->getHeight()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_depth"]')[0].innerHTML = "<?=
+                $block->escapeHtml($block->getDepth()); ?> " + dimensionUnit;
+            $$('[for="carriers_dhl_width"]')[0].innerHTML = "<?=
+                $block->escapeHtml($block->getWidth()); ?> " + dimensionUnit;
 
             $("carriers_dhl_divide_order_weight").next().down().innerHTML = dhlUnitOfMeasureNote;
         }
diff --git a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
index ee8a1a562ecff..bae7a08143cce 100644
--- a/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
+++ b/app/code/Magento/Directory/view/adminhtml/templates/js/optional_zip_countries.phtml
@@ -19,7 +19,7 @@ require([
 ], function(){
 
 //<![CDATA[
-optionalZipCountries = <?php /* @noEscape */ echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>;
+optionalZipCountries = <?= /* @noEscape */ $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>;
 
 function onAddressCountryChanged (countryElement) {
     var zipElementId = countryElement.id.replace(/country_id/, 'postcode');
diff --git a/app/code/Magento/Directory/view/frontend/templates/currency.phtml b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
index 4d22eaa6ee9a6..30283effe4bb7 100644
--- a/app/code/Magento/Directory/view/frontend/templates/currency.phtml
+++ b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
@@ -16,23 +16,23 @@
 <?php $currencies = $block->getCurrencies(); ?>
 <?php $currentCurrencyCode = $block->getCurrentCurrencyCode(); ?>
 <?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
-<div class="switcher currency switcher-currency" id="switcher-currency<?php echo $block->escapeHtmlAttr($id) ?>">
-    <strong class="label switcher-label"><span><?php echo $block->escapeHtml(__('Currency')) ?></span></strong>
+<div class="switcher currency switcher-currency" id="switcher-currency<?= $block->escapeHtmlAttr($id) ?>">
+    <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Currency')) ?></span></strong>
     <div class="actions dropdown options switcher-options">
         <div class="action toggle switcher-trigger"
-             id="switcher-currency-trigger<?php echo $block->escapeHtmlAttr($id) ?>"
+             id="switcher-currency-trigger<?= $block->escapeHtmlAttr($id) ?>"
              data-mage-init='{"dropdown":{}}'
              data-toggle="dropdown"
              data-trigger-keypress-button="true">
-            <strong class="language-<?php echo $block->escapeHtml($block->getCurrentCurrencyCode()) ?>">
-                <span><?php echo $block->escapeHtml($currentCurrencyCode) ?> - <?php echo @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
+            <strong class="language-<?= $block->escapeHtml($block->getCurrentCurrencyCode()) ?>">
+                <span><?= $block->escapeHtml($currentCurrencyCode) ?> - <?= @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
             </strong>
         </div>
         <ul class="dropdown switcher-dropdown" data-target="dropdown">
             <?php foreach ($currencies as $_code => $_name): ?>
                 <?php if ($_code != $currentCurrencyCode): ?>
-                    <li class="currency-<?php echo $block->escapeHtmlAttr($_code) ?> switcher-option">
-                        <a href="#" data-post='<?php /* @noEscape */ echo $block->getSwitchCurrencyPostData($_code); ?>'><?php echo $block->escapeHtml($_code) ?> - <?php echo $block->escapeHtml($_name) ?></a>
+                    <li class="currency-<?= $block->escapeHtmlAttr($_code) ?> switcher-option">
+                        <a href="#" data-post='<?= /* @noEscape */ $block->getSwitchCurrencyPostData($_code) ?>'><?= $block->escapeHtml($_code) ?> - <?= $block->escapeHtml($_name) ?></a>
                     </li>
                 <?php endif; ?>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
index 0e1ab1d86c015..4411aa2579e66 100644
--- a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
+++ b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
@@ -9,5 +9,5 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 
 ?>
-<p><?php echo $block->escapeHtml(__('Your current currency is: %1.', $currency->getCode())) ?></p>
-<p><a href="<?php echo $block->escapeUrl($block->getBaseUrl()); ?>" class="action continue"><span><?php echo $block->escapeHtml(__('Continue')) ?></span></a></p>
+<p><?= $block->escapeHtml(__('Your current currency is: %1.', $currency->getCode())) ?></p>
+<p><a href="<?= $block->escapeUrl($block->getBaseUrl()) ?>" class="action continue"><span><?= $block->escapeHtml(__('Continue')) ?></span></a></p>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
index 604f1cde88e96..c86eb56a39008 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/composite/fieldset/downloadable.phtml
@@ -13,31 +13,31 @@
 <?php if (($block->getProduct()->isSaleable() || $_skipSaleableCheck) && $block->hasLinks()):?>
 
 <fieldset id="catalog_product_composite_configure_fields_downloadable"
-          class="fieldset admin__fieldset downloadable information<?php echo $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
-    <legend class="legend admin__legend"><span><?php /* @escapeNotVerified */ echo __('Downloadable Information') ?></span></legend><br />
+          class="fieldset admin__fieldset downloadable information<?= $block->getIsLastFieldset() ? ' last-fieldset' : '' ?>">
+    <legend class="legend admin__legend"><span><?= /* @escapeNotVerified */ __('Downloadable Information') ?></span></legend><br />
     <?php $_links = $block->getLinks(); ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
     <div class="field admin__field link<?php if ($_isRequired) echo ' required _required' ?>">
-        <label class="label admin__field-label"><span><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></span></label>
+        <label class="label admin__field-label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
         <div class="control admin__field-control" id="downloadable-links-list">
             <?php foreach ($_links as $_link): ?>
                 <div class="nested admin__field-option">
                 <?php if ($_linksPurchasedSeparately): ?>
                     <input type="checkbox"
                            class="admin__control-checkbox checkbox<?php if ($_isRequired):?> validate-one-required-by-name<?php endif; ?> product downloadable link"
-                           name="links[]" id="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>"
-                           value="<?php /* @escapeNotVerified */ echo $_link->getId(); ?>" <?php /* @escapeNotVerified */ echo $block->getLinkCheckedValue($_link); ?>
-                           price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_link->getPrice()); ?>"/>
+                           name="links[]" id="links_<?= /* @escapeNotVerified */ $_link->getId() ?>"
+                           value="<?= /* @escapeNotVerified */ $_link->getId() ?>" <?= /* @escapeNotVerified */ $block->getLinkCheckedValue($_link) ?>
+                           price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_link->getPrice()) ?>"/>
                     <?php endif; ?>
-                    <label for="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>" class="label">
-                        <?php echo $block->escapeHtml($_link->getTitle()) ?>
+                    <label for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>" class="label">
+                        <?= $block->escapeHtml($_link->getTitle()) ?>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                            &nbsp;(<a href="<?php /* @escapeNotVerified */ echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php /* @escapeNotVerified */ echo __('sample') ?></a>)
+                            &nbsp;(<a href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':'' ?>><?= /* @escapeNotVerified */ __('sample') ?></a>)
                         <?php endif; ?>
                         <?php if ($_linksPurchasedSeparately): ?>
-                        <?php /* @escapeNotVerified */ echo $block->getFormattedLinkPrice($_link); ?>
+                        <?= /* @escapeNotVerified */ $block->getFormattedLinkPrice($_link) ?>
                             <br />
-                            <?php /* @escapeNotVerified */ echo $block->getLinkPrice($_link); ?>
+                            <?= /* @escapeNotVerified */ $block->getLinkPrice($_link) ?>
                         <?php endif; ?>
                     </label>
                 <?php if ($_isRequired): ?>
@@ -45,8 +45,8 @@
 require(['prototype'], function(){
 
     //<![CDATA[
-    $('links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>').advaiceContainer = 'links-advice-container';
-    $('links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
+    $('links_<?= /* @escapeNotVerified */ $_link->getId() ?>').advaiceContainer = 'links-advice-container';
+    $('links_<?= /* @escapeNotVerified */ $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
     //]]>
                     
 });
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
index 2bfa666ff933c..7dc547c5e2752 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml
@@ -203,10 +203,10 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
 });
 </script>
 
-<div data-tab-type="tab_content_downloadableInfo" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_content"
-    <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'content', $block->getId()) ?>
+<div data-tab-type="tab_content_downloadableInfo" id="<?= /* @escapeNotVerified */ $block->getId() ?>_content"
+    <?= /* @escapeNotVerified */ $block->getUiId('tab', 'content', $block->getId()) ?>
 >
-<div id="alert_messages_block"><?php echo $block->getMessageHtml() ?></div>
+<div id="alert_messages_block"><?= $block->getMessageHtml() ?></div>
 <div class="admin__field admin__field-option admin__field-is-downloaodable">
     <input type="checkbox" data-action="change-type-product-downloadable"  class="admin__control-checkbox"
            name="is_downloadable" id="is-downloaodable" <?= $block->isDownloadable() ? 'checked="checked"' : ''?> />
@@ -215,7 +215,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
     </label>
 </div>
 <div class="entry-edit" id="product_info_tabs_downloadable_items">
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </div>
 <div style="display:none">
     <div id="custom-advice-container"></div>
@@ -224,7 +224,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
     <script>
         require(['prototype'], function(){
 
-        $(<?= /* @escapeNotVerified */  $block->getContentTabId(); ?>).select('input', 'select', 'textarea', 'button').each(function (item){
+        $(<?= /* @escapeNotVerified */  $block->getContentTabId() ?>).select('input', 'select', 'textarea', 'button').each(function (item){
             item.disabled = true;
             if (item.tagName.toLowerCase() == 'button') {
                 item.addClassName('disabled');
@@ -240,7 +240,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
         "*": {
             "Magento_Downloadable/downloadable-type-handler": {
                 "isDownloadable": "<?= /* @noEscape */ $block->isDownloadable() ? 'true' : 'false' ?>",
-                "tabId": "<?= /* @noEscape */ $block->getTabId()?>"
+                "tabId": "<?= /* @noEscape */ $block->getTabId() ?>"
             }
         }
     }
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
index a3be9e4b3dc43..2515e5e339366 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml
@@ -16,23 +16,23 @@
 <?php $_product = $block->getProduct()?>
 <?php $block->getConfigJson() ?>
 <fieldset class="admin__fieldset downloadable-form" data-ui-id="downloadable-links">
-    <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Links')?></span></legend><br>
-    <p class="note"><?php /* @escapeNotVerified */ echo __('Add links to your product files here.')?></p>
-    <div class="admin__field" <?php echo !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : ''; ?>>
-        <label class="admin__field-label" for="downloadable_links_title"><span><?php /* @escapeNotVerified */ echo __('Title')?></span></label>
+    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Links') ?></span></legend><br>
+    <p class="note"><?= /* @escapeNotVerified */ __('Add links to your product files here.') ?></p>
+    <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
+        <label class="admin__field-label" for="downloadable_links_title"><span><?= /* @escapeNotVerified */ __('Title') ?></span></label>
         <div class="admin__field-control">
-            <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?>" <?php echo($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
+            <input type="text" class="admin__control-text" id="downloadable_links_title" name="product[links_title]" value="<?= /* @escapeNotVerified */ $block->getLinksTitle() ?>" <?= ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
                 <div class="admin__field admin__field-option">
-                    <input id="link_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?php echo $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
-                    <label class="admin__field-label" for="link_title_default"><span><?php /* @escapeNotVerified */ echo __('Use Default Value'); ?></span></label>
+                    <input id="link_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="links_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?= $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
+                    <label class="admin__field-label" for="link_title_default"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>
                 </div>
             <?php endif; ?>
         </div>
     </div>
 
-    <div class="admin__field" <?php echo !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : ''; ?>>
-        <label class="admin__field-label" for="downloadable_link_purchase_type"><span><?php /* @escapeNotVerified */ echo __('Links can be purchased separately')?></span></label>
+    <div class="admin__field" <?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[GLOBAL]') . '"' : '' ?>>
+        <label class="admin__field-label" for="downloadable_link_purchase_type"><span><?= /* @escapeNotVerified */ __('Links can be purchased separately') ?></span></label>
         <div class="admin__field-control">
             <div class="admin__field-control link-switcher" data-role="link-switcher">
                 <div class="admin__field-control-group">
@@ -70,21 +70,21 @@
                 <table class="admin__control-table">
                     <thead>
                         <tr>
-                            <th class="col-sort"><span><?php /* @escapeNotVerified */ echo __('Sort Order') ?></span></th>
-                            <th class="col-title _required"><span><?php /* @escapeNotVerified */ echo __('Title') ?></span></th>
+                            <th class="col-sort"><span><?= /* @escapeNotVerified */ __('Sort Order') ?></span></th>
+                            <th class="col-title _required"><span><?= /* @escapeNotVerified */ __('Title') ?></span></th>
                             <?php if ($block->getCanReadPrice() !== false) : ?>
-                                <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
+                                <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
                             <?php endif; ?>
-                            <th class="col-file"><span><?php /* @escapeNotVerified */ echo __('Attach File or Enter Link') ?></span></th>
-                            <th class="col-sample"><span><?php /* @escapeNotVerified */ echo __('Sample') ?></span></th>
-                            <th class="col-share"><span><?php /* @escapeNotVerified */ echo __('Shareable') ?></span></th>
-                            <th class="col-limit"><span><?php /* @escapeNotVerified */ echo __('Max. Downloads') ?></span></th>
+                            <th class="col-file"><span><?= /* @escapeNotVerified */ __('Attach File or Enter Link') ?></span></th>
+                            <th class="col-sample"><span><?= /* @escapeNotVerified */ __('Sample') ?></span></th>
+                            <th class="col-share"><span><?= /* @escapeNotVerified */ __('Shareable') ?></span></th>
+                            <th class="col-limit"><span><?= /* @escapeNotVerified */ __('Max. Downloads') ?></span></th>
                             <th class="col-actions">&nbsp;</th>
                         </tr>
                     </thead>
                     <tfoot>
                         <tr>
-                            <td class="col-actions-add" colspan="8"><?php echo $block->getAddButtonHtml() ?></td>
+                            <td class="col-actions-add" colspan="8"><?= $block->getAddButtonHtml() ?></td>
                         </tr>
                     </tfoot>
                     <tbody id="link_items_body">
@@ -92,7 +92,7 @@
                 </table>
             </div>
             <div class="admin__field-note">
-                <span><?php /* @escapeNotVerified */ echo __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')?></span>
+                <span><?= /* @escapeNotVerified */ __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.') ?></span>
             </div>
         </div>
     </div>
@@ -123,7 +123,7 @@ require([
                 <?php if($_product->getStoreId()): ?>
                     '<div class="admin__field admin__field-option">'+
                     '<input type="checkbox" id="downloadable_link_<%- data.id %>_title" name="downloadable[link][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
-                    '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Use Default Value'); ?></span></label>'+
+                    '<label for="downloadable_link_<%- data.id %>_title" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
                     '</div>' +
                 <?php endif; ?>
                 <?php if ($block->getCanReadPrice() == false) : ?>
@@ -137,12 +137,12 @@ require([
                 '<td class="col-price">'+
                     '<div class="admin__control-addon">' +
                         '<input type="text" id="downloadable_link_<%- data.id %>_price_value" class="input-text admin__control-text validate-number link-prices<?php if ($block->getCanEditPrice() === false) : ?> disabled<?php endif; ?>" name="downloadable[link][<%- data.id %>][price]" value="<%- data.price %>"<?php if ($block->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?> /> ' +
-                        '<label class="admin__addon-prefix"><span><?php echo $block->escapeHtml($block->getBaseCurrencySymbol($_product->getStoreId())) ?></span></label>' +
+                        '<label class="admin__addon-prefix"><span><?= $block->escapeHtml($block->getBaseCurrencySymbol($_product->getStoreId())) ?></span></label>' +
                     '</div>' +
                     <?php if ($_product->getStoreId() && $block->getIsPriceWebsiteScope()) : ?>
                         '<div class="admin__field admin__field-option">'+
                             '<input type="checkbox" id="downloadable_link_<%- data.id %>_price" name="downloadable[link][<%- data.id %>][use_default_price]" value="1"<?php if ($block->getCanEditPrice() === false) : ?> disabled="disabled"<?php endif; ?> class="admin__control-checkbox" />'+
-                            '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Use Default Value'); ?></span></label>' +
+                            '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>' +
                         '</div>' +
                     <?php endif; ?>
                 '</td>' +
@@ -150,25 +150,25 @@ require([
             '<td class="col-file">'+
                 '<div class="admin__field admin__field-option">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_file_type" name="downloadable[link][<%- data.id %>][type]" value="file"<%- data.file_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_file_type" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('File'); ?></span></label>'+
+                    '<label for="downloadable_link_<%- data.id %>_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?></span></label>'+
                     '<input type="hidden" class="validate-downloadable-file" id="downloadable_link_<%- data.id %>_file_save" name="downloadable[link][<%- data.id %>][file]" value="<%- data.file_save %>" />'+
 
                     '<div id="downloadable_link_<%- data.id %>_file" class="admin__field-uploader">'+
                         '<div id="downloadable_link_<%- data.id %>_file-old" class="file-row-info"></div>'+
                         '<div id="downloadable_link_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
-                            '<span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>' +
-                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?php /* @escapeNotVerified */ echo $block->getFileFieldName('links') ?>">' +
+                            '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
+                            '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?= /* @escapeNotVerified */ $block->getFileFieldName('links') ?>">' +
                             '<script>' +
-                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?php /* @escapeNotVerified */ echo $block->getUploadUrl('links') ?>"); ' +
+                                'linksUploader("#downloadable_link_<%- data.id %>_file", "<?= /* @escapeNotVerified */ $block->getUploadUrl('links') ?>"); ' +
                             '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
                 '</div>'+
                 '<div class="admin__field admin__field-option admin__field-file-url">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_url_type" name="downloadable[link][<%- data.id %>][type]" value="url"<%- data.url_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_url_type" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('URL'); ?></span></label>' +
-                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][link_url]" value="<%- data.link_url %>" placeholder="<?php /* @escapeNotVerified */ echo __('URL'); ?>" />'+
+                    '<label for="downloadable_link_<%- data.id %>_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>' +
+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][link_url]" value="<%- data.link_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
                 '</div>'+
                 '<div>'+
                     '<span id="downloadable_link_<%- data.id %>_link_container"></span>'+
@@ -177,16 +177,16 @@ require([
             '<td class="col-sample">'+
                 '<div class="admin__field admin__field-option">'+
                     '<input type="radio" class="admin__control-radio" id="downloadable_link_<%- data.id %>_sample_file_type" name="downloadable[link][<%- data.id %>][sample][type]" value="file"<%- data.sample_file_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_sample_file_type" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('File'); ?>:</span></label>'+
+                    '<label for="downloadable_link_<%- data.id %>_sample_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?>:</span></label>'+
                     '<input type="hidden" id="downloadable_link_<%- data.id %>_sample_file_save" name="downloadable[link][<%- data.id %>][sample][file]" value="<%- data.sample_file_save %>" class="validate-downloadable-file"/>'+
                     '<div id="downloadable_link_<%- data.id %>_sample_file" class="admin__field-uploader">'+
                         '<div id="downloadable_link_<%- data.id %>_sample_file-old" class="file-row-info"></div>'+
                         '<div id="downloadable_link_<%- data.id %>_sample_file-new" class="file-row-info new-file"></div>'+
                         '<div class="fileinput-button form-buttons">'+
-                        '<span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>' +
-                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?php /* @escapeNotVerified */ echo $block->getFileFieldName('link_samples') ?>">' +
+                        '<span><?= /* @escapeNotVerified */ __('Browse Files...') ?></span>' +
+                        '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?= /* @escapeNotVerified */ $block->getFileFieldName('link_samples') ?>">' +
                         '<script>'+
-                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?php /* @escapeNotVerified */ echo $block->getUploadUrl('link_samples') ?>"); ' +
+                        'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?= /* @escapeNotVerified */ $block->getUploadUrl('link_samples') ?>"); ' +
                         '</scr'+'ipt>'+
                         '</div>'+
                     '</div>'+
@@ -194,8 +194,8 @@ require([
 
                 '<div class="admin__field admin__field-option admin__field-file-url">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_link_<%- data.id %>_sample_url_type" name="downloadable[link][<%- data.id %>][sample][type]" value="url"<%- data.sample_url_checked %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_sample_url_type" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('URL'); ?></span></label>'+
-                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][sample][url]" value="<%- data.sample_url %>" placeholder="<?php /* @escapeNotVerified */ echo __('URL'); ?>" />'+
+                    '<label for="downloadable_link_<%- data.id %>_sample_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>'+
+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[link][<%- data.id %>][sample][url]" value="<%- data.sample_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
                 '</div>'+
                 '<div>'+
                     '<span id="downloadable_link_<%- data.id %>_sample_container"></span>'+
@@ -203,20 +203,20 @@ require([
             '</td>'+
             '<td class="col-share">'+
                 '<select id="downloadable_link _<%- data.id %>_shareable" class="admin__control-select" name="downloadable[link][<%- data.id %>][is_shareable]">'+
-                    '<option value="1"><?php /* @escapeNotVerified */ echo __('Yes'); ?></option>'+
-                    '<option value="0"><?php /* @escapeNotVerified */ echo __('No'); ?></option>'+
-                    '<option value="2" selected="selected"><?php /* @escapeNotVerified */ echo __('Use config'); ?></option>'+
+                    '<option value="1"><?= /* @escapeNotVerified */ __('Yes') ?></option>'+
+                    '<option value="0"><?= /* @escapeNotVerified */ __('No') ?></option>'+
+                    '<option value="2" selected="selected"><?= /* @escapeNotVerified */ __('Use config') ?></option>'+
                 '</select>'+
             '</td>'+
             '<td class="col-limit">' +
                 '<input type="text" id="downloadable_link_<%- data.id %>_downloads" name="downloadable[link][<%- data.id %>][number_of_downloads]" class="input-text validate-zero-or-greater admin__control-text downloads" value="<%- data.number_of_downloads %>" />'+
                 '<div class="admin__field admin__field-option">' +
                     '<input type="checkbox" class="admin__control-checkbox" id="downloadable_link_<%- data.id %>_is_unlimited" name="downloadable[link][<%- data.id %>][is_unlimited]" value="1" <%- data.is_unlimited %> />' +
-                    '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Unlimited'); ?></span></label>' +
+                    '<label for="downloadable_link_<%- data.id %>_is_unlimited" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Unlimited') ?></span></label>' +
                 '</div>' +
             '</td>'+
             '<td class="col-action">'+
-                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete" title="<?=  /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?php /* @escapeNotVerified */ echo __('Delete'); ?></span></button>'+
+                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button>'+
             '</td>'+
         '</tr>';
 
@@ -233,7 +233,7 @@ require([
                     data.link_id  = 0;
                     data.link_type = 'file';
                     data.sample_type = 'none';
-                    data.number_of_downloads = '<?php /* @escapeNotVerified */ echo $block->getConfigMaxDownloads() ?>';
+                    data.number_of_downloads = '<?= /* @escapeNotVerified */ $block->getConfigMaxDownloads() ?>';
                     data.sort_order = this.itemCount + 1;
                 }
 
@@ -324,7 +324,7 @@ require([
                     'downloadable[link]['+data.id+'][sample]',
                     data.sample_file_save,
                     'downloadable_link_'+data.id+'_sample_file',
-                    <?php /* @escapeNotVerified */ echo $block->getConfigJson('link_samples') ?>
+                    <?= /* @escapeNotVerified */ $block->getConfigJson('link_samples') ?>
                 );
                 // link file
                 new Downloadable.FileUploader(
@@ -334,7 +334,7 @@ require([
                     'downloadable[link]['+data.id+']',
                     data.file_save,
                     'downloadable_link_'+data.id+'_file',
-                    <?php /* @escapeNotVerified */ echo $block->getConfigJson() ?>
+                    <?= /* @escapeNotVerified */ $block->getConfigJson() ?>
                 );
 
                 linkFile = $('downloadable_link_'+data.id+'_file_type');
@@ -479,7 +479,7 @@ require([
         }
 
         <?php foreach ($block->getLinkData() as $item): ?>
-            linkItems.add(<?php /* @escapeNotVerified */ echo $item->toJson()?>);
+            linkItems.add(<?= /* @escapeNotVerified */ $item->toJson() ?>);
         <?php endforeach; ?>
 
     });
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
index ffd186c8f2e1a..af4dee226f38b 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml
@@ -16,10 +16,10 @@ $_product = $block->getProduct();
 $block->getConfigJson();
 ?>
 <fieldset class="admin__fieldset downloadable-form" data-ui-id="downloadable-samples">
-    <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Samples')?></span></legend><br>
-    <p class="note"><?php /* @escapeNotVerified */ echo __('Add product preview files here.')?></p>
-    <div class="admin__field"<?php echo !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : ''; ?>>
-        <label class="admin__field-label" for="downloadable_samples_title"><span><?= /* @noEscape */ __('Title')?></span></label>
+    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Samples') ?></span></legend><br>
+    <p class="note"><?= /* @escapeNotVerified */ __('Add product preview files here.') ?></p>
+    <div class="admin__field"<?= !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : '' ?>>
+        <label class="admin__field-label" for="downloadable_samples_title"><span><?= /* @noEscape */ __('Title') ?></span></label>
         <div class="admin__field-control">
             <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?= /* @noEscape */ $block->getSamplesTitle() ?>" <?= /* @noEscape */ ($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
@@ -44,7 +44,7 @@ $block->getConfigJson();
                     </thead>
                     <tfoot>
                         <tr>
-                            <td colspan="4" class="col-actions-add"><?php echo $block->getAddButtonHtml() ?></td>
+                            <td colspan="4" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
                         </tr>
                     </tfoot>
                     <tbody id="sample_items_body">
@@ -52,7 +52,7 @@ $block->getConfigJson();
                 </table>
             </div>
             <div class="admin__field-note">
-                <?= /* @noEscape */ __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')?>
+                <?= /* @noEscape */ __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.') ?>
             </div>
         </div>
     </div>
@@ -79,14 +79,14 @@ require([
                 <?php if($_product->getStoreId()): ?>
                     '<div class="admin__field admin__field-option">'+
                         '<input type="checkbox" id="downloadable_sample_<%- data.id %>_title" name="downloadable[sample][<%- data.id %>][use_default_title]" value="1" class="admin__control-checkbox" />'+
-                        '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Use Default Value'); ?></span></label>'+
+                        '<label for="downloadable_link_<%- data.id %>_price" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Use Default Value') ?></span></label>'+
                     '</div>' +
                 <?php endif; ?>
             '</td>'+
             '<td class="col-file">'+
                 '<div class="admin__field admin__field-option">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_sample_<%- data.id %>_file_type" name="downloadable[sample][<%- data.id %>][type]" value="file"<%- data.file_checked %> />' +
-                    '<label for="downloadable_sample_<%- data.id %>_file_type" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('File'); ?>:</span></label>'+
+                    '<label for="downloadable_sample_<%- data.id %>_file_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('File') ?>:</span></label>'+
                     '<input type="hidden" class="validate-downloadable-file" id="downloadable_sample_<%- data.id %>_file_save" name="downloadable[sample][<%- data.id %>][file]" value="<%- data.file_save %>" />'+
                     '<div id="downloadable_sample_<%- data.id %>_file" class="admin__field-uploader">'+
                         '<div id="downloadable_sample_<%- data.id %>_file-old" class="file-row-info"></div>'+
@@ -104,15 +104,15 @@ require([
                 '</div>'+
                 '<div class="admin__field admin__field-option admin__field-file-url">'+
                     '<input type="radio" class="admin__control-radio validate-one-required-by-name" id="downloadable_sample_<%- data.id %>_url_type" name="downloadable[sample][<%- data.id %>][type]" value="url"<%- data.url_checked %> />' +
-                    '<label for="downloadable_sample_<%- data.id %>_url_type" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('URL'); ?></span></label>' +
-                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[sample][<%- data.id %>][sample_url]" value="<%- data.sample_url %>" placeholder="<?php /* @escapeNotVerified */ echo __('URL'); ?>" />'+
+                    '<label for="downloadable_sample_<%- data.id %>_url_type" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('URL') ?></span></label>' +
+                    '<input type="text" class="validate-downloadable-url validate-url admin__control-text" name="downloadable[sample][<%- data.id %>][sample_url]" value="<%- data.sample_url %>" placeholder="<?= /* @escapeNotVerified */ __('URL') ?>" />'+
                 '</div>'+
                 '<div>'+
                     '<span id="downloadable_sample_<%- data.id %>_container"></span>'+
                 '</div>'+
             '</td>'+
             '<td class="col-actions">'+
-                '<button type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')); ?>"><span><?php /* @escapeNotVerified */ echo __('Delete'); ?></span></button>'+
+                '<button type="button" class="action-delete" title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Delete')) ?>"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button>'+
             '</td>'+
         '</tr>';
         sampleItems = {
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
index 6fda085f80c2a..8cc135334583f 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/creditmemo/name.phtml
@@ -9,25 +9,25 @@
 ?>
 
 <?php if ($_item = $block->getItem()): ?>
-    <div class="product-title"><?php /* @escapeNotVerified */ echo $_item->getName() ?></div>
-    <div><strong><?php /* @escapeNotVerified */ echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?></div>
+    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
+    <div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?></div>
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?></dt>
+            <dt><?= /* @escapeNotVerified */ $_option['label'] ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php /* @escapeNotVerified */ echo $_option['value'];?>
+                <?= /* @escapeNotVerified */ $_option['value'] ?>
             <?php else: ?>
-                <?php echo $block->truncateString($_option['value'], 55, '', $_remainder);?>
+                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
                 <?php if ($_remainder):?>
-                    ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                     <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -39,11 +39,11 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle(); ?></dt>
+            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()); ?></dd>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?></dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $block->escapeHtml($_item->getDescription()) ?>
+    <?= $block->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
index 57db50ba296e5..ef7e7627b7a9c 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/invoice/name.phtml
@@ -9,25 +9,25 @@
 ?>
 
 <?php if ($_item = $block->getItem()): ?>
-    <div class="product-title"><?php /* @escapeNotVerified */ echo $_item->getName() ?></div>
-    <div><strong><?php /* @escapeNotVerified */ echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?></div>
+    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
+    <div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?></div>
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?></dt>
+            <dt><?= /* @escapeNotVerified */ $_option['label'] ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php /* @escapeNotVerified */ echo $_option['value'];?>
+                <?= /* @escapeNotVerified */ $_option['value'] ?>
             <?php else: ?>
-                <?php echo $block->truncateString($_option['value'], 55, '', $_remainder);?>
+                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
                 <?php if ($_remainder):?>
-                    ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                     <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -39,11 +39,11 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle(); ?></dt>
+            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()); ?> (<?php /* @escapeNotVerified */ echo $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $block->escapeHtml($_item->getDescription()) ?>
+    <?= $block->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
index 2e7bb764da8f9..5462008aab385 100644
--- a/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
+++ b/app/code/Magento/Downloadable/view/adminhtml/templates/sales/items/column/downloadable/name.phtml
@@ -9,28 +9,28 @@
 ?>
 
 <?php if ($_item = $block->getItem()): ?>
-    <div class="product-title"><?php /* @escapeNotVerified */ echo $_item->getName() ?></div>
+    <div class="product-title"><?= /* @escapeNotVerified */ $_item->getName() ?></div>
     <div class="product-sku-block">
-        <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-        <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?>
+        <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+        <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
     </div>
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?>:</dt>
+            <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php /* @escapeNotVerified */ echo $_option['value'];?>
+                <?= /* @escapeNotVerified */ $_option['value'] ?>
             <?php else: ?>
-                <?php echo $block->truncateString($_option['value'], 55, '', $_remainder);?>
+                <?= $block->truncateString($_option['value'], 55, '', $_remainder) ?>
                 <?php if ($_remainder):?>
-                    ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
+                    ... <span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_remainder ?></span>
                     <script>
 require(['prototype'], function(){
 
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
 
 });
 </script>
@@ -42,11 +42,11 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle(); ?>:</dt>
+            <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?>:</dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()) ?> (<?php /* @escapeNotVerified */ echo $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
+                <dd><?= $block->escapeHtml($_link->getLinkTitle()) ?> (<?= /* @escapeNotVerified */ $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $block->escapeHtml($_item->getDescription()) ?>
+    <?= $block->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
index 8aba9b6490cf4..fbc673ef910fb 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/links.phtml
@@ -13,14 +13,14 @@
     <?php $_links = $block->getLinks(); ?>
     <?php $_linksLength = 0; ?>
     <?php $_isRequired = $block->getLinkSelectionRequired(); ?>
-    <legend class="legend links-title"><span><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></span></legend><br>
+    <legend class="legend links-title"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></legend><br>
     <div class="field downloads<?php if ($_isRequired) echo ' required' ?><?php if (!$_linksPurchasedSeparately) echo ' downloads-no-separately' ?>">
-        <label class="label"><span><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></span></label>
+        <label class="label"><span><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></span></label>
         <div class="control" id="downloadable-links-list"
              data-mage-init='{"downloadable":{
                  "linkElement":"input:checkbox[value]",
                  "allElements":"#links_all",
-                 "config":<?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>}
+                 "config":<?= /* @escapeNotVerified */ $block->getJsonConfig() ?>}
              }'
              data-container-for="downloadable-links">
             <?php foreach ($_links as $_link): ?>
@@ -30,19 +30,19 @@
                         <input type="checkbox"
                                <?php if ($_isRequired): ?>data-validate="{'validate-one-checkbox-required-by-name':'downloadable-links-list'}" <?php endif; ?>
                                name="links[]"
-                               id="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>"
-                               value="<?php /* @escapeNotVerified */ echo $_link->getId(); ?>" <?php /* @escapeNotVerified */ echo $block->getLinkCheckedValue($_link); ?> />
+                               id="links_<?= /* @escapeNotVerified */ $_link->getId() ?>"
+                               value="<?= /* @escapeNotVerified */ $_link->getId() ?>" <?= /* @escapeNotVerified */ $block->getLinkCheckedValue($_link) ?> />
                     <?php endif; ?>
-                    <label class="label" for="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>">
-                        <span><?php echo $block->escapeHtml($_link->getTitle()); ?></span>
+                    <label class="label" for="links_<?= /* @escapeNotVerified */ $_link->getId() ?>">
+                        <span><?= $block->escapeHtml($_link->getTitle()) ?></span>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
                             <a class="sample link"
-                               href="<?php /* @escapeNotVerified */ echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>>
-                                <?php /* @escapeNotVerified */ echo __('sample') ?>
+                               href="<?= /* @escapeNotVerified */ $block->getLinkSampleUrl($_link) ?>" <?= $block->getIsOpenInNewWindow() ? 'target="_blank"' : '' ?>>
+                                <?= /* @escapeNotVerified */ __('sample') ?>
                             </a>
                         <?php endif; ?>
                         <?php if ($_linksPurchasedSeparately): ?>
-                            <?php /* @escapeNotVerified */ echo $block->getLinkPrice($_link); ?>
+                            <?= /* @escapeNotVerified */ $block->getLinkPrice($_link) ?>
                         <?php endif; ?>
                     </label>
                 </div>
@@ -50,10 +50,10 @@
             <?php if ($_linksPurchasedSeparately && $_linksLength > 1): ?>
                 <div class="field choice downloads-all">
                     <input type="checkbox"
-                           data-notchecked="<?php /* @escapeNotVerified */ echo __('Select all')?>"
-                           data-checked="<?php /* @escapeNotVerified */ echo __('Unselect all')?>"
+                           data-notchecked="<?= /* @escapeNotVerified */ __('Select all') ?>"
+                           data-checked="<?= /* @escapeNotVerified */ __('Unselect all') ?>"
                            id="links_all" />
-                    <label class="label" for="links_all"><span><?php /* @escapeNotVerified */ echo __('Select all')?></span></label>
+                    <label class="label" for="links_all"><span><?= /* @escapeNotVerified */ __('Select all') ?></span></label>
                 </div>
             <?php endif; ?>
         </div>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
index 96e7d0c677486..4371ffdfc2956 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/samples.phtml
@@ -15,13 +15,13 @@
 
 <?php if ($block->hasSamples()): ?>
     <dl class="items samples">
-        <dt class="item-title samples-item-title"><?php /* @escapeNotVerified */ echo $block->getSamplesTitle() ?></dt>
+        <dt class="item-title samples-item-title"><?= /* @escapeNotVerified */ $block->getSamplesTitle() ?></dt>
         <?php $_samples = $block->getSamples() ?>
         <?php foreach ($_samples as $_sample): ?>
             <dd class="item samples-item">
-                <a href="<?php /* @escapeNotVerified */ echo $block->getSampleUrl($_sample) ?>" <?php echo $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : ''; ?>
+                <a href="<?= /* @escapeNotVerified */ $block->getSampleUrl($_sample) ?>" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>
                    class="item-link samples-item-link">
-                    <?php echo $block->escapeHtml($_sample->getTitle()) ?>
+                    <?= $block->escapeHtml($_sample->getTitle()) ?>
                 </a>
             </dd>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
index a5f6bf33531d0..d4afdf5f81fe2 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
@@ -15,12 +15,12 @@
 <?php $_product = $block->getProduct() ?>
 
 <?php if ($_product->getIsSalable()): ?>
-    <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-        <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+    <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+        <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
     </div>
 <?php else: ?>
-    <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-        <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+    <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
     </div>
 <?php endif; ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
index 415a053d406b7..a32d854d3b47f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/checkout/success.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <?php if ($block->getOrderHasDownloadable()): ?>
-    <?php /* @escapeNotVerified */ echo __('Go to <a href="%1">My Downloadable Products</a>', $block->getDownloadableProductsUrl()) ?>
+    <?= /* @escapeNotVerified */ __('Go to <a href="%1">My Downloadable Products</a>', $block->getDownloadableProductsUrl()) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
index dd102ec555d54..08cadb2d78f11 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/customer/products/list.phtml
@@ -16,34 +16,34 @@
 <?php if (count($_items)): ?>
     <div class="table-wrapper downloadable-products">
         <table id="my-downloadable-products-table" class="data table table-downloadable-products">
-            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Downloadable Products') ?></caption>
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Downloadable Products') ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php /* @escapeNotVerified */ echo __('Order #') ?></th>
-                    <th scope="col" class="col date"><?php /* @escapeNotVerified */ echo __('Date') ?></th>
-                    <th scope="col" class="col title"><?php /* @escapeNotVerified */ echo __('Title') ?></th>
-                    <th scope="col" class="col status"><?php /* @escapeNotVerified */ echo __('Status') ?></th>
-                    <th scope="col" class="col remaining"><?php /* @escapeNotVerified */ echo __('Remaining Downloads') ?></th>
+                    <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
+                    <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
+                    <th scope="col" class="col title"><?= /* @escapeNotVerified */ __('Title') ?></th>
+                    <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
+                    <th scope="col" class="col remaining"><?= /* @escapeNotVerified */ __('Remaining Downloads') ?></th>
                 </tr>
             </thead>
             <tbody>
             <?php foreach ($_items as $_item): ?>
                 <tr>
-                    <td data-th="<?php echo $block->escapeHtml(__('Order #')) ?>" class="col id">
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>"
-                            title="<?php echo $block->escapeHtml(__('View Order')) ?>">
-                            <?php /* @escapeNotVerified */ echo $_item->getPurchased()->getOrderIncrementId() ?>
+                    <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
+                        <a href="<?= /* @escapeNotVerified */ $block->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>"
+                            title="<?= $block->escapeHtml(__('View Order')) ?>">
+                            <?= /* @escapeNotVerified */ $_item->getPurchased()->getOrderIncrementId() ?>
                         </a>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Title')) ?>" class="col title">
-                        <strong class="product-name"><?php echo $block->escapeHtml($_item->getPurchased()->getProductName()) ?></strong>
+                    <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_item->getPurchased()->getCreatedAt()) ?></td>
+                    <td data-th="<?= $block->escapeHtml(__('Title')) ?>" class="col title">
+                        <strong class="product-name"><?= $block->escapeHtml($_item->getPurchased()->getProductName()) ?></strong>
                         <?php if ($_item->getStatus() == \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE): ?>
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getDownloadUrl($_item) ?>" title="<?php echo $block->escapeHtml(__('Start Download')) ?>" class="action download" <?php echo $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : ''; ?>><?php echo $block->escapeHtml($_item->getLinkTitle()) ?></a>
+                        <a href="<?= /* @escapeNotVerified */ $block->getDownloadUrl($_item) ?>" title="<?= $block->escapeHtml(__('Start Download')) ?>" class="action download" <?= $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : '' ?>><?= $block->escapeHtml($_item->getLinkTitle()) ?></a>
                         <?php endif; ?>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Status')) ?>" class="col status"><?php /* @escapeNotVerified */ echo __(ucfirst($_item->getStatus())) ?></td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Remaining Downloads')) ?>" class="col remaining"><?php /* @escapeNotVerified */ echo $block->getRemainingDownloads($_item) ?></td>
+                    <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ __(ucfirst($_item->getStatus())) ?></td>
+                    <td data-th="<?= $block->escapeHtml(__('Remaining Downloads')) ?>" class="col remaining"><?= /* @escapeNotVerified */ $block->getRemainingDownloads($_item) ?></td>
                 </tr>
             <?php endforeach; ?>
             </tbody>
@@ -51,17 +51,17 @@
     </div>
     <?php if ($block->getChildHtml('pager')): ?>
         <div class="toolbar downloadable-products-toolbar bottom">
-            <?php echo $block->getChildHtml('pager'); ?>
+            <?= $block->getChildHtml('pager') ?>
         </div>
     <?php endif; ?>
 <?php else: ?>
-    <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('You have not purchased any downloadable products yet.'); ?></span></div>
+    <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have not purchased any downloadable products yet.') ?></span></div>
 <?php endif; ?>
 
 <div class="actions-toolbar">
     <div class="secondary">
-        <a href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-            <span><?php /* @escapeNotVerified */ echo __('Back') ?></span>
+        <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+            <span><?= /* @escapeNotVerified */ __('Back') ?></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
index a0d2a757cbf8f..4882074b60074 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/creditmemo/downloadable.phtml
@@ -13,7 +13,7 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
         <dl>
             <?php foreach ($block->getItemOptions() as $option): ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
index 19cd46afb0843..1be4ac56bad3e 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
@@ -13,7 +13,7 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
         <dl>
             <?php foreach ($block->getItemOptions() as $option): ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
index 122204fcae6bd..21b4ebc598917 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
@@ -13,7 +13,7 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
         <dl>
             <?php foreach ($block->getItemOptions() as $option): ?>
@@ -39,9 +39,9 @@
                 <tr>
                     <td>
                         <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
-                        <strong><?= /* @escapeNotVerified */  __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('Message:'); ?></strong>
+                        <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                        <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                        <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                     </td>
                 </tr>
@@ -50,6 +50,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index d38f4f60d5822..278374969e08a 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
@@ -10,28 +10,28 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr class="border" id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
             <dl class="item-options links">
                 <?php foreach ($_options as $_option) : ?>
-                    <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                             <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
-                                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
                     <?php else: ?>
-                        <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                        <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
@@ -39,9 +39,9 @@
         <?php /* downloadable */?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
+                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
+                    <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
@@ -49,20 +49,20 @@
 
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+            <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-        <?php echo $block->getItemPriceHtml(); ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+        <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
-        <?php echo $block->getItemRowTotalHtml(); ?>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+        <?= $block->getItemRowTotalHtml() ?>
     </td>
-    <td class="col discount" data-th="<?php echo $block->escapeHtml(__('Discount Amount')); ?>"><?php /* @escapeNotVerified */ echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-    <td class="col total" data-th="<?php echo $block->escapeHtml(__('Row Total')); ?>">
-        <?php echo $block->getItemRowTotalAfterDiscountHtml(); ?>
+    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @escapeNotVerified */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+    <td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
+        <?= $block->getItemRowTotalAfterDiscountHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
index 4426130d016e6..0cf1bf8469860 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/invoice/items/renderer/downloadable.phtml
@@ -10,28 +10,28 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
             <dl class="item-options links">
                 <?php foreach ($_options as $_option) : ?>
-                    <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                             <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
-                                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
                     <?php else: ?>
-                        <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                        <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
             </dl>
@@ -39,27 +39,27 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
+                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
+                    <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php /* EOF downloadable */ ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+            <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-        <?php echo $block->getItemPriceHtml(); ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+        <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>">
-        <span class="qty summary" data-label="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></span>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
+        <span class="qty summary" data-label="<?= $block->escapeHtml(__('Qty Invoiced')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></span>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
-        <?php echo $block->getItemRowTotalHtml(); ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+        <?= $block->getItemRowTotalHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
index 4fc0b28945018..40d965e5304ab 100644
--- a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
+++ b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/items/renderer/downloadable.phtml
@@ -9,29 +9,29 @@
 /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
 ?>
 <?php $_item = $block->getItem() ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
             <dl class="item-options links">
                 <?php foreach ($_options as $_option) : ?>
-                    <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                    <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                            <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                             <?php if (isset($_formatedOptionValue['full_view'])): ?>
                                 <div class="tooltip content">
                                     <dl class="item options">
-                                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
                         </dd>
                     <?php else: ?>
                         <dd>
-                            <?php echo nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
+                            <?= nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
                         </dd>
                     <?php endif; ?>
                 <?php endforeach; ?>
@@ -40,52 +40,52 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
+                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
+                    <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
         <?php /* EOF downloadable */ ?>
         <?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addtInfoBlock) :?>
-            <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
+            <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-        <?php echo $block->getItemPriceHtml(); ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+        <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
         <ul class="items-qty">
             <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Ordered'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyOrdered()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyShipped() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyShipped() * 1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyShipped() * 1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Canceled'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyCanceled()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Refunded'); ?></span>
-                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
+                    <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyRefunded()*1 ?></span>
                 </li>
             <?php endif; ?>
         </ul>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
-        <?php echo $block->getItemRowTotalHtml(); ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+        <?= $block->getItemRowTotalHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
index 7aae388bc4186..3c89e8c2a9308 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -11,20 +11,20 @@ use Magento\Framework\App\TemplateTypesInterface;
 /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
 ?>
 <?php if (!$block->getEditMode()): ?>
-<form action="<?php echo $block->escapeUrl($block->getLoadUrl()) ?>" method="post" id="email_template_load_form">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= $block->escapeUrl($block->getLoadUrl()) ?>" method="post" id="email_template_load_form">
+    <?= $block->getBlockHtml('formkey') ?>
     <fieldset class="admin__fieldset form-inline">
-        <legend class="admin__legend"><span><?php echo $block->escapeHtml(__('Load default template')) ?></span></legend><br>
+        <legend class="admin__legend"><span><?= $block->escapeHtml(__('Load default template')) ?></span></legend><br>
         <div class="admin__field">
-            <label class="admin__field-label" for="template_select"><?php echo $block->escapeHtml(__('Template')) ?></label>
+            <label class="admin__field-label" for="template_select"><?= $block->escapeHtml(__('Template')) ?></label>
             <div class="admin__field-control">
                 <select id="template_select" name="code" class="admin__control-select required-entry">
                     <?php foreach ($block->getTemplateOptions() as $group => $options): ?>
                         <?php if ($group): ?>
-                            <optgroup label="<?php echo $block->escapeHtmlAttr($group) ?>">
+                            <optgroup label="<?= $block->escapeHtmlAttr($group) ?>">
                         <?php endif; ?>
                         <?php foreach ($options as $option): ?>
-                            <option value="<?php echo $block->escapeHtmlAttr($option['value']) ?>"<?php /* @noEscape */ echo $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?php echo $block->escapeHtml($option['label']) ?></option>
+                            <option value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?= $block->escapeHtml($option['label']) ?></option>
                         <?php endforeach; ?>
                         <?php if ($group): ?>
                             </optgroup>
@@ -36,24 +36,24 @@ use Magento\Framework\App\TemplateTypesInterface;
         <div class="admin__field required">
             <span class="admin__field-label"></span>
             <div class="admin__field-control">
-                <?php /* @noEscape */ echo $block->getLoadButtonHtml() ?>
+                <?= /* @noEscape */ $block->getLoadButtonHtml() ?>
             </div>
         </div>
     </fieldset>
 </form>
 <?php endif ?>
 
-<form action="<?php echo $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="email_template_edit_form">
-    <?php /* @noEscape */ echo $block->getBlockHtml('formkey')?>
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="email_template_edit_form">
+    <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <input type="hidden" id="change_flag_element" name="_change_type_flag" value="" />
-    <input type="hidden" id="orig_template_code" name="orig_template_code" value="<?php echo $block->escapeHtmlAttr($block->getOrigTemplateCode()) ?>" />
-    <?php /* @noEscape */ echo $block->getFormHtml() ?>
+    <input type="hidden" id="orig_template_code" name="orig_template_code" value="<?= $block->escapeHtmlAttr($block->getOrigTemplateCode()) ?>" />
+    <?= /* @noEscape */ $block->getFormHtml() ?>
 </form>
 
-<form action="<?php echo $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="email_template_preview_form" target="_blank">
-    <?php /* @noEscape */ echo $block->getBlockHtml('formkey')?>
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="email_template_preview_form" target="_blank">
+    <?= /* @noEscape */ $block->getBlockHtml('formkey') ?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?php /* @noEscape */ echo $block->isTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
     </div>
@@ -93,7 +93,7 @@ require([
 
             this.bindEvents();
 
-            this.renderPaths(<?php /* @noEscape */ echo $block->getCurrentlyUsedForPaths(); ?>, 'currently_used_for');
+            this.renderPaths(<?= /* @noEscape */ $block->getCurrentlyUsedForPaths() ?>, 'currently_used_for');
         },
 
         bindEvents: function(){
@@ -115,7 +115,7 @@ require([
         },
 
         stripTags: function () {
-            if(!window.confirm("<?php echo $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>")) {
+            if(!window.confirm("<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to strip tags?'))) ?>")) {
                 return false;
             }
             this.unconvertedText = $('template_text').value;
@@ -146,9 +146,9 @@ require([
         },
         preview: function() {
             if (this.typeChange) {
-                $('preview_type').value = <?php /* @noEscape */ echo TemplateTypesInterface::TYPE_TEXT ?>;
+                $('preview_type').value = <?= /* @noEscape */ TemplateTypesInterface::TYPE_TEXT ?>;
             } else {
-                $('preview_type').value = <?php echo (int) $block->getTemplateType() ?>;
+                $('preview_type').value = <?= (int) $block->getTemplateType() ?>;
             }
             if (typeof tinyMCE == 'undefined' || !tinyMCE.getInstanceById('template_text')) {
                 $('preview_text').value = $('template_text').value;
@@ -166,8 +166,8 @@ require([
         },
 
         deleteTemplate: function() {
-            if(window.confirm("<?php echo $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>")) {
-                   window.location.href = '<?php echo $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>';
+            if(window.confirm("<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>")) {
+                   window.location.href = '<?= $block->escapeJs($block->escapeUrl($block->getDeleteUrl())) ?>';
             }
         },
 
@@ -212,7 +212,7 @@ require([
                        }.bind(this));
                    } else {
                        alert({
-                           content: '<?php echo $block->escapeJs($block->escapeHtml(__('The template did not load. Please review the log for details.'))) ?>'
+                           content: '<?= $block->escapeJs($block->escapeHtml(__('The template did not load. Please review the log for details.'))) ?>'
                        });
                    }
                }.bind(this)
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
index 769d99ce6f9b2..b0e7206005071 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/list.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getChildHtml('add_button') ?></div>
-<?php echo $block->getChildHtml('grid') ?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getChildHtml('add_button') ?></div>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
index 5a1101abd82ec..80d2ab0692675 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
@@ -10,9 +10,9 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><?php echo $block->escapeHtml(__('Email Preview')); ?></title>
+    <title><?= $block->escapeHtml(__('Email Preview')) ?></title>
 </head>
 <body>
-    <?php echo $block->getChildHtml('content') ?>
+    <?= $block->getChildHtml('content') ?>
 </body>
 </html>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
index 8aa2494d130a9..15e87b00622ac 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
@@ -11,7 +11,7 @@
 <?php if ($block->canDisplayGiftmessageForm()): ?>
 <div id="gift_options_giftmessage" class="giftcard-form giftcard-send-form fieldset admin__fieldset">
     <div class="field admin__field">
-        <label class="admin__field-label" for="current_item_giftmessage_sender"><?php /* @escapeNotVerified */ echo __('From'); ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_sender"><?= /* @escapeNotVerified */ __('From') ?></label>
         <div class="control admin__field-control">
             <input type="text" class="input-text admin__control-text"
                    name="current_item_giftmessage_sender"
@@ -19,7 +19,7 @@
         </div>
     </div>
     <div class="field admin__field">
-        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?php /* @escapeNotVerified */ echo __('To'); ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?= /* @escapeNotVerified */ __('To') ?></label>
         <div class="control admin__field-control">
             <input type="text"
                    class="input-text admin__control-text"
@@ -28,7 +28,7 @@
         </div>
     </div>
     <div class="field admin__field">
-        <label class="admin__field-label" for="current_item_giftmessage_message"><?php /* @escapeNotVerified */ echo __('Message'); ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_message"><?= /* @escapeNotVerified */ __('Message') ?></label>
         <div class="control admin__field-control">
             <textarea class="textarea admin__control-textarea"
                       cols="15"
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
index 561dac21277ed..c15d717c2291a 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -12,11 +12,11 @@
 <div id="gift_options_configure_new" class="gift-options-popup product-configure-popup" style="display: none;">
     <div id="gift_options_form_contents">
         <div class="content">
-            <?php echo $block->getChildHtml();?>
+            <?= $block->getChildHtml() ?>
         </div>
         <div class="ui-dialog-buttonset">
-            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?php /* @escapeNotVerified */ echo __('Cancel'); ?></span></button>
-            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?php /* @escapeNotVerified */ echo __('OK'); ?></span></button>
+            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?= /* @escapeNotVerified */ __('Cancel') ?></span></button>
+            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?= /* @escapeNotVerified */ __('OK') ?></span></button>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
index 6d80e18551aa5..377b870ce450a 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/giftoptions.phtml
@@ -14,18 +14,18 @@
     <?php if ($_childHtml): ?>
         <tr class="row-gift-options">
             <td colspan="7">
-                <a class="action-link" href="#" id="gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><?php /* @escapeNotVerified */ echo __('Gift Options') ?></a>
+                <a class="action-link" href="#" id="gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ __('Gift Options') ?></a>
                 <script>
 require([
     "Magento_Sales/order/giftoptions_tooltip"
 ], function(){
 
-    giftOptionsTooltip.addTargetLink('gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>', <?php /* @escapeNotVerified */ echo $_item->getId() ?>);
+    giftOptionsTooltip.addTargetLink('gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>', <?= /* @escapeNotVerified */ $_item->getId() ?>);
 
 });
 </script>
-                <div id="gift_options_data_<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-                    <?php /* @escapeNotVerified */ echo $_childHtml ?>
+                <div id="gift_options_data_<?= /* @escapeNotVerified */ $_item->getId() ?>">
+                    <?= /* @escapeNotVerified */ $_childHtml ?>
                 </div>
             </td>
         </tr>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
index 6695459e25b7f..5b0c61375f8c6 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/create/items.phtml
@@ -10,14 +10,14 @@
 
 <?php if ($block->canDisplayGiftMessage()): ?>
     <div class="no-display">
-        <div id="gift-message-form-data-<?php /* @escapeNotVerified */ echo $block->getItem()->getId(); ?>">
-            <?php echo $block->getFormHtml();?>
+        <div id="gift-message-form-data-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>">
+            <?= $block->getFormHtml() ?>
         </div>
 
         <?php if ($block->getMessageText()): ?>
         <div class="gift-options-tooltip-content">
-            <div><strong><?php /* @escapeNotVerified */ echo __('Gift Message')?></strong>:</div>
-            <div><?php /* @escapeNotVerified */ echo $block->getMessageText(); ?></div>
+            <div><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>:</div>
+            <div><?= /* @escapeNotVerified */ $block->getMessageText() ?></div>
         </div>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
index 2834a7af89db9..47b5957fd2765 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/giftoptions.phtml
@@ -13,18 +13,18 @@
 <?php $_item = $block->getItem() ?>
 <tr>
     <td colspan="10" class="last">
-        <a class="action-link" href="#" id="gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><?php /* @escapeNotVerified */ echo __('Gift Options') ?></a>
+        <a class="action-link" href="#" id="gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ __('Gift Options') ?></a>
         <script>
 require([
 	"Magento_Sales/order/giftoptions_tooltip"
 ], function(){
 
-	giftOptionsTooltip.addTargetLink('gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>', <?php /* @escapeNotVerified */ echo $_item->getId() ?>);
+	giftOptionsTooltip.addTargetLink('gift_options_link_<?= /* @escapeNotVerified */ $_item->getId() ?>', <?= /* @escapeNotVerified */ $_item->getId() ?>);
 
 });
 </script>
-        <div id="gift_options_data_<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-            <?php /* @escapeNotVerified */ echo $_childHtml ?>
+        <div id="gift_options_data_<?= /* @escapeNotVerified */ $_item->getId() ?>">
+            <?= /* @escapeNotVerified */ $_childHtml ?>
         </div>
     </td>
 </tr>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
index 607b17516ebbf..5680f1ef98a5d 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/sales/order/view/items.phtml
@@ -9,18 +9,18 @@
 ?>
 
 <?php if ($block->canDisplayGiftmessage()): ?>
-<div id="gift-message-form-data-<?php /* @escapeNotVerified */ echo $block->getItem()->getId(); ?>" class="no-display">
-    <form id="<?php /* @escapeNotVerified */ echo $block->getFieldId('form') ?>" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
-        <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('type') ?>" name="<?php /* @escapeNotVerified */ echo $block->getFieldName('type') ?>" value="order_item" />
-        <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('sender') ?>" name="<?php /* @escapeNotVerified */ echo $block->getFieldName('sender') ?>" value="<?php /* @escapeNotVerified */ echo $block->getSender() ?>" />
-        <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('recipient') ?>" name="<?php /* @escapeNotVerified */ echo $block->getFieldName('recipient') ?>"  value="<?php /* @escapeNotVerified */ echo $block->getRecipient() ?>" />
-        <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('message') ?>" name="<?php /* @escapeNotVerified */ echo $block->getFieldName('message') ?>"  value="<?php /* @escapeNotVerified */ echo $block->getMessageText() ?>" />
+<div id="gift-message-form-data-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>" class="no-display">
+    <form id="<?= /* @escapeNotVerified */ $block->getFieldId('form') ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('type') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('type') ?>" value="order_item" />
+        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('sender') ?>" value="<?= /* @escapeNotVerified */ $block->getSender() ?>" />
+        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('recipient') ?>"  value="<?= /* @escapeNotVerified */ $block->getRecipient() ?>" />
+        <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>" name="<?= /* @escapeNotVerified */ $block->getFieldName('message') ?>"  value="<?= /* @escapeNotVerified */ $block->getMessageText() ?>" />
     </form>
 
     <?php if ($block->getMessageText()): ?>
     <div class="gift-options-tooltip-content">
-        <div><strong><?php /* @escapeNotVerified */ echo __('Gift Message')?></strong>: </div>
-        <div><?php /* @escapeNotVerified */ echo $block->getMessageText() ?></div>
+        <div><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>: </div>
+        <div><?= /* @escapeNotVerified */ $block->getMessageText() ?></div>
     </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
index d89c5b60c0d07..0211c5464315c 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/gift_options.phtml
@@ -9,11 +9,11 @@
     <script type="text/x-magento-init">
         {
             "#gift-options-cart": {
-                "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+                "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
             }
         }
     </script>
     <script>
-        window.giftOptionsConfig = <?php /* @escapeNotVerified */ echo $block->getGiftOptionsConfigJson(); ?>;
+        window.giftOptionsConfig = <?= /* @escapeNotVerified */ $block->getGiftOptionsConfigJson() ?>;
     </script>
 </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
index 02917045aa23c..f98ec0714671a 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/cart/item/renderer/actions/gift_options.phtml
@@ -9,14 +9,14 @@
 /** @var $block \Magento\GiftMessage\Block\Cart\Item\Renderer\Actions\GiftOptions */
 ?>
 <?php if (!$block->isVirtual()): ?>
-    <div id="gift-options-cart-item-<?php /* @escapeNotVerified */ echo $block->getItem()->getId() ?>"
-        data-bind="scope:'giftOptionsCartItem-<?php /* @escapeNotVerified */ echo $block->getItem()->getId() ?>'"
+    <div id="gift-options-cart-item-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>"
+        data-bind="scope:'giftOptionsCartItem-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>'"
         class="gift-options-cart-item">
         <!-- ko template: getTemplate() --><!-- /ko -->
         <script type="text/x-magento-init">
             {
-                "#gift-options-cart-item-<?php /* @escapeNotVerified */ echo $block->getItem()->getId() ?>": {
-                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
+                "#gift-options-cart-item-<?= /* @escapeNotVerified */ $block->getItem()->getId() ?>": {
+                    "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
                 }
             }
         </script>
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index 6155cfc37c4ad..dec54cfeb9df9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -10,54 +10,54 @@
 <?php $_giftMessage = false; ?>
 <?php switch ($block->getCheckoutType()): case 'onepage_checkout': ?>
     <fieldset class="fieldset gift-message">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Do you have any gift items in your order?'); ?></span></legend><br>
+        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Do you have any gift items in your order?') ?></span></legend><br>
 
-        <div class="field choice" id="add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>">
+        <div class="field choice" id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
             <input type="checkbox" name="allow_gift_options" id="allow_gift_options" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options" class="label"><span><?php /* @escapeNotVerified */ echo __('Add Gift Options') ?></span></label>
+            <label for="allow_gift_options" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options') ?></span></label>
         </div>
 
         <dl class="options-items" id="allow-gift-options-container">
             <?php if ($block->isMessagesAvailable()): ?>
-            <dt id="add-gift-options-for-order-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-title">
+            <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order" class="label"><span><?php /* @escapeNotVerified */ echo __('Gift Options for the Entire Order'); ?></span></label>
+                    <label for="allow_gift_options_for_order" class="label"><span><?= /* @escapeNotVerified */ __('Gift Options for the Entire Order') ?></span></label>
                 </div>
             </dt>
 
             <dd id="allow-gift-options-for-order-container" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></div>
+                <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
                     <button class="action action-gift"
                             data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
-                        <span><?php /* @escapeNotVerified */ echo __('Gift Message') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
                     </button>
                     <div id="allow-gift-messages-for-order-container" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?php /* @escapeNotVerified */ echo __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
+                            <p><?= /* @escapeNotVerified */ __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
                             <div class="field from">
-                                <label for="gift-message-whole-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
+                                <label for="gift-message-whole-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?php /* @escapeNotVerified */ echo __('From') ?>"  value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?= /* @escapeNotVerified */ __('From') ?>"  value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-whole-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
+                                <label for="gift-message-whole-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?php /* @escapeNotVerified */ echo __('To') ?>" value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-whole-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
+                                <label for="gift-message-whole-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
                                 <div class="control">
-                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>][message]" title="<?php /* @escapeNotVerified */ echo __('Message') ?>" rows="5" cols="10"><?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="10"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
                         <script>
                             require(['jquery'], function(jQuery){
-                                jQuery('#add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>')
-                                    .add('#add-gift-options-for-order-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>')
+                                jQuery('#add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
+                                    .add('#add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
                                     .removeClass('hidden');
                             });
                         </script>
@@ -65,10 +65,10 @@
             </dd>
             <?php endif ?>
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_options_for_items" id="allow_gift_options_for_items" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items" class="label"><span><?php /* @escapeNotVerified */ echo __('Gift Options for Individual Items'); ?></span></label>
+                    <label for="allow_gift_options_for_items" class="label"><span><?= /* @escapeNotVerified */ __('Gift Options for Individual Items') ?></span></label>
                 </div>
             </dt>
 
@@ -79,39 +79,39 @@
                     <li class="item">
                          <div class="product">
                              <div class="number">
-                                 <?php /* @escapeNotVerified */ echo __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?>
+                                 <?= /* @escapeNotVerified */ __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?>
                              </div>
                              <div class="img photo container">
-                                 <?php echo $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml(); ?>
+                                 <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
                              </div>
-                             <strong class="product name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
+                             <strong class="product name"><?= $block->escapeHtml($_product->getName()) ?></strong>
                          </div>
                          <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"></div>
+                             <div class="options-items-container" id="options-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-<?= /* @escapeNotVerified */ $_item->getId() ?>"></div>
                              <?php if ($block->isItemMessagesAvailable($_item)): ?>
                              <button class="action action-gift"
-                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"}}'>
-                                 <span><?php /* @escapeNotVerified */ echo __('Gift Message') ?></span>
+                                     data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+                                 <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
                              </button>
-                             <div id="gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="block message hidden">
+                             <div id="gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="block message hidden">
                                  <fieldset class="fieldset">
-                                     <p><?php /* @escapeNotVerified */ echo __('Leave a box blank if you don\'t want to add a gift message for that item.') ?></p>
+                                     <p><?= /* @escapeNotVerified */ __('Leave a box blank if you don\'t want to add a gift message for that item.') ?></p>
                                      <div class="field from">
-                                         <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
+                                         <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
                                          <div class="control">
-                                             <input type="text" name="giftmessage[quote_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][from]" id="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-from" title="<?php /* @escapeNotVerified */ echo __('From') ?>" value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                             <input type="text" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                          </div>
                                      </div>
                                      <div class="field to">
-                                        <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
+                                        <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
                                         <div class="control">
-                                            <input type="text" name="giftmessage[quote_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][to]" id="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-to" title="<?php /* @escapeNotVerified */ echo __('To') ?>" value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                            <input type="text" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                         </div>
                                      </div>
                                      <div class="field text">
-                                         <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
+                                         <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
                                          <div class="control">
-                                            <textarea id="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][message]" title="<?php /* @escapeNotVerified */ echo __('Message') ?>" rows="5" cols="40"><?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                            <textarea id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="40"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
                                          </div>
                                      </div>
                                 </fieldset>
@@ -124,13 +124,13 @@
             </dd>
             <script>
                 require(['jquery'], function(jQuery){
-                    jQuery('#add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>')
-                        .add('#add-gift-options-for-items-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>')
+                    jQuery('#add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
+                        .add('#add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>')
                         .removeClass('hidden');
                 });
             </script>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></dt>
         </dl>
     </fieldset>
     <script type="text/x-magento-init">
@@ -143,49 +143,49 @@
 <?php break; ?>
 
 <?php case 'multishipping_address': ?>
-    <fieldset id="add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="fieldset gift-message">
-        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Do you have any gift items in your order?'); ?></span></legend><br>
+    <fieldset id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="fieldset gift-message">
+        <legend class="legend"><span><?= /* @escapeNotVerified */ __('Do you have any gift items in your order?') ?></span></legend><br>
 
-        <div class="field choice" id="add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>">
-            <input type="checkbox" name="allow_gift_options_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" id="allow_gift_options_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="label"><span><?php /* @escapeNotVerified */ echo __('Add Gift Options') ?></span></label>
+        <div class="field choice" id="add-gift-options-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
+            <input type="checkbox" name="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+            <label for="allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options') ?></span></label>
         </div>
 
-        <dl class="options-items" id="allow-gift-options-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>">
-            <dt id="add-gift-options-for-order-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-title">
+        <dl class="options-items" id="allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
+            <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_order_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="label"><span><?php /* @escapeNotVerified */ echo __('Add Gift Options for the Entire Order') ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+                    <label for="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options for the Entire Order') ?></span></label>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></div>
+            <dd id="allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-options">
+                <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
                 <?php if ($block->isMessagesAvailable()): ?>
                     <?php $_giftMessage = true; ?>
                     <button class="action action-gift"
-                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"}}'>
-                        <span><?php /* @escapeNotVerified */ echo __('Gift Message') ?></span>
+                            data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}}'>
+                        <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
                     </button>
-                    <div id="gift-messages-for-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
+                    <div id="gift-messages-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?php /* @escapeNotVerified */ echo __('You can leave this box blank if you don\'t want to add a gift message for this address.') ?></p>
+                            <p><?= /* @escapeNotVerified */ __('You can leave this box blank if you don\'t want to add a gift message for this address.') ?></p>
                             <div class="field from">
-                                <label for="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
+                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>][from]" id="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-from" title="<?php /* @escapeNotVerified */ echo __('From') ?>" value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
+                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>][to]" id="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-to" title="<?php /* @escapeNotVerified */ echo __('To') ?>" value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <input type="text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
+                                <label for="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
                                 <div class="control">
-                                    <textarea id="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>][message]" title="<?php /* @escapeNotVerified */ echo __('Message') ?>" rows="5" cols="40"><?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <textarea id="gift-message-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="40"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
                                 </div>
                             </div>
                         </fieldset>
@@ -194,55 +194,55 @@
             </dd>
 
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_items_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="label"><span><?php /* @escapeNotVerified */ echo __('Add Gift Options for Individual Items') ?></span></label>
+                    <input type="checkbox" name="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
+                    <label for="allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="label"><span><?= /* @escapeNotVerified */ __('Add Gift Options for Individual Items') ?></span></label>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-items-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-options individual">
+            <dd id="allow-gift-options-for-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-options individual">
                  <ol class="items">
                  <?php foreach ($block->getItems() as $_index => $_item): ?>
                  <?php $_product = $_item->getProduct() ?>
                      <li class="item">
                          <div class="product">
-                             <div class="number"><?php /* @escapeNotVerified */ echo __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?></div>
+                             <div class="number"><?= /* @escapeNotVerified */ __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?></div>
                              <div class="img photo container">
-                                 <?php echo $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml(); ?>
+                                 <?= $block->getImage($_product, 'gift_messages_checkout_thumbnail')->toHtml() ?>
                              </div>
-                             <strong class="product-name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
+                             <strong class="product-name"><?= $block->escapeHtml($_product->getName()) ?></strong>
                          </div>
                          <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"></div>
-                             <input type="hidden" name="giftoptions[quote_address_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][address]" value="<?php /* @escapeNotVerified */ echo $block->getEntity()->getId()?>" />
+                             <div class="options-items-container" id="options-items-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>-<?= /* @escapeNotVerified */ $_item->getId() ?>"></div>
+                             <input type="hidden" name="giftoptions[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][address]" value="<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" />
 
                              <?php if ($block->isItemMessagesAvailable($_item)): ?>
                              <?php $_giftMessage = true; ?>
                                  <button class="action action-gift"
-                                         data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"}}'>
-                                     <span><?php /* @escapeNotVerified */ echo __('Gift Message') ?></span>
+                                         data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+                                     <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
                                  </button>
-                                 <div id="gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="block message hidden">
+                                 <div id="gift-messages-for-item-container-<?= /* @escapeNotVerified */ $_item->getId() ?>" class="block message hidden">
                                      <fieldset class="fieldset">
-                                        <p><?php /* @escapeNotVerified */ echo __('You can leave this box blank if you don\'t want to add a gift message for the item.') ?></p>
-                                         <input type="hidden" name="giftmessage[quote_address_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][address]" value="<?php /* @escapeNotVerified */ echo $block->getEntity()->getId()?>" />
+                                        <p><?= /* @escapeNotVerified */ __('You can leave this box blank if you don\'t want to add a gift message for the item.') ?></p>
+                                         <input type="hidden" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][address]" value="<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" />
                                          <div class="field from">
-                                             <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
+                                             <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" class="label"><span><?= /* @escapeNotVerified */ __('From') ?></span></label>
                                              <div class="control">
-                                                 <input type="text" name="giftmessage[quote_address_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][from]" id="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-from" title="<?php /* @escapeNotVerified */ echo __('From') ?>"  value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                                 <input type="text" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][from]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-from" title="<?= /* @escapeNotVerified */ __('From') ?>"  value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
                                              </div>
                                          </div>
                                          <div class="field to">
-                                            <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
+                                            <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" class="label"><span><?= /* @escapeNotVerified */ __('To') ?></span></label>
                                             <div class="control">
-                                                <input type="text" name="giftmessage[quote_address_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][to]" id="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-to" title="<?php /* @escapeNotVerified */ echo __('To') ?>" value="<?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                                <input type="text" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][to]" id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-to" title="<?= /* @escapeNotVerified */ __('To') ?>" value="<?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
                                             </div>
                                         </div>
                                          <div class="field text">
-                                             <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
+                                             <label for="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="label"><span><?= /* @escapeNotVerified */ __('Message') ?></span></label>
                                              <div class="control">
-                                                <textarea id="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?php /* @escapeNotVerified */ echo $_item->getId() ?>][message]" title="<?php /* @escapeNotVerified */ echo __('Message') ?>" rows="5" cols="10"><?php /* @escapeNotVerified */ echo $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                                <textarea id="gift-message-<?= /* @escapeNotVerified */ $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?= /* @escapeNotVerified */ $_item->getId() ?>][message]" title="<?= /* @escapeNotVerified */ __('Message') ?>" rows="5" cols="10"><?= /* @escapeNotVerified */ $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
                                              </div>
                                          </div>
                                      </fieldset>
@@ -254,12 +254,12 @@
                  </ol>
             </dd>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></dt>
         </dl>
     </fieldset>
     <script type="text/x-magento-init">
         {
-            "#allow_gift_options_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>": {
+            "#allow_gift_options_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>": {
                 "giftOptions": {}
             }
         }
diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
index ee713ec6a956d..9388a3cb6fcfb 100644
--- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
@@ -12,19 +12,19 @@
 <!-- Google Code for Sale Conversion Page -->
 <script>
     /* <![CDATA[ */
-    var google_conversion_id = <?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionId() ?>;
-    var google_conversion_language = "<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionLanguage() ?>";
-    var google_conversion_format = "<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionFormat() ?>";
-    var google_conversion_color = "<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionColor() ?>";
-    var google_conversion_label = "<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionLabel() ?>";
-    var google_conversion_value = <?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionValue() ?>;
+    var google_conversion_id = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionId() ?>;
+    var google_conversion_language = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLanguage() ?>";
+    var google_conversion_format = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionFormat() ?>";
+    var google_conversion_color = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionColor() ?>";
+    var google_conversion_label = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLabel() ?>";
+    var google_conversion_value = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionValue() ?>;
     /* ]]> */
 </script>
-<script src="<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionJsSrc()?>"></script>
+<script src="<?= /* @escapeNotVerified */ $block->getHelper()->getConversionJsSrc() ?>"></script>
 <noscript>
     <div style="display:inline;">
         <img height="1" width="1" style="border-style:none;" alt=""
-             src="<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionImgSrc() ?>"/>
+             src="<?= /* @escapeNotVerified */ $block->getHelper()->getConversionImgSrc() ?>"/>
     </div>
 </noscript>
 <!-- END Google Code for Sale Conversion Page -->
diff --git a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
index 655195cd102f7..ed8c0e3fe3cc8 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
@@ -14,11 +14,11 @@
 {
     "*": {
         "Magento_GoogleAnalytics/js/google-analytics": {
-            "isCookieRestrictionModeEnabled": <?php echo (int)$block->isCookieRestrictionModeEnabled(); ?>,
-            "currentWebsite": <?php echo (int)$block->getCurrentWebsiteId(); ?>,
-            "cookieName": "<?php /* @escapeNotVerified */ echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE; ?>",
-            "ordersTrackingData": <?php /* @escapeNotVerified */ echo json_encode($block->getOrdersTrackingData()); ?>,
-            "pageTrackingData": <?php /* @escapeNotVerified */ echo json_encode($block->getPageTrackingData($accountId)); ?>
+            "isCookieRestrictionModeEnabled": <?= (int)$block->isCookieRestrictionModeEnabled() ?>,
+            "currentWebsite": <?= (int)$block->getCurrentWebsiteId() ?>,
+            "cookieName": "<?= /* @escapeNotVerified */ \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
+            "ordersTrackingData": <?= /* @escapeNotVerified */ json_encode($block->getOrdersTrackingData()) ?>,
+            "pageTrackingData": <?= /* @escapeNotVerified */ json_encode($block->getPageTrackingData($accountId)) ?>
         }
     }
 }
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 7a1ed56634336..6bd2c4e3c67f9 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
@@ -10,27 +10,27 @@
 
 <?php /* @var $block \Magento\GroupedProduct\Block\Adminhtml\Product\Composite\Fieldset\Grouped */ ?>
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
-<div id="catalog_product_composite_configure_fields_grouped" class="<?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
-    <h4><?php /* @escapeNotVerified */ echo __('Associated Products') ?></h4>
+<div id="catalog_product_composite_configure_fields_grouped" class="<?= $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
+    <h4><?= /* @escapeNotVerified */ __('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"><?php /* @escapeNotVerified */ echo __('Availability:') ?> <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></p>
+            <p class="availability out-of-stock"><?= /* @escapeNotVerified */ __('Availability:') ?> <span><?= /* @escapeNotVerified */ __('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"><?php /* @escapeNotVerified */ echo __('ID') ?></th>
-                    <th class="col-sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                    <th class="col-name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+                    <th class="col-id"><?= /* @escapeNotVerified */ __('ID') ?></th>
+                    <th class="col-sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                    <th class="col-name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
-                    <th class="col-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
+                    <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
                     <?php endif; ?>
                     <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
-                    <th class="col-qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                    <th class="col-qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
                     <?php endif; ?>
                 </tr>
             </thead>
@@ -38,14 +38,14 @@
             <?php if ($_hasAssociatedProducts): ?>
                 <?php $i = 0 ?>
             <?php foreach ($_associatedProducts as $_item): ?>
-                <tr class="<?php /* @escapeNotVerified */ echo(++$i % 2) ? 'even' : 'odd' ?>">
-                    <td class="col-id"><?php /* @escapeNotVerified */ echo $_item->getId() ?></td>
-                    <td class="col-sku"><?php echo $block->escapeHtml($_item->getSku()) ?></td>
-                    <td class="col-name"><?php echo $block->escapeHtml($_item->getName()) ?></td>
+                <tr class="<?= /* @escapeNotVerified */ (++$i % 2) ? 'even' : 'odd' ?>">
+                    <td class="col-id"><?= /* @escapeNotVerified */ $_item->getId() ?></td>
+                    <td class="col-sku"><?= $block->escapeHtml($_item->getSku()) ?></td>
+                    <td class="col-name"><?= $block->escapeHtml($_item->getName()) ?></td>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
                     <td class="col-price">
                         <?php if ($block->getCanShowProductPrice($_item)): ?>
-                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item) ?>
+                        <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
                         <?php endif; ?>
                     </td>
                     <?php endif; ?>
@@ -53,15 +53,15 @@
                     <td class="col-qty">
                     <?php if ($_item->isSaleable() || $_skipSaleableCheck) : ?>
                         <input type="text"
-                               name="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
-                               id="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
+                               name="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
+                               id="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
                                maxlength="12"
-                               value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"
-                               title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+                               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"
+                               title="<?= /* @escapeNotVerified */ __('Qty') ?>"
                                class="input-text admin__control-text qty" />
-                        <input type="hidden" value="1" price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]" />
+                        <input type="hidden" value="1" price="<?= /* @escapeNotVerified */ $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]" />
                     <?php else: ?>
-                        <p class="availability out-of-stock"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></p>
+                        <p class="availability out-of-stock"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></p>
                     <?php endif; ?>
                     </td>
                     <?php endif; ?>
@@ -69,7 +69,7 @@
             <?php endforeach; ?>
             <?php else: ?>
                <tr>
-                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>4<?php else : ?>3<?php endif; ?>"><?php /* @escapeNotVerified */ echo __('No options of this product are available.') ?></td>
+                   <td class="empty-text" colspan="<?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>4<?php else : ?>3<?php endif; ?>"><?= /* @escapeNotVerified */ __('No options of this product are available.') ?></td>
                </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 44cbf0d263369..2c5a24195dd3a 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
@@ -12,13 +12,13 @@
 $_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=<?php /* @escapeNotVerified */ echo $_gridPopupBlock->getId() ?>]"}}'>
+<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?= /* @escapeNotVerified */ $_gridPopupBlock->getId() ?>]"}}'>
     <div class="no-products-message">
-        <?php /* @escapeNotVerified */ echo __('There are no grouped products.')?>
+        <?= /* @escapeNotVerified */ __('There are no grouped products.') ?>
     </div>
-    <?php echo $block->getChildHtml('list'); ?>
+    <?= $block->getChildHtml('list') ?>
     <div data-role="add-product-dialog" class="no-display">
-        <?php echo $block->getChildBlock('catalog.product.group.grid.popup.container')->getChildHtml('grid');?>
+        <?= $block->getChildBlock('catalog.product.group.grid.popup.container')->getChildHtml('grid') ?>
     </div>
     <button type="button" data-role="add-product">Add Products to Group</button>
 </div>
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 319b57f152bc9..c931304fcaeac 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
@@ -47,7 +47,7 @@
 </script>
 <div class="grid-container no-display">
     <table class="admin__control-table" data-role="grouped-product-grid"
-        data-products="<?php echo $block->escapeHtml(
+        data-products="<?= $block->escapeHtml(
             $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getAssociatedProducts())
         ); ?>">
         <thead>
@@ -56,16 +56,16 @@
                     <span></span>
                 </th>
                 <th data-column="name" class="no-link col-name">
-                    <span><?php /* @escapeNotVerified */ echo __('Name') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Name') ?></span>
                 </th>
                 <th data-column="sku" class="no-link col-sku">
-                    <span><?php /* @escapeNotVerified */ echo __('SKU') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('SKU') ?></span>
                 </th>
                 <th data-column="price" class="no-link col-price">
-                    <span><?php /* @escapeNotVerified */ echo __('Price') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Price') ?></span>
                     </th>
                 <th data-column="qty" class="no-link col-qty">
-                    <span><?php /* @escapeNotVerified */ echo __('Default Qty') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('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 0f7d60fe3a9f2..34de1a18cf28a 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
@@ -29,7 +29,7 @@ if ($minProduct) {
 <div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
     <?php if ($minProduct && \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW != $block->getZone()): ?>
     <p class="minimal-price">
-        <span class="price-label"><?php /* @escapeNotVerified */ echo __('Starting at')?></span><?php echo $amountRender->toHtml();?>
+        <span class="price-label"><?= /* @escapeNotVerified */ __('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 2416878ca2d59..89434ac7b13cd 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
@@ -14,12 +14,12 @@
 <?php $_hasAssociatedProducts = count($_associatedProducts) > 0; ?>
 <?php if ($block->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable() && $_hasAssociatedProducts): ?>
-        <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-            <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
+        <div class="stock available" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+            <span><?= /* @escapeNotVerified */ __('In stock') ?></span>
         </div>
     <?php else: ?>
-        <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-            <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+        <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+            <span><?= /* @escapeNotVerified */ __('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 3e89cca89251a..7fad5635f8690 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
@@ -20,12 +20,12 @@
 
 <div class="table-wrapper grouped">
     <table class="table data grouped" id="super-product-table">
-        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Grouped product items') ?></caption>
+        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Grouped product items') ?></caption>
         <thead>
         <tr>
-            <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+            <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
             <?php if ($_product->isSaleable()): ?>
-                <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
             <?php endif; ?>
         </tr>
         </thead>
@@ -34,30 +34,30 @@
         <?php foreach ($_associatedProducts as $_item): ?>
         <tbody>
             <tr>
-                <td data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>" class="col item">
-                    <strong class="product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+                <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
+                    <strong class="product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
                         <?php if ($block->getCanShowProductPrice($_item)): ?>
-                            <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item) ?>
+                            <?= /* @escapeNotVerified */ $block->getProductPrice($_item) ?>
                         <?php endif; ?>
                      <?php endif; ?>
                 </td>
                 <?php if ($_product->isSaleable()): ?>
-                <td data-th="<?php echo $block->escapeHtml(__('Qty')); ?>" class="col qty">
+                <td data-th="<?= $block->escapeHtml(__('Qty')) ?>" class="col qty">
                 <?php if ($_item->isSaleable()) : ?>
                     <div class="control qty">
                         <input type="number"
-                               name="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
-                               data-selector="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
-                               value="<?php /* @escapeNotVerified */ echo $_item->getQty() * 1 ?>"
-                               title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
+                               name="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
+                               data-selector="super_group[<?= /* @escapeNotVerified */ $_item->getId() ?>]"
+                               value="<?= /* @escapeNotVerified */ $_item->getQty() * 1 ?>"
+                               title="<?= /* @escapeNotVerified */ __('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="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
+                    <div class="stock unavailable" title="<?= /* @escapeNotVerified */ __('Availability') ?>">
+                        <span><?= /* @escapeNotVerified */ __('Out of stock') ?></span>
                     </div>
                 <?php endif; ?>
                 </td>
@@ -71,7 +71,7 @@
                 ))): ?>
                 <tr class="row-tier-price">
                     <td colspan="2">
-                        <?php echo $block->getProductPriceHtml(
+                        <?= $block->getProductPriceHtml(
                             $_item,
                             \Magento\Catalog\Pricing\Price\TierPrice::PRICE_CODE
                         ) ?>
@@ -85,7 +85,7 @@
             <tr>
                 <td class="unavailable"
                     colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
-                    <?php /* @escapeNotVerified */ echo __('No options of this product are available.') ?>
+                    <?= /* @escapeNotVerified */ __('No options of this product are available.') ?>
                 </td>
             </tr>
         </tbody>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
index 0025c4114af5c..4f13b759efd87 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/busy.phtml
@@ -6,11 +6,11 @@
 ?>
 <div class="fieldset">
     <div class="legend">
-        <span><?php /* @escapeNotVerified */ echo __('Status'); ?></span>
+        <span><?= /* @escapeNotVerified */ __('Status') ?></span>
     </div><br>
     <div class="messages">
         <div class="message message-success success">
-            <div><?php /* @escapeNotVerified */ echo $block->getStatusMessage(); ?></div>
+            <div><?= /* @escapeNotVerified */ $block->getStatusMessage() ?></div>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
index 6ba9024bb72a2..7e801bcd1d662 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml
@@ -8,11 +8,11 @@
 ?>
 <fieldset class="admin__fieldset" id="export_filter_container" style="display:none;">
     <legend class="admin__legend">
-        <span><?php /* @escapeNotVerified */ echo __('Entity Attributes'); ?></span>
+        <span><?= /* @escapeNotVerified */ __('Entity Attributes') ?></span>
     </legend>
     <br />
-    <form id="export_filter_form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/export') ?>" method="post">
-        <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
+    <form id="export_filter_form" action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/export') ?>" method="post">
+        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
         <div id="export_filter_grid_container"><!-- --></div>
     </form>
     <button class="action- scalable" type="button" onclick="getFile();"><span><?php
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
index 354fc8fd6f275..093830d6fdb1c 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/export/form/before.phtml
@@ -44,7 +44,7 @@ require([
          */
         getFilter: function() {
             if ($('entity') && $F('entity')) {
-                var url    = "<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/getFilter') ?>";
+                var url    = "<?= /* @escapeNotVerified */ $block->getUrl('*/*/getFilter') ?>";
                 var entity = $F('entity');
                 if (entity != this.previousGridEntity) {
                     this.previousGridEntity = entity;
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
index 31e0e7bb361ed..b6c67e4167aac 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/after.phtml
@@ -9,7 +9,7 @@
 <div class="entry-edit fieldset" id="import_validation_container" style="display:none;">
     <div class="entry-edit-head legend">
         <span class="icon-head head-edit-form fieldset-legend"
-            id="import_validation_container_header"><?php /* @escapeNotVerified */ echo __('Validation Results'); ?></span>
+            id="import_validation_container_header"><?= /* @escapeNotVerified */ __('Validation Results') ?></span>
     </div><br>
     <div id="import_validation_messages" class="fieldset"><!-- --></div>
 </div>
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index bebf207ee98dd..73b013fdb8df4 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -29,25 +29,25 @@ require([
          * List of existing behavior sets
          * @type {Array}
          */
-        uniqueBehaviors: <?php /* @escapeNotVerified */ echo $block->getUniqueBehaviors() ?>,
+        uniqueBehaviors: <?= /* @escapeNotVerified */ $block->getUniqueBehaviors() ?>,
 
         /**
          * Behaviour codes for import entities
          * @type {Array}
          */
-        entityBehaviors: <?php /* @escapeNotVerified */ echo $block->getEntityBehaviors() ?>,
+        entityBehaviors: <?= /* @escapeNotVerified */ $block->getEntityBehaviors() ?>,
 
         /**
          * Behaviour notes for import entities
          * @type {Array}
          */
-        entityBehaviorsNotes: <?php /* @escapeNotVerified */ echo $block->getEntityBehaviorsNotes() ?>,
+        entityBehaviorsNotes: <?= /* @escapeNotVerified */ $block->getEntityBehaviorsNotes() ?>,
 
         /**
          * Base url
          * @type {string}
          */
-        sampleFilesBaseUrl: '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
+        sampleFilesBaseUrl: '<?= /* @escapeNotVerified */ $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
 
         /**
          * Reset selected index
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
index 59d7334af7d22..fbb9baa452ac8 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/frame/result.phtml
@@ -6,6 +6,6 @@
 ?>
 <script type='text/javascript'>
 //<![CDATA[
-    top.varienImport.postToFrameComplete(<?php /* @escapeNotVerified */ echo $block->getResponseJson() ?>);
+    top.varienImport.postToFrameComplete(<?= /* @escapeNotVerified */ $block->getResponseJson() ?>);
 //]]>
 </script>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
index 523e825842e18..3264b640c8840 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions.phtml
@@ -10,8 +10,8 @@
 
 // @codingStandardsIgnoreFile
 ?>
-<div><p><?php /* @escapeNotVerified */ echo __('The integration you selected asks you to approve access to the following:'); ?></p></div>
+<div><p><?= /* @escapeNotVerified */ __('The integration you selected asks you to approve access to the following:') ?></p></div>
 <div id="integration-activate-permissions-tabs">
-    <?php echo $block->getChildHtml('tabs'); ?>
+    <?= $block->getChildHtml('tabs') ?>
 </div>
 <div id="integrations-activate-permissions-content"></div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
index 7ba9bf7d35342..2a0ac30d67df7 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml
@@ -13,7 +13,7 @@
 ?>
 <fieldset class="admin__fieldset form-inline entry-edit">
     <?php if ($block->isTreeEmpty()): ?>
-        <p class="empty"><?php /* @escapeNotVerified */ echo __('No permissions requested'); ?></p>
+        <p class="empty"><?= /* @escapeNotVerified */ __('No permissions requested') ?></p>
     <?php else: ?>
         <div class="field" data-role="tree-resources-container">
             <div class="control">
@@ -35,8 +35,8 @@
             });
 
             $('[data-role="resource-tree"]').rolesTree({
-                'treeInitData': <?php /* @escapeNotVerified */ echo $block->getResourcesTreeJson() ?>,
-                'treeInitSelectedData': <?php /* @escapeNotVerified */ echo $block->getSelectedResourcesJson() ?>
+                'treeInitData': <?= /* @escapeNotVerified */ $block->getResourcesTreeJson() ?>,
+                'treeInitSelectedData': <?= /* @escapeNotVerified */ $block->getSelectedResourcesJson() ?>
             });
         });
     </script>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
index 44e9f0d627118..6faeee56ba692 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
@@ -19,11 +19,11 @@
     ], function ($, Confirm) {
 
         window.integration = new Integration(
-            '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]); ?>',
-            '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]); ?>',
-            '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]); ?>',
-            '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*'); ?>',
-            '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/loginSuccessCallback'); ?>'
+            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
+            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
+            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize', '_escape_params' => false]) ?>',
+            '<?= /* @escapeNotVerified */ $block->getUrl('*/*') ?>',
+            '<?= /* @escapeNotVerified */ $block->getUrl('*/*/loginSuccessCallback') ?>'
         );
 
         /**
@@ -51,10 +51,10 @@
 <div id="integration-delete-container"
      class="messages"
      style="display: none;"
-     title="<?php /* @escapeNotVerified */ echo __('Are you sure ?'); ?>">
+     title="<?= /* @escapeNotVerified */ __('Are you sure ?') ?>">
     <div class="message message-notice notice">
         <div>
-            <?php /* @escapeNotVerified */ echo __("Are you sure you want to delete this integration? You can't undo this action."); ?>
+            <?= /* @escapeNotVerified */ __("Are you sure you want to delete this integration? You can't undo this action.") ?>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
index 3ea4977253916..c8e4c914b7c82 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/tokens_exchange.phtml
@@ -11,4 +11,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div><p><?php /* @escapeNotVerified */ echo __("Please setup or sign in into your 3rd party account to complete setup of this integration."); ?></p></div>
+<div><p><?= /* @escapeNotVerified */ __("Please setup or sign in into your 3rd party account to complete setup of this integration.") ?></p></div>
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
index b22e91bffe487..00f78226b6ac5 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -12,26 +12,26 @@
 /** @var $block \Magento\Integration\Block\Adminhtml\Integration\Edit\Tab\Webapi */
 ?>
 
-<?php echo $block->getChildHtml(); ?>
+<?= $block->getChildHtml() ?>
 
 <fieldset class="fieldset form-inline entry-edit">
     <legend class="legend">
-        <span><?php /* @escapeNotVerified */ echo __('Available APIs') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Available APIs') ?></span>
     </legend><br />
 
     <div class="field">
-        <label class="label" for="all_resources"><span><?php /* @escapeNotVerified */ echo __('Resource Access') ?></span></label>
+        <label class="label" for="all_resources"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
 
         <div class="control">
             <select id="all_resources" name="all_resources" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
-                <option value="0" <?php echo($block->isEverythingAllowed() ? '' : 'selected="selected"'); ?>><?php /* @escapeNotVerified */ echo __('Custom') ?></option>
-                <option value="1" <?php echo($block->isEverythingAllowed() ? 'selected="selected"' : ''); ?>><?php /* @escapeNotVerified */ echo __('All') ?></option>
+                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
+                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
             </select>
         </div>
     </div>
 
     <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
-        <label class="label"><span><?php /* @escapeNotVerified */ echo __('Resources') ?></span></label>
+        <label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
 
         <div class="control">
             <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
index 84570da5a58c7..fab89973d908b 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
@@ -19,18 +19,18 @@
     <?php foreach ($filterItems as $filterItem): ?>
         <li class="item">
             <?php if ($filterItem->getCount() > 0): ?>
-                <a href="<?php echo $block->escapeUrl($filterItem->getUrl()) ?>">
-                    <?php /* @escapeNotVerified */ echo $filterItem->getLabel() ?>
+                <a href="<?= $block->escapeUrl($filterItem->getUrl()) ?>">
+                    <?= /* @escapeNotVerified */ $filterItem->getLabel() ?>
                     <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
-                        <span class="count"><?php /* @escapeNotVerified */ echo $filterItem->getCount()?><span class="filter-count-label">
-                            <?php if ($filterItem->getCount() == 1):?> <?php /* @escapeNotVerified */ echo __('item')?><?php else:?> <?php /* @escapeNotVerified */ echo __('items') ?><?php endif;?></span></span>
+                        <span class="count"><?= /* @escapeNotVerified */ $filterItem->getCount() ?><span class="filter-count-label">
+                            <?php if ($filterItem->getCount() == 1):?> <?= /* @escapeNotVerified */ __('item') ?><?php else:?> <?= /* @escapeNotVerified */ __('items') ?><?php endif;?></span></span>
                     <?php endif; ?>
                 </a>
             <?php else:?>
-                <?php /* @escapeNotVerified */ echo $filterItem->getLabel() ?>
+                <?= /* @escapeNotVerified */ $filterItem->getLabel() ?>
                 <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
-                    <span class="count"><?php /* @escapeNotVerified */ echo $filterItem->getCount()?><span class="filter-count-label">
-                        <?php if ($filterItem->getCount() == 1):?><?php /* @escapeNotVerified */ echo __('item')?><?php else:?><?php /* @escapeNotVerified */ echo __('items') ?><?php endif;?></span></span>
+                    <span class="count"><?= /* @escapeNotVerified */ $filterItem->getCount() ?><span class="filter-count-label">
+                        <?php if ($filterItem->getCount() == 1):?><?= /* @escapeNotVerified */ __('item') ?><?php else:?><?= /* @escapeNotVerified */ __('items') ?><?php endif;?></span></span>
                 <?php endif; ?>
             <?php endif; ?>
         </li>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
index e33449c365d78..603f2f93ff754 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/state.phtml
@@ -20,30 +20,30 @@
     <strong class="block-subtitle filter-current-subtitle"
             role="heading"
             aria-level="2"
-            data-count="<?php echo count($_filters); ?>"><?php /* @escapeNotVerified */ echo __('Now Shopping by') ?></strong>
+            data-count="<?= count($_filters) ?>"><?= /* @escapeNotVerified */ __('Now Shopping by') ?></strong>
     <ol class="items">
         <?php foreach ($_filters as $_filter): ?>
             <li class="item">
-                <span class="filter-label"><?php echo $block->escapeHtml(__($_filter->getName())); ?></span>
-                <span class="filter-value"><?php /* @escapeNotVerified */ echo $block->stripTags($_filter->getLabel()) ?></span>
+                <span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
+                <span class="filter-value"><?= /* @escapeNotVerified */ $block->stripTags($_filter->getLabel()) ?></span>
                 <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
                 $currentFilterName = $block->escapeHtml(__($_filter->getName())) . " " . $block->stripTags($_filter->getLabel());
                 if ($clearLinkUrl):
                     ?>
-                    <a class="action previous" href="<?php /* @escapeNotVerified */ echo $_filter->getRemoveUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo __('Previous') ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Previous') ?></span>
+                    <a class="action previous" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
+                       title="<?= /* @escapeNotVerified */ __('Previous') ?>">
+                        <span><?= /* @escapeNotVerified */ __('Previous') ?></span>
                     </a>
                     <a class="action remove"
-                       title="<?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
-                       href="<?php /* @escapeNotVerified */ echo $clearLinkUrl ?>">
-                        <span><?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
+                       title="<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
+                       href="<?= /* @escapeNotVerified */ $clearLinkUrl ?>">
+                        <span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
                     </a>
                 <?php else: ?>
-                    <a class="action remove" href="<?php /* @escapeNotVerified */ echo $_filter->getRemoveUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo $block->escapeHtml(__('Remove')) . " " . $currentFilterName;?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Remove This Item') ?></span>
+                    <a class="action remove" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
+                       title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Remove')) . " " . $currentFilterName ?>">
+                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
                     </a>
                 <?php endif; ?>
             </li>
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
index 901492f2790c1..b2159d2ff08d4 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
@@ -18,26 +18,26 @@
 <?php if ($block->canShowBlock()): ?>
     <div class="block filter">
         <div class="block-title filter-title">
-            <strong><?php /* @escapeNotVerified */ echo __('Shop By') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
         </div>
 
         <div class="block-content filter-content">
-            <?php echo $block->getChildHtml('state') ?>
+            <?= $block->getChildHtml('state') ?>
 
             <?php if ($block->getLayer()->getState()->getFilters()): ?>
                 <div class="block-actions filter-actions">
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getClearUrl() ?>" class="action clear filter-clear"><span><?php /* @escapeNotVerified */ echo __('Clear All') ?></span></a>
+                    <a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
                 </div>
             <?php endif; ?>
             <?php $wrapOptions = false; ?>
             <?php foreach ($block->getFilters() as $filter): ?>
                 <?php if (!$wrapOptions): ?>
-                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?php /* @escapeNotVerified */ echo __('Shopping Options') ?></strong>
+                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
                     <dl class="filter-options" id="narrow-by-list">
                 <?php $wrapOptions = true; endif; ?>
                     <?php if ($filter->getItemsCount()): ?>
-                        <dt role="heading" aria-level="3" class="filter-options-title"><?php echo $block->escapeHtml(__($filter->getName())) ?></dt>
-                        <dd class="filter-options-content"><?php /* @escapeNotVerified */ echo $block->getChildBlock('renderer')->render($filter); ?></dd>
+                        <dt role="heading" aria-level="3" class="filter-options-title"><?= $block->escapeHtml(__($filter->getName())) ?></dt>
+                        <dd class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></dd>
                     <?php endif; ?>
             <?php endforeach; ?>
             <?php if ($wrapOptions): ?>
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
index f0c2bdf23134b..ec74b837e1077 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/index.phtml
@@ -8,7 +8,7 @@
 ?>
 
 <section class="page-partners">
-    <h2 class="page-sub-title"><?php /* @escapeNotVerified */ echo __('Platinum Partners'); ?></h2>
+    <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Platinum Partners') ?></h2>
     <p class="partners-description">
         <?php /* @escapeNotVerified */
         echo __(
@@ -16,7 +16,7 @@
             'Magento reserves the Platinum level for select trusted partners that are committed to offering integrations of commerce features, functions, and tools, as well as back-end systems and operations, to extend and enhance the power of the Magento commerce platform.'
         ); ?>
     </p>
-    <h3 class="page-sub-sub-title"><?php /* @escapeNotVerified */ echo __('Featured Platinum Partners'); ?></h3>
+    <h3 class="page-sub-sub-title"><?= /* @escapeNotVerified */ __('Featured Platinum Partners') ?></h3>
     <div data-role="partners-block" class="partners-block">
         <div data-role="spinner" class="admin__data-grid-loading-mask">
             <div class="spinner">
@@ -29,7 +29,7 @@
     <div class="row row-gutter partners-footer">
         <div class="col-m-5">
             <div class="partners-search">
-                <h2 class="page-sub-title"><?php /* @escapeNotVerified */ echo __('Partner search'); ?></h2>
+                <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Partner search') ?></h2>
                 <p>
                     <?php /* @escapeNotVerified */
                     echo __(
@@ -40,7 +40,7 @@
                 </p>
                 <a class="action-secondary" target="_blank"
                    href="http://partners.magento.com/partner_locator/search.aspx">
-                    <?php /* @escapeNotVerified */ echo __('More Partners'); ?>
+                    <?= /* @escapeNotVerified */ __('More Partners') ?>
                 </a>
             </div>
         </div>
@@ -53,7 +53,7 @@
                 alt="Partner"/>
         </div>
         <div class="col-m-4">
-            <h2 class="page-sub-title"><?php /* @escapeNotVerified */ echo __('Magento Marketplace'); ?></h2>
+            <h2 class="page-sub-title"><?= /* @escapeNotVerified */ __('Magento Marketplace') ?></h2>
             <p class="partner-description">
                 <?php /* @escapeNotVerified */ echo __(
                     'Extensions and Themes are an essential component of the Magento Ecosystem. ' .
@@ -62,7 +62,7 @@
             </p>
             <a class="action-secondary" target="_blank"
                href="http://www.magentocommerce.com/magento-connect/">
-                <?php /* @escapeNotVerified */ echo __('Visit Magento Marketplaces'); ?>
+                <?= /* @escapeNotVerified */ __('Visit Magento Marketplaces') ?>
             </a>
         </div>
     </div>
@@ -73,7 +73,7 @@
     {
         "*": {
             "Magento_Marketplace/default": {
-                "url": "<?php echo $block->getUrl('marketplace/partners/index',
+                "url": "<?= $block->getUrl('marketplace/partners/index',
                     ['_current' => true, 'block' => '', 'period' => '']) ?>"
             }
         }
diff --git a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
index 6c011330b9798..309df6f883a49 100644
--- a/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
+++ b/app/code/Magento/Marketplace/view/adminhtml/templates/partners.phtml
@@ -15,24 +15,24 @@ $partners = $block->getPartners();
         <div class="partner">
             <img
                 class="partner-image"
-                src="<?php echo $block->escapeHtml($partner['img']);?>"
-                alt="<?php echo $block->escapeHtml($partner['title']);?>"/>
-            <h3 class="partner-title"><?php echo $block->escapeHtml($partner['title']);?></h3>
+                src="<?= $block->escapeHtml($partner['img']) ?>"
+                alt="<?= $block->escapeHtml($partner['title']) ?>"/>
+            <h3 class="partner-title"><?= $block->escapeHtml($partner['title']) ?></h3>
             <p class="partner-description">
-                <?php echo $block->escapeHtml($partner['description']);?>
+                <?= $block->escapeHtml($partner['description']) ?>
                 <br />
-                <a href="<?php echo $block->escapeHtml($partner['url_page']);?>" target="_blank">
-                    <?php /* @escapeNotVerified */ echo __('Read More'); ?>
+                <a href="<?= $block->escapeHtml($partner['url_page']) ?>" target="_blank">
+                    <?= /* @escapeNotVerified */ __('Read More') ?>
                 </a>
                 <br />
-                <a href="<?php echo $block->escapeHtml($partner['url_partner_page']);?>" target="_blank">
-                    <?php /* @escapeNotVerified */ echo __('Partner Page'); ?>
+                <a href="<?= $block->escapeHtml($partner['url_partner_page']) ?>" target="_blank">
+                    <?= /* @escapeNotVerified */ __('Partner Page') ?>
                 </a>
             </p>
         </div>
     <?php endforeach; ?>
 <?php else : ?>
     <p>
-        <?php /* @escapeNotVerified */ echo __('No partners were found'); ?>
+        <?= /* @escapeNotVerified */ __('No partners were found') ?>
     </p>
 <?php endif; ?>
diff --git a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
index ea37507adc2ad..f3c301b490282 100644
--- a/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
+++ b/app/code/Magento/MediaStorage/view/adminhtml/templates/system/config/system/storage/media/synchronize.phtml
@@ -35,7 +35,7 @@ require([
     );
 
     <?php $syncStorageParams = $block->getSyncStorageParams() ?>
-    addAllowedStorage(<?php /* @escapeNotVerified */ echo $syncStorageParams['storage_type'] ?>, '<?php /* @escapeNotVerified */ echo $syncStorageParams['connection_name'] ?>');
+    addAllowedStorage(<?= /* @escapeNotVerified */ $syncStorageParams['storage_type'] ?>, '<?= /* @escapeNotVerified */ $syncStorageParams['connection_name'] ?>');
 
     defaultValues   = [];
     defaultValues['system_media_storage_configuration_media_storage']   = $('system_media_storage_configuration_media_storage').value;
@@ -93,7 +93,7 @@ require([
     }
 
     var checkStatus = function() {
-        u = new Ajax.PeriodicalUpdater('', '<?php /* @escapeNotVerified */ echo $block->getAjaxStatusUpdateUrl() ?>', {
+        u = new Ajax.PeriodicalUpdater('', '<?= /* @escapeNotVerified */ $block->getAjaxStatusUpdateUrl() ?>', {
             method:     'get',
             frequency:  5,
             loaderArea: false,
@@ -103,7 +103,7 @@ require([
 
                 try {
                     response = JSON.parse(transport.responseText);
-                    if (response.state == '<?php /* @escapeNotVerified */ echo \Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
+                    if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
                         && response.message
                     ) {
                         if ($('sync_span').hasClassName('no-display')) {
@@ -115,12 +115,12 @@ require([
                         enableStorageSelection();
                         $('sync_span').addClassName('no-display');
 
-                        if (response.state == '<?php /* @escapeNotVerified */ echo \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
+                        if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
                             addAllowedStorage(
                                 $('system_media_storage_configuration_media_storage').value,
                                 $('system_media_storage_configuration_media_database').value
                             );
-                        } else if (response.state == '<?php /* @escapeNotVerified */ echo \Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
+                        } else if (response.state == '<?= /* @escapeNotVerified */ \Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
                             if (response.has_errors) {
                                 enableSyncButton();
                             } else {
@@ -155,7 +155,7 @@ require([
             connection: $('system_media_storage_configuration_media_database').value
         };
 
-        new Ajax.Request('<?php /* @escapeNotVerified */ echo $block->getAjaxSyncUrl() ?>', {
+        new Ajax.Request('<?= /* @escapeNotVerified */ $block->getAjaxSyncUrl() ?>', {
             parameters:     params,
             loaderArea:     false,
             asynchronous:   true
@@ -177,9 +177,9 @@ require([
 });
 </script>
 
-<?php echo $block->getButtonHtml() ?>
+<?= $block->getButtonHtml() ?>
 <span class="sync-indicator no-display" id="sync_span">
-    <img alt="Synchronize" style="margin:0 5px" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/process_spinner.gif') ?>"/>
+    <img alt="Synchronize" style="margin:0 5px" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/process_spinner.gif') ?>"/>
     <span id="sync_message_span"></span>
 </span>
 <input type="hidden" id="synchronize-validation-input" class="required-synchronize no-display"/>
diff --git a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
index 9755772fbdeb5..869d81563645a 100644
--- a/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
+++ b/app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml
@@ -46,7 +46,7 @@ if ($product->isSaleable()) {
 }
 ?>
 <?php if ($product->getMsrp()): ?>
-    <span class="old-price map-old-price"><?php /* @escapeNotVerified */ echo $msrpPrice ?></span>
+    <span class="old-price map-old-price"><?= /* @escapeNotVerified */ $msrpPrice ?></span>
 <?php endif; ?>
 
 <?php if ($priceType->isShowPriceOnGesture()): ?>
@@ -76,26 +76,26 @@ if ($product->isSaleable()) {
             );
         }
     ?>
-    <span id="<?php /* @escapeNotVerified */ echo $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
+    <span id="<?= /* @escapeNotVerified */ $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
     <a href="javascript:void(0);"
-       id="<?php /* @escapeNotVerified */ echo($popupId);?>"
+       id="<?= /* @escapeNotVerified */ ($popupId) ?>"
        class="action map-show-info"
-       data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)?>'><?php /* @escapeNotVerified */ echo __('Click for price'); ?>
+       data-mage-init='<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data) ?>'><?= /* @escapeNotVerified */ __('Click for price') ?>
     </a>
 <?php else: ?>
     <span class="msrp-message">
-     <?php /* @escapeNotVerified */ echo $priceType->getMsrpPriceMessage() ?>
+     <?= /* @escapeNotVerified */ $priceType->getMsrpPriceMessage() ?>
     </span>
 <?php endif; ?>
 
 <?php if ($block->getZone() == \Magento\Framework\Pricing\Render::ZONE_ITEM_VIEW): ?>
     <?php $helpLinkId = 'msrp-help-' . $productId . $block->getRandomString(20); ?>
     <a href="javascript:void(0);"
-       id="<?php /* @escapeNotVerified */ echo $helpLinkId;?>"
+       id="<?= /* @escapeNotVerified */ $helpLinkId ?>"
        class="action map-show-info"
        data-mage-init='{"addToCart":{"origin": "info",
-                                     "helpLinkId": "#<?php /* @escapeNotVerified */ echo $helpLinkId;?>",
-                                     "productName": "<?php echo $block->escapeJs($block->escapeHtml($product->getName())) ?>",
-                                     "closeButtonId": "#map-popup-close"}}'><span><?php /* @escapeNotVerified */ echo __("What's this?"); ?></span>
+                                     "helpLinkId": "#<?= /* @escapeNotVerified */ $helpLinkId ?>",
+                                     "productName": "<?= $block->escapeJs($block->escapeHtml($product->getName())) ?>",
+                                     "closeButtonId": "#map-popup-close"}}'><span><?= /* @escapeNotVerified */ __("What's this?") ?></span>
     </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml b/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
index 1018322d2ab8f..0bfd4589bb79f 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/subtotal.phtml
@@ -6,6 +6,6 @@
 ?>
 <div class="subtotal">
     <span class="mark msrp">
-        <?php /* @escapeNotVerified */ echo __('Order total will be displayed before you submit the order'); ?>
+        <?= /* @escapeNotVerified */ __('Order total will be displayed before you submit the order') ?>
     </span>
 </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
index 3ff4a3ecfd1b7..d632a2fe8c1aa 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 ?>
 <div class="cart-totals">
-    <div class="msrp totals"><?php /* @escapeNotVerified */ echo __('You will see the order total before you submit the order.'); ?></div>
+    <div class="msrp totals"><?= /* @escapeNotVerified */ __('You will see the order total before you submit the order.') ?></div>
 </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
index 3f135f0bd0049..7ccd606b8f113 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -20,31 +20,31 @@
             <div class="map-info-price" id="map-popup-content">
                 <div class="price-box">
                     <div class="map-msrp" id="map-popup-msrp-box">
-                        <span class="label"><?php /* @escapeNotVerified */ echo __('Price'); ?></span>
+                        <span class="label"><?= /* @escapeNotVerified */ __('Price') ?></span>
                         <span class="old-price map-old-price" id="map-popup-msrp">
                             <span class="price"></span>
                         </span>
                     </div>
                     <div class="map-price" id="map-popup-price-box">
-                        <span class="label"><?php /* @escapeNotVerified */ echo __('Actual Price'); ?></span>
+                        <span class="label"><?= /* @escapeNotVerified */ __('Actual Price') ?></span>
                         <span id="map-popup-price" class="actual-price"></span>
                     </div>
                 </div>
                 <form action="" method="POST" id="product_addtocart_form_from_popup" class="map-form-addtocart">
                     <input type="hidden" name="product" class="product_id" value="" id="map-popup-product-id"/>
                     <button type="button"
-                            title="<?php echo $block->escapeHtml(__('Add to Cart')); ?>"
+                            title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
                             class="action tocart primary"
                             id="map-popup-button">
-                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart'); ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                     </button>
                     <div class="additional-addtocart-box">
-                        <?php echo $block->getChildHtml(); ?>
+                        <?= $block->getChildHtml() ?>
                     </div>
                 </form>
             </div>
             <div class="map-text" id="map-popup-text">
-                <?php /* @escapeNotVerified */ echo $block->getExplanationMessage(); ?>
+                <?= /* @escapeNotVerified */ $block->getExplanationMessage() ?>
             </div>
         </div>
     </div>
@@ -56,7 +56,7 @@
         </div>
         <div class="popup-content">
             <div class="map-help-text" id="map-popup-text-what-this">
-                <?php /* @escapeNotVerified */ echo $block->getExplanationMessageWhatsThis(); ?>
+                <?= /* @escapeNotVerified */ $block->getExplanationMessageWhatsThis() ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
index f440651af64d3..8f697001d30c4 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_item.phtml
@@ -29,27 +29,27 @@
 <div class="price-box msrp">
     <?php if ($_product->getMsrp()): ?>
         <?php $_msrpPrice = $pricingHelper->currency($_product->getMsrp(), true, false) ?>
-        <span class="old-price"><?php /* @escapeNotVerified */ echo $_msrpPrice ?></span>
+        <span class="old-price"><?= /* @escapeNotVerified */ $_msrpPrice ?></span>
     <?php endif; ?>
     <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
         <?php $priceElementId = 'product-price-' . $_id . $block->getIdSuffix(); ?>
-        <span id="<?php /* @escapeNotVerified */ echo $priceElementId ?>" style="display: none"></span>
+        <span id="<?= /* @escapeNotVerified */ $priceElementId ?>" style="display: none"></span>
         <?php $popupId = 'msrp-popup-' . $_id . $block->getRandomString(20); ?>
         <a href="javascript:void(0);"
-           id="<?php /* @escapeNotVerified */ echo($popupId);?>"
-           data-mage-init='{"addToCart":{"popupId": "#<?php /* @escapeNotVerified */ echo($popupId);?>",
-                                         "productName": "<?php /* @noEscape */ echo $block->escapeJs($block->escapeHtml($_product->getName())) ?>",
-                                         "realPrice": <?php /* @escapeNotVerified */ echo $block->getRealPriceJs($_product) ?>,
-                                         "msrpPrice": "<?php /* @escapeNotVerified */ echo $_msrpPrice ?>",
-                                         "priceElementId":"<?php /* @escapeNotVerified */ echo $priceElementId ?>",
+           id="<?= /* @escapeNotVerified */ ($popupId) ?>"
+           data-mage-init='{"addToCart":{"popupId": "#<?= /* @escapeNotVerified */ ($popupId) ?>",
+                                         "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>",
+                                         "realPrice": <?= /* @escapeNotVerified */ $block->getRealPriceJs($_product) ?>,
+                                         "msrpPrice": "<?= /* @escapeNotVerified */ $_msrpPrice ?>",
+                                         "priceElementId":"<?= /* @escapeNotVerified */ $priceElementId ?>",
                                          "popupCartButtonId": "#map-popup-button",
-                                         "cartForm": "#wishlist-view-form"}}'><?php /* @escapeNotVerified */ echo __('Click for price') ?>
+                                         "cartForm": "#wishlist-view-form"}}'><?= /* @escapeNotVerified */ __('Click for price') ?>
         </a>
     <?php else: ?>
         <span class="msrp-message">
-            <?php /* @escapeNotVerified */ echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
+            <?= /* @escapeNotVerified */ $_catalogHelper->getMsrpPriceMessage($_product) ?>
         </span>
     <?php endif; ?>
     <?php $helpLinkId = 'msrp-help-' . $_id . $block->getRandomString(20); ?>
-    <a href="javascript:void(0);" id="<?php /* @escapeNotVerified */ echo($helpLinkId);?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php /* @escapeNotVerified */ echo($helpLinkId);?>", "productName": "<?php /* @noEscape */ echo $block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}' class="link tip"><?php /* @escapeNotVerified */ echo __("What's this?"); ?></a>
+    <a href="javascript:void(0);" id="<?= /* @escapeNotVerified */ ($helpLinkId) ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?= /* @escapeNotVerified */ ($helpLinkId) ?>", "productName": "<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($_product->getName())) ?>"}}' class="link tip"><?= /* @escapeNotVerified */ __("What's this?") ?></a>
 </div>
diff --git a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
index 977009b6ddedf..d41bec0d9ebcc 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/render/item/price_msrp_rss.phtml
@@ -16,6 +16,6 @@
 ?>
 <div class="price-box msrp">
     <?php if ($this->helper('Magento\Msrp\Helper\Data')->canApplyMsrp($block->getProduct())): ?>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getProduct()->getProductUrl() ?>"><?php /* @escapeNotVerified */ echo __('Click for price'); ?></a>
+        <a href="<?= /* @escapeNotVerified */ $block->getProduct()->getProductUrl() ?>"><?= /* @escapeNotVerified */ __('Click for price') ?></a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
index 990d6bd6186c8..30e7218285642 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/address/select.phtml
@@ -14,28 +14,28 @@
         <div class="box box-billing-address">
             <div class="box-content">
                 <address>
-                    <?php echo $block->getAddressAsHtml($_address) ?>
+                    <?= $block->getAddressAsHtml($_address) ?>
                     <?php if ($block->isAddressDefaultBilling($_address)): ?>
-                        <br /><strong><?php /* @escapeNotVerified */ echo __('Default Billing') ?></strong>
+                        <br /><strong><?= /* @escapeNotVerified */ __('Default Billing') ?></strong>
                     <?php endif; ?>
                     <?php if ($block->isAddressDefaultShipping($_address)): ?>
-                        <br /><strong><?php /* @escapeNotVerified */ echo __('Default Shipping') ?></strong>
+                        <br /><strong><?= /* @escapeNotVerified */ __('Default Shipping') ?></strong>
                     <?php endif; ?>
                 </address>
             </div>
             <div class="box-actions">
-                <a href="<?php /* @escapeNotVerified */ echo $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit Address') ?></span></a>
-                <a href="<?php /* @escapeNotVerified */ echo $block->getSetAddressUrl($_address) ?>" class="action select"><span><?php /* @escapeNotVerified */ echo __('Select Address') ?></span></a>
+                <a href="<?= /* @escapeNotVerified */ $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Address') ?></span></a>
+                <a href="<?= /* @escapeNotVerified */ $block->getSetAddressUrl($_address) ?>" class="action select"><span><?= /* @escapeNotVerified */ __('Select Address') ?></span></a>
             </div>
         </div>
     <?php endforeach; ?>
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="button" class="action add primary" role="add-address" title="<?php /* @escapeNotVerified */ echo __('Add New Address') ?>"><span><?php /* @escapeNotVerified */ echo __('Add New Address') ?></span></button>
+            <button type="button" class="action add primary" role="add-address" title="<?= /* @escapeNotVerified */ __('Add New Address') ?>"><span><?= /* @escapeNotVerified */ __('Add New Address') ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Billing Information') ?></span></a>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
         </div>
     </div>
 </div>
@@ -44,7 +44,7 @@
         ".actions": {
             "address": {
                 "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?php /* @escapeNotVerified */ echo $block->getAddNewUrl() ?>"
+                "addAddressLocation": "<?= /* @escapeNotVerified */ $block->getAddNewUrl() ?>"
             }
         }
     }
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
index 21bb27fc138db..a55b84c0a2d8a 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml
@@ -14,20 +14,20 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Addresses
  */
 ?>
-<form id="checkout_multishipping_form" data-mage-init='{"multiShipping":{}, "validation":{}}' action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" class="multicheckout address form">
+<form id="checkout_multishipping_form" data-mage-init='{"multiShipping":{}, "validation":{}}' action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" class="multicheckout address form">
     <div class="title">
-        <strong><?php /* @escapeNotVerified */ echo __('Please select a shipping address for applicable items.') ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Please select a shipping address for applicable items.') ?></strong>
     </div>
     <input type="hidden" name="continue" value="0" id="can_continue_flag"/>
     <input type="hidden" name="new_address" value="0" id="add_new_address_flag"/>
     <div class="table-wrapper">
         <table class="items data table" id="multiship-addresses-table">
-            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Please select a shipping address for applicable items.') ?></caption>
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Please select a shipping address for applicable items.') ?></caption>
             <thead>
             <tr>
-                <th class="col product" scope="col"><?php /* @escapeNotVerified */ echo __('Product') ?></th>
-                <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
-                <th class="col address" scope="col"><?php /* @escapeNotVerified */ echo __('Send To') ?></th>
+                <th class="col product" scope="col"><?= /* @escapeNotVerified */ __('Product') ?></th>
+                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                <th class="col address" scope="col"><?= /* @escapeNotVerified */ __('Send To') ?></th>
                 <th class="col actions" scope="col">&nbsp;</th>
             </tr>
             </thead>
@@ -35,34 +35,34 @@
             <?php foreach ($block->getItems() as $_index => $_item): ?>
                 <?php if ($_item->getQuoteItem()) : ?>
                     <tr>
-                        <td class="col product" data-th="<?php echo $block->escapeHtml(__('Product'));?>"><?php echo $block->getItemHtml($_item->getQuoteItem()) ?></td>
-                        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>">
+                        <td class="col product" data-th="<?= $block->escapeHtml(__('Product')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
+                        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
                             <div class="field qty">
-                                <label for="ship-<?php /* @escapeNotVerified */ echo $_index ?>-<?php /* @escapeNotVerified */ echo $_item->getQuoteItemId() ?>-qty" class="label">
-                                    <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
+                                <label for="ship-<?= /* @escapeNotVerified */ $_index ?>-<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>-qty" class="label">
+                                    <span><?= /* @escapeNotVerified */ __('Qty') ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="number" data-multiship-item-id="<?php /* @escapeNotVerified */ echo $_item->getSku() ?>" id="ship-<?php /* @escapeNotVerified */ echo $_index ?>-<?php /* @escapeNotVerified */ echo $_item->getQuoteItemId() ?>-qty" name="ship[<?php /* @escapeNotVerified */ echo $_index ?>][<?php /* @escapeNotVerified */ echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
+                                    <input type="number" data-multiship-item-id="<?= /* @escapeNotVerified */ $_item->getSku() ?>" id="ship-<?= /* @escapeNotVerified */ $_index ?>-<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>-qty" name="ship[<?= /* @escapeNotVerified */ $_index ?>][<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>][qty]" value="<?= $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
                                 </div>
                             </div>
                         </td>
-                        <td class="col address" data-th="<?php echo $block->escapeHtml(__('Send To'));?>">
+                        <td class="col address" data-th="<?= $block->escapeHtml(__('Send To')) ?>">
                             <?php if ($_item->getProduct()->getIsVirtual()): ?>
-                                <div class="applicable"><?php /* @escapeNotVerified */ echo __('A shipping selection is not applicable.'); ?></div>
+                                <div class="applicable"><?= /* @escapeNotVerified */ __('A shipping selection is not applicable.') ?></div>
                             <?php else: ?>
                                 <div class="field address">
-                                    <label for="ship_<?php /* @escapeNotVerified */ echo $_index ?>_<?php /* @escapeNotVerified */ echo $_item->getQuoteItemId() ?>_address" class="label">
-                                        <span><?php /* @escapeNotVerified */ echo __('Send To') ?></span>
+                                    <label for="ship_<?= /* @escapeNotVerified */ $_index ?>_<?= /* @escapeNotVerified */ $_item->getQuoteItemId() ?>_address" class="label">
+                                        <span><?= /* @escapeNotVerified */ __('Send To') ?></span>
                                     </label>
                                     <div class="control">
-                                        <?php echo $block->getAddressesHtmlSelect($_item, $_index); ?>
+                                        <?= $block->getAddressesHtmlSelect($_item, $_index) ?>
                                     </div>
                                 </div>
                             <?php endif; ?>
                         </td>
-                        <td class="col actions" data-th="<?php echo $block->escapeHtml(__('Actions'));?>">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getItemDeleteUrl($_item) ?>" title="<?php /* @escapeNotVerified */ echo __('Remove Item') ?>" class="action delete" data-multiship-item-update="">
-                                <span><?php /* @escapeNotVerified */ echo __('Remove item') ?></span>
+                        <td class="col actions" data-th="<?= $block->escapeHtml(__('Actions')) ?>">
+                            <a href="<?= /* @escapeNotVerified */ $block->getItemDeleteUrl($_item) ?>" title="<?= /* @escapeNotVerified */ __('Remove Item') ?>" class="action delete" data-multiship-item-update="">
+                                <span><?= /* @escapeNotVerified */ __('Remove item') ?></span>
                             </a>
                         </td>
                     </tr>
@@ -73,12 +73,12 @@
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Go to Shipping Information') ?>" class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($block->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?php /* @escapeNotVerified */ echo __('Go to Shipping Information') ?></span></button>
+            <button type="submit" title="<?= /* @escapeNotVerified */ __('Go to Shipping Information') ?>" class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($block->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?= /* @escapeNotVerified */ __('Go to Shipping Information') ?></span></button>
         </div>
         <div class="secondary">
-            <button type="submit" data-multiship-item-update="" class="action update" data-role="can-continue" data-flag="0"><span><?php /* @escapeNotVerified */ echo __('Update Qty &amp; Addresses') ?></span></button>
-            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?php /* @escapeNotVerified */ echo __('Enter a New Address') ?></span></button>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Shopping Cart') ?></span></a>
+            <button type="submit" data-multiship-item-update="" class="action update" data-role="can-continue" data-flag="0"><span><?= /* @escapeNotVerified */ __('Update Qty &amp; Addresses') ?></span></button>
+            <button type="button" title="<?= /* @escapeNotVerified */ __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?= /* @escapeNotVerified */ __('Enter a New Address') ?></span></button>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Shopping Cart') ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
index 40aa947bb75f4..277328c1b5b2a 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -14,24 +14,24 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Billing
  */
 ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" id="multishipping-billing-form" class="form multicheckout billing">
+<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="multishipping-billing-form" class="form multicheckout billing">
     <div class="block block-billing">
         <div class="block-content">
             <div class="box box-billing-address">
                 <strong class="box-title">
-                    <span><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getSelectAddressUrl() ?>" class="action"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
+                    <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
+                    <a href="<?= /* @escapeNotVerified */ $block->getSelectAddressUrl() ?>" class="action"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
                 </strong>
                 <div class="box-content">
                     <?php $_address = $block->getAddress() ?>
-                    <address><?php /* @escapeNotVerified */ echo $_address->format('html') ?></address>
+                    <address><?= /* @escapeNotVerified */ $_address->format('html') ?></address>
                 </div>
             </div>
             <div class="box box-billing-method">
                 <fieldset class="fieldset">
-                    <legend class="legend box-title"><span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span></legend><br>
+                    <legend class="legend box-title"><span><?= /* @escapeNotVerified */ __('Payment Method') ?></span></legend><br>
                     <div class="box-content">
-                        <?php echo $block->getChildHtml('payment_methods_before') ?>
+                        <?= $block->getChildHtml('payment_methods_before') ?>
                         <?php /* Payment methods forms list */ ?>
                         <dl class="items methods-payment" id="payment-methods">
                             <?php
@@ -41,21 +41,21 @@
                             <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
                                 <dt class="item-title">
                                     <?php if ($_methodsCount > 1): ?>
-                                        <input type="radio" id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" name="payment[method]" title="<?php echo $block->escapeHtml($_method->getTitle()) ?>" <?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio"/>
+                                        <input type="radio" id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" name="payment[method]" title="<?= $block->escapeHtml($_method->getTitle()) ?>" <?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio"/>
                                     <?php else : ?>
-                                        <input type="radio" id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/>
+                                        <input type="radio" id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/>
                                     <?php endif; ?>
-                                    <label for="p_method_<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
+                                    <label for="p_method_<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_method->getTitle()) ?></label>
                                 </dt>
                                 <?php if ($html = $block->getChildHtml('payment.method.' . $_code)) : ?>
                                     <dd class="item-content">
-                                        <?php /* @escapeNotVerified */ echo $html; ?>
+                                        <?= /* @escapeNotVerified */ $html ?>
                                     </dd>
                                 <?php endif; ?>
                             <?php endforeach; ?>
                         </dl>
-                        <?php echo $block->getChildHtml('payment_methods_after') ?>
-                        <?php echo $block->getChildHtml('checkout_billing_items') ?>
+                        <?= $block->getChildHtml('payment_methods_after') ?>
+                        <?= $block->getChildHtml('checkout_billing_items') ?>
                     </div>
                 </fieldset>
             </div>
@@ -63,10 +63,10 @@
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button id="payment-continue" type="submit" class="action primary continue"><span><?php /* @escapeNotVerified */ echo __('Go to Review Your Order') ?></span></button>
+            <button id="payment-continue" type="submit" class="action primary continue"><span><?= /* @escapeNotVerified */ __('Go to Review Your Order') ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Shipping Information') ?></span></a>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Shipping Information') ?></span></a>
         </div>
     </div>
 </form>
@@ -75,7 +75,7 @@ require(['jquery', 'mage/mage'], function(jQuery){
 
     var addtocartForm = jQuery('#multishipping-billing-form');
     addtocartForm.mage('payment', {
-        checkoutPrice: <?php echo (float)$block->getQuoteBaseGrandTotal(); ?>
+        checkoutPrice: <?= (float)$block->getQuoteBaseGrandTotal() ?>
     });
     addtocartForm.mage('validation', {
         errorPlacement: function(error, element) {
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
index 10f5fbe729839..d1c39970518e6 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing/items.phtml
@@ -10,25 +10,25 @@
 <?php if ($block->getQuote()->hasVirtualItems()): ?>
 <div class="block block-other">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Other items in your order') ?></strong>
-        <a href="<?php /* @escapeNotVerified */ echo $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit Items') ?></span></a>
+        <strong><?= /* @escapeNotVerified */ __('Other items in your order') ?></strong>
+        <a href="<?= /* @escapeNotVerified */ $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
     </div>
     <div class="block-content">
-        <p><?php /* @escapeNotVerified */ echo __('Shipping is not applicable.') ?></p>
+        <p><?= /* @escapeNotVerified */ __('Shipping is not applicable.') ?></p>
         <div class="table-wrapper">
             <table class="items data table" id="unavailable-shipping-table">
-                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Other items in your order') ?></caption>
+                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Other items in your order') ?></caption>
                 <thead>
                     <tr>
-                        <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                        <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                        <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                        <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
                     </tr>
                 </thead>
                 <tbody>
                 <?php foreach ($block->getVirtualQuoteItems() as $_item): ?>
                     <tr>
-                        <td class="col item" data-th="<?php echo $block->escapeHtml(__('Product Name'));?>"><?php echo $block->getItemHtml($_item) ?></td>
-                        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><?php /* @escapeNotVerified */ echo $_item->getQty() ?></td>
+                        <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getItemHtml($_item) ?></td>
+                        <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty() ?></td>
                     </tr>
                 <?php endforeach; ?>
                 </tbody>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
index 5e279a4dbea06..1de8357db8986 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/item/default.phtml
@@ -7,18 +7,18 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<strong class="product name product-item-name"><a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a></strong>
+<strong class="product name product-item-name"><a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
 <?php if ($_options = $block->getOptionList()): ?>
     <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <dl class="item options tooltip content">
-                        <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                        <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                        <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                     </dl>
                 <?php endif; ?>
             </dd>
@@ -26,5 +26,5 @@
     </dl>
 <?php endif; ?>
 <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()): ?>
-    <?php echo $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
+    <?= $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
index 2e396dee4c765..ae65caf6983d0 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/link.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<a class="action multicheckout" href="<?php /* @escapeNotVerified */ echo $block->getCheckoutUrl()?>"><span><?php /* @escapeNotVerified */ echo __('Check Out with Multiple Addresses');?></span></a>
+<a class="action multicheckout" href="<?= /* @escapeNotVerified */ $block->getCheckoutUrl() ?>"><span><?= /* @escapeNotVerified */ __('Check Out with Multiple Addresses') ?></span></a>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index 051596321a52d..2549eff3aca7d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -8,75 +8,75 @@
 
 /** @var \Magento\Multishipping\Block\Checkout\Overview $block */
 ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}, "validation":{}}' class="form multicheckout order-review">
-    <?php echo $block->getBlockHtml('formkey'); ?>
+<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}, "validation":{}}' class="form multicheckout order-review">
+    <?= $block->getBlockHtml('formkey') ?>
     <div class="block block-billing">
-        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Billing Information') ?></strong></div>
+        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Billing Information') ?></strong></div>
         <div class="block-content">
             <div class="box box-billing-address">
                 <?php $_address = $block->getBillingAddress() ?>
                 <strong class="box-title">
-                    <span><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getEditBillingAddressUrl($_address) ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
+                    <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
+                    <a href="<?= /* @escapeNotVerified */ $block->getEditBillingAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
                 </strong>
                 <div class="box-content">
                     <address>
-                        <?php /* @escapeNotVerified */ echo $_address->format('html') ?>
+                        <?= /* @escapeNotVerified */ $_address->format('html') ?>
                     </address>
                 </div>
             </div>
             <div class="box box-billing-method">
                 <strong class="box-title">
-                    <span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getEditBillingUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
+                    <span><?= /* @escapeNotVerified */ __('Payment Method') ?></span>
+                    <a href="<?= /* @escapeNotVerified */ $block->getEditBillingUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
                 </strong>
                 <div class="box-content">
-                    <input type="hidden" name="payment[cc_number]" value="<?php echo $block->escapeHtml($block->getPayment()->getCcNumber())?>" />
-                    <input type="hidden" name="payment[cc_cid]" value="<?php echo $block->escapeHtml($block->getPayment()->getCcCid())?>" />
-                    <?php echo $block->getPaymentHtml() ?>
+                    <input type="hidden" name="payment[cc_number]" value="<?= $block->escapeHtml($block->getPayment()->getCcNumber()) ?>" />
+                    <input type="hidden" name="payment[cc_cid]" value="<?= $block->escapeHtml($block->getPayment()->getCcCid()) ?>" />
+                    <?= $block->getPaymentHtml() ?>
                 </div>
             </div>
         </div>
     </div>
     <div class="block block-shipping">
-        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Shipping Information') ?></strong></div>
+        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Shipping Information') ?></strong></div>
         <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
         <?php foreach ($block->getShippingAddresses() as $_index => $_address): ?>
             <div class="block-content">
                 <div class="title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Address %1 <span>of %2</span>', ($_index+1), $block->getShippingAddressCount()) ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Address %1 <span>of %2</span>', ($_index+1), $block->getShippingAddressCount()) ?></strong>
                 </div>
                 <div class="box box-shipping-address">
                     <strong class="box-title">
-                        <span><?php /* @escapeNotVerified */ echo __('Shipping To') ?></span>
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getEditShippingAddressUrl($_address) ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
+                        <span><?= /* @escapeNotVerified */ __('Shipping To') ?></span>
+                        <a href="<?= /* @escapeNotVerified */ $block->getEditShippingAddressUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
                     </strong>
                     <div class="box-content">
                         <address>
-                            <?php /* @escapeNotVerified */ echo $_address->format('html') ?>
+                            <?= /* @escapeNotVerified */ $_address->format('html') ?>
                         </address>
                     </div>
                 </div>
                 <div class="box box-shipping-method">
                     <strong class="box-title">
-                        <span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span>
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getEditShippingUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
+                        <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
+                        <a href="<?= /* @escapeNotVerified */ $block->getEditShippingUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
                     </strong>
                     <?php if ($_rate = $block->getShippingAddressRate($_address)): ?>
                         <div class="box-content">
-                            <?php echo $block->escapeHtml($_rate->getCarrierTitle()) ?> (<?php echo $block->escapeHtml($_rate->getMethodTitle()) ?>)
+                            <?= $block->escapeHtml($_rate->getCarrierTitle()) ?> (<?= $block->escapeHtml($_rate->getMethodTitle()) ?>)
                             <?php $_excl = $block->getShippingPriceExclTax($_address); ?>
                             <?php $_incl = $block->getShippingPriceInclTax($_address); ?>
 
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            <span class="price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>">
+                            <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
                             <?php endif; ?>
-                                <?php /* @escapeNotVerified */ echo $_incl; ?>
+                                <?= /* @escapeNotVerified */ $_incl ?>
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
                             </span>
                             <?php endif; ?>
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                <span class="price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>"><?php /* @escapeNotVerified */ echo $_excl; ?></span>
+                                <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><?= /* @escapeNotVerified */ $_excl ?></span>
                             <?php endif; ?>
                         </div>
                     <?php endif; ?>
@@ -84,25 +84,25 @@
                 <div class="box box-items">
                     <div class="box-content">
                         <div class="order-review-wrapper table-wrapper">
-                            <table class="items data table table-order-review" id="overview-table-<?php /* @escapeNotVerified */ echo $_address->getId() ?>">
-                                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Order Review') ?></caption>
+                            <table class="items data table table-order-review" id="overview-table-<?= /* @escapeNotVerified */ $_address->getId() ?>">
+                                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Order Review') ?></caption>
                                 <thead>
                                 <tr>
-                                    <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Item') ?>
-                                        <a href="<?php /* @escapeNotVerified */ echo $block->getAddressesEditUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit') ?></span></a>
+                                    <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Item') ?>
+                                        <a href="<?= /* @escapeNotVerified */ $block->getAddressesEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit') ?></span></a>
                                     </th>
-                                    <th class="col price" scope="col"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                                    <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
-                                    <th class="col subtotal" scope="col"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
+                                    <th class="col price" scope="col"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                                    <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                                    <th class="col subtotal" scope="col"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
                                 </tr>
                                 </thead>
                                 <tbody>
                                 <?php foreach ($block->getShippingAddressItems($_address) as $_item): ?>
-                                    <?php echo $block->getRowItemHtml($_item); ?>
+                                    <?= $block->getRowItemHtml($_item) ?>
                                 <?php endforeach; ?>
                                 </tbody>
                                 <tfoot>
-                                    <?php /* @escapeNotVerified */ echo $block->renderTotals($block->getShippingAddressTotals($_address)); ?>
+                                    <?= /* @escapeNotVerified */ $block->renderTotals($block->getShippingAddressTotals($_address)) ?>
                                 </tfoot>
                             </table>
                         </div>
@@ -114,31 +114,31 @@
 
     <?php if ($block->getQuote()->hasVirtualItems()): ?>
     <div class="block block-other">
-        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Other items in your order') ?></strong></div>
+        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Other items in your order') ?></strong></div>
         <div class="block-content">
             <strong class="subtitle">
-                <span><?php /* @escapeNotVerified */ echo __('Items') ?></span>
-                <a href="<?php /* @escapeNotVerified */ echo $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit Items') ?></span></a>
+                <span><?= /* @escapeNotVerified */ __('Items') ?></span>
+                <a href="<?= /* @escapeNotVerified */ $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
             </strong>
             <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
             <div class="order-review-wrapper table-wrapper">
                 <table class="items data table table-order-review" id="virtual-overview-table">
-                    <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items') ?></caption>
+                    <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items') ?></caption>
                     <thead>
                         <tr>
-                            <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                            <th class="col price" scope="col"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                            <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
-                            <th class="col subtotal" scope="col"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
+                            <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                            <th class="col price" scope="col"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                            <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                            <th class="col subtotal" scope="col"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
                         </tr>
                     </thead>
                     <tbody>
                         <?php foreach ($block->getVirtualItems() as $_item): ?>
-                            <?php echo $block->getRowItemHtml($_item); ?>
+                            <?= $block->getRowItemHtml($_item) ?>
                         <?php endforeach; ?>
                     </tbody>
                     <tfoot>
-                    <?php /* @escapeNotVerified */ echo $block->renderTotals($block->getBillinAddressTotals()); ?>
+                    <?= /* @escapeNotVerified */ $block->renderTotals($block->getBillinAddressTotals()) ?>
                     </tfoot>
                 </table>
             </div>
@@ -146,23 +146,23 @@
     </div>
     <?php endif; ?>
 
-    <?php echo $block->getChildHtml('items_after'); ?>
+    <?= $block->getChildHtml('items_after') ?>
 
     <div id="checkout-review-submit" class="checkout-review">
-        <?php echo $block->getChildHtml('agreements') ?>
+        <?= $block->getChildHtml('agreements') ?>
         <div class="grand totals">
-            <strong class="mark"><?php /* @escapeNotVerified */ echo __('Grand Total:') ?></strong>
-            <strong class="amount"><?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()) ?></strong>
+            <strong class="mark"><?= /* @escapeNotVerified */ __('Grand Total:') ?></strong>
+            <strong class="amount"><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()) ?></strong>
         </div>
         <div class="actions-toolbar" id="review-buttons-container">
             <div class="primary">
-                <button type="submit" class="action primary submit" id="review-button"><span><?php /* @escapeNotVerified */ echo __('Place Order') ?></span></button>
+                <button type="submit" class="action primary submit" id="review-button"><span><?= /* @escapeNotVerified */ __('Place Order') ?></span></button>
             </div>
             <div class="secondary">
-                <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Billing Information') ?></span></a>
+                <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Billing Information') ?></span></a>
             </div>
-            <span id="review-please-wait" class="please-wait load indicator" style="display: none;" data-text="<?php /* @escapeNotVerified */ echo __('Submitting order information...') ?>">
-                <span><?php /* @escapeNotVerified */ echo __('Submitting order information...') ?></span>
+            <span id="review-please-wait" class="please-wait load indicator" style="display: none;" data-text="<?= /* @escapeNotVerified */ __('Submitting order information...') ?>">
+                <span><?= /* @escapeNotVerified */ __('Submitting order information...') ?></span>
             </span>
         </div>
     </div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
index e3f77207c1abf..5424f37efac07 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview/item.phtml
@@ -17,39 +17,39 @@
 <?php /** @var $block Magento\Checkout\Block\Cart\Item\Renderer */ ?>
 <?php $_item = $block->getItem() ?>
 <tr>
-    <td class="col item" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <?php echo $block->getRenderedBlock()->getItemHtml($_item) ?>
+    <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <?= $block->getRenderedBlock()->getItemHtml($_item) ?>
     </td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
         <?php /* Including Tax */ ?>
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-                <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
-                    <?php echo $block->getUnitPriceInclTaxHtml($_item); ?>
+                <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+                    <?= $block->getUnitPriceInclTaxHtml($_item) ?>
                 </span>
             <?php endif; ?>
         <?php /* end Including Tax */ ?>
         <?php /* Excluding Tax */ ?>
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-            <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
-                <?php echo $block->getUnitPriceExclTaxHtml($_item); ?>
+            <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+                <?= $block->getUnitPriceExclTaxHtml($_item) ?>
             </span>
         <?php endif; ?>
         <?php /* end Excluding Tax */ ?>
     </td>
 
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
     <?php /* Including Tax Subtotal */ ?>
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
-            <?php echo $block->getRowTotalInclTaxHtml($_item); ?>
+        <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
+            <?= $block->getRowTotalInclTaxHtml($_item) ?>
         </span>
         <?php endif; ?>
     <?php /* end Including Tax Subtotal */ ?>
     <?php /* Excluding Tax Subtotal */ ?>
     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceExclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
-        <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
-            <?php echo $block->getRowTotalExclTaxHtml($_item); ?>
+        <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
+            <?= $block->getRowTotalExclTaxHtml($_item) ?>
         </span>
     <?php endif; ?>
     <?php /* end Excluding Tax Subtotal */ ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
index f97626fee6f56..f66a2093b0aff 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
@@ -14,60 +14,60 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Shipping
  */
 ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
+<form action="<?= /* @escapeNotVerified */ $block->getPostActionUrl() ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
     <?php foreach ($block->getAddresses() as $_index => $_address): ?>
     <div class="block block-shipping">
-        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()) ?></strong></div>
+        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()) ?></strong></div>
         <div class="block-content">
             <div class="box box-shipping-address">
                 <strong class="box-title">
-                    <span><?php /* @escapeNotVerified */ echo __('Shipping To') ?></span>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getAddressEditUrl($_address) ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
+                    <span><?= /* @escapeNotVerified */ __('Shipping To') ?></span>
+                    <a href="<?= /* @escapeNotVerified */ $block->getAddressEditUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Change') ?></span></a>
                 </strong>
                 <div class="box-content">
-                    <address><?php /* @escapeNotVerified */ echo $_address->format('html') ?></address>
+                    <address><?= /* @escapeNotVerified */ $_address->format('html') ?></address>
                 </div>
             </div>
             <div class="box box-shipping-method">
                 <strong class="box-title">
-                    <span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
                 </strong>
                 <div class="box-content">
                     <?php if (!($_shippingRateGroups = $block->getShippingRates($_address))): ?>
-                        <p><?php /* @escapeNotVerified */ echo __('Sorry, no quotes are available for this order right now.') ?></p>
+                        <p><?= /* @escapeNotVerified */ __('Sorry, no quotes are available for this order right now.') ?></p>
                     <?php else: ?>
                     <dl class="items methods-shipping">
                         <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
-                            <dt class="item-title"><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></dt>
+                            <dt class="item-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
                             <dd class="item-content">
                                 <fieldset class="fieldset">
                                     <legend class="legend">
-                                        <span><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></span>
+                                        <span><?= $block->escapeHtml($block->getCarrierName($code)) ?></span>
                                     </legend><br>
                                     <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
                                     <div class="field choice">
                                     <?php if ($_rate->getErrorMessage()): ?>
-                                        <strong><?php echo $block->escapeHtml($_rate->getCarrierTitle()) ?>: <?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></strong>
+                                        <strong><?= $block->escapeHtml($_rate->getCarrierTitle()) ?>: <?= $block->escapeHtml($_rate->getErrorMessage()) ?></strong>
                                     <?php else: ?>
                                         <div class="control">
                                             <?php if ($_sole) : ?>
-                                                <input type="radio" name="shipping_method[<?php /* @escapeNotVerified */ echo $_address->getId() ?>]" value="<?php echo $block->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php /* @escapeNotVerified */ echo $_address->getId() ?>_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>" class="radio solo method" checked="checked"/>
+                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= $block->escapeHtml($_rate->getCode()) ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>" class="radio solo method" checked="checked"/>
                                             <?php else: ?>
-                                                <input type="radio" name="shipping_method[<?php /* @escapeNotVerified */ echo $_address->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>" id="s_method_<?php /* @escapeNotVerified */ echo $_address->getId() ?>_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
+                                                <input type="radio" name="shipping_method[<?= /* @escapeNotVerified */ $_address->getId() ?>]" value="<?= /* @escapeNotVerified */ $_rate->getCode() ?>" id="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
                                             <?php endif; ?>
                                         </div>
-                                        <label for="s_method_<?php /* @escapeNotVerified */ echo $_address->getId() ?>_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>"><?php echo $block->escapeHtml($_rate->getMethodTitle()) ?>
+                                        <label for="s_method_<?= /* @escapeNotVerified */ $_address->getId() ?>_<?= /* @escapeNotVerified */ $_rate->getCode() ?>"><?= $block->escapeHtml($_rate->getMethodTitle()) ?>
                                             <?php $_excl = $block->getShippingPrice($_address, $_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
                                             <?php $_incl = $block->getShippingPrice($_address, $_rate->getPrice(), true); ?>
                                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                            <span class="price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>">
+                                            <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
                                         <?php endif; ?>
-                                            <?php /* @escapeNotVerified */ echo $_incl; ?>
+                                            <?= /* @escapeNotVerified */ $_incl ?>
                                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
                                             </span>
                                         <?php endif; ?>
                                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                            <span class="price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>"><?php /* @escapeNotVerified */ echo $_excl; ?></span>
+                                            <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><?= /* @escapeNotVerified */ $_excl ?></span>
                                         <?php endif; ?>
                                         </label>
                                     <?php endif ?>
@@ -78,29 +78,29 @@
                         <?php endforeach; ?>
                     </dl>
                     <?php endif; ?>
-                    <?php /* @escapeNotVerified */ echo $block->getItemsBoxTextAfter($_address); ?>
+                    <?= /* @escapeNotVerified */ $block->getItemsBoxTextAfter($_address) ?>
                 </div>
             </div>
             <div class="box box-items">
                 <strong class="box-title">
-                    <span><?php /* @escapeNotVerified */ echo __('Items') ?></span>
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getItemsEditUrl($_address) ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit Items') ?></span></a>
+                    <span><?= /* @escapeNotVerified */ __('Items') ?></span>
+                    <a href="<?= /* @escapeNotVerified */ $block->getItemsEditUrl($_address) ?>" class="action edit"><span><?= /* @escapeNotVerified */ __('Edit Items') ?></span></a>
                 </strong>
                 <div class="box-content">
                     <div class="table-wrapper">
-                        <table class="items data table" id="shipping-table-<?php /* @escapeNotVerified */ echo $_address->getId() ?>">
-                            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items') ?></caption>
+                        <table class="items data table" id="shipping-table-<?= /* @escapeNotVerified */ $_address->getId() ?>">
+                            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items') ?></caption>
                             <thead>
                             <tr>
-                                <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                                <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                                <th class="col item" scope="col"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                                <th class="col qty" scope="col"><?= /* @escapeNotVerified */ __('Qty') ?></th>
                             </tr>
                             </thead>
                             <tbody>
                             <?php foreach ($block->getAddressItems($_address) as $_item): ?>
                                 <tr>
-                                    <td class="col item" data-th="<?php echo $block->escapeHtml(__('Product Name'));?>"><?php echo $block->getItemHtml($_item->getQuoteItem()) ?></td>
-                                    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><?php /* @escapeNotVerified */ echo $_item->getQty() ?></td>
+                                    <td class="col item" data-th="<?= $block->escapeHtml(__('Product Name')) ?>"><?= $block->getItemHtml($_item->getQuoteItem()) ?></td>
+                                    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty() ?></td>
                                 </tr>
                             <?php endforeach; ?>
                             </tbody>
@@ -111,13 +111,13 @@
         </div>
     </div>
     <?php endforeach; ?>
-    <?php echo $block->getChildHtml('checkout_billing_items') ?>
+    <?= $block->getChildHtml('checkout_billing_items') ?>
     <div class="actions-toolbar">
         <div class="primary">
-            <button class="action primary continue" type="submit"><span><?php /* @escapeNotVerified */ echo __('Continue to Billing Information') ?></span></button>
+            <button class="action primary continue" type="submit"><span><?= /* @escapeNotVerified */ __('Continue to Billing Information') ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Select Addresses') ?></span></a>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back"><span><?= /* @escapeNotVerified */ __('Back to Select Addresses') ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
index 689640b3830ba..bf520d639a58d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/state.phtml
@@ -16,6 +16,6 @@
 ?>
 <ol class="block multicheckout progress items" id="checkout-progress-state">
     <?php foreach ($block->getSteps() as $_step): ?>
-        <li title="<?php /* @escapeNotVerified */ echo $_step->getLabel() ?>" class="item<?php echo($_step->getIsActive()) ? ' active' : ''?>"><span><?php /* @escapeNotVerified */ echo $_step->getLabel() ?></span></li>
+        <li title="<?= /* @escapeNotVerified */ $_step->getLabel() ?>" class="item<?= ($_step->getIsActive()) ? ' active' : '' ?>"><span><?= /* @escapeNotVerified */ $_step->getLabel() ?></span></li>
     <?php endforeach; ?>
 </ol>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
index 67f70fc961026..3403c745e6495 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -8,23 +8,23 @@
 
 ?>
 <div class="multicheckout success">
-    <h2 class="subtitle"><?php echo $block->escapeHtml(__('Thank you for your purchase!')) ?></h2>
-    <p><?php echo $block->escapeHtml(__('Thanks for your order. We\'ll email you order details and tracking information.')) ?></p>
+    <h2 class="subtitle"><?= $block->escapeHtml(__('Thank you for your purchase!')) ?></h2>
+    <p><?= $block->escapeHtml(__('Thanks for your order. We\'ll email you order details and tracking information.')) ?></p>
     <?php if ($_orderIds = $block->getOrderIds()): ?>
     <p class="order-number">
         <?php $flag = false ?>
         <span>
             <?php if (count($_orderIds) > 1): ?>
-                <?php echo $block->escapeHtml(__('Your order numbers are: ')) ?>
+                <?= $block->escapeHtml(__('Your order numbers are: ')) ?>
             <?php else : ?>
-                <?php echo $block->escapeHtml(__('Your order number is: ')) ?>
+                <?= $block->escapeHtml(__('Your order number is: ')) ?>
             <?php endif; ?>
         </span>
-        <?php foreach ($_orderIds as $orderId => $incrementId): ?><?php if ($flag): ?><?php echo ', ' ?><?php endif; ?><?php $flag = true ?><a href="<?php /* @escapeNotVerified */ echo $block->getViewOrderUrl($orderId) ?>"><?php /* @escapeNotVerified */ echo $incrementId ?></a><?php endforeach; ?>
+        <?php foreach ($_orderIds as $orderId => $incrementId): ?><?php if ($flag): ?><?= ', ' ?><?php endif; ?><?php $flag = true ?><a href="<?= /* @escapeNotVerified */ $block->getViewOrderUrl($orderId) ?>"><?= /* @escapeNotVerified */ $incrementId ?></a><?php endforeach; ?>
     </p>
     <?php endif; ?>
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
     <div class="actions">
-        <a class="action continue" title="<?php echo $block->escapeHtml(__('Continue Shopping')) ?>" href="<?php /* @escapeNotVerified */ echo $block->getContinueUrl() ?>"><span><?php echo $block->escapeHtml(__('Continue Shopping')) ?></span></a>
+        <a class="action continue" title="<?= $block->escapeHtml(__('Continue Shopping')) ?>" href="<?= /* @escapeNotVerified */ $block->getContinueUrl() ?>"><span><?= $block->escapeHtml(__('Continue Shopping')) ?></span></a>
     </div>
 </div>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
index 11c2ec77a8f50..79e6d02465847 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/multishipping/item/default.phtml
@@ -8,18 +8,18 @@
 
 ?>
 <div class="product details">
-    <strong class="product name"><a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a></strong>
+    <strong class="product name"><a href="<?= /* @escapeNotVerified */ $block->getProductUrl() ?>"><?= $block->escapeHtml($block->getProductName()) ?></a></strong>
     <?php if ($_options = $block->getOptionList()): ?>
         <dl class="item options">
             <?php foreach ($_options as $_option) : ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
-                <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+                <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                         <dl class="item options tooltip content">
-                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     <?php endif; ?>
                 </dd>
@@ -27,6 +27,6 @@
         </dl>
     <?php endif; ?>
     <?php if ($addtInfoBlock = $block->getProductAdditionalInformationBlock()): ?>
-        <?php echo $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
+        <?= $addtInfoBlock->setItem($block->getItem())->toHtml() ?>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
index 310824ce8ac4f..a64185ce67958 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -12,12 +12,12 @@
     <div class="toolbar">
         <?php if (!$block->isSingleStoreMode()) :?>
         <div class="store-switcher">
-            <?php echo $block->getChildHtml('store_switcher') ?>
+            <?= $block->getChildHtml('store_switcher') ?>
         </div>
         <?php endif;?>
     </div>
-    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?php echo $block->escapeHtmlAttr(__('Preview')) ?>" width="100%"></iframe>
-    <?php echo $block->getChildHtml('preview_form'); ?>
+    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?= $block->escapeHtmlAttr(__('Preview')) ?>" width="100%"></iframe>
+    <?= $block->getChildHtml('preview_form') ?>
 </div>
 
 <script>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
index 5d0b369495c2c..2583ccea6fca4 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/store.phtml
@@ -10,7 +10,7 @@
 
 <?php if ($websites = $block->getWebsites()): ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?php echo $block->escapeHtml(__('Choose Store View:')) ?></label>
+    <label class="label" for="store_switcher"><?= $block->escapeHtml(__('Choose Store View:')) ?></label>
     <div class="control">
         <select
             id="store_switcher"
@@ -23,13 +23,13 @@
                     <?php foreach ($block->getStores($group) as $store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                            <optgroup label="<?php echo $block->escapeHtmlAttr($website->getName()) ?>"></optgroup>
+                            <optgroup label="<?= $block->escapeHtmlAttr($website->getName()) ?>"></optgroup>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <optgroup label="&nbsp;&nbsp;&nbsp;<?php echo $block->escapeHtmlAttr($group->getName()) ?>">
+                            <optgroup label="&nbsp;&nbsp;&nbsp;<?= $block->escapeHtmlAttr($group->getName()) ?>">
                         <?php endif; ?>
-                        <option value="<?php echo $block->escapeHtmlAttr($store->getId()) ?>"<?php if ($block->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $block->escapeHtml($store->getName()) ?></option>
+                        <option value="<?= $block->escapeHtmlAttr($store->getId()) ?>"<?php if ($block->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($store->getName()) ?></option>
                     <?php endforeach; ?>
                     <?php if ($showGroup): ?>
                         </optgroup>
@@ -38,7 +38,7 @@
             <?php endforeach; ?>
         </select>
     </div>
-    <?php echo $block->getHintHtml() ?>
+    <?= $block->getHintHtml() ?>
 </div>
 <script>
 require(['prototype'], function(){
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
index 60450d7b66ba2..51808cab7f7a0 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/problem/list.phtml
@@ -7,12 +7,12 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
 
 <?php if ($block->getShowButtons()): ?>
 <div class="form-buttons">
-    <?php echo $block->getUnsubscribeButtonHtml(); ?>
-    <?php echo $block->getDeleteButtonHtml(); ?>
+    <?= $block->getUnsubscribeButtonHtml() ?>
+    <?= $block->getDeleteButtonHtml() ?>
 </div>
 <?php endif ?>
 <script>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
index adca1ee068691..eea865eac1f22 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
@@ -10,25 +10,25 @@
 
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?php echo $block->getBackButtonHtml() ?>
-    <?php echo $block->getPreviewButtonHtml(); ?>
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getPreviewButtonHtml() ?>
     <?php if (!$block->getIsPreview()): ?>
-        <?php echo $block->getResetButtonHtml() ?>
-        <?php echo $block->getSaveButtonHtml() ?>
+        <?= $block->getResetButtonHtml() ?>
+        <?= $block->getSaveButtonHtml() ?>
     <?php endif ?>
     <?php if ($block->getCanResume()): ?>
-        <?php echo $block->getResumeButtonHtml() ?>
+        <?= $block->getResumeButtonHtml() ?>
     <?php endif ?>
 </div>
 
-<form action="<?php echo $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="queue_edit_form">
-    <?php echo $block->getBlockHtml('formkey')?>
-    <?php echo $block->getChildHtml('form') ?>
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="queue_edit_form">
+    <?= $block->getBlockHtml('formkey') ?>
+    <?= $block->getChildHtml('form') ?>
 </form>
-<form action="<?php echo $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_queue_preview_form" target="_blank">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_queue_preview_form" target="_blank">
+    <?= $block->getBlockHtml('formkey') ?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?php /* @noEscape */ echo $block->getIsTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->getIsTextType() ? 1 : 2 ?>" />
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
         <input type="hidden" id="preview_id" name="id" value="" />
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
index 73a143dcf1fc4..902c6932f0ae1 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/list.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid'); ?>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml
index a3112a93fab8e..e0a88cdf53f15 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml
@@ -10,9 +10,9 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><?php echo $block->escapeHtml(__('Newsletter Message Preview')); ?></title>
+    <title><?= $block->escapeHtml(__('Newsletter Message Preview')) ?></title>
 </head>
 <body>
-    <?php echo $block->getChildHtml('content') ?>
+    <?= $block->getChildHtml('content') ?>
 </body>
 </html>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
index 55ec42f627e50..a405a6895b1d3 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
@@ -9,15 +9,15 @@
 /** @var \Magento\Newsletter\Block\Adminhtml\Subscriber $block */
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
 <?php if (count($block->getQueueAsOptions())>0 && $block->getShowQueueAdd()): ?>
 <div class="form-buttons">
     <select id="queueList" name="queue">
     <?php foreach ($block->getQueueAsOptions() as $_queue): ?>
-        <option value="<?php echo $block->escapeHtmlAttr($_queue['value']) ?>"><?php echo $block->escapeHtml($_queue['label']) ?> #<?php echo $block->escapeHtml($_queue['value']) ?></option>
+        <option value="<?= $block->escapeHtmlAttr($_queue['value']) ?>"><?= $block->escapeHtml($_queue['label']) ?> #<?= $block->escapeHtml($_queue['value']) ?></option>
     <?php endforeach; ?>
     </select>
-    <button type="button" class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?php echo $block->escapeHtml(__('Add to Queue')); ?></span></span></span></button>
+    <button type="button" class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?= $block->escapeHtml(__('Add to Queue')) ?></span></span></span></button>
 </div>
 <?php endif ?>
 <script>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
index 61a92f9528c34..eeca4fabd348d 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -11,18 +11,18 @@ use Magento\Framework\App\TemplateTypesInterface;
 /* @var $block \Magento\Newsletter\Block\Adminhtml\Template\Edit */
 
 ?>
-<form action="<?php echo $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="newsletter_template_edit_form">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= $block->escapeUrl($block->getSaveUrl()) ?>" method="post" id="newsletter_template_edit_form">
+    <?= $block->getBlockHtml('formkey') ?>
     <div class="no-display">
         <input type="hidden" id="change_flag_element" name="_change_type_flag" value="" />
-        <input type="hidden" id="save_as_flag" name="_save_as_flag" value="<?php echo $block->escapeHtmlAttr($block->getSaveAsFlag()) ?>" />
+        <input type="hidden" id="save_as_flag" name="_save_as_flag" value="<?= $block->escapeHtmlAttr($block->getSaveAsFlag()) ?>" />
     </div>
-    <?php /* @noEscape */ echo $block->getForm() ?>
+    <?= /* @noEscape */ $block->getForm() ?>
 </form>
-<form action="<?php echo $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_template_preview_form" target="_blank">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= $block->escapeUrl($block->getPreviewUrl()) ?>" method="post" id="newsletter_template_preview_form" target="_blank">
+    <?= $block->getBlockHtml('formkey') ?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?php /* @noEscape */ echo $block->isTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?= /* @noEscape */ $block->isTextType() ? 1 : 2 ?>" />
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
         <input type="hidden" id="preview_id" name="id" value="" />
@@ -87,7 +87,7 @@ require([
             var self = this;
 
             confirm({
-                content: "<?php echo $block->escapeJs($block->escapeHtml(__('Are you sure that you want to strip all tags?'))) ?>",
+                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure that you want to strip all tags?'))) ?>",
                 actions: {
                     confirm: function(){
                         if(self.isEditor()) {
@@ -141,8 +141,8 @@ require([
             if($F('code').blank() || $F('code')==templateControl.templateName) {
 
                 prompt({
-                    content: '<?php echo $block->escapeJs($block->escapeHtml(__('Please enter a new template name.'))) ?>',
-                    value: templateControl.templateName + '<?php echo $block->escapeJs(__(' Copy')) ?>',
+                    content: '<?= $block->escapeJs($block->escapeHtml(__('Please enter a new template name.'))) ?>',
+                    value: templateControl.templateName + '<?= $block->escapeJs(__(' Copy')) ?>',
                     actions: {
                         confirm: function(value) {
                             $('code').value = value;
@@ -176,9 +176,9 @@ require([
 
         preview: function() {
             if (this.typeChange) {
-                $('preview_type').value = <?php echo $block->escapeJs(TemplateTypesInterface::TYPE_TEXT) ?>;
+                $('preview_type').value = <?= $block->escapeJs(TemplateTypesInterface::TYPE_TEXT) ?>;
             } else {
-                $('preview_type').value = <?php echo $block->escapeJs($block->getTemplateType()) ?>;
+                $('preview_type').value = <?= $block->escapeJs($block->getTemplateType()) ?>;
             }
             if (this.isEditor() && tinyMCE.get(this.id)) {
                 tinyMCE.triggerSave();
@@ -200,10 +200,10 @@ require([
 
         deleteTemplate: function() {
             confirm({
-                content: "<?php echo $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>",
+                content: "<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to delete this template?'))) ?>",
                 actions: {
                     confirm: function() {
-                        window.location.href = '<?php echo $block->escapeUrl($block->getDeleteUrl()) ?>';
+                        window.location.href = '<?= $block->escapeUrl($block->getDeleteUrl()) ?>';
                     }
                 }
             });
@@ -219,7 +219,7 @@ require([
     };
 
     templateControl.init();
-    templateControl.templateName = "<?php echo $block->escapeJs($block->getJsTemplateName()) ?>";
+    templateControl.templateName = "<?= $block->escapeJs($block->getJsTemplateName()) ?>";
 //]]>
 
 });
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
index bb3f69ead1c2d..902c6932f0ae1 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/list.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/template/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/template/preview.phtml
index a3112a93fab8e..e0a88cdf53f15 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/preview.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/preview.phtml
@@ -10,9 +10,9 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><?php echo $block->escapeHtml(__('Newsletter Message Preview')); ?></title>
+    <title><?= $block->escapeHtml(__('Newsletter Message Preview')) ?></title>
 </head>
 <body>
-    <?php echo $block->getChildHtml('content') ?>
+    <?= $block->getChildHtml('content') ?>
 </body>
 </html>
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
index 751c2779a2336..9db4399d816d5 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -10,25 +10,25 @@
 
 ?>
 <div class="block newsletter">
-    <div class="title"><strong><?php /* @escapeNotVerified */ echo __('Newsletter') ?></strong></div>
+    <div class="title"><strong><?= /* @escapeNotVerified */ __('Newsletter') ?></strong></div>
     <div class="content">
         <form class="form subscribe"
             novalidate
-            action="<?php echo $block->escapeUrl($block->getFormActionUrl()) ?>"
+            action="<?= $block->escapeUrl($block->getFormActionUrl()) ?>"
             method="post"
             data-mage-init='{"validation": {"errorClass": "mage-error"}}'
             id="newsletter-validate-detail">
             <div class="field newsletter">
-                <label class="label" for="newsletter"><span><?php echo $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?></span></label>
+                <label class="label" for="newsletter"><span><?= $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?></span></label>
                 <div class="control">
                     <input name="email" type="email" id="newsletter"
-                                placeholder="<?php echo $block->escapeHtmlAttr(__('Enter your email address')) ?>"
+                                placeholder="<?= $block->escapeHtmlAttr(__('Enter your email address')) ?>"
                                 data-validate="{required:true, 'validate-email':true}"/>
                 </div>
             </div>
             <div class="actions">
-                <button class="action subscribe primary" title="<?php echo $block->escapeHtmlAttr(__('Subscribe')) ?>" type="submit">
-                    <span><?php echo $block->escapeHtml(__('Subscribe')) ?></span>
+                <button class="action subscribe primary" title="<?= $block->escapeHtmlAttr(__('Subscribe')) ?>" type="submit">
+                    <span><?= $block->escapeHtml(__('Subscribe')) ?></span>
                 </button>
             </div>
         </form>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
index d5803ce613bbd..e1ffd7bdaf7a8 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
@@ -12,10 +12,10 @@ $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?php /* @noEscape */ echo $methodCode ?>" style="display:none;">
+    <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display:none;">
         <li>
-            <div class="<?php /* @noEscape */ echo $methodCode ?>-instructions-content checkout-agreement-item-content">
-                <?php /* @noEscape */ echo nl2br($block->escapeHtml($instructions)) ?>
+            <div class="<?= /* @noEscape */ $methodCode ?>-instructions-content checkout-agreement-item-content">
+                <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
             </div>
         </li>
     </ul>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
index ea022e9bb450d..ac72b5f5707ea 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
@@ -13,10 +13,10 @@ $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?php /* @noEscape */ echo $methodCode ?>" style="display:none;">
+    <ul class="form-list checkout-agreements" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display:none;">
         <li>
-            <div class="<?php /* @noEscape */ echo $methodCode ?>-instructions-content checkout-agreement-item-content">
-                <?php /* @noEscape */ echo nl2br($block->escapeHtml($instructions)) ?>
+            <div class="<?= /* @noEscape */ $methodCode ?>-instructions-content checkout-agreement-item-content">
+                <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
             </div>
         </li>
     </ul>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
index 5c7526231757e..2a1de9df69ecd 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -9,15 +9,15 @@
  * @var $block \Magento\OfflinePayments\Block\Form\Checkmo
  */
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()) ?>" style="display:none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none">
     <?php if ($block->getMethod()->getPayableTo()): ?>
-        <label class="label"><span><?php echo $block->escapeHtml(__('Make Check payable to:')) ?></span></label> <?php echo $block->escapeHtml($block->getMethod()->getPayableTo()) ?>
+        <label class="label"><span><?= $block->escapeHtml(__('Make Check payable to:')) ?></span></label> <?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?>
     <?php endif; ?>
     <?php if ($block->getMethod()->getMailingAddress()): ?>
         <div class="admin__field">
-            <label class="admin__field-label"><span><?php echo $block->escapeHtml(__('Send Check to:')) ?></span></label>
+            <label class="admin__field-label"><span><?= $block->escapeHtml(__('Send Check to:')) ?></span></label>
             <div class="admin__field-control checkmo-mailing-address">
-                <?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
+                <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
             </div>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
index 2dbd1b8a3c7c8..d6ee0d53eaaae 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -9,13 +9,13 @@
  * @var $block \Magento\OfflinePayments\Block\Form\Purchaseorder
  */
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()) ?>" style="display: none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display: none">
     <div class="admin__field _required">
-        <label for="po_number" class="admin__field-label"><span><?php echo $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
+        <label for="po_number" class="admin__field-label"><span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
         <div class="admin__field-control">
             <input type="text" id="po_number" name="payment[po_number]"
-                   title="<?php echo $block->escapeHtml(__("Purchase Order Number")) ?>" class="required-entry admin__control-text"
-                   value="<?php /* @noEscape */ echo $block->getInfoData('po_number') ?>"/>
+                   title="<?= $block->escapeHtml(__("Purchase Order Number")) ?>" class="required-entry admin__control-text"
+                   value="<?= /* @noEscape */ $block->getInfoData('po_number') ?>"/>
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
index ccea56bc5dd94..0882619db8fe3 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
@@ -9,15 +9,15 @@
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
  */
 ?>
-<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
 <?php if ($block->getInfo()->getAdditionalInformation()): ?>
     <?php if ($block->getPayableTo()): ?>
-        <br /><?php echo $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+        <br /><?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
     <?php endif; ?>
     <?php if ($block->getMailingAddress()): ?>
-        <label><?php echo $block->escapeHtml(__('Send Check to:')) ?></label>
+        <label><?= $block->escapeHtml(__('Send Check to:')) ?></label>
         <div class="checkmo-mailing-address">
-            <?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+            <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
         </div>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
index 1556bea55da51..4d63577319d5b 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml
@@ -9,18 +9,18 @@
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
  */
 ?>
-<?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
     {{pdf_row_separator}}
 <?php if ($block->getInfo()->getAdditionalInformation()): ?>
     {{pdf_row_separator}}
     <?php if ($block->getPayableTo()): ?>
-        <?php echo $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
+        <?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
     <?php if ($block->getMailingAddress()): ?>
-        <?php echo $block->escapeHtml(__('Send Check to:')) ?>
+        <?= $block->escapeHtml(__('Send Check to:')) ?>
         {{pdf_row_separator}}
-        <?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+        <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
         {{pdf_row_separator}}
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml
index 1a7bf529898c6..4a6ea1c00b21c 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/purchaseorder.phtml
@@ -7,5 +7,5 @@
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
  */
 ?>
-<?php echo $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
+<?= $block->escapeHtml(__('Purchase Order Number: %1', $block->getInfo()->getPoNumber())) ?>
     {{pdf_row_separator}}
diff --git a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
index 0621f02ec6f8f..2a6de7f0cc356 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml
@@ -7,10 +7,10 @@
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
  */
 ?>
-<div class="order-payment-method-name"><?php echo $block->escapeHtml($block->getMethod()->getTitle()); ?></div>
+<div class="order-payment-method-name"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></div>
 <table class="data-table admin__table-secondary">
     <tr>
-        <th><?php echo $block->escapeHtml(__('Purchase Order Number')); ?>:</th>
-        <td><?php echo $block->escapeHtml($block->getInfo()->getPoNumber()); ?></td>
+        <th><?= $block->escapeHtml(__('Purchase Order Number')) ?>:</th>
+        <td><?= $block->escapeHtml($block->getInfo()->getPoNumber()) ?></td>
     </tr>
 </table>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
index 369559889193d..7c21047fbb90d 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
@@ -12,7 +12,7 @@ $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <div class="items <?php /* @noEscape */ echo $methodCode ?> instructions agreement checkout-agreement-item-content" id="payment_form_<?php /* @noEscape */ echo $methodCode ?>" style="display: none;">
-        <?php /* @noEscape */ echo nl2br($block->escapeHtml($instructions)) ?>
+    <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement checkout-agreement-item-content" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none;">
+        <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
index 6764213a6820c..f6f019bc84ce4 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
@@ -13,7 +13,7 @@ $instructions = $block->getInstructions();
 ?>
 <?php if ($instructions): ?>
     <?php $methodCode = $block->escapeHtml($block->getMethodCode());?>
-    <div class="items <?php /* @noEscape */ echo $methodCode ?> instructions agreement" id="payment_form_<?php /* @noEscape */ echo $methodCode ?>" style="display: none;">
-        <?php /* @noEscape */ echo nl2br($block->escapeHtml($instructions)) ?>
+    <div class="items <?= /* @noEscape */ $methodCode ?> instructions agreement" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none;">
+        <?= /* @noEscape */ nl2br($block->escapeHtml($instructions)) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
index 0aa5c9ab4b48e..de4b6ac66cf29 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
@@ -10,16 +10,16 @@
  */
 ?>
 <?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()): ?>
-    <dl class="items check payable" id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()) ?>" style="display:none;">
+    <dl class="items check payable" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none;">
         <?php if ($block->getMethod()->getPayableTo()): ?>
-            <dt class="title"><?php echo $block->escapeHtml(__('Make Check payable to:')) ?></dt>
-            <dd class="content"><?php echo $block->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
+            <dt class="title"><?= $block->escapeHtml(__('Make Check payable to:')) ?></dt>
+            <dd class="content"><?= $block->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
         <?php endif; ?>
         <?php if ($block->getMethod()->getMailingAddress()): ?>
-            <dt class="title"><?php echo $block->escapeHtml(__('Send Check to:')) ?></dt>
+            <dt class="title"><?= $block->escapeHtml(__('Send Check to:')) ?></dt>
             <dd class="content">
                 <address class="checkmo mailing address">
-                    <?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
+                    <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
                 </address>
             </dd>
         <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
index 82ceb36530cb7..5d04977ab3455 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
@@ -10,13 +10,13 @@
  */
 $methodCode = $block->escapeHtml($block->getMethodCode());
 ?>
-<fieldset class="fieldset items <?php /* @noEscape */ echo $methodCode ?>" id="payment_form_<?php /* @noEscape */ echo $methodCode ?>" style="display: none">
+<fieldset class="fieldset items <?= /* @noEscape */ $methodCode ?>" id="payment_form_<?= /* @noEscape */ $methodCode ?>" style="display: none">
     <div class="field number required">
-        <label for="po_number" class="label"><span><?php echo $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
+        <label for="po_number" class="label"><span><?= $block->escapeHtml(__('Purchase Order Number')) ?></span></label>
         <div class="control">
-            <input type="text" id="po_number" name="payment[po_number]" title="<?php echo $block->escapeHtml(__('Purchase Order Number')) ?>"
+            <input type="text" id="po_number" name="payment[po_number]" title="<?= $block->escapeHtml(__('Purchase Order Number')) ?>"
                    class="input-text required-entry"
-                   value="<?php echo $block->escapeHtml($block->getInfoData('po_number')) ?>" />
+                   value="<?= $block->escapeHtml($block->getInfoData('po_number')) ?>" />
         </div>
     </div>
 </fieldset>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
index fd03691c2163d..cf7496b7c566f 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
@@ -10,19 +10,19 @@
  */
 ?>
 <dl class="payment-method checkmemo">
-    <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
     <?php if ($block->getInfo()->getAdditionalInformation()): ?>
         <?php if ($block->getPayableTo()): ?>
             <dd class="content">
-                <strong><?php echo $block->escapeHtml(__('Make Check payable to')) ?></strong>
-                <?php echo $block->escapeHtml($block->getPayableTo()) ?>
+                <strong><?= $block->escapeHtml(__('Make Check payable to')) ?></strong>
+                <?= $block->escapeHtml($block->getPayableTo()) ?>
             </dd>
         <?php endif; ?>
         <?php if ($block->getMailingAddress()): ?>
             <dd class="content">
-                <strong><?php echo $block->escapeHtml(__('Send Check to')) ?></strong>
+                <strong><?= $block->escapeHtml(__('Send Check to')) ?></strong>
                 <address class="checkmo mailing address">
-                    <?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getMailingAddress())) ?>
+                    <?= /* @noEscape */ nl2br($block->escapeHtml($block->getMailingAddress())) ?>
                 </address>
             </dd>
         <?php endif; ?>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
index bb959b6b33e32..523c2f8e9c0b4 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
@@ -8,9 +8,9 @@
  */
 ?>
 <dl class="payment-method purchase order">
-    <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
     <dd class="content">
-        <strong><?php echo $block->escapeHtml(__('Purchase Order Number')) ?></strong>
-        <span class="number"><?php echo $block->escapeHtml($block->getInfo()->getPoNumber()) ?></span>
+        <strong><?= $block->escapeHtml(__('Purchase Order Number')) ?></strong>
+        <span class="number"><?= $block->escapeHtml($block->getInfo()->getPoNumber()) ?></span>
     </dd>
 </dl>
diff --git a/app/code/Magento/PageCache/view/frontend/templates/javascript.phtml b/app/code/Magento/PageCache/view/frontend/templates/javascript.phtml
index 464dbc7ae663d..8d3d97c5b005f 100644
--- a/app/code/Magento/PageCache/view/frontend/templates/javascript.phtml
+++ b/app/code/Magento/PageCache/view/frontend/templates/javascript.phtml
@@ -9,7 +9,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "pageCache": <?php /* @noEscape */ echo $block->getScriptOptions(); ?>
+            "pageCache": <?= /* @noEscape */ $block->getScriptOptions() ?>
         }
     }
 </script>
diff --git a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
index ef728fe1c6e77..52a280651da78 100644
--- a/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/PageCache/view/frontend/templates/js/components.phtml
@@ -8,4 +8,4 @@
 
 /** @var \Magento\Framework\View\Element\Js\Components $block */
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
index ea372971d0cbf..8e4127c4cbb11 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
@@ -13,54 +13,54 @@ $ccType = $block->getInfoData('cc_type');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?= /* @noEscape */ $code ?>"
           style="display:none">
     <div class="field-type admin__field _required">
-        <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_cc_type">
-            <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+        <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_type">
+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type" name="payment[cc_type]"
+            <select id="<?= /* @noEscape */ $code ?>_cc_type" name="payment[cc_type]"
                     class="required-entry validate-cc-type-select admin__control-select">
                 <option value=""></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                    <option value="<?php echo $block->escapeHtml($typeCode); ?>" <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($typeName); ?>
+                    <option value="<?= $block->escapeHtml($typeCode) ?>" <?php if ($typeCode == $ccType): ?>selected="selected"<?php endif ?>>
+                        <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <div class="field-number admin__field _required">
-        <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_cc_number">
-            <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+        <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_number">
+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="admin__field-control">
-            <input type="text" id="<?php /* @noEscape */ echo $code; ?>_cc_number" name="payment[cc_number]"
-                   title="<?php echo $block->escapeHtml(__('Credit Card Number')); ?>" class="admin__control-text validate-cc-number"
-                   value="<?php /* @noEscape */ echo $block->getInfoData('cc_number'); ?>"/>
+            <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number" name="payment[cc_number]"
+                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="admin__control-text validate-cc-number"
+                   value="<?= /* @noEscape */ $block->getInfoData('cc_number') ?>"/>
         </div>
     </div>
     <div class="field-date admin__field _required">
-        <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_expiration">
-            <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+        <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_expiration">
+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code ?>_expiration" name="payment[cc_exp_month]"
+            <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
                     class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                    <option value="<?php echo $block->escapeHtml($k); ?>"
+                    <option value="<?= $block->escapeHtml($k) ?>"
                             <?php if ($k == $ccExpMonth): ?>selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
-            <select id="<?php /* @noEscape */ echo $code ?>_expiration_yr" name="payment[cc_exp_year]"
+            <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year required-entry">
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
-                    <option value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : '' ?>"
+                    <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                             <?php if ($k == $ccExpYear): ?>selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -69,14 +69,14 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
 
     <?php if ($block->hasVerification()): ?>
         <div class="field-number required admin__field _required">
-            <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_cc_cid">
-                <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+            <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_cc_cid">
+                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
             <div class="admin__field-control">
-                <input type="text" title="<?php echo $block->escapeHtml(__('Card Verification Number')); ?>"
+                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
                        class="required-entry validate-cc-cvn admin__control-cvn admin__control-text"
-                       id="<?php /* @noEscape */ echo $code; ?>_cc_cid"
-                       name="payment[cc_cid]" value="<?php /* @noEscape */ echo $block->getInfoData('cc_cid') ?>"/>
+                       id="<?= /* @noEscape */ $code ?>_cc_cid"
+                       name="payment[cc_cid]" value="<?= /* @noEscape */ $block->getInfoData('cc_cid') ?>"/>
             </div>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
index f7a2ee7a2ab59..3c55e97ec580d 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
@@ -11,19 +11,19 @@
  */
 $specificInfo = $block->getSpecificInformation();
 ?>
-<?php echo $block->escapeHtml($block->getMethod()->getTitle()); ?>
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
 
 <?php if ($specificInfo): ?>
     <table class="data-table admin__table-secondary">
     <?php foreach ($specificInfo as $label => $value):?>
         <tr>
-            <th><?php echo $block->escapeHtml($label)?>:</th>
+            <th><?= $block->escapeHtml($label) ?>:</th>
             <td>
-                <?php /* @noEscape */ echo nl2br($block->escapeHtml(implode("\n", $block->getValueAsArray($value, true))));?>
+                <?= /* @noEscape */ nl2br($block->escapeHtml(implode("\n", $block->getValueAsArray($value, true)))) ?>
             </td>
         </tr>
     <?php endforeach; ?>
     </table>
 <?php endif;?>
 
-<?php echo $block->getChildHtml()?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
index 1d5896cf013e8..e95237cc82021 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
@@ -10,12 +10,12 @@
  * @see \Magento\Payment\Block\Info
  */
 ?>
-<p><?php echo $block->escapeHtml($block->getMethod()->getTitle()); ?></p>
+<p><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></p>
 <?php if ($block->getInstructions()): ?>
     <table>
         <tbody>
             <tr>
-                <td><?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getInstructions())); ?></td>
+                <td><?= /* @noEscape */ nl2br($block->escapeHtml($block->getInstructions())) ?></td>
             </tr>
         </tbody>
     </table>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
index 28f922aba2305..7acac62f65d38 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml
@@ -10,14 +10,14 @@
  * @var \Magento\Payment\Block\Info $block
  */
 ?>
-<?php echo $block->escapeHtml($block->getMethod()->getTitle()); ?>{{pdf_row_separator}}
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()):?>
     <?php foreach ($specificInfo as $label => $value):?>
-        <?php echo $block->escapeHtml($label) ?>:
-        <?php echo $block->escapeHtml(implode(' ', $block->getValueAsArray($value)));?>
+        <?= $block->escapeHtml($label) ?>:
+        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
         {{pdf_row_separator}}
     <?php endforeach; ?>
 <?php endif;?>
 
-<?php echo $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())); ?>
+<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
index 6c0e586115cb9..ad24b113ffdea 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/substitution.phtml
@@ -11,5 +11,5 @@
 ?>
 <div>
     <?php $block->escapeHtml($block->getMethod()->getTitle());?>
-    <?php echo $block->escapeHtml(__(' is not available. You still can process offline actions.')); ?>
+    <?= $block->escapeHtml(__(' is not available. You still can process offline actions.')) ?>
 </div>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
index f192e34a1bbed..5b65bbaa3d9b7 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
@@ -14,44 +14,44 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
-<iframe id="<?php /* @noEscape */ echo $code; ?>-transparent-iframe"
-        data-container="<?php /* @noEscape */ echo $code; ?>-transparent-iframe"
+<iframe id="<?= /* @noEscape */ $code ?>-transparent-iframe"
+        data-container="<?= /* @noEscape */ $code ?>-transparent-iframe"
         allowtransparency="true"
         frameborder="0"
         name="iframeTransparent"
         style="display: none; width: 100%; background-color: transparent;"
-        src="<?php echo $block->escapeUrl($block->getViewFileUrl('blank.html')); ?>"></iframe>
+        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
 <fieldset
-    id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+    id="payment_form_<?= /* @noEscape */ $code ?>"
     class="admin__fieldset"
     data-mage-init='{
      "transparent":{
-        "controller":"<?php echo $block->escapeHtml($block->getRequest()->getControllerName()); ?>",
-        "gateway":"<?php /* @noEscape */ echo $code; ?>",
-        "dateDelim":"<?php echo $block->escapeHtml($block->getDateDelim()); ?>",
-        "cardFieldsMap":<?php echo $block->escapeHtml($block->getCardFieldsMap()); ?>,
-        "orderSaveUrl":"<?php echo $block->escapeUrl($block->getOrderUrl()); ?>",
-        "cgiUrl":"<?php echo $block->escapeUrl($block->getCgiUrl()); ?>",
-        "expireYearLength":"<?php echo $block->escapeHtml($block->getMethodConfigData('cc_year_length')); ?>",
-        "nativeAction":"<?php echo $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])); ?>"
+        "controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
+        "gateway":"<?= /* @noEscape */ $code ?>",
+        "dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
+        "cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
+        "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
+        "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
+        "expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
+        "nativeAction":"<?= $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])) ?>"
       }, "validation":[]}'
     style="display: none;">
     <div class="admin__field _required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_type" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-type"
+            <select id="<?= /* @noEscape */ $code ?>_cc_type"
+                    data-container="<?= /* @noEscape */ $code ?>-cc-type"
                     name="payment[cc_type]"
-                    data-validate='{required:true, "validate-cc-type-select":"#<?php /* @noEscape */ echo $code; ?>_cc_number"}'
+                    data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
                     class="admin__control-select">
-                <option value=""><?php echo $block->escapeHtml(__('Please Select')); ?></option>
+                <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option
-                        value="<?php echo $block->escapeHtml($typeCode); ?>"<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($typeName); ?>
+                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
+                        <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -59,75 +59,75 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     </div>
 
     <div class="admin__field _required field-number">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_number" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_number" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <input type="text" id="<?php /* @noEscape */ echo $code; ?>_cc_number"
-                   data-container="<?php /* @noEscape */ echo $code; ?>-cc-number"
-                   name="payment[cc_number]" title="<?php echo $block->escapeHtml(__('Credit Card Number')); ?>"
+            <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number"
+                   data-container="<?= /* @noEscape */ $code ?>-cc-number"
+                   name="payment[cc_number]" title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
                    class="admin__control-text"
                    value=""
                    data-validate='{
                        "required-number":true,
-                       "validate-cc-number":"#<?php /* @noEscape */ echo $code; ?>_cc_type",
-                       "validate-cc-type":"#<?php /* @noEscape */ echo $code; ?>_cc_type"
+                       "validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
+                       "validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
                    }'
                    autocomplete="off"/>
         </div>
     </div>
 
-    <div class="admin__field _required field-date" id="<?php /* @noEscape */ echo $code; ?>_cc_type_exp_div">
-        <label for="<?php /* @noEscape */ echo $code; ?>_expiration" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+    <div class="admin__field _required field-date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
+        <label for="<?= /* @noEscape */ $code ?>_expiration" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_expiration" name="payment[cc_exp_month]"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-month"
+            <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
+                    data-container="<?= /* @noEscape */ $code ?>-cc-month"
                     class="admin__control-select admin__control-select-month"
-                    data-validate='{required:true, "validate-cc-exp":"#<?php /* @noEscape */ echo $code; ?>_expiration_yr"}'>
+                    data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
-                        value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : ''; ?>"
+                        value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                         <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
 
-            <select id="<?php /* @noEscape */ echo $code; ?>_expiration_yr" name="payment[cc_exp_year]"
+            <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-year" data-validate='{required:true}'>
+                    data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
-                        value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : '' ?>"
+                        value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                         <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <?php if ($block->hasVerification()): ?>
-        <div class="admin__field _required field-cvv" id="<?php /* @noEscape */ echo $code; ?>_cc_type_cvv_div">
-            <label for="<?php /* @noEscape */ echo $code; ?>_cc_cid" class="admin__field-label">
-                <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+        <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
+            <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
+                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
 
             <div class="admin__field-control">
-                <input type="text" title="<?php echo $block->escapeHtml(__('Card Verification Number')); ?>"
-                       data-container="<?php /* @noEscape */ echo $code; ?>-cc-cvv"
+                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                       data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
                        class="admin__control-text cvv"
-                       id="<?php /* @noEscape */ echo $code; ?>_cc_cid" name="payment[cc_cid]"
+                       id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
                        value=""
-                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @noEscape */ echo $code; ?>_cc_type"}'
+                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'
                        autocomplete="off"/>
             </div>
         </div>
     <?php endif; ?>
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </fieldset>
 
 <script>
@@ -135,6 +135,6 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
      * Disable card server validation in admin
      */
     require(["Magento_Sales/order/create/form"], function () {
-        order.addExcludedPaymentMethod('<?php /* @noEscape */ echo $code; ?>');
+        order.addExcludedPaymentMethod('<?= /* @noEscape */ $code ?>');
     });
 </script>
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
index 996ebfd5d2626..8ef51d4794f00 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
@@ -15,13 +15,13 @@ $params = $block->getParams();
 <head>
 <script>
 <?php if (isset($params['redirect'])): ?>
-    window.location="<?php echo $block->escapeUrl($params['redirect']); ?>";
+    window.location="<?= $block->escapeUrl($params['redirect']) ?>";
 <?php elseif (isset($params['redirect_parent'])): ?>
-    window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']); ?>";
+    window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
 <?php elseif (isset($params['error_msg'])): ?>
-    window.top.alert(<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']); ?>);
+    window.top.alert(<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
 <?php elseif (isset($params['order_success'])): ?>
-    window.top.location = "<?php echo $block->escapeUrl($params['order_success']); ?>";
+    window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
 <?php else: ?>
     var require = window.top.require;
     require(['jquery'], function($) {
diff --git a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
index 87f5704c8650c..636779667f2b4 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
@@ -11,6 +11,6 @@
  * @see \Magento\Payment\Block\Transparent\Info
  */
 ?>
-<fieldset id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()); ?>" style="display:none" class="fieldset items redirect">
-    <div><?php echo $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')); ?></div>
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none" class="fieldset items redirect">
+    <div><?= $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?></div>
 </fieldset>
diff --git a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
index a4c211af04a79..926139e60c958 100644
--- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
@@ -13,60 +13,60 @@ $ccType = $block->getInfoData('cc_type');
 $ccExpMonth = $block->getInfoData('cc_exp_month');
 $ccExpYear = $block->getInfoData('cc_exp_year');
 ?>
-<fieldset class="fieldset payment items ccard <?php /* @noEscape */ echo $code; ?>"
-          id="payment_form_<?php /* @noEscape */ echo $code; ?>" style="display: none;">
+<fieldset class="fieldset payment items ccard <?= /* @noEscape */ $code ?>"
+          id="payment_form_<?= /* @noEscape */ $code ?>" style="display: none;">
     <div class="field type required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_type" class="label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_type" class="label">
+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
         <div class="control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type"
+            <select id="<?= /* @noEscape */ $code ?>_cc_type"
                     data-mage-init='{
-                        "creditCardType":{"creditCardTypeContainer":"#<?php /* @noEscape */ echo $code; ?>_cc_type_ss_div"}
+                        "creditCardType":{"creditCardTypeContainer":"#<?= /* @noEscape */ $code ?>_cc_type_ss_div"}
                     }'
                     name="payment[cc_type]" data-validate='{
                         required:true,
-                        "validate-cc-type-select":"#<?php /* @noEscape */ echo $code; ?>_cc_number"
+                        "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
                     }'
                     class="select">
-                <option value=""><?php echo $block->escapeHtml(__('--Please Select--')); ?></option>
+                <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
             <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                <option value="<?php echo $block->escapeHtml($typeCode); ?>"
+                <option value="<?= $block->escapeHtml($typeCode) ?>"
                     <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-                    <?php echo $block->escapeHtml($typeName); ?>
+                    <?= $block->escapeHtml($typeName) ?>
                 </option>
             <?php endforeach; ?>
             </select>
         </div>
     </div>
     <div class="field number required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_number" class="label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_number" class="label">
+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
         <div class="control">
-            <input type="number" id="<?php /* @noEscape */ echo $code; ?>_cc_number" name="payment[cc_number]"
-                   title="<?php echo $block->escapeHtml(__('Credit Card Number')); ?>" class="input-text" value=""
+            <input type="number" id="<?= /* @noEscape */ $code ?>_cc_number" name="payment[cc_number]"
+                   title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="input-text" value=""
                    data-validate='{
                        "required-number":true,
-                       "validate-cc-number":"#<?php /* @noEscape */ echo $code; ?>_cc_type",
-                       "validate-cc-type":"#<?php /* @noEscape */ echo $code; ?>_cc_type"
+                       "validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
+                       "validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
                    }'/>
         </div>
     </div>
-    <div class="field date required" id="<?php /* @noEscape */ echo $code; ?>_cc_type_exp_div">
-        <label for="<?php /* @noEscape */ echo $code; ?>_expiration" class="label">
-            <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+    <div class="field date required" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
+        <label for="<?= /* @noEscape */ $code ?>_expiration" class="label">
+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
         <div class="control">
             <div class="fields group group-2">
                 <div class="field no-label month">
                     <div class="control">
-                        <select id="<?php /* @noEscape */ echo $code; ?>_expiration" name="payment[cc_exp_month]" class="select month"
-                                data-validate='{required:true, "validate-cc-exp":"#<?php /* @noEscape */ echo $code; ?>_expiration_yr"}'>
+                        <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]" class="select month"
+                                data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : ''; ?>"
+                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                                     <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                                    <?php echo $block->escapeHtml($v); ?>
+                                    <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach; ?>
                         </select>
@@ -74,12 +74,12 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
                 </div>
                 <div class="field no-label year">
                     <div class="control">
-                        <select id="<?php /* @noEscape */ echo $code; ?>_expiration_yr" name="payment[cc_exp_year]"
+                        <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                                 class="select year" data-validate='{required:true}'>
                             <?php foreach ($block->getCcYears() as $k => $v): ?>
-                                <option value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : ''; ?>
+                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>
                                 "<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
-                                    <?php echo $block->escapeHtml($v); ?>
+                                    <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach; ?>
                         </select>
@@ -89,25 +89,25 @@ $ccExpYear = $block->getInfoData('cc_exp_year');
         </div>
     </div>
     <?php if ($block->hasVerification()): ?>
-    <div class="field cvv required" id="<?php /* @noEscape */ echo $code; ?>_cc_type_cvv_div">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_cid" class="label">
-            <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+    <div class="field cvv required" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
+        <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
+            <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
         </label>
         <div class="control">
-            <input type="number" title="<?php echo $block->escapeHtml(__('Card Verification Number')); ?>"
-                   class="input-text cvv" id="<?php /* @noEscape */ echo $code; ?>_cc_cid" name="payment[cc_cid]" value=""
-                   data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @noEscape */ echo $code; ?>_cc_type"}' />
+            <input type="number" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                   class="input-text cvv" id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
+                   data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}' />
             <?php $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' .
                 $block->escapeHtml(__('Card Verification Number Visual Reference')) .
                 '\" title=\"' . $block->escapeHtml(__('Card Verification Number Visual Reference')) . '\" />'; ?>
             <div class="note">
-                <a href="#" class="action cvv" title="<?php echo $block->escapeHtml(__('What is this?')); ?>"
-                   data-mage-init='{"tooltip": {"content": "<?php /* @noEscape */ echo $content; ?>"}}'>
-                    <span><?php echo $block->escapeHtml(__('What is this?')); ?></span>
+                <a href="#" class="action cvv" title="<?= $block->escapeHtml(__('What is this?')) ?>"
+                   data-mage-init='{"tooltip": {"content": "<?= /* @noEscape */ $content ?>"}}'>
+                    <span><?= $block->escapeHtml(__('What is this?')) ?></span>
                 </a>
             </div>
         </div>
     </div>
     <?php endif; ?>
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </fieldset>
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
index 9f061669dc543..a6311b8ca0de6 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
@@ -14,16 +14,16 @@ $specificInfo = $block->getSpecificInformation();
 $title = $block->escapeHtml($block->getMethod()->getTitle());
 ?>
 <dl class="payment-method">
-    <dt class="title"><?php /* @noEscape */ echo $title; ?></dt>
+    <dt class="title"><?= /* @noEscape */ $title ?></dt>
 <?php if ($specificInfo):?>
     <dd class="content">
         <table class="data table">
-            <caption class="table-caption"><?php /* @noEscape */ echo $title; ?></caption>
+            <caption class="table-caption"><?= /* @noEscape */ $title ?></caption>
             <?php foreach ($specificInfo as $label => $value):?>
                 <tr>
-                    <th scope="row"><?php echo $block->escapeHtml($label)?></th>
+                    <th scope="row"><?= $block->escapeHtml($label) ?></th>
                     <td>
-                        <?php /* @noEscape */ echo nl2br($block->escapeHtml(implode("\n", $block->getValueAsArray($value, true))));?>
+                        <?= /* @noEscape */ nl2br($block->escapeHtml(implode("\n", $block->getValueAsArray($value, true)))) ?>
                     </td>
                 </tr>
             <?php endforeach; ?>
@@ -31,4 +31,4 @@ $title = $block->escapeHtml($block->getMethod()->getTitle());
     </dd>
 <?php endif;?>
 </dl>
-<?php echo $block->getChildHtml()?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
index 36605ad2ea614..653d0502c6354 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
@@ -11,8 +11,8 @@
  */
 ?>
 <dl class="payment-method">
-    <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
+    <dt class="title"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
 <?php if ($block->getInstructions()): ?>
-    <dd class="content"><?php /* @noEscape */ echo nl2br($block->escapeHtml($block->getInstructions())); ?></dd>
+    <dd class="content"><?= /* @noEscape */ nl2br($block->escapeHtml($block->getInstructions())) ?></dd>
 <?php endif; ?>
 </dl>
diff --git a/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml b/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
index 28f922aba2305..7acac62f65d38 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/pdf/default.phtml
@@ -10,14 +10,14 @@
  * @var \Magento\Payment\Block\Info $block
  */
 ?>
-<?php echo $block->escapeHtml($block->getMethod()->getTitle()); ?>{{pdf_row_separator}}
+<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()):?>
     <?php foreach ($specificInfo as $label => $value):?>
-        <?php echo $block->escapeHtml($label) ?>:
-        <?php echo $block->escapeHtml(implode(' ', $block->getValueAsArray($value)));?>
+        <?= $block->escapeHtml($label) ?>:
+        <?= $block->escapeHtml(implode(' ', $block->getValueAsArray($value))) ?>
         {{pdf_row_separator}}
     <?php endforeach; ?>
 <?php endif;?>
 
-<?php echo $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())); ?>
+<?= $block->escapeHtml(implode('{{pdf_row_separator}}', $block->getChildPdfAsArray())) ?>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
index 39030452251b0..47390e321f6d4 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
@@ -17,78 +17,78 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
-<iframe width="0" height="0" id="<?php /* @noescape */ echo $code; ?>-transparent-iframe"
-        data-container="<?php /* @noEscape */ echo $code; ?>-transparent-iframe" allowtransparency="true"
+<iframe width="0" height="0" id="<?= /* @noescape */ $code ?>-transparent-iframe"
+        data-container="<?= /* @noEscape */ $code ?>-transparent-iframe" allowtransparency="true"
         frameborder="0"  name="iframeTransparent" style="display:none;width:100%;background-color:transparent"
-        src="<?php echo $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
+        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
 <form class="form" id="co-transparent-form" action="#" method="post" data-mage-init='{
     "transparent":{
-        "controller":"<?php echo $block->escapeHtml($block->getRequest()->getControllerName()); ?>",
-        "gateway":"<?php /* @noEscape */ echo $code; ?>",
-        "orderSaveUrl":"<?php echo $block->escapeUrl($block->getOrderUrl()); ?>",
-        "cgiUrl":"<?php echo $block->escapeUrl($block->getCgiUrl()); ?>",
-        "dateDelim":"<?php echo $block->escapeHtml($block->getDateDelim()); ?>",
-        "cardFieldsMap":<?php echo $block->escapeHtml($block->getCardFieldsMap()); ?>,
-        "nativeAction":"<?php echo $block->escapeUrl($block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])); ?>"
+        "controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
+        "gateway":"<?= /* @noEscape */ $code ?>",
+        "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
+        "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
+        "dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
+        "cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
+        "nativeAction":"<?= $block->escapeUrl($block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()])) ?>"
     }, "validation":[]}'>
-    <fieldset class="fieldset ccard <?php /* @noEscape */ echo $code; ?>" id="payment_form_<?php /* @noEscape */ echo $code; ?>">
+    <fieldset class="fieldset ccard <?= /* @noEscape */ $code ?>" id="payment_form_<?= /* @noEscape */ $code ?>">
         <legend class="legend">
-            <span><?php echo $block->escapeHtml(__('Credit Card Information')); ?></span>\
+            <span><?= $block->escapeHtml(__('Credit Card Information')) ?></span>\
         </legend><br />
         <div class="field required type">
-            <label for="<?php /* @noEscape */ echo $code;?>_cc_type" class="label">
-                <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+            <label for="<?= /* @noEscape */ $code ?>_cc_type" class="label">
+                <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
             </label>
             <div class="control">
-                <select id="<?php /* @noEscape */ echo $code; ?>_cc_type" data-container="<?php /* @noEscape */ echo $code; ?>-cc-type"
+                <select id="<?= /* @noEscape */ $code ?>_cc_type" data-container="<?= /* @noEscape */ $code ?>-cc-type"
                         name="payment[cc_type]"
                         data-validate='{
                             required:true,
-                            "validate-cc-type-select":"#<?php /* @noEscape */ echo $code; ?>_cc_number"
+                            "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"
                         }'>
-                    <option value=""><?php echo $block->escapeHtml(__('--Please Select--'));?></option>
+                    <option value=""><?= $block->escapeHtml(__('--Please Select--')) ?></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
-                    <option value="<?php echo $block->escapeHtml($typeCode); ?>"
+                    <option value="<?= $block->escapeHtml($typeCode) ?>"
                         <?php if ($typeCode == $ccType): ?> selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($typeName); ?></option>
+                        <?= $block->escapeHtml($typeName) ?></option>
                 <?php endforeach ?>
                 </select>
             </div>
         </div>
         <div class="field required number">
-            <label for="<?php /* @noEscape */ echo $code; ?>_cc_number" class="label">
-                <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+            <label for="<?= /* @noEscape */ $code ?>_cc_number" class="label">
+                <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
             </label>
             <div class="control">
-                <input type="number" id="<?php /* @noEscape */ echo $code; ?>_cc_number"
-                       data-container="<?php /* @noEscape */ echo $code; ?>-cc-number" name="payment[cc_number]"
-                       title="<?php echo $block->escapeHtml(__('Credit Card Number')); ?>" class="input-text" value=""
+                <input type="number" id="<?= /* @noEscape */ $code ?>_cc_number"
+                       data-container="<?= /* @noEscape */ $code ?>-cc-number" name="payment[cc_number]"
+                       title="<?= $block->escapeHtml(__('Credit Card Number')) ?>" class="input-text" value=""
                        data-validate='{
                            "required-number":true,
-                           "validate-cc-number":"#<?php /* @noEscape */ echo $code; ?>_cc_type",
-                           "validate-cc-type":"#<?php /* @noEscape */ echo $code; ?>_cc_type"
+                           "validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
+                           "validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
                        }'
                        autocomplete="off"/>
             </div>
         </div>
-        <div class="field required date" id="<?php /* @noEscape */ echo $code; ?>_cc_type_exp_div">
-            <label for="<?php /* @noEscape */ echo $code; ?>_expiration" class="label">
-                <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+        <div class="field required date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
+            <label for="<?= /* @noEscape */ $code ?>_expiration" class="label">
+                <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
             </label>
             <div class="control">
                 <div class="fields group group-2">
                     <div class="field no-label month">
                         <div class="control">
-                            <select id="<?php /* @noEscape */ echo $code; ?>_expiration" name="payment[cc_exp_month]"
-                                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-month" class="month"
+                            <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
+                                    data-container="<?= /* @noEscape */ $code ?>-cc-month" class="month"
                                     data-validate='{
                                         required:true,
-                                        "validate-cc-exp":"#<?php /* @noEscape */ echo $code; ?>_expiration_yr"
+                                        "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"
                                     }'>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : '' ?>"
+                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                                     <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                                    <?php echo $block->escapeHtml($v); ?>
+                                    <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach ?>
                             </select>
@@ -96,13 +96,13 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
                     </div>
                     <div class="field no-label year">
                         <div class="control">
-                            <select id="<?php /* @noEscape */ echo $code; ?>_expiration_yr" name="payment[cc_exp_year]"
-                                    class="year" data-container="<?php /* @noEscape */ echo $code; ?>-cc-year"
+                            <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
+                                    class="year" data-container="<?= /* @noEscape */ $code ?>-cc-year"
                                     data-validate='{required:true}'>
                             <?php foreach ($block->getCcYears() as $k => $v): ?>
-                                <option value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : ''; ?>"
+                                <option value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                                     <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif; ?>>
-                                    <?php echo $block->escapeHtml($v); ?>
+                                    <?= $block->escapeHtml($v) ?>
                                 </option>
                             <?php endforeach ?>
                             </select>
@@ -112,29 +112,29 @@ $content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') .
             </div>
         </div>
         <?php if ($block->hasVerification()): ?>
-        <div class="field required cvv" id="<?php /* @noEscape */ echo $code; ?>_cc_type_cvv_div">
-            <label for="<?php /* @noEscape */ echo $code; ?>_cc_cid" class="label">
-                <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+        <div class="field required cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
+            <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="label">
+                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
             <div class="control">
-                <input type="number" title="<?php echo $block->escapeHtml(__('Card Verification Number')); ?>"
-                       data-container="<?php /* @noEscape */ echo $code; ?>-cc-cvv" class="input-text cvv"
-                       id="<?php /* @noEscape */ echo $code; ?>_cc_cid" name="payment[cc_cid]" value=""
+                <input type="number" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                       data-container="<?= /* @noEscape */ $code ?>-cc-cvv" class="input-text cvv"
+                       id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]" value=""
                        data-validate='{
                            "required-number":true,
-                           "validate-cc-cvn":"#<?php /* @noEscape */ echo $code;?>_cc_type"
+                           "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"
                        }' autocomplete="off"/>
                 <div class="note">
-                    <a href="#" id="<?php /* @noEscape */ echo $code; ?>-cvv-what-is-this" class="action cvv"
-                       title="<?php echo $block->escapeHtml(__('What is this?'));?>" data-mage-init='{
-                           "tooltip": {"content": "<?php /* @noEscape */ echo $content; ?>"}
+                    <a href="#" id="<?= /* @noEscape */ $code ?>-cvv-what-is-this" class="action cvv"
+                       title="<?= $block->escapeHtml(__('What is this?')) ?>" data-mage-init='{
+                           "tooltip": {"content": "<?= /* @noEscape */ $content ?>"}
                        }'>
-                        <span><?php echo $block->escapeHtml(__('What is this?')); ?></span>
+                        <span><?= $block->escapeHtml(__('What is this?')) ?></span>
                     </a>
                 </div>
             </div>
         </div>
         <?php endif; ?>
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </fieldset>
 </form>
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
index 153f9c5102920..7141969285aa0 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -14,7 +14,7 @@ $params = $block->getParams();
     <head>
         <script>
         <?php if (isset($params['redirect'])): ?>
-            window.location="<?php echo $block->escapeUrl($params['redirect']); ?>";
+            window.location="<?= $block->escapeUrl($params['redirect']) ?>";
         <?php elseif (isset($params['redirect_parent'])): ?>
             var require = window.top.require;
             require(
@@ -24,7 +24,7 @@ $params = $block->getParams();
                 function($) {
                     var parent = window.top;
                     $(parent).trigger('clearTimeout');
-                    parent.location="<?php echo $block->escapeUrl($params['redirect_parent']); ?>";
+                    parent.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
                 }
             );
         <?php elseif (isset($params['error_msg'])): ?>
@@ -44,7 +44,7 @@ $params = $block->getParams();
                 }
             );
         <?php elseif (isset($params['order_success'])): ?>
-            window.top.location = "<?php echo $block->escapeUrl($params['order_success']); ?>";
+            window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
         <?php else: ?>
             var require = window.top.require;
             require(
diff --git a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
index a1bc58270bced..9304f24a3b4b1 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
@@ -11,8 +11,8 @@
  * @see \Magento\Payment\Block\Transparent\Info
  */
 ?>
-<fieldset id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()); ?>" style="display:none" class="fieldset items redirect">
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none" class="fieldset items redirect">
     <div>
-        <?php echo $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')); ?>
+        <?= $block->escapeHtml(__('We\'ll ask for your payment details before you place an order.')) ?>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
index 806b009774c39..a474be1e8b881 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/form.phtml
@@ -8,19 +8,19 @@
 /** @var \Magento\Paypal\Block\Adminhtml\Billing\Agreement\View\Form $block */
 ?>
 <?php $code = $block->escapeHtml($block->getMethodCode()) ?>
-<fieldset class="form-list" id="payment_form_<?php /* @noEscape */ echo $code; ?>" style="display:none;">
+<fieldset class="form-list" id="payment_form_<?= /* @noEscape */ $code ?>" style="display:none;">
     <div class="admin__field _required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_ba_agreement_id" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Billing Agreement')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_ba_agreement_id" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Billing Agreement')) ?></span>
         </label>
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_ba_agreement_id"
-                    name="payment[<?php echo $block->escapeHtml($block->getTransportBAId()); ?>]"
+            <select id="<?= /* @noEscape */ $code ?>_ba_agreement_id"
+                    name="payment[<?= $block->escapeHtml($block->getTransportBAId()) ?>]"
                     class="required-entry admin__control-select">
-                <option value=""><?php echo $block->escapeHtml(__('Please Select')); ?></option>
+                <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
                 <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-                    <option value="<?php echo $block->escapeHtml($id); ?>">
-                        <?php echo $block->escapeHtml($referenceId); ?>
+                    <option value="<?= $block->escapeHtml($id) ?>">
+                        <?= $block->escapeHtml($referenceId) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/view/tab/info.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/view/tab/info.phtml
index cbd6e5e7a6fa8..96c937a9967aa 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/view/tab/info.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/billing/agreement/view/tab/info.phtml
@@ -7,34 +7,34 @@
 ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo $block->escapeHtml(__('General Information')); ?></span>
+        <span class="title"><?= $block->escapeHtml(__('General Information')) ?></span>
     </div>
     <div class="admin__page-section-content log-details">
         <table class="data-table admin__table-secondary order-billing-agreement-table">
             <tbody>
                 <tr>
-                    <th><?php echo $block->escapeHtml(__('Reference ID')); ?></th>
-                    <td><?php echo $block->escapeHtml($block->getReferenceId()); ?></td>
+                    <th><?= $block->escapeHtml(__('Reference ID')) ?></th>
+                    <td><?= $block->escapeHtml($block->getReferenceId()) ?></td>
                 </tr>
                 <tr>
-                    <th><?php echo $block->escapeHtml(__('Customer')); ?></th>
+                    <th><?= $block->escapeHtml(__('Customer')) ?></th>
                     <td>
-                        <a href="<?php echo $block->escapeUrl($block->getCustomerUrl()); ?>">
-                            <?php echo $block->escapeHtml($block->getCustomerEmail()); ?>
+                        <a href="<?= $block->escapeUrl($block->getCustomerUrl()) ?>">
+                            <?= $block->escapeHtml($block->getCustomerEmail()) ?>
                         </a>
                     </td>
                 </tr>
                 <tr>
-                    <th><?php echo $block->escapeHtml(__('Status')); ?></th>
-                    <td><?php echo $block->escapeHtml($block->getStatus()); ?></td>
+                    <th><?= $block->escapeHtml(__('Status')) ?></th>
+                    <td><?= $block->escapeHtml($block->getStatus()) ?></td>
                 </tr>
                 <tr>
-                    <th><?php echo $block->escapeHtml(__('Created At')); ?></th>
-                    <td><?php echo $block->escapeHtml($block->getCreatedAt()); ?></td>
+                    <th><?= $block->escapeHtml(__('Created At')) ?></th>
+                    <td><?= $block->escapeHtml($block->getCreatedAt()) ?></td>
                 </tr>
                 <tr>
-                    <th><?php echo $block->escapeHtml(__('Updated At')); ?></th>
-                    <td><?php echo $block->escapeHtml($block->getUpdatedAt()); ?></td>
+                    <th><?= $block->escapeHtml(__('Updated At')) ?></th>
+                    <td><?= $block->escapeHtml($block->getUpdatedAt()) ?></td>
                 </tr>
             </tbody>
         </table>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
index 324ca5fb32fdc..74c020e4d5e8a 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
@@ -13,21 +13,21 @@ $id = $block->escapeHtml($block->getData('id'));
 ?>
 <div data-mage-init='{
         "Magento_Paypal/js/payflowpro/vault": {
-            "container": "payment_<?php /* @noEscape */ echo $id; ?>",
-            "publicHash": "<?php echo $block->escapeHtml(
+            "container": "payment_<?= /* @noEscape */ $id ?>",
+            "publicHash": "<?= $block->escapeHtml(
                                 $block->getData(TokenUiComponentProviderInterface::COMPONENT_PUBLIC_HASH)
                             ); ?>"
         }
-    }' id="payment_<?php /* @noEscape */ echo $id;?>" class="admin__field">
+    }' id="payment_<?= /* @noEscape */ $id ?>" class="admin__field">
     <div class="admin__field-control control">
-        <input type="radio" id="token_switcher_<?php /* @noEscape */ echo $id; ?>" name="payment[token_switcher]"/>
-        <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
-             width="<?php echo $block->escapeHtml($icon['width']); ?>"
-             height="<?php echo $block->escapeHtml($icon['height']); ?>"
+        <input type="radio" id="token_switcher_<?= /* @noEscape */ $id ?>" name="payment[token_switcher]"/>
+        <img src="<?= $block->escapeUrl($icon['url']) ?>"
+             width="<?= $block->escapeHtml($icon['width']) ?>"
+             height="<?= $block->escapeHtml($icon['height']) ?>"
              class="payment-icon" >
-        <span><?php echo $block->escapeHtml(__('ending'));?></span>
-        <span><?php echo $block->escapeHtml($details['cc_last_4']); ?></span>
-        (<span><?php echo $block->escapeHtml(__('expires'));?></span>:
+        <span><?= $block->escapeHtml(__('ending')) ?></span>
+        <span><?= $block->escapeHtml($details['cc_last_4']) ?></span>
+        (<span><?= $block->escapeHtml(__('expires')) ?></span>:
         <span><?php /* @noEscape */ echo $block->escapeHtml(
                 $details['cc_exp_month'] . "/" . $details['cc_exp_year']
             ); ?></span>)
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
index bcbcc73faf60f..64017a72b94dc 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/payment/form/billing/agreement.phtml
@@ -9,23 +9,23 @@
 ?>
 <?php $code = $block->escapeHtml($block->getMethodCode()) ?>
 <fieldset class="admin__fieldset payment-method form-list"
-          id="payment_form_<?php /* @noEscape */ echo $code; ?>" style="display:none;">
+          id="payment_form_<?= /* @noEscape */ $code ?>" style="display:none;">
     <div class="admin__field _required">
         <label class="admin__field-label"
-               for="<?php /* @noEscape */ echo $code; ?>_ba_agreement_id">
-            <span><?php echo $block->escapeHtml(__('Billing Agreement')); ?></span>
+               for="<?= /* @noEscape */ $code ?>_ba_agreement_id">
+            <span><?= $block->escapeHtml(__('Billing Agreement')) ?></span>
         </label>
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_ba_agreement_id"
-                    name="payment[<?php echo $block->escapeHtml($block->getTransportName()); ?>]"
+            <select id="<?= /* @noEscape */ $code ?>_ba_agreement_id"
+                    name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]"
                     class="required-entry admin__control-select">
-                <option value=""><?php echo $block->escapeHtml(__('Please Select')); ?></option>
+                <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
                 <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-                    <option value="<?php echo $block->escapeHtml($id); ?>"
-                        <?php echo ($id == $block->getInfoData($block->getTransportName())) ?
+                    <option value="<?= $block->escapeHtml($id) ?>"
+                        <?= ($id == $block->getInfoData($block->getTransportName())) ?
                             ' selected="selected"' : '';
                         ?>>
-                        <?php echo $block->escapeHtml($referenceId); ?>
+                        <?= $block->escapeHtml($referenceId) ?>
                     </option>
                 <?php endforeach; ?>
             </select>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
index 6a3b6ff944a5c..f906a08425aa4 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/api_wizard.phtml
@@ -23,14 +23,12 @@
 
         <a class="action-default"
            data-paypal-button="true"
-           href="<?php /* @noEscape */ echo $block->escapeUrl($block->getButtonUrl() . '?' . $block->getQuery()); ?>"
-           target="PPFrame"><?php echo $block->escapeHtml($block->getButtonLabel()); ?></a>
+           href="<?= /* @noEscape */ $block->escapeUrl($block->getButtonUrl() . '?' . $block->getQuery()) ?>"
+           target="PPFrame"><?= $block->escapeHtml($block->getButtonLabel()) ?></a>
 
         <a class="action-default"
            data-paypal-button="true"
-           href="<?php
-               /* @noEscape */ echo $block->escapeUrl($block->getSandboxButtonUrl(). '?' . $block->getQuery());
-           ?>"
-           target="PPFrame"><?php echo $block->escapeHtml($block->getSandboxButtonLabel()); ?></a>
+           href="<?= /* @noEscape */ $block->escapeUrl($block->getSandboxButtonUrl(). '?' . $block->getQuery()) ?>"
+           target="PPFrame"><?= $block->escapeHtml($block->getSandboxButtonLabel()) ?></a>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
index f8581a8370a50..72b7ac86ee056 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/bml_api_wizard.phtml
@@ -11,12 +11,12 @@
 ?>
 <div class="pp-buttons-container">
     <button onclick="javascript:window.open(
-            '<?php echo $block->escapeUrl($block->getButtonUrl()); ?>',
+            '<?= $block->escapeUrl($block->getButtonUrl()) ?>',
             'bmlapiwizard',
             'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
             'left=100, top=100, width=550, height=550'
         ); return false;"
-            class="scalable" type="button" id="<?php echo $block->escapeHtml($block->getHtmlId()); ?>">
-        <span><span><span><?php echo $block->escapeHtml($block->getButtonLabel()); ?></span></span></span>
+            class="scalable" type="button" id="<?= $block->escapeHtml($block->getHtmlId()) ?>">
+        <span><span><span><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
     </button>
 </div>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
index 3c84ec9c3d38b..e2e52d03982ef 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/fieldset/hint.phtml
@@ -15,10 +15,10 @@ $helpLink = $block->escapeUrl($block->getHelpLink());
 if ($helpLink):
 ?>
     <div class="paypal-payment-notice">
-        <?php echo $block->escapeHtml(__('Not sure what PayPal payment method to use? Click ')); ?>
+        <?= $block->escapeHtml(__('Not sure what PayPal payment method to use? Click ')) ?>
         <a href="<?php /* @noEscape */
-        echo $helpLink; ?>" target="_blank"><?php echo $block->escapeHtml(__('here')); ?></a>
-        <?php echo $block->escapeHtml(__(' to learn more.')); ?>
+        echo $helpLink; ?>" target="_blank"><?= $block->escapeHtml(__('here')) ?></a>
+        <?= $block->escapeHtml(__(' to learn more.')) ?>
     </div>
 <?php
 endif;
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
index 6442ce7c81921..2339b9ca38534 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/advanced.phtml
@@ -11,9 +11,9 @@
 ?>
 <div class="payflow-settings-notice">
     <p>
-        <strong class="important-label"><?php echo $block->escapeHtml(__('Important: ')); ?></strong>
-        <?php echo $block->escapeHtml(__('To use PayPal Payments Advanced, you must configure  your PayPal Payments Advanced account on the PayPal website.')); ?>
-        <?php echo $block->escapeHtml(__('Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below')); ?>
+        <strong class="important-label"><?= $block->escapeHtml(__('Important: ')) ?></strong>
+        <?= $block->escapeHtml(__('To use PayPal Payments Advanced, you must configure  your PayPal Payments Advanced account on the PayPal website.')) ?>
+        <?= $block->escapeHtml(__('Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below')) ?>
     </p>
     <ul class="options-list">
         <li><strong>AVS:</strong> No</li>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml
index 8a9097420bdec..ad53e6358081e 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/payflowlink/info.phtml
@@ -12,9 +12,9 @@
 
 ?>
 <div class="payflow-settings-notice">
-    <strong class="important-label"><?php echo $block->escapeHtml(__('Important: ')); ?></strong>
-    <?php echo $block->escapeHtml(__('To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.')); ?>
-    <?php echo $block->escapeHtml(__('Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below')); ?>
+    <strong class="important-label"><?= $block->escapeHtml(__('Important: ')) ?></strong>
+    <?= $block->escapeHtml(__('To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.')) ?>
+    <?= $block->escapeHtml(__('Once you log into your PayPal Payflow Link account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below')) ?>
     <ul class="options-list">
         <li><strong>AVS:</strong> No</li>
         <li><strong>CSC:</strong> No</li>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml
index 06b17f7023833..ee97d60aa72f8 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/system/config/rules.phtml
@@ -14,6 +14,6 @@
         "Magento_Paypal/js/solutions",
         "domReady!"
     ], function (Solutions) {
-        var solutions = new Solutions({config: {solutions: <?php /* @noEscape */ echo $block->getJson(); ?>}});
+        var solutions = new Solutions({config: {solutions: <?= /* @noEscape */ $block->getJson() ?>}});
     });
 </script>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
index c1a926d93279a..cdd4779a2fd87 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/form.phtml
@@ -14,44 +14,44 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
-<iframe id="<?php /* @noEscape */ echo $code; ?>-transparent-iframe"
-        data-container="<?php /* @noEscape */ echo $code; ?>-transparent-iframe"
+<iframe id="<?= /* @noEscape */ $code ?>-transparent-iframe"
+        data-container="<?= /* @noEscape */ $code ?>-transparent-iframe"
         allowtransparency="true"
         frameborder="0"
         name="iframeTransparent"
         style="display: none; width: 100%; background-color: transparent;"
-        src="<?php echo $block->escapeUrl($block->getViewFileUrl('blank.html')); ?>"></iframe>
+        src="<?= $block->escapeUrl($block->getViewFileUrl('blank.html')) ?>"></iframe>
 <fieldset
-    id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+    id="payment_form_<?= /* @noEscape */ $code ?>"
     class="admin__fieldset"
     data-mage-init='{
      "transparent":{
-        "controller":"<?php echo $block->escapeHtml($block->getRequest()->getControllerName()); ?>",
-        "gateway":"<?php /* @noEscape */ echo $code; ?>",
-        "dateDelim":"<?php echo $block->escapeHtml($block->getDateDelim()); ?>",
-        "cardFieldsMap":<?php echo $block->escapeHtml($block->getCardFieldsMap()); ?>,
-        "orderSaveUrl":"<?php echo $block->escapeUrl($block->getOrderUrl()); ?>",
-        "cgiUrl":"<?php echo $block->escapeUrl($block->getCgiUrl()); ?>",
-        "expireYearLength":"<?php echo $block->escapeHtml($block->getMethodConfigData('cc_year_length')); ?>",
-        "nativeAction":"<?php echo $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])); ?>"
+        "controller":"<?= $block->escapeHtml($block->getRequest()->getControllerName()) ?>",
+        "gateway":"<?= /* @noEscape */ $code ?>",
+        "dateDelim":"<?= $block->escapeHtml($block->getDateDelim()) ?>",
+        "cardFieldsMap":<?= $block->escapeHtml($block->getCardFieldsMap()) ?>,
+        "orderSaveUrl":"<?= $block->escapeUrl($block->getOrderUrl()) ?>",
+        "cgiUrl":"<?= $block->escapeUrl($block->getCgiUrl()) ?>",
+        "expireYearLength":"<?= $block->escapeHtml($block->getMethodConfigData('cc_year_length')) ?>",
+        "nativeAction":"<?= $block->escapeUrl($block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()])) ?>"
       }, "validation":[]}'
     style="display: none;">
     <div class="admin__field _required">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_type" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Type')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_type" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Credit Card Type')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_cc_type"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-type"
+            <select id="<?= /* @noEscape */ $code ?>_cc_type"
+                    data-container="<?= /* @noEscape */ $code ?>-cc-type"
                     name="payment[cc_type]"
-                    data-validate='{required:true, "validate-cc-type-select":"#<?php /* @noEscape */ echo $code; ?>_cc_number"}'
+                    data-validate='{required:true, "validate-cc-type-select":"#<?= /* @noEscape */ $code ?>_cc_number"}'
                     class="admin__control-select">
-                <option value=""><?php echo $block->escapeHtml(__('Please Select')); ?></option>
+                <option value=""><?= $block->escapeHtml(__('Please Select')) ?></option>
                 <?php foreach ($block->getCcAvailableTypes() as $typeCode => $typeName): ?>
                     <option
-                        value="<?php echo $block->escapeHtml($typeCode); ?>"<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($typeName); ?>
+                        value="<?= $block->escapeHtml($typeCode) ?>"<?php if ($typeCode == $ccType): ?> selected="selected"<?php endif ?>>
+                        <?= $block->escapeHtml($typeName) ?>
                     </option>
                 <?php endforeach ?>
             </select>
@@ -59,70 +59,70 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     </div>
 
     <div class="admin__field _required field-number">
-        <label for="<?php /* @noEscape */ echo $code; ?>_cc_number" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Credit Card Number')); ?></span>
+        <label for="<?= /* @noEscape */ $code ?>_cc_number" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Credit Card Number')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <input type="text" id="<?php /* @noEscape */ echo $code; ?>_cc_number"
-                   data-container="<?php /* @noEscape */ echo $code; ?>-cc-number"
-                   name="payment[cc_number]" title="<?php echo $block->escapeHtml(__('Credit Card Number')); ?>"
+            <input type="text" id="<?= /* @noEscape */ $code ?>_cc_number"
+                   data-container="<?= /* @noEscape */ $code ?>-cc-number"
+                   name="payment[cc_number]" title="<?= $block->escapeHtml(__('Credit Card Number')) ?>"
                    class="admin__control-text"
                    value=""
                    data-validate='{
                        "required-number":true,
-                       "validate-cc-number":"#<?php /* @noEscape */ echo $code; ?>_cc_type",
-                       "validate-cc-type":"#<?php /* @noEscape */ echo $code; ?>_cc_type"
+                       "validate-cc-number":"#<?= /* @noEscape */ $code ?>_cc_type",
+                       "validate-cc-type":"#<?= /* @noEscape */ $code ?>_cc_type"
                    }'
                    autocomplete="off"/>
         </div>
     </div>
 
-    <div class="admin__field _required field-date" id="<?php /* @noEscape */ echo $code; ?>_cc_type_exp_div">
-        <label for="<?php /* @noEscape */ echo $code; ?>_expiration" class="admin__field-label">
-            <span><?php echo $block->escapeHtml(__('Expiration Date')); ?></span>
+    <div class="admin__field _required field-date" id="<?= /* @noEscape */ $code ?>_cc_type_exp_div">
+        <label for="<?= /* @noEscape */ $code ?>_expiration" class="admin__field-label">
+            <span><?= $block->escapeHtml(__('Expiration Date')) ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php /* @noEscape */ echo $code; ?>_expiration" name="payment[cc_exp_month]"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-month"
+            <select id="<?= /* @noEscape */ $code ?>_expiration" name="payment[cc_exp_month]"
+                    data-container="<?= /* @noEscape */ $code ?>-cc-month"
                     class="admin__control-select admin__control-select-month"
-                    data-validate='{required:true, "validate-cc-exp":"#<?php /* @noEscape */ echo $code; ?>_expiration_yr"}'>
+                    data-validate='{required:true, "validate-cc-exp":"#<?= /* @noEscape */ $code ?>_expiration_yr"}'>
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
-                        value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : ''; ?>"
+                        value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                         <?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif; ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
 
-            <select id="<?php /* @noEscape */ echo $code; ?>_expiration_yr" name="payment[cc_exp_year]"
+            <select id="<?= /* @noEscape */ $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
-                    data-container="<?php /* @noEscape */ echo $code; ?>-cc-year" data-validate='{required:true}'>
+                    data-container="<?= /* @noEscape */ $code ?>-cc-year" data-validate='{required:true}'>
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
-                        value="<?php /* @noEscape */ echo $k ? $block->escapeHtml($k) : '' ?>"
+                        value="<?= /* @noEscape */ $k ? $block->escapeHtml($k) : '' ?>"
                         <?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>>
-                        <?php echo $block->escapeHtml($v); ?>
+                        <?= $block->escapeHtml($v) ?>
                     </option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <?php if ($block->hasVerification()): ?>
-        <div class="admin__field _required field-cvv" id="<?php /* @noEscape */ echo $code; ?>_cc_type_cvv_div">
-            <label for="<?php /* @noEscape */ echo $code; ?>_cc_cid" class="admin__field-label">
-                <span><?php echo $block->escapeHtml(__('Card Verification Number')); ?></span>
+        <div class="admin__field _required field-cvv" id="<?= /* @noEscape */ $code ?>_cc_type_cvv_div">
+            <label for="<?= /* @noEscape */ $code ?>_cc_cid" class="admin__field-label">
+                <span><?= $block->escapeHtml(__('Card Verification Number')) ?></span>
             </label>
 
             <div class="admin__field-control">
-                <input type="text" title="<?php echo $block->escapeHtml(__('Card Verification Number')); ?>"
-                       data-container="<?php /* @noEscape */ echo $code; ?>-cc-cvv"
+                <input type="text" title="<?= $block->escapeHtml(__('Card Verification Number')) ?>"
+                       data-container="<?= /* @noEscape */ $code ?>-cc-cvv"
                        class="admin__control-text cvv"
-                       id="<?php /* @noEscape */ echo $code; ?>_cc_cid" name="payment[cc_cid]"
+                       id="<?= /* @noEscape */ $code ?>_cc_cid" name="payment[cc_cid]"
                        value=""
-                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @noEscape */ echo $code; ?>_cc_type"}'
+                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?= /* @noEscape */ $code ?>_cc_type"}'
                        autocomplete="off"/>
             </div>
         </div>
@@ -131,18 +131,18 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
     <?php if($block->isVaultEnabled()): ?>
         <div class="admin__field admin__field-option field-tooltip-content">
             <input type="checkbox"
-                   id="<?php /* @noEscape */ echo $code; ?>_vault"
+                   id="<?= /* @noEscape */ $code ?>_vault"
                    name="payment[is_active_payment_token_enabler]"
                    class="admin__control-checkbox"/>
-            <label class="admin__field-label" for="<?php /* @noEscape */ echo $code; ?>_vault">
-                <span><?php echo $block->escapeHtml('Save for later use.'); ?></span>
+            <label class="admin__field-label" for="<?= /* @noEscape */ $code ?>_vault">
+                <span><?= $block->escapeHtml('Save for later use.') ?></span>
             </label>
         </div>
     <?php endif; ?>
-    <input type="hidden" id="<?php /* @noEscape */ echo $code; ?>_cc_last_4"
+    <input type="hidden" id="<?= /* @noEscape */ $code ?>_cc_last_4"
            name="payment[cc_last_4]"/>
 
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </fieldset>
 
 <script>
@@ -150,6 +150,6 @@ $ccExpMonth = $block->getInfoData('cc_exp_month');
      * Disable card server validation in admin
      */
     require(["Magento_Sales/order/create/form"], function () {
-        order.addExcludedPaymentMethod('<?php /* @noEscape */ echo $code; ?>');
+        order.addExcludedPaymentMethod('<?= /* @noEscape */ $code ?>');
     });
 </script>
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
index a7e5a00478b4e..63d2d437503a9 100644
--- a/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Paypal/view/adminhtml/templates/transparent/iframe.phtml
@@ -15,13 +15,13 @@ $params = $block->getParams();
 <head>
 <script>
 <?php if (isset($params['redirect'])): ?>
-    window.location="<?php echo $block->escapeUrl($params['redirect']); ?>";
+    window.location="<?= $block->escapeUrl($params['redirect']) ?>";
 <?php elseif (isset($params['redirect_parent'])): ?>
-    window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']); ?>";
+    window.top.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
 <?php elseif (isset($params['error_msg'])): ?>
-    window.top.alert(<?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']); ?>);
+    window.top.alert(<?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
 <?php elseif (isset($params['order_success'])): ?>
-    window.top.location = "<?php echo $block->escapeUrl($params['order_success']); ?>";
+    window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
 <?php else: ?>
     var require = window.top.require;
     require(['jquery'], function($) {
diff --git a/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml b/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
index 9248d6ded12ed..7b06c19d639e9 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreement/view.phtml
@@ -13,56 +13,56 @@ $relatedOrders = $block->getRelatedOrders();
 <div class="block block-billing-agreements-view">
     <div class="block-title">
         <strong>
-            <?php echo $block->escapeHtml(__('Billing Agreement # ')); ?>
-            <?php echo $block->escapeHtml($block->getReferenceId()); ?>
+            <?= $block->escapeHtml(__('Billing Agreement # ')) ?>
+            <?= $block->escapeHtml($block->getReferenceId()) ?>
         </strong>
         <?php if ($block->getCanCancel()): ?>
             <button data-mage-init='{"Magento_Paypal/js/in-context/billing-agreement": {
-                        "cancelMessage" : "<?php echo $block->escapeHtml(__('Are you sure you want to do this?')); ?>",
-                        "cancelUrl" : "<?php echo $block->escapeUrl($block->getCancelUrl()) ?>"
+                        "cancelMessage" : "<?= $block->escapeHtml(__('Are you sure you want to do this?')) ?>",
+                        "cancelUrl" : "<?= $block->escapeUrl($block->getCancelUrl()) ?>"
                     }}'
-                    type="button" title="<?php echo $block->escapeHtml(__('Cancel')); ?>"
+                    type="button" title="<?= $block->escapeHtml(__('Cancel')) ?>"
                     class="secondary action cancel" />
-                <span><?php echo $block->escapeHtml(__('Cancel')); ?></span>
+                <span><?= $block->escapeHtml(__('Cancel')) ?></span>
             </button>
         <?php endif; ?>
     </div>
     <div class="block-title">
-        <strong><?php echo $block->escapeHtml(__('Agreement Information')); ?></strong>
+        <strong><?= $block->escapeHtml(__('Agreement Information')) ?></strong>
     </div>
     <div class="block-content">
         <div class="table-wrapper billing-agreements-view">
             <table class="data table table-billing-agreements-view">
-                <caption class="table-caption"><?php echo $block->escapeHtml(__('Agreement Information')); ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Agreement Information')) ?></caption>
                 <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php echo $block->escapeHtml(__('Reference ID:')); ?></th>
-                    <th scope="col" class="col status"><?php echo $block->escapeHtml(__('Status:')); ?></th>
-                    <th scope="col" class="col created"><?php echo $block->escapeHtml(__('Created:')); ?></th>
+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Reference ID:')) ?></th>
+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status:')) ?></th>
+                    <th scope="col" class="col created"><?= $block->escapeHtml(__('Created:')) ?></th>
                     <?php if ($block->getAgreementUpdatedAt()): ?>
-                        <th scope="col" class="col updated"><?php echo $block->escapeHtml(__('Updated:')); ?></th>
+                        <th scope="col" class="col updated"><?= $block->escapeHtml(__('Updated:')) ?></th>
                     <?php endif; ?>
-                    <th scope="col" class="col payment"><?php echo $block->escapeHtml(__('Payment Method:')); ?></th>
+                    <th scope="col" class="col payment"><?= $block->escapeHtml(__('Payment Method:')) ?></th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr>
-                    <td data-th="<?php echo $block->escapeHtml(__('Reference ID:')); ?>" class="col id">
-                        <?php echo $block->escapeHtml($block->getReferenceId()); ?>
+                    <td data-th="<?= $block->escapeHtml(__('Reference ID:')) ?>" class="col id">
+                        <?= $block->escapeHtml($block->getReferenceId()) ?>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Status:')); ?>" class="col status">
-                        <?php echo $block->escapeHtml($block->getAgreementStatus()); ?>
+                    <td data-th="<?= $block->escapeHtml(__('Status:')) ?>" class="col status">
+                        <?= $block->escapeHtml($block->getAgreementStatus()) ?>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Created:')); ?>" class="col created">
-                        <?php echo $block->escapeHtml($block->getAgreementCreatedAt()); ?>
+                    <td data-th="<?= $block->escapeHtml(__('Created:')) ?>" class="col created">
+                        <?= $block->escapeHtml($block->getAgreementCreatedAt()) ?>
                     </td>
                     <?php if ($block->getAgreementUpdatedAt()): ?>
-                        <td data-th="<?php echo $block->escapeHtml(__('Updated:')); ?>" class="col updated">
-                            <?php echo $block->escapeHtml($block->getAgreementUpdatedAt()); ?>
+                        <td data-th="<?= $block->escapeHtml(__('Updated:')) ?>" class="col updated">
+                            <?= $block->escapeHtml($block->getAgreementUpdatedAt()) ?>
                         </td>
                     <?php endif; ?>
-                    <td data-th="<?php echo $block->escapeHtml(__('Payment Method:')); ?>" class="col payment">
-                        <?php echo $block->escapeHtml($block->getPaymentMethodTitle()); ?>
+                    <td data-th="<?= $block->escapeHtml(__('Payment Method:')) ?>" class="col payment">
+                        <?= $block->escapeHtml($block->getPaymentMethodTitle()) ?>
                     </td>
                 </tr>
                 </tbody>
@@ -72,53 +72,53 @@ $relatedOrders = $block->getRelatedOrders();
 </div>
 <?php if (count($relatedOrders) > 0): ?>
     <div class="block block-billing-orders-view">
-        <?php echo $block->getChildHtml('pager'); ?>
+        <?= $block->getChildHtml('pager') ?>
         <div class="block-title">
-            <span><?php echo $block->escapeHtml(__('Related Orders')); ?></span>
+            <span><?= $block->escapeHtml(__('Related Orders')) ?></span>
         </div>
         <div class="block-content">
             <div class="table-wrapper billing-agreements-related">
                 <table class="data table table-billing-agreements-related" id="related-orders-table">
-                    <caption class="table-caption"><?php echo $block->escapeHtml(__('Related Orders')) ?></caption>
+                    <caption class="table-caption"><?= $block->escapeHtml(__('Related Orders')) ?></caption>
                     <thead>
                     <tr>
-                        <th scope="col" class="col id"><?php echo $block->escapeHtml(__('Order #')); ?></th>
-                        <th scope="col" class="col date"><?php echo $block->escapeHtml(__('Date')); ?></th>
-                        <th scope="col" class="col shipto"><?php echo $block->escapeHtml(__('Ship To')); ?></th>
-                        <th scope="col" class="col total"><?php echo $block->escapeHtml(__('Order Total')); ?></th>
-                        <th scope="col" class="col status"><?php echo $block->escapeHtml(__('Order Status')); ?></th>
+                        <th scope="col" class="col id"><?= $block->escapeHtml(__('Order #')) ?></th>
+                        <th scope="col" class="col date"><?= $block->escapeHtml(__('Date')) ?></th>
+                        <th scope="col" class="col shipto"><?= $block->escapeHtml(__('Ship To')) ?></th>
+                        <th scope="col" class="col total"><?= $block->escapeHtml(__('Order Total')) ?></th>
+                        <th scope="col" class="col status"><?= $block->escapeHtml(__('Order Status')) ?></th>
                         <th scope="col" class="col actions">&nbsp;</th>
                     </tr>
                     </thead>
                     <tbody>
                         <?php foreach ($relatedOrders as $order): ?>
                             <tr>
-                                <td data-th="<?php echo $block->escapeHtml(__('Order #')); ?>" class="col id">
-                                    <?php echo $block->escapeHtml($block->getOrderItemValue(
+                                <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id">
+                                    <?= $block->escapeHtml($block->getOrderItemValue(
                                         $order, 'order_increment_id'
                                     )); ?>
                                 </td>
-                                <td data-th="<?php echo $block->escapeHtml(__('Date')); ?>" class="col date">
-                                    <?php echo $block->escapeHtml($block->getOrderItemValue($order, 'created_at')); ?>
+                                <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date">
+                                    <?= $block->escapeHtml($block->getOrderItemValue($order, 'created_at')) ?>
                                 </td>
-                                <td data-th="<?php echo $block->escapeHtml(__('Ship To')); ?>" class="col shipto">
-                                    <?php echo $block->escapeHtml($block->getOrderItemValue(
+                                <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipto">
+                                    <?= $block->escapeHtml($block->getOrderItemValue(
                                         $order, 'shipping_address'
                                     )); ?>
                                 </td>
-                                <td data-th="<?php echo $block->escapeHtml(__('Order Total')); ?>" class="col total">
-                                    <?php /* @noEscape */ echo $block->getOrderItemValue($order, 'order_total'); ?>
+                                <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total">
+                                    <?= /* @noEscape */ $block->getOrderItemValue($order, 'order_total') ?>
                                 </td>
-                                <td data-th="<?php echo $block->escapeHtml(__('Order Status')); ?>" class="col status">
-                                    <?php echo $block->escapeHtml($block->getOrderItemValue(
+                                <td data-th="<?= $block->escapeHtml(__('Order Status')) ?>" class="col status">
+                                    <?= $block->escapeHtml($block->getOrderItemValue(
                                         $order, 'status_label'
                                     )); ?>
                                 </td>
                                 <td data-th="" class="col actions">
-                                    <a href="<?php echo $block->escapeUrl($block->getOrderItemValue(
+                                    <a href="<?= $block->escapeUrl($block->getOrderItemValue(
                                         $order, 'view_url'
                                     )); ?>" class="action view">
-                                        <span><?php echo $block->escapeHtml(__('View Order')); ?></span>
+                                        <span><?= $block->escapeHtml(__('View Order')) ?></span>
                                     </a>
                                 </td>
                             </tr>
@@ -132,8 +132,8 @@ $relatedOrders = $block->getRelatedOrders();
 
 <div class="actions-toolbar">
     <div class="secondary">
-        <a href="<?php echo $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
-            <?php echo $block->escapeHtml(__('Back to Billing Agreements')); ?>
+        <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+            <?= $block->escapeHtml(__('Back to Billing Agreements')) ?>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
index 7753b5424d79c..77987c948b686 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
@@ -14,42 +14,42 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
 ?>
 <div class="account-billing-agreements">
     <?php if (count($billingAgreements) > 0): ?>
-        <?php echo $block->getChildHtml('pager'); ?>
+        <?= $block->getChildHtml('pager') ?>
         <div class="table-wrapper billing-agreements">
             <table id="billing-agreements" class="data table table-billing-agreements">
-                <caption class="table-caption"><?php echo $block->escapeHtml(__('Billing Agreements')); ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Billing Agreements')) ?></caption>
                 <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php echo $block->escapeHtml(__('Reference ID')); ?></th>
-                    <th scope="col" class="col status"><?php echo $block->escapeHtml(__('Status')); ?></th>
-                    <th scope="col" class="col created"><?php echo $block->escapeHtml(__('Created At')); ?></th>
-                    <th scope="col" class="col updated"><?php echo $block->escapeHtml(__('Updated At')); ?></th>
-                    <th scope="col" class="col payment"><?php echo $block->escapeHtml(__('Payment Method')); ?></th>
+                    <th scope="col" class="col id"><?= $block->escapeHtml(__('Reference ID')) ?></th>
+                    <th scope="col" class="col status"><?= $block->escapeHtml(__('Status')) ?></th>
+                    <th scope="col" class="col created"><?= $block->escapeHtml(__('Created At')) ?></th>
+                    <th scope="col" class="col updated"><?= $block->escapeHtml(__('Updated At')) ?></th>
+                    <th scope="col" class="col payment"><?= $block->escapeHtml(__('Payment Method')) ?></th>
                     <th scope="col" class="col actions">&nbsp;</th>
                 </tr>
                 </thead>
                 <tbody>
                     <?php foreach ($billingAgreements as $item): ?>
                         <tr>
-                            <td data-th="<?php echo $block->escapeHtml(__('Reference ID')); ?>" class="col id">
-                                <?php echo $block->escapeHtml($block->getItemValue($item, 'reference_id')); ?>
+                            <td data-th="<?= $block->escapeHtml(__('Reference ID')) ?>" class="col id">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'reference_id')) ?>
                             </td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Status')); ?>" class="col status">
-                                <?php echo $block->escapeHtml($block->getItemValue($item, 'status')); ?>
+                            <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'status')) ?>
                             </td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Created At')); ?>" class="col created">
-                                <?php echo $block->escapeHtml($block->getItemValue($item, 'created_at')); ?>
+                            <td data-th="<?= $block->escapeHtml(__('Created At')) ?>" class="col created">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'created_at')) ?>
                             </td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Updated At')); ?>" class="col updated">
-                                <?php echo $block->escapeHtml($block->getItemValue($item, 'updated_at')); ?>
+                            <td data-th="<?= $block->escapeHtml(__('Updated At')) ?>" class="col updated">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'updated_at')) ?>
                             </td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Payment Method')); ?>" class="col payment">
-                                <?php echo $block->escapeHtml($block->getItemValue($item, 'payment_method_label')); ?>
+                            <td data-th="<?= $block->escapeHtml(__('Payment Method')) ?>" class="col payment">
+                                <?= $block->escapeHtml($block->getItemValue($item, 'payment_method_label')) ?>
                             </td>
                             <td data-th="" class="col actions">
-                                <a href="<?php echo $block->escapeUrl($block->getItemValue($item, 'edit_url')); ?>"
+                                <a href="<?= $block->escapeUrl($block->getItemValue($item, 'edit_url')) ?>"
                                    class="action view">
-                                    <span><?php echo $block->escapeHtml(__('View')); ?></span>
+                                    <span><?= $block->escapeHtml(__('View')) ?></span>
                                 </a>
                             </td>
                         </tr>
@@ -59,29 +59,29 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
         </div>
     <?php else: ?>
         <div class="message info empty">
-            <span><?php echo $block->escapeHtml(__('There are no billing agreements yet.')); ?></span>
+            <span><?= $block->escapeHtml(__('There are no billing agreements yet.')) ?></span>
         </div>
     <?php endif; ?>
 
     <?php if ($paymentMethods): ?>
-        <form action="<?php echo $block->escapeUrl($block->getCreateUrl()); ?>" method="post"
+        <form action="<?= $block->escapeUrl($block->getCreateUrl()) ?>" method="post"
               class="form form-new-agreement">
             <fieldset class="fieldset">
                 <legend class="legend">
-                    <span><?php echo $block->escapeHtml(__('New Billing Agreement')); ?></span>
+                    <span><?= $block->escapeHtml(__('New Billing Agreement')) ?></span>
                 </legend>
                 <br />
                 <p class="note">
-                    <?php echo $block->escapeHtml(__('You will be redirected to the payment system website.')); ?>
+                    <?= $block->escapeHtml(__('You will be redirected to the payment system website.')) ?>
                 </p>
 
                 <div class="field payment method">
                     <div class="control">
                         <select id="payment_method" name="payment_method">
-                            <option value=""><?php echo $block->escapeHtml(__('-- Please Select --'));?></option>
+                            <option value=""><?= $block->escapeHtml(__('-- Please Select --')) ?></option>
                             <?php foreach ($paymentMethods as $code => $title): ?>
-                                <option value="<?php echo $block->escapeHtml($code); ?>">
-                                    <?php echo $block->escapeHtml($title); ?>
+                                <option value="<?= $block->escapeHtml($code) ?>">
+                                    <?= $block->escapeHtml($title) ?>
                                 </option>
                             <?php endforeach; ?>
                         </select>
@@ -90,12 +90,12 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
                 <div class="actions-toolbar">
                     <div class="primary">
                         <button type="submit" class="primary action create">
-                            <span><?php echo $block->escapeHtml(__('Create...')); ?></span>
+                            <span><?= $block->escapeHtml(__('Create...')) ?></span>
                         </button>
                     </div>
                     <div class="secondary">
-                        <a href="<?php echo $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
-                            <span><?php echo $block->escapeHtml(__('Back')); ?></span>
+                        <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                            <span><?= $block->escapeHtml(__('Back')) ?></span>
                         </a>
                     </div>
                 </div>
@@ -104,8 +104,8 @@ $paymentMethods = $block->getWizardPaymentMethodOptions();
     <?php else: ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php echo $block->escapeUrl($block->getBackUrl()); ?>" class="action back">
-                <span><?php echo $block->escapeHtml(__('Back')); ?></span>
+            <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                <span><?= $block->escapeHtml(__('Back')) ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/bml.phtml b/app/code/Magento/Paypal/view/frontend/templates/bml.phtml
index 765228c9cf8d4..d1a9939258315 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/bml.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/bml.phtml
@@ -13,8 +13,8 @@
  */
 ?>
 <div class="paypal-logo">
-    <script data-pp-pubid="<?php echo $block->escapeHtml($block->getPublisherId()) ?>"
-            data-pp-placementtype="<?php echo $block->escapeHtml($block->getSize()) ?>"
+    <script data-pp-pubid="<?= $block->escapeHtml($block->getPublisherId()) ?>"
+            data-pp-placementtype="<?= $block->escapeHtml($block->getSize()) ?>"
         > (function (d, t) {
             "use strict";
             var s = d.getElementsByTagName(t)[0], n = d.createElement(t);
diff --git a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml
index 9735212d8f16a..2f7191b247203 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/review/totals.phtml
@@ -12,15 +12,15 @@
 ?>
 <?php if ($block->getTotals()): ?>
     <?php $_colspan = 3; ?>
-    <?php /* @escapeNotVerified */ echo $block->renderTotals(null, $_colspan); ?>
-    <?php /* @escapeNotVerified */ echo $block->renderTotals('footer', $_colspan); ?>
+    <?= /* @escapeNotVerified */ $block->renderTotals(null, $_colspan) ?>
+    <?= /* @escapeNotVerified */ $block->renderTotals('footer', $_colspan) ?>
     <?php if ($block->needDisplayBaseGrandtotal()):?>
     <tr class="totals charge">
-        <th class="mark" colspan="<?php /* @escapeNotVerified */ echo $_colspan; ?>" scope="row">
-            <?php /* @escapeNotVerified */ echo __('Your credit card will be charged for') ?>
+        <th class="mark" colspan="<?= /* @escapeNotVerified */ $_colspan ?>" scope="row">
+            <?= /* @escapeNotVerified */ __('Your credit card will be charged for') ?>
         </th>
-        <td class="amount" data-th="<?php echo $block->escapeHtml(__('Your credit card will be charged for')); ?>">
-            <?php /* @escapeNotVerified */ echo $block->displayBaseGrandtotal() ?>
+        <td class="amount" data-th="<?= $block->escapeHtml(__('Your credit card will be charged for')) ?>">
+            <?= /* @escapeNotVerified */ $block->displayBaseGrandtotal() ?>
         </td>
     </tr>
     <?php endif?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml
index 673a8eafd26b2..adb78ae4c220a 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/checkout/onepage/success/billing_agreement.phtml
@@ -10,8 +10,8 @@
  */
 ?>
 <p data-mage-init='{"Magento_Paypal/js/in-context/billing-agreement": {"invalidateOnLoad" : true}}'>
-    <?php echo $block->escapeHtml(__('Your billing agreement # is: ')); ?>
-    <a href="<?php echo $block->escapeUrl($block->getAgreementUrl()); ?>">
-        <?php echo $block->escapeHtml($block->getAgreementRefId()); ?>
+    <?= $block->escapeHtml(__('Your billing agreement # is: ')) ?>
+    <a href="<?= $block->escapeUrl($block->getAgreementUrl()) ?>">
+        <?= $block->escapeHtml($block->getAgreementRefId()) ?>
     </a>.
 </p>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
index c60b55e31c165..6efb678ffdae6 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
@@ -31,7 +31,7 @@ $configuration = [
 ];
 
 ?>
-<div style="display: none;" id="<?php /* @noEscape */ echo Button::PAYPAL_BUTTON_ID; ?>"></div>
+<div style="display: none;" id="<?= /* @noEscape */ Button::PAYPAL_BUTTON_ID ?>"></div>
 <script type="text/x-magento-init">
-    <?php /* @noEscape */ echo json_encode($configuration); ?>
+    <?= /* @noEscape */ json_encode($configuration) ?>
 </script>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
index bf76ecca9e32e..3725f51f0b8bb 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/shortcut/button.phtml
@@ -19,11 +19,11 @@ $config = [
 ];
 
 ?>
-<div data-mage-init='<?php /* @noEscape */ echo json_encode($config); ?>'
-     class="paypal checkout paypal-logo <?php echo $block->escapeHtml($block->getContainerId()); ?>-container">
-    <a data-action="<?php echo $block->escapeHtml($block->getLinkAction()); ?>" href="#">
+<div data-mage-init='<?= /* @noEscape */ json_encode($config) ?>'
+     class="paypal checkout paypal-logo <?= $block->escapeHtml($block->getContainerId()) ?>-container">
+    <a data-action="<?= $block->escapeHtml($block->getLinkAction()) ?>" href="#">
         <img class="paypal-button-hidden"
-             src="<?php echo $block->escapeHtml($block->getImageUrl()); ?>"
+             src="<?= $block->escapeHtml($block->getImageUrl()) ?>"
              alt="Check out with PayPal" />
     </a>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
index c3c7d1d1a8d66..93b5d57b3182d 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
@@ -15,11 +15,11 @@
             <?php if ($block->getShippingAddress()): ?>
                 <div class="box box-order-shipping-method">
                     <strong class="box-title">
-                        <span><?php echo $block->escapeHtml(__('Shipping Method')) ?></span>
+                        <span><?= $block->escapeHtml(__('Shipping Method')) ?></span>
                     </strong>
                     <div class="box-content">
                         <form method="post" id="shipping-method-form"
-                              action="<?php echo $block->escapeUrl($block->getShippingMethodSubmitUrl()); ?>"
+                              action="<?= $block->escapeUrl($block->getShippingMethodSubmitUrl()) ?>"
                               class="form">
                             <?php if ($block->canEditShippingMethod()): ?>
                                 <?php if ($groups = $block->getShippingRateGroups()): ?>
@@ -27,19 +27,19 @@
                                     <div class="field shipping required">
                                         <select name="shipping_method" id="shipping-method" class="select">
                                             <?php if (!$currentRate): ?>
-                                                <option value=""><?php echo $block->escapeHtml(__(
+                                                <option value=""><?= $block->escapeHtml(__(
                                                         'Please select a shipping method...'
                                                     )); ?></option>
                                             <?php endif; ?>
                                             <?php foreach ($groups as $code => $rates): ?>
-                                                <optgroup label="<?php echo $block->escapeHtml($block->getCarrierName(
+                                                <optgroup label="<?= $block->escapeHtml($block->getCarrierName(
                                                         $code
                                                     )); ?>">
                                                     <?php foreach ($rates as $rate): ?>
-                                                        <option value="<?php echo $block->escapeHtml(
+                                                        <option value="<?= $block->escapeHtml(
                                                                 $block->renderShippingRateValue($rate)
                                                             ); ?>"
-                                                            <?php echo($currentRate === $rate) ?
+                                                            <?= ($currentRate === $rate) ?
                                                                 ' selected="selected"' : '';
                                                             ?>>
                                                             <?php /* @noEscape */ echo
@@ -56,14 +56,14 @@
                                             <button id="update-shipping-method-submit" type="submit"
                                                     class="action update primary">
                                                 <span>
-                                                    <?php echo $block->escapeHtml(__('Update Shipping Method')); ?>
+                                                    <?= $block->escapeHtml(__('Update Shipping Method')) ?>
                                                 </span>
                                             </button>
                                         </div>
                                     </div>
                                 <?php else: ?>
                                     <p>
-                                        <?php echo $block->escapeHtml(__(
+                                        <?= $block->escapeHtml(__(
                                             'Sorry, no quotes are available for this order right now.'
                                         )); ?>
                                     </p>
@@ -80,11 +80,11 @@
                 </div>
                 <div class="box box-order-shipping-address">
                     <strong class="box-title">
-                        <span><?php echo $block->escapeHtml(__('Shipping Address')); ?></span>
+                        <span><?= $block->escapeHtml(__('Shipping Address')) ?></span>
                     </strong>
                     <div class="box-content">
                         <address>
-                            <?php echo $block->escapeHtml(
+                            <?= $block->escapeHtml(
                                 $block->renderAddress($block->getShippingAddress()),
                                 ['br']
                             );?>
@@ -92,25 +92,25 @@
                     </div>
                     <?php if ($block->getCanEditShippingAddress()): ?>
                         <div class="box-actions">
-                            <a href="<?php echo $block->escapeUrl($block->getEditUrl()); ?>" class="action edit">
-                                <span><?php echo $block->escapeHtml(__('Edit')); ?></span>
+                            <a href="<?= $block->escapeUrl($block->getEditUrl()) ?>" class="action edit">
+                                <span><?= $block->escapeHtml(__('Edit')) ?></span>
                             </a>
                         </div>
                     <?php endif; ?>
                 </div>
             <?php endif; ?>
             <div class="box box-order-billing-address">
-                <strong class="box-title"><span><?php echo $block->escapeHtml(__('Payment Method')); ?></span></strong>
+                <strong class="box-title"><span><?= $block->escapeHtml(__('Payment Method')) ?></span></strong>
                 <div class="box-content">
-                    <?php echo $block->escapeHtml($block->getPaymentMethodTitle()); ?><br>
-                    <?php echo $block->escapeHtml($block->getEmail()); ?> <br>
+                    <?= $block->escapeHtml($block->getPaymentMethodTitle()) ?><br>
+                    <?= $block->escapeHtml($block->getEmail()) ?> <br>
                     <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png"
-                         alt="<?php echo $block->escapeHtml(__('Buy now with PayPal')); ?>"/>
+                         alt="<?= $block->escapeHtml(__('Buy now with PayPal')) ?>"/>
                 </div>
             <?php if ($block->getEditUrl()): ?>
                 <div class="box-actions">
-                    <a href="<?php echo $block->escapeUrl($block->getEditUrl()); ?>" class="action edit">
-                        <span><?php echo $block->escapeHtml(__('Edit Payment Information')); ?></span>
+                    <a href="<?= $block->escapeUrl($block->getEditUrl()) ?>" class="action edit">
+                        <span><?= $block->escapeHtml(__('Edit Payment Information')) ?></span>
                     </a>
                 </div>
             <?php endif ?>
@@ -119,36 +119,36 @@
     </div>
 
     <div class="paypal-review-discount">
-        <?php echo $block->getChildHtml('paypal.additional.actions') ?>
+        <?= $block->getChildHtml('paypal.additional.actions') ?>
     </div>
 
     <div class="paypal-review-items">
         <div class="paypal-review-title">
-            <strong><?php echo $block->escapeHtml(__('Items in Your Shopping Cart')); ?></strong>
-            <a href="<?php echo $block->escapeUrl($block->getUrl('checkout/cart')); ?>" class="action edit">
-                <span><?php echo $block->escapeHtml(__('Edit Shopping Cart')); ?></span>
+            <strong><?= $block->escapeHtml(__('Items in Your Shopping Cart')) ?></strong>
+            <a href="<?= $block->escapeUrl($block->getUrl('checkout/cart')) ?>" class="action edit">
+                <span><?= $block->escapeHtml(__('Edit Shopping Cart')) ?></span>
             </a>
         </div>
 
-        <?php echo $block->getChildHtml('details') ?>
+        <?= $block->getChildHtml('details') ?>
 
-        <form method="post" id="order-review-form" action="<?php echo $block->escapeUrl($block->getPlaceOrderUrl()); ?>"
+        <form method="post" id="order-review-form" action="<?= $block->escapeUrl($block->getPlaceOrderUrl()) ?>"
               class="form order-review-form">
-            <?php echo $block->getChildHtml('agreements'); ?>
+            <?= $block->getChildHtml('agreements') ?>
             <div class="actions-toolbar" id="review-buttons-container">
                 <div class="primary">
                     <button type="button" id="review-button" class="action checkout primary"
-                            value="<?php echo $block->escapeHtml(__('Place Order')); ?>">
-                        <span><?php echo $block->escapeHtml(__('Place Order')); ?></span>
+                            value="<?= $block->escapeHtml(__('Place Order')) ?>">
+                        <span><?= $block->escapeHtml(__('Place Order')) ?></span>
                     </button>
                     <button type="button" id="review-submit" class="action checkout primary"
-                            value="<?php echo $block->escapeHtml(__('Place Order')); ?>">
-                        <span><?php echo $block->escapeHtml(__('Place Order')); ?></span>
+                            value="<?= $block->escapeHtml(__('Place Order')) ?>">
+                        <span><?= $block->escapeHtml(__('Place Order')) ?></span>
                     </button>
                 </div>
                 <span class="please-wait load indicator" id="review-please-wait" style="display: none;"
-                      data-text="<?php echo $block->escapeHtml(__('Submitting order information...')); ?>">
-                   <span><?php echo $block->escapeHtml(__('Submitting order information...')); ?></span>
+                      data-text="<?= $block->escapeHtml(__('Submitting order information...')) ?>">
+                   <span><?= $block->escapeHtml(__('Submitting order information...')) ?></span>
                 </span>
             </div>
         </form>
@@ -161,9 +161,9 @@
             "orderReview": {
                 "shippingSubmitFormSelector": "#shipping-method-form",
                 "shippingSelector": "#shipping-method",
-                "shippingMethodUpdateUrl": "<?php echo $block->escapeUrl($block->getUpdateShippingMethodsUrl()) ?>",
-                "isAjax": <?php /* @noEscape */ echo $block->getUseAjax() ? 'true' : 'false' ?>,
-                "canEditShippingMethod": <?php /* @noEscape */ echo $block->canEditShippingMethod() ? 'true' : 'false' ?>
+                "shippingMethodUpdateUrl": "<?= $block->escapeUrl($block->getUpdateShippingMethodsUrl()) ?>",
+                "isAjax": <?= /* @noEscape */ $block->getUseAjax() ? 'true' : 'false' ?>,
+                "canEditShippingMethod": <?= /* @noEscape */ $block->canEditShippingMethod() ? 'true' : 'false' ?>
             }
         }
     }
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml
index 0bf3b85815446..0d61b6cdc2c9f 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review/details.phtml
@@ -12,20 +12,20 @@
 ?>
 <div id="details-reload" class="table-wrapper order-items cart">
     <table id="details-table" class="cart items data table table-paypal-review-items">
-        <caption class="table-caption"><?php echo $block->escapeHtml(__('Items in Your Shopping Cart')); ?></caption>
+        <caption class="table-caption"><?= $block->escapeHtml(__('Items in Your Shopping Cart')) ?></caption>
         <thead>
         <tr>
-            <th class="col name" scope="col"><?php echo $block->escapeHtml(__('Item')); ?></th>
-            <th class="col price" scope="col"><?php echo $block->escapeHtml(__('Price')); ?></th>
-            <th class="col qty" scope="col"><?php echo $block->escapeHtml(__('Qty')); ?></th>
-            <th class="col subtotal" scope="col"><?php echo $block->escapeHtml(__('Subtotal')); ?></th>
+            <th class="col name" scope="col"><?= $block->escapeHtml(__('Item')) ?></th>
+            <th class="col price" scope="col"><?= $block->escapeHtml(__('Price')) ?></th>
+            <th class="col qty" scope="col"><?= $block->escapeHtml(__('Qty')) ?></th>
+            <th class="col subtotal" scope="col"><?= $block->escapeHtml(__('Subtotal')) ?></th>
         </tr>
         </thead>
             <?php foreach ($block->getItems() as $item): ?>
-                <?php echo $block->getItemHtml($item) ?>
+                <?= $block->getItemHtml($item) ?>
             <?php endforeach ?>
         <tfoot class="opc-block-summary">
-            <?php echo $block->getChildHtml('totals'); ?>
+            <?= $block->getChildHtml('totals') ?>
         </tfoot>
     </table>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
index f9512d994dab8..ca84b0829ea9e 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review/shipping/method.phtml
@@ -14,17 +14,17 @@
             <select name="shipping_method" id="shipping_method" class="required-entry">
                 <?php if (!$currentRate): ?>
                     <option value="">
-                        <?php echo $block->escapeHtml(__('Please select a shipping method...')); ?>
+                        <?= $block->escapeHtml(__('Please select a shipping method...')) ?>
                     </option>
                 <?php endif; ?>
                 <?php foreach ($groups as $code => $rates): ?>
-                    <optgroup label="<?php echo $block->escapeHtml($block->getCarrierName($code)) ?>"
+                    <optgroup label="<?= $block->escapeHtml($block->getCarrierName($code)) ?>"
                               style="font-style:normal;">
                         <?php foreach ($rates as $rate): ?>
                             <option
-                                value="<?php echo $block->escapeHtml($block->renderShippingRateValue($rate)); ?>"
-                                    <?php echo($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
-                                <?php /* @noEscape */ echo $block->renderShippingRateOption($rate); ?>
+                                value="<?= $block->escapeHtml($block->renderShippingRateValue($rate)) ?>"
+                                    <?= ($currentRate === $rate) ? ' selected="selected"' : '' ?>>
+                                <?= /* @noEscape */ $block->renderShippingRateOption($rate) ?>
                             </option>
                         <?php endforeach; ?>
                     </optgroup>
@@ -33,18 +33,18 @@
         <?php else: ?>
             <p>
                 <strong>
-                    <?php echo $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')); ?>
+                    <?= $block->escapeHtml(__('Sorry, no quotes are available for this order right now.')) ?>
                 </strong>
             </p>
         <?php endif; ?>
     <?php else: ?>
         <p>
             <strong>
-                <?php /* @noEscape */ echo $block->renderShippingRateOption($block->getCurrentShippingRate()); ?>
+                <?= /* @noEscape */ $block->renderShippingRateOption($block->getCurrentShippingRate()) ?>
             </strong>
         </p>
     <?php endif; ?>
 </div>
 <div style="display: none" id="shipping_method_update">
-    <p><?php echo $block->escapeHtml(__('Please update order data to get shipping methods and rates')); ?></p>
+    <p><?= $block->escapeHtml(__('Please update order data to get shipping methods and rates')) ?></p>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
index ddf2fc95a8647..ce8a0e940230b 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
@@ -22,25 +22,25 @@ if ($block->getIsInCatalogProduct()) {
     $isInCatalogProduct = $block->getIsInCatalogProduct();
 }
 ?>
-<div data-label="<?php echo $block->escapeHtml(__('or')); ?>"
-     class="paypal checkout <?php /* @noEscape */ echo $labelPosition; ?> paypal-logo
-        <?php /* @noEscape */ echo $shortcutHtmlId; ?>"
+<div data-label="<?= $block->escapeHtml(__('or')) ?>"
+     class="paypal checkout <?= /* @noEscape */ $labelPosition ?> paypal-logo
+        <?= /* @noEscape */ $shortcutHtmlId ?>"
      data-mage-init='{
      "paypalCheckout": {
-                "isCatalogProduct": "<?php /* @noEscape */ echo !empty($isInCatalogProduct) ? (bool)$isInCatalogProduct : false;?>",
-                "shortcutContainerClass": "<?php /* @noEscape */ echo "." . $shortcutHtmlId; ?>"
+                "isCatalogProduct": "<?= /* @noEscape */ !empty($isInCatalogProduct) ? (bool)$isInCatalogProduct : false ?>",
+                "shortcutContainerClass": "<?= /* @noEscape */ "." . $shortcutHtmlId ?>"
             }
      }'
     >
     <input type="image" data-action="checkout-form-submit"
-           data-checkout-url="<?php echo $block->escapeUrl($block->getCheckoutUrl()); ?>"
-           src="<?php echo $block->escapeUrl($block->getImageUrl()); ?>"
-           alt="<?php echo $block->escapeHtml(__('Checkout with PayPal')); ?>"
-           title="<?php echo $block->escapeHtml(__('Checkout with PayPal')); ?>"/>
+           data-checkout-url="<?= $block->escapeUrl($block->getCheckoutUrl()) ?>"
+           src="<?= $block->escapeUrl($block->getImageUrl()) ?>"
+           alt="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"
+           title="<?= $block->escapeHtml(__('Checkout with PayPal')) ?>"/>
     <?php if ($block->getAdditionalLinkImage()): ?>
         <?php $linkImage = $block->getAdditionalLinkImage(); ?>
-        <a href="<?php echo $block->escapeUrl($linkImage['href']);?>">
-            <img src="<?php echo $block->escapeHtml($linkImage['src']);?>" />
+        <a href="<?= $block->escapeUrl($linkImage['href']) ?>">
+            <img src="<?= $block->escapeHtml($linkImage['src']) ?>" />
         </a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
index cc005749ea008..ec6f7b4ad985e 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
@@ -15,10 +15,10 @@
 <head>
 </head>
 <body>
-<form id="token_form" method="POST" action="<?php echo $block->escapeUrl($block->getTransactionUrl()); ?>">
-    <input type="hidden" name="SECURETOKEN" value="<?php echo $block->escapeHtml($block->getSecureToken()); ?>"/>
-    <input type="hidden" name="SECURETOKENID" value="<?php echo $block->escapeHtml($block->getSecureTokenId()); ?>"/>
-    <input type="hidden" name="MODE" value="<?php /* @noEscape */ echo $block->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+<form id="token_form" method="POST" action="<?= $block->escapeUrl($block->getTransactionUrl()) ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?= $block->escapeHtml($block->getSecureToken()) ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
+    <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
 </form>
 <script>
     document.getElementById('token_form').submit();
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/iframe.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/iframe.phtml
index 4e871096e4912..22bc5cf5b980e 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/iframe.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/iframe.phtml
@@ -9,7 +9,7 @@
  */
 ?>
 <div id="iframe-warning" class="message notice">
-    <div><?php echo $block->escapeHtml(__('Please do not refresh the page until you complete payment.')); ?></div>
+    <div><?= $block->escapeHtml(__('Please do not refresh the page until you complete payment.')) ?></div>
 </div>
 <iframe id="hss-iframe" data-container="paypal-iframe" class="paypal iframe" scrolling="no" frameborder="0" border="0"
-        src="<?php echo $block->escapeUrl($block->getFrameActionUrl()); ?>" height="610" width="100%"></iframe>
+        src="<?= $block->escapeUrl($block->getFrameActionUrl()) ?>" height="610" width="100%"></iframe>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
index 0cb56cf009713..28daa150b8888 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
@@ -8,9 +8,9 @@
  * @var \Magento\Paypal\Block\Payment\Info $block
  */
 ?>
-<div id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()); ?>"
+<div id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>"
      style="display:none" class="hss items">
-    <?php echo $block->escapeHtml(__(
+    <?= $block->escapeHtml(__(
         'You will be required to enter your payment details after you place an order.'
     )); ?>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml
index f70157efeb2ec..1072c6bc30453 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/review/button.phtml
@@ -7,7 +7,7 @@
 
 
 ?>
-<button type="submit" data-role="review-save" title="<?php echo $block->escapeHtml(__('Continue')); ?>"
+<button type="submit" data-role="review-save" title="<?= $block->escapeHtml(__('Continue')) ?>"
         class="button action checkout primary">
-    <span><?php echo $block->escapeHtml(__('Continue')); ?></span>
+    <span><?= $block->escapeHtml(__('Continue')) ?></span>
 </button>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml b/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
index de3770e44f18d..7ba9307742031 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/js/components.phtml
@@ -6,4 +6,4 @@
 
 // @codingStandardsIgnoreFile
 ?>
-<?php echo $block->getChildHtml(); ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
index 9971b7afa01ac..f0f672492270a 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
@@ -13,16 +13,16 @@
 
 <div class="block paypal acceptance">
     <div class="block-content">
-        <a href="#" title="<?php echo $block->escapeHtml(__('Additional Options')); ?>"
+        <a href="#" title="<?= $block->escapeHtml(__('Additional Options')) ?>"
            onclick="javascript:window.open(
-               '<?php echo $block->escapeUrl($block->getAboutPaypalPageUrl()); ?>',
+               '<?= $block->escapeUrl($block->getAboutPaypalPageUrl()) ?>',
                'paypal',
                'width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'
                ); return false;"
            class="action paypal additional">
-            <img src="<?php echo $block->escapeUrl($block->getLogoImageUrl()); ?>"
-                 alt="<?php echo $block->escapeHtml(__('Additional Options')); ?>"
-                 title="<?php echo $block->escapeHtml(__('Additional Options')); ?>" />
+            <img src="<?= $block->escapeUrl($block->getLogoImageUrl()) ?>"
+                 alt="<?= $block->escapeHtml(__('Additional Options')) ?>"
+                 title="<?= $block->escapeHtml(__('Additional Options')) ?>" />
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
index 541af242628c2..e643acac297e9 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
@@ -12,10 +12,10 @@
 <head>
 </head>
 <body>
-<form id="token_form" method="GET" action="<?php echo $block->escapeUrl($block->getTransactionUrl()); ?>">
-    <input type="hidden" name="SECURETOKEN" value="<?php echo $block->escapeHtml($block->getSecureToken()); ?>"/>
-    <input type="hidden" name="SECURETOKENID" value="<?php echo $block->escapeHtml($block->getSecureTokenId()); ?>"/>
-    <input type="hidden" name="MODE" value="<?php /* @noEscape */ echo $block->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+<form id="token_form" method="GET" action="<?= $block->escapeUrl($block->getTransactionUrl()) ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?= $block->escapeHtml($block->getSecureToken()) ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
+    <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
 </form>
 <script>
     document.getElementById('token_form').submit();
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
index cab3d96076ab6..06cbc9f3e354c 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
@@ -9,9 +9,9 @@
  * @var \Magento\Paypal\Block\Payflow\Advanced\Form $block
  */
 ?>
-<fieldset id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()); ?>" style="display:none"
+<fieldset id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>" style="display:none"
           class="fieldset payflowadvanced items redirect">
     <div>
-        <?php echo $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')); ?>
+        <?= $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')) ?>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
index 9487ace945fc4..cef3e2f0565ba 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
@@ -15,10 +15,10 @@
 <head>
 </head>
 <body>
-<form id="token_form" method="GET" action="<?php echo $block->escapeUrl($block->getTransactionUrl()); ?>">
-    <input type="hidden" name="SECURETOKEN" value="<?php echo $block->escapeHtml($block->getSecureToken()); ?>"/>
-    <input type="hidden" name="SECURETOKENID" value="<?php echo $block->escapeHtml($block->getSecureTokenId()); ?>"/>
-    <input type="hidden" name="MODE" value="<?php /* @noEscape */ echo $block->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+<form id="token_form" method="GET" action="<?= $block->escapeUrl($block->getTransactionUrl()) ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?= $block->escapeHtml($block->getSecureToken()) ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?= $block->escapeHtml($block->getSecureTokenId()) ?>"/>
+    <input type="hidden" name="MODE" value="<?= /* @noEscape */ $block->isTestMode() ? 'TEST' : 'LIVE' ?>"/>
 </form>
 <script>
     document.getElementById('token_form').submit();
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
index 1e832b6a9f6ab..cbd4a8ba715e7 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
@@ -8,7 +8,7 @@
  * @var \Magento\Paypal\Block\Payflow\Link\Form $block
  */
 ?>
-<div class="payflowlink items" id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()); ?>"
+<div class="payflowlink items" id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>"
      style="display:none">
-    <?php echo $block->escapeHtml(__('You will be required to enter your payment details after you place an order.'));?>
+    <?= $block->escapeHtml(__('You will be required to enter your payment details after you place an order.')) ?>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
index 3f7dc13f54fce..75cc2a09e9444 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/redirect.phtml
@@ -29,13 +29,13 @@
             }
         }
 
-        var cartUrl = '<?php echo $block->escapeUrl($block->getUrl('checkout/cart')); ?>',
-            successUrl = '<?php echo $block->escapeUrl($block->getUrl('checkout/onepage/success')); ?>',
-            goToSuccessPage = '<?php echo $block->escapeUrl($block->getGotoSuccessPage()); ?>',
+        var cartUrl = '<?= $block->escapeUrl($block->getUrl('checkout/cart')) ?>',
+            successUrl = '<?= $block->escapeUrl($block->getUrl('checkout/onepage/success')) ?>',
+            goToSuccessPage = '<?= $block->escapeUrl($block->getGotoSuccessPage()) ?>',
             require = window.top.require,
             windowContext = window,
             errorMessage = {
-                message: '<?php echo $block->escapeHtml($block->getErrorMsg()); ?>'
+                message: '<?= $block->escapeHtml($block->getErrorMsg()) ?>'
             };
 
         if(typeof(require) == "undefined") {
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
index 01ee97021f73d..d9095c202f88f 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/form/billing/agreement.phtml
@@ -10,17 +10,17 @@
  */
 $code = $block->escapeHtml($block->getMethodCode());
 ?>
-<div class="field items required" id="payment_form_<?php /* @noEscape */ echo $code; ?>" style="display:none;">
-    <label for="<?php /* @noEscape */ echo $code; ?>_ba_agreement_id" class="label">
-        <span><?php echo $block->escapeHtml(__('Billing Agreement')); ?></span>
+<div class="field items required" id="payment_form_<?= /* @noEscape */ $code ?>" style="display:none;">
+    <label for="<?= /* @noEscape */ $code ?>_ba_agreement_id" class="label">
+        <span><?= $block->escapeHtml(__('Billing Agreement')) ?></span>
     </label>
     <div class="control">
-        <select id="<?php /* @noEscape */ echo $code; ?>_ba_agreement_id"
-                name="payment[<?php echo $block->escapeHtml($block->getTransportName()); ?>]" class="select">
-            <option value=""><?php echo $block->escapeHtml(__('-- Please Select Billing Agreement--')); ?></option>
+        <select id="<?= /* @noEscape */ $code ?>_ba_agreement_id"
+                name="payment[<?= $block->escapeHtml($block->getTransportName()) ?>]" class="select">
+            <option value=""><?= $block->escapeHtml(__('-- Please Select Billing Agreement--')) ?></option>
             <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-                <option value="<?php echo $block->escapeHtml($id); ?>">
-                    <?php echo $block->escapeHtml($referenceId); ?>
+                <option value="<?= $block->escapeHtml($id) ?>">
+                    <?= $block->escapeHtml($referenceId) ?>
                 </option>
             <?php endforeach; ?>
         </select>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
index a5aa0653e5187..934136281746c 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
@@ -13,11 +13,11 @@
 $url = $block->escapeUrl($block->getPaymentAcceptanceMarkHref());
 ?>
 <!-- PayPal Logo -->
-<img src="<?php echo $block->escapeUrl($block->getPaymentAcceptanceMarkSrc()) ?>"
-     alt="<?php echo $block->escapeHtml(__('Acceptance Mark')); ?>" class="paypal icon"/>
-<a href="<?php /* @noEscape */ echo $url; ?>"
+<img src="<?= $block->escapeUrl($block->getPaymentAcceptanceMarkSrc()) ?>"
+     alt="<?= $block->escapeHtml(__('Acceptance Mark')) ?>" class="paypal icon"/>
+<a href="<?= /* @noEscape */ $url ?>"
    onclick="javascript:window.open(
-           '<?php /* @noEscape */ echo $url; ?>',
+           '<?= /* @noEscape */ $url ?>',
            'olcwhatispaypal',
            'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,' +
            'left=0, top=0, width=400, height=350'
diff --git a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
index a26bc80008d24..d954eab92c6f7 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
@@ -12,15 +12,15 @@
 $code = $block->escapeHtml($block->getBillingAgreementCode());
 ?>
 <fieldset class="fieldset paypal items redirect" style="display:none;"
-          id="payment_form_<?php echo $block->escapeHtml($block->getMethodCode()); ?>">
-    <div><?php echo $block->escapeHtml($block->getRedirectMessage()); ?></div>
+          id="payment_form_<?= $block->escapeHtml($block->getMethodCode()) ?>">
+    <div><?= $block->escapeHtml($block->getRedirectMessage()) ?></div>
     <?php  ?>
     <?php if ($code): ?>
-        <input type="checkbox" id="<?php /* @noEscape */ echo $code; ?>" value="1" class="checkbox"
-               name="payment[<?php /* @noEscape */ echo $code; ?>]">
-        <label for="<?php /* @noEscape */ echo $code; ?>" class="label">
+        <input type="checkbox" id="<?= /* @noEscape */ $code ?>" value="1" class="checkbox"
+               name="payment[<?= /* @noEscape */ $code ?>]">
+        <label for="<?= /* @noEscape */ $code ?>" class="label">
             <span>
-                <?php echo $block->escapeHtml(__('Sign a billing agreement to streamline further purchases  with PayPal.')); ?>
+                <?= $block->escapeHtml(__('Sign a billing agreement to streamline further purchases  with PayPal.')) ?>
             </span>
         </label>
     <?php endif; ?>
diff --git a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
index 55d064a3f0b43..1e04e8ae3b407 100644
--- a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
+++ b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
@@ -15,12 +15,12 @@
 ?>
 <div id="remember-me-box" class="field choice persistent">
     <?php $rememberMeId = 'remember_me' . $block->getRandomString(10); ?>
-    <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php echo $block->escapeHtmlAttr($rememberMeId); ?>"<?php if ($block->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo $block->escapeHtmlAttr(__('Remember Me')) ?>" />
-    <label for="<?php echo $block->escapeHtmlAttr($rememberMeId); ?>" class="label"><span><?php echo $block->escapeHtml(__('Remember Me')) ?></span></label>
+    <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?= $block->escapeHtmlAttr($rememberMeId) ?>"<?php if ($block->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?= $block->escapeHtmlAttr(__('Remember Me')) ?>" />
+    <label for="<?= $block->escapeHtmlAttr($rememberMeId) ?>" class="label"><span><?= $block->escapeHtml(__('Remember Me')) ?></span></label>
     <span class="tooltip wrapper">
-        <a class="link tooltip toggle" href="#"><?php echo $block->escapeHtml(__('What\'s this?')) ?></a>
+        <a class="link tooltip toggle" href="#"><?= $block->escapeHtml(__('What\'s this?')) ?></a>
         <span class="tooltip content">
-            <?php echo $block->escapeHtml(__('Check &quot;Remember Me&quot; to access your shopping cart on this computer even if you are not signed in.')) ?>
+            <?= $block->escapeHtml(__('Check &quot;Remember Me&quot; to access your shopping cart on this computer even if you are not signed in.')) ?>
         </span>
     </span>
 </div>
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
index 86adf7fc83129..9942c94ea887d 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
@@ -16,7 +16,7 @@
     <tr>
         <td class="col photo">
             <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
-                <?php echo $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml(); ?>
+                <?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
             </a>
         </td>
         <td class="col item">
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
index 92e386ec5b6bd..ffacd605517bc 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
@@ -15,7 +15,7 @@
     <tr>
         <td class="col photo">
             <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product photo">
-                <?php echo $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml(); ?>
+                <?= $block->getImage($_product, 'product_thumbnail_image', ['class' => 'photo image'])->toHtml() ?>
             </a>
         </td>
         <td class="col item">
diff --git a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
index 52332f28c3bff..5b9553a49e723 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
@@ -5,9 +5,9 @@
  */
 ?>
 <?php /* @var $block \Magento\ProductAlert\Block\Product\View */?>
-<div class="product alert <?php echo $block->getHtmlClass() ?>">
-    <a href="#" data-post='<?php /* @noEscape */ echo $block->getPostAction(); ?>'
-       title="<?php echo $block->escapeHtml(__($block->getSignupLabel())); ?>" class="action alert">
-        <?php echo $block->escapeHtml(__($block->getSignupLabel())); ?>
+<div class="product alert <?= $block->getHtmlClass() ?>">
+    <a href="#" data-post='<?= /* @noEscape */ $block->getPostAction() ?>'
+       title="<?= $block->escapeHtml(__($block->getSignupLabel())) ?>" class="action alert">
+        <?= $block->escapeHtml(__($block->getSignupLabel())) ?>
     </a>
 </div>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
index d39028bdfce79..f0ae057bc724d 100755
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/helper/gallery.phtml
@@ -14,12 +14,12 @@ $formName = $block->getFormName();
 <div class="row">
     <div class="add-video-button-container">
         <button id="add_video_button"
-                title="<?php echo $block->escapeHtml(__('Add Video'));?>"
+                title="<?= $block->escapeHtml(__('Add Video')) ?>"
                 data-role="add-video-button"
                 type="button"
                 class="action-secondary"
                 data-ui-id="widget-button-1">
-            <span><?php echo $block->escapeHtml(__('Add Video')) ?></span>
+            <span><?= $block->escapeHtml(__('Add Video')) ?></span>
         </button>
     </div>
 </div>
@@ -30,12 +30,12 @@ $element = $block->getElement();
 $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'toggleValueElements(this, this.parentNode.parentNode.parentNode)';
 ?>
 
-<div id="<?php echo $block->getHtmlId() ?>"
+<div id="<?= $block->getHtmlId() ?>"
      class="gallery"
      data-mage-init='{"openVideoModal":{}}'
-     data-parent-component="<?php echo $block->escapeHtml($block->getData('config/parentComponent')) ?>"
-     data-images="<?php echo $block->escapeHtml($block->getImagesJson()) ?>"
-     data-types="<?php echo $block->escapeHtml(
+     data-parent-component="<?= $block->escapeHtml($block->getData('config/parentComponent')) ?>"
+     data-images="<?= $block->escapeHtml($block->getImagesJson()) ?>"
+     data-types="<?= $block->escapeHtml(
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getImageTypes())
      ) ?>"
 >
@@ -48,90 +48,90 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             ?>
             <div class="product-image-wrapper">
                 <p class="image-placeholder-text">
-                    <?php echo $block->escapeHtml(
+                    <?= $block->escapeHtml(
                         __('Browse to find or drag image here')
                     ); ?>
                 </p>
             </div>
         </div>
-        <?php /* @escapeNotVerified */ echo $block->getChildHtml('additional_buttons'); ?>
+        <?= /* @escapeNotVerified */ $block->getChildHtml('additional_buttons') ?>
         <?php
     endif;
     ?>
     <?php
     foreach ($block->getImageTypes() as $typeData):
         ?>
-        <input name="<?php echo $block->escapeHtml($typeData['name']) ?>"
-               data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
-               class="image-<?php echo $block->escapeHtml($typeData['code']) ?>"
+        <input name="<?= $block->escapeHtml($typeData['name']) ?>"
+               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
+               class="image-<?= $block->escapeHtml($typeData['code']) ?>"
                type="hidden"
-               value="<?php echo $block->escapeHtml($typeData['value']) ?>"/>
+               value="<?= $block->escapeHtml($typeData['value']) ?>"/>
         <?php
     endforeach;
     ?>
-    <script id="<?php /* @escapeNotVerified */ echo $block->getHtmlId() ?>-template" data-template="image" type="text/x-magento-template">
+    <script id="<?= /* @escapeNotVerified */ $block->getHtmlId() ?>-template" data-template="image" type="text/x-magento-template">
         <div class="image item <% if (data.disabled == 1) { %>hidden-for-front<% } %>  <% if (data.video_url) { %>video-item<% } %>"
              data-role="image">
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][position]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][position]"
                    value="<%- data.position %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    class="position"/>
             <% if (data.media_type !== 'external-video') {%>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][media_type]"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                    value="image"/>
             <% } else { %>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][media_type]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][media_type]"
                    value="<%- data.media_type %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <% } %>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][video_provider]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_provider]"
                    value="<%- data.video_provider %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][file]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][file]"
                    value="<%- data.file %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][value_id]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][value_id]"
                    value="<%- data.value_id %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][label]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][label]"
                    value="<%- data.label %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][disabled]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
                    value="<%- data.disabled %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][removed]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][removed]"
                    value="" class="is-removed"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][video_url]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_url]"
                    value="<%- data.video_url %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][video_title]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_title]"
                    value="<%- data.video_title %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][video_description]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_description]"
                    value="<%- data.video_description %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][video_metadata]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][video_metadata]"
                    value="<%- data.video_metadata %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
             <input type="hidden"
-                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][role]"
+                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][role]"
                    value="<%- data.video_description %>"
-                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"/>
+                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"/>
 
             <div class="product-image-wrapper">
                 <img class="product-image"
@@ -144,21 +144,21 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                             class="action-remove"
                             data-role="delete-button"
                             title="<% if (data.media_type == 'external-video') {%>
-                            <?php echo $block->escapeHtml(
+                            <?= $block->escapeHtml(
                                 __('Delete video')
                             ); ?>
                         <%} else {%>
-                            <?php echo $block->escapeHtml(
+                            <?= $block->escapeHtml(
                                 __('Delete image')
                             ); ?>
                         <%}%>">
                     <span>
                         <% if (data.media_type == 'external-video') { %>
-                        <?php echo $block->escapeHtml(
+                        <?= $block->escapeHtml(
                             __('Delete video')
                         ); ?>
                         <% } else {%>
-                        <?php echo $block->escapeHtml(
+                        <?= $block->escapeHtml(
                             __('Delete image')
                         ); ?>
                         <%} %>
@@ -166,7 +166,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                     </button>
                     <div class="draggable-handle"></div>
                 </div>
-                <div class="image-fade"><span><?php echo $block->escapeHtml(
+                <div class="image-fade"><span><?= $block->escapeHtml(
                             __('Hidden')
                         ); ?></span></div>
             </div>
@@ -186,12 +186,12 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                 <?php
                 foreach ($block->getImageTypes() as $typeData):
                     ?>
-                    <li data-role-code="<?php echo $block->escapeHtml(
+                    <li data-role-code="<?= $block->escapeHtml(
                         $typeData['code']
-                    ) ?>" class="item-role item-role-<?php echo $block->escapeHtml(
+                    ) ?>" class="item-role item-role-<?= $block->escapeHtml(
                         $typeData['code']
                     ) ?>">
-                        <?php echo $block->escapeHtml($typeData['label']) ?>
+                        <?= $block->escapeHtml($typeData['label']) ?>
                     </li>
                     <?php
                 endforeach;
@@ -215,7 +215,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             <fieldset class="admin__fieldset fieldset-image-panel">
                 <div class="admin__field field-image-description">
                     <label class="admin__field-label" for="image-description">
-                        <span><?php /* @escapeNotVerified */ echo __('Alt Text')?></span>
+                        <span><?= /* @escapeNotVerified */ __('Alt Text') ?></span>
                     </label>
 
                     <div class="admin__field-control">
@@ -230,7 +230,7 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
 
                 <div class="admin__field field-image-role">
                     <label class="admin__field-label">
-                            <span><?php echo $block->escapeHtml(
+                            <span><?= $block->escapeHtml(
                                     __('Role')
                                 ); ?></span>
                     </label>
@@ -243,9 +243,9 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                                     <label>
                                         <input class="image-type"
                                                data-role="type-selector"
-                                               data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                                               data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                                                type="checkbox"
-                                               value="<?php echo $block->escapeHtml(
+                                               value="<?= $block->escapeHtml(
                                                    $attribute->getAttributeCode()
                                                ) ?>"
                                         />
@@ -263,16 +263,16 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
 
                 <div class="admin__field admin__field-inline field-image-size" data-role="size">
                     <label class="admin__field-label">
-                        <span><?php /* @escapeNotVerified */ echo __('Image Size') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Image Size') ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?php /* @escapeNotVerified */ echo __('{size}') ?>"></div>
+                    <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{size}') ?>"></div>
                 </div>
 
                 <div class="admin__field admin__field-inline field-image-resolution" data-role="resolution">
                     <label class="admin__field-label">
-                        <span><?php /* @escapeNotVerified */ echo __('Image Resolution') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Image Resolution') ?></span>
                     </label>
-                    <div class="admin__field-value" data-message="<?php /* @escapeNotVerified */ echo __('{width}^{height} px') ?>"></div>
+                    <div class="admin__field-value" data-message="<?= /* @escapeNotVerified */ __('{width}^{height} px') ?>"></div>
                 </div>
 
                 <div class="admin__field field-image-hide">
@@ -281,14 +281,14 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
                             <input type="checkbox"
                                    id="hide-from-product-page"
                                    data-role="visibility-trigger"
-                                   data-form-part="<?php /* @escapeNotVerified */ echo $formName ?>"
+                                   data-form-part="<?= /* @escapeNotVerified */ $formName ?>"
                                    value="1"
                                    class="admin__control-checkbox"
-                                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][disabled]"
+                                   name="<?= /* @escapeNotVerified */ $elementName ?>[<%- data.file_id %>][disabled]"
                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
 
                             <label for="hide-from-product-page" class="admin__field-label">
-                                <?php echo $block->escapeHtml(
+                                <?= $block->escapeHtml(
                                     __('Hide from Product Page')
                                 ); ?>
                             </label>
@@ -298,34 +298,34 @@ $elementToggleCode = $element->getToggleCode() ? $element->getToggleCode() : 'to
             </fieldset>
         </div>
     </script>
-    <div id="<?php /* @noEscape */ echo $block->getNewVideoBlockName();?>" style="display:none">
-        <?php /* @escapeNotVerified */ echo $block->getFormHtml();?>
+    <div id="<?= /* @noEscape */ $block->getNewVideoBlockName() ?>" style="display:none">
+        <?= /* @escapeNotVerified */ $block->getFormHtml() ?>
         <div id="video-player-preview-location" class="video-player-sidebar">
             <div class="video-player-container"></div>
             <div class="video-information title">
-                <label><?php echo $block->escapeHtml(
+                <label><?= $block->escapeHtml(
                         __('Title:')
                     ); ?> </label><span></span>
             </div>
             <div class="video-information uploaded">
-                <label><?php echo $block->escapeHtml(
+                <label><?= $block->escapeHtml(
                         __('Uploaded:')
                     ); ?> </label><span></span>
             </div>
             <div class="video-information uploader">
-                <label><?php echo $block->escapeHtml(
+                <label><?= $block->escapeHtml(
                         __('Uploader:')
                     ); ?> </label><span></span>
             </div>
             <div class="video-information duration">
-                <label><?php echo $block->escapeHtml(
+                <label><?= $block->escapeHtml(
                         __('Duration:')
                     ); ?> </label><span></span>
             </div>
         </div>
     </div>
 
-    <?php echo $block->getChildHtml('new-video'); ?>
+    <?= $block->getChildHtml('new-video') ?>
 </div>
 <script>
     jQuery('body').trigger('contentUpdated');
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
index abffc1e8c54db..dc0d8206571dd 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/base_image.phtml
@@ -8,31 +8,30 @@
     <div class="add-video-button-container">
         <button
             id="add_video_button"
-            title="<?php /* @escapeNotVerified */ echo $addVideoTitle;?>"
+            title="<?= /* @escapeNotVerified */ $addVideoTitle ?>"
             type="button"
             class="action-secondary"
             onclick="jQuery('#new-video').modal('openModal'); jQuery('#new_video_form')[0].reset();"
             data-ui-id="widget-button-1">
-            <span><?php /* @escapeNotVerified */ echo __('Add Video') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Add Video') ?></span>
         </button>
     </div>
 </div>
-<div id="<?php /* @escapeNotVerified */ echo $htmlId;?>-container"
+<div id="<?= /* @escapeNotVerified */ $htmlId ?>-container"
      class="images"
      data-mage-init='{"baseImage":{}}'
-     data-max-file-size="<?php /* @escapeNotVerified */ echo $fileMaxSize;?>"
+     data-max-file-size="<?= /* @escapeNotVerified */ $fileMaxSize ?>"
     >
     <div class="image image-placeholder">
-        <input type="file" name="image" data-url="<?php 
-        /* @escapeNotVerified */ echo $uploadUrl;?>" multiple="multiple" />
-        <img class="spacer" src="<?php /* @escapeNotVerified */ echo $spacerImage;?>"/>
-        <p class="image-placeholder-text"><?php /* @escapeNotVerified */ echo $imagePlaceholderText;?></p>
+        <input type="file" name="image" data-url="<?= /* @escapeNotVerified */ $uploadUrl ?>" multiple="multiple" />
+        <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
+        <p class="image-placeholder-text"><?= /* @escapeNotVerified */ $imagePlaceholderText ?></p>
     </div>
-    <script id="<?php /* @escapeNotVerified */ echo $htmlId;?>-template"
+    <script id="<?= /* @escapeNotVerified */ $htmlId ?>-template"
             data-template="image"
             type="text/x-magento-template">
         <div class="image">
-            <img class="spacer" src="<?php /* @escapeNotVerified */ echo $spacerImage;?>"/>
+            <img class="spacer" src="<?= /* @escapeNotVerified */ $spacerImage ?>"/>
             <img
                 class="product-image"
                 src="<%- data.url %>"
@@ -43,25 +42,25 @@
                     type="button"
                     class="action-delete"
                     data-role="delete-button"
-                    title="<?php /* @escapeNotVerified */ echo $deleteImageText;?>">
-                    <span><?php /* @escapeNotVerified */ echo $deleteImageText;?></span>
+                    title="<?= /* @escapeNotVerified */ $deleteImageText ?>">
+                    <span><?= /* @escapeNotVerified */ $deleteImageText ?></span>
                 </button>
                 <button
                     type="button"
                     class="action-make-base"
                     data-role="make-base-button"
-                    title="<?php /* @escapeNotVerified */ echo $makeBaseText;?>">
-                    <span><?php /* @escapeNotVerified */ echo $makeBaseText;?></span>
+                    title="<?= /* @escapeNotVerified */ $makeBaseText ?>">
+                    <span><?= /* @escapeNotVerified */ $makeBaseText ?></span>
                 </button>
                 <div class="draggable-handle"></div>
             </div>
             <div class="image-label"></div>
-            <div class="image-fade"><span><?php /* @escapeNotVerified */ echo $hiddenText;?></span></div>
+            <div class="image-fade"><span><?= /* @escapeNotVerified */ $hiddenText ?></span></div>
         </div>
     </script>
 </div>
 <span class="action-manage-images" data-activate-tab="image-management">
-    <span><?php /* @escapeNotVerified */ echo $imageManagementText;?></span>
+    <span><?= /* @escapeNotVerified */ $imageManagementText ?></span>
 </span>
 <script>
     require([
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
index 768553160b39c..e9421f8e74a87 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
+++ b/app/code/Magento/ProductVideo/view/adminhtml/templates/product/edit/slideout/form.phtml
@@ -5,23 +5,23 @@
  */
 /* @var Magento\ProductVideo\Block\Adminhtml\Product\Edit\NewVideo $block */
 ?>
-<div id="<?php /* @escapeNotVerified */ echo $block->getNameInLayout();?>" style="display:none"
-    data-modal-info='<?php /* @escapeNotVerified */ echo $block->getWidgetOptions();?>'
+<div id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none"
+    data-modal-info='<?= /* @escapeNotVerified */ $block->getWidgetOptions() ?>'
 >
-    <?php /* @escapeNotVerified */ echo $block->getFormHtml();?>
+    <?= /* @escapeNotVerified */ $block->getFormHtml() ?>
     <div id="video-player-preview-location" class="video-player-sidebar">
         <div class="video-player-container"></div>
         <div class="video-information title">
-            <label><?php /* @escapeNotVerified */ echo __('Title:') ?> </label><span></span>
+            <label><?= /* @escapeNotVerified */ __('Title:') ?> </label><span></span>
         </div>
         <div class="video-information uploaded">
-            <label><?php /* @escapeNotVerified */ echo __('Uploaded:') ?> </label><span></span>
+            <label><?= /* @escapeNotVerified */ __('Uploaded:') ?> </label><span></span>
         </div>
         <div class="video-information uploader">
-            <label><?php /* @escapeNotVerified */ echo __('Uploader:') ?> </label><span></span>
+            <label><?= /* @escapeNotVerified */ __('Uploader:') ?> </label><span></span>
         </div>
         <div class="video-information duration">
-            <label><?php /* @escapeNotVerified */ echo __('Duration:') ?> </label><span></span>
+            <label><?= /* @escapeNotVerified */ __('Duration:') ?> </label><span></span>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
index 5ba9c8eb4727c..55486dbbb0cfe 100644
--- a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
@@ -14,9 +14,9 @@
     {
         "[data-gallery-role=gallery-placeholder]": {
             "Magento_ProductVideo/js/fotorama-add-video-events": {
-                "videoData": <?php /* @escapeNotVerified */ echo $block->getMediaGalleryDataJson(); ?>,
-                "videoSettings": <?php /* @escapeNotVerified */ echo $block->getVideoSettingsJson(); ?>,
-                "optionsVideoData": <?php /* @noEscape */ echo $block->getOptionsMediaGalleryDataJson(); ?>
+                "videoData": <?= /* @escapeNotVerified */ $block->getMediaGalleryDataJson() ?>,
+                "videoSettings": <?= /* @escapeNotVerified */ $block->getVideoSettingsJson() ?>,
+                "optionsVideoData": <?= /* @noEscape */ $block->getOptionsMediaGalleryDataJson() ?>
             }
         }
     }
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index b635c5ebdcd5e..cb267ce29dd34 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -13,52 +13,52 @@ $numColumns = sizeof($block->getColumns());
 ?>
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
-    <div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
+    <div id="<?= /* @escapeNotVerified */ $block->getId() ?>">
         <?php else: ?>
-            <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+            <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
         <?php endif; ?>
         <?php if ($block->getStoreSwitcherVisibility() || $block->getDateFilterVisibility()): ?>
             <div class="admin__data-grid-header admin__data-grid-toolbar">
                 <div class="admin__data-grid-header-row">
                     <?php if ($block->getDateFilterVisibility()): ?>
-                        <div class="admin__filter-actions" data-role="filter-form" id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_range')?>">
+                        <div class="admin__filter-actions" data-role="filter-form" id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_range') ?>">
                             <span class="field-row">
-                                <label for="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from') ?>"
+                                <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
                                        class="admin__control-support-text">
-                                    <span><?php /* @escapeNotVerified */ echo __('From') ?>:</span>
+                                    <span><?= /* @escapeNotVerified */ __('From') ?>:</span>
                                 </label>
                                 <input class="input-text no-changes required-entry admin__control-text"
                                        type="text"
-                                       id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from') ?>"
+                                       id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
                                        name="report_from"
-                                       value="<?php /* @escapeNotVerified */ echo $block->getFilter('report_from') ?>">
-                                <span id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from_advice')?>"></span>
+                                       value="<?= /* @escapeNotVerified */ $block->getFilter('report_from') ?>">
+                                <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>"></span>
                             </span>
 
                             <span class="field-row">
-                                <label for="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to') ?>"
+                                <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
                                        class="admin__control-support-text">
-                                    <span><?php /* @escapeNotVerified */ echo __('To') ?>:</span>
+                                    <span><?= /* @escapeNotVerified */ __('To') ?>:</span>
                                 </label>
                                 <input class="input-text no-changes required-entry admin__control-text"
                                        type="text"
-                                       id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to') ?>"
+                                       id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
                                        name="report_to"
-                                       value="<?php /* @escapeNotVerified */ echo $block->getFilter('report_to') ?>"/>
-                                <span id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to_advice')?>"></span>
+                                       value="<?= /* @escapeNotVerified */ $block->getFilter('report_to') ?>"/>
+                                <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>"></span>
                             </span>
 
                             <span class="field-row admin__control-filter">
-                                 <label for="<?php /* @escapeNotVerified */ echo $block->getSuffixId('report_period')?>"
+                                 <label for="<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>"
                                         class="admin__control-support-text">
-                                     <span><?php /* @escapeNotVerified */ echo __('Show By') ?>:</span>
+                                     <span><?= /* @escapeNotVerified */ __('Show By') ?>:</span>
                                  </label>
-                                <select name="report_period" id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('report_period')?>" class="admin__control-select">
+                                <select name="report_period" id="<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>" class="admin__control-select">
                                     <?php foreach ($block->getPeriods() as $_value => $_label): ?>
-                                        <option value="<?php /* @escapeNotVerified */ echo $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?php /* @escapeNotVerified */ echo $_label ?></option>
+                                        <option value="<?= /* @escapeNotVerified */ $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?= /* @escapeNotVerified */ $_label ?></option>
                                     <?php endforeach; ?>
                                 </select>
-                                <?php echo $block->getRefreshButtonHtml() ?>
+                                <?= $block->getRefreshButtonHtml() ?>
                             </span>
                             <script>
                                 require([
@@ -66,14 +66,14 @@ $numColumns = sizeof($block->getColumns());
                                     "mage/calendar"
                                 ], function($){
 
-                                    $("#<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_range') ?>").dateRange({
-                                        dateFormat:"<?php /* @escapeNotVerified */ echo $block->getDateFormat() ?>",
-                                        buttonText:"<?php /* @escapeNotVerified */ echo __('Select Date') ?>",
+                                    $("#<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_range') ?>").dateRange({
+                                        dateFormat:"<?= /* @escapeNotVerified */ $block->getDateFormat() ?>",
+                                        buttonText:"<?= /* @escapeNotVerified */ __('Select Date') ?>",
                                         from:{
-                                            id:"<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from')?>"
+                                            id:"<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
                                         },
                                         to:{
-                                            id:"<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to')?>"
+                                            id:"<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
                                         }
                                     });
                                 });
@@ -81,14 +81,14 @@ $numColumns = sizeof($block->getColumns());
                         </div>
                     <?php endif; ?>
                     <?php if ($block->getChildBlock('grid.export')): ?>
-                        <?php echo $block->getChildHtml('grid.export');?>
+                        <?= $block->getChildHtml('grid.export') ?>
                     <?php endif; ?>
                 </div>
             </div>
         <?php endif; ?>
         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-            <table class="data-grid" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
-                <?php echo $block->getChildHtml('grid.columnSet'); ?>
+            <table class="data-grid" id="<?= /* @escapeNotVerified */ $block->getId() ?>_table">
+                <?= $block->getChildHtml('grid.columnSet') ?>
             </table>
         </div>
     </div>
@@ -102,14 +102,14 @@ $numColumns = sizeof($block->getColumns());
             ], function(jQuery){
 
                 //<![CDATA[
-                <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?> = new varienGrid('<?php /* @escapeNotVerified */ echo $block->getId() ?>', '<?php /* @escapeNotVerified */ echo $block->getGridUrl() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameSort() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameDir() ?>', '<?php /* @escapeNotVerified */ echo $block->getVarNameFilter() ?>');
-                <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): /* @escapeNotVerified */ echo $block->getUseAjax(); endif; ?>';
+                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?> = new varienGrid('<?= /* @escapeNotVerified */ $block->getId() ?>', '<?= /* @escapeNotVerified */ $block->getGridUrl() ?>', '<?= /* @escapeNotVerified */ $block->getVarNamePage() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameSort() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameDir() ?>', '<?= /* @escapeNotVerified */ $block->getVarNameFilter() ?>');
+                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): /* @escapeNotVerified */ echo $block->getUseAjax(); endif; ?>';
                 <?php if ($block->getDateFilterVisibility()): ?>
-                <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
-                var period_date_from = $('<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from')?>');
-                var period_date_to = $('<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to')?>');
-                period_date_from.adviceContainer = $('<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from_advice')?>');
-                period_date_to.adviceContainer = $('<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to_advice')?>');
+                <?= /* @escapeNotVerified */ $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
+                var period_date_from = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>');
+                var period_date_to = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>');
+                period_date_from.adviceContainer = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>');
+                period_date_to.adviceContainer = $('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>');
 
                 var validateFilterDate = function() {
                     if (period_date_from && period_date_to) {
@@ -138,9 +138,9 @@ $numColumns = sizeof($block->getColumns());
                     if (obj.switchParams) {
                         storeParam += obj.switchParams;
                     }
-                    var formParam = new Array('<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from')?>', '<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to')?>', '<?php /* @escapeNotVerified */ echo $block->getSuffixId('report_period')?>');
+                    var formParam = new Array('<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>', '<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>', '<?= /* @escapeNotVerified */ $block->getSuffixId('report_period') ?>');
                     var paramURL = '';
-                    var switchURL = '<?php /* @escapeNotVerified */ echo $block->getAbsoluteGridUrl(['_current' => false]); ?>'.replace(/(store|group|website)\/\d+\//, '');
+                    var switchURL = '<?= /* @escapeNotVerified */ $block->getAbsoluteGridUrl(['_current' => false]) ?>'.replace(/(store|group|website)\/\d+\//, '');
 
                     for (var i = 0; i < formParam.length; i++) {
                         if ($(formParam[i]).value && $(formParam[i]).name) {
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
index 561f60140c40b..6f93cd157a4f0 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/grid/container.phtml
@@ -7,10 +7,10 @@
 ?>
 
 <div class="reports-content">
-    <?php echo $block->getChildHtml('grid.filter.form') ?>
+    <?= $block->getChildHtml('grid.filter.form') ?>
 </div>
 
-<?php echo $block->getGridHtml() ?>
+<?= $block->getGridHtml() ?>
 
 <script>
 require([
@@ -32,7 +32,7 @@ require([
         }
 
         if (jQuery('#filter_form').valid()) {
-            setLocation('<?php /* @escapeNotVerified */ echo $block->getFilterUrl();?>filter/'+
+            setLocation('<?= /* @escapeNotVerified */ $block->getFilterUrl() ?>filter/'+
                 Base64.encode(Form.serializeElements(elements))+'/'
             );
         }
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
index 079e1f2759154..1c448f966375a 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/refresh/statistics.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getButtonsHtml() ?></div>
-<?php echo $block->getChildHtml('grid') ?>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
index 937a7cdd473cd..16b99744c42e4 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
 
 <div class="switcher f-left" style="margin: 10px 10px 10px 0px; padding:15px;">
 <?php
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
index b693b8266aef5..0a1dc5dacd99d 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
@@ -14,14 +14,14 @@
 ?>
 <?php if ($block->isShow()): ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Show Report For:') ?></label>
+    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Show Report For:') ?></label>
     <div class="control">
         <select 
             id="store_switcher"
             class="admin__control-select"
             name="store_switcher"
             onchange="return switchStore(this);">
-            <option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
+            <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
             <?php foreach ($block->getWebsiteCollection() as $_website): ?>
                 <?php $showWebsite = false; ?>
                 <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
@@ -29,21 +29,21 @@
                     <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                                <option website="true" value="<?php /* @escapeNotVerified */ echo $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected<?php endif; ?>>
-                                    <?php /* @escapeNotVerified */ echo $_website->getName() ?>
+                                <option website="true" value="<?= /* @escapeNotVerified */ $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected<?php endif; ?>>
+                                    <?= /* @escapeNotVerified */ $_website->getName() ?>
                                 </option>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <option group="true" value="<?php /* @escapeNotVerified */ echo $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $_group->getName() ?></option>
+                            <option group="true" value="<?= /* @escapeNotVerified */ $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_group->getName() ?></option>
                         <?php endif; ?>
-                        <option value="<?php /* @escapeNotVerified */ echo $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $_store->getName() ?></option>
+                        <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= /* @escapeNotVerified */ $_store->getName() ?></option>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
             <?php endforeach; ?>
         </select>
     </div>
-    <?php echo $block->getHintHtml() ?>
+    <?= $block->getHintHtml() ?>
 </div>
 <script>
 require(['prototype'], function(){
@@ -60,7 +60,7 @@ require(['prototype'], function(){
         if(obj.switchParams){
             storeParam+= obj.switchParams;
         }
-        setLocation('<?php /* @escapeNotVerified */ echo $block->getSwitchUrl() ?>'+storeParam);
+        setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>'+storeParam);
     }
 
 });
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
index 5fbd00e46df31..7edeee628be4a 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher/enhanced.phtml
@@ -19,14 +19,14 @@
 
 <?php if ($block->isShow()): ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Show Report For:') ?></label>
+    <label class="label" for="store_switcher"><?= /* @escapeNotVerified */ __('Show Report For:') ?></label>
     <div class="control">
         <select 
             id="store_switcher"
             class="admin__control-select"
             name="store_switcher"
             onchange="return switchStore(this);">
-            <option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
+            <option value=""><?= /* @escapeNotVerified */ __('All Websites') ?></option>
             <?php foreach ($block->getWebsiteCollection() as $_website): ?>
                 <?php $showWebsite = false; ?>
                 <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
@@ -34,13 +34,13 @@
                     <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                            <option website="true" value="<?php /* @escapeNotVerified */ echo implode(',', $_website->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())): ?> selected<?php endif; ?>><?php echo $block->escapeHtml($_website->getName()) ?></option>
+                            <option website="true" value="<?= /* @escapeNotVerified */ implode(',', $_website->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_website->getStoreIds())): ?> selected<?php endif; ?>><?= $block->escapeHtml($_website->getName()) ?></option>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <option group="true" value="<?php /* @escapeNotVerified */ echo implode(',', $_group->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?php echo $block->escapeHtml($_group->getName()) ?></option>
+                            <option group="true" value="<?= /* @escapeNotVerified */ implode(',', $_group->getStoreIds()) ?>"<?php if ($block->getRequest()->getParam('store_ids') == implode(',', $_group->getStoreIds())): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_group->getName()) ?></option>
                         <?php endif; ?>
-                        <option value="<?php /* @escapeNotVerified */ echo $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $block->escapeHtml($_store->getName()) ?></option>
+                        <option value="<?= /* @escapeNotVerified */ $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?= $block->escapeHtml($_store->getName()) ?></option>
                     <?php endforeach; ?>
                     <?php if ($showGroup): ?>
                         </optgroup>
@@ -49,7 +49,7 @@
             <?php endforeach; ?>
         </select>
     </div>
-    <?php echo $block->getHintHtml() ?>
+    <?= $block->getHintHtml() ?>
 </div>
 <script>
 require(['prototype'], function(){
@@ -59,7 +59,7 @@ require(['prototype'], function(){
         if(obj.switchParams){
             storeParam+= obj.switchParams;
         }
-        setLocation('<?php /* @escapeNotVerified */ echo $block->getSwitchUrl() ?>'+storeParam);
+        setLocation('<?= /* @escapeNotVerified */ $block->getSwitchUrl() ?>'+storeParam);
     }
 
 });
diff --git a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
index f6690d9068313..a6e2f3dc72261 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
@@ -15,12 +15,12 @@ $type = $block->getType() . '-' . $mode;
 $class = 'widget viewed' . ' ' . $mode;
 $title = __('Recently Viewed');
 ?>
-<div class="block <?php /* @escapeNotVerified */ echo $class; ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?php /* @escapeNotVerified */ echo $block->getCount(); ?>" style="display: none;">
+<div class="block <?= /* @escapeNotVerified */ $class ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?= /* @escapeNotVerified */ $block->getCount() ?>" style="display: none;">
     <div class="title">
-        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
     <div class="content">
-        <ol class="products list items <?php /* @escapeNotVerified */ echo $type; ?>">
+        <ol class="products list items <?= /* @escapeNotVerified */ $type ?>">
         </ol>
     </div>
 </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
index 3f2ec872ec3aa..579239d63e11e 100644
--- a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
@@ -17,16 +17,16 @@ $item = $block->getProduct();
 $image = $block->getImageType();
 $rating = 'short';
 ?>
-<div class="block" id="widget_viewed_item" data-sku="<?php /* @escapeNotVerified */ echo $item->getSku(); ?>" style="display: none;">
+<div class="block" id="widget_viewed_item" data-sku="<?= /* @escapeNotVerified */ $item->getSku() ?>" style="display: none;">
     <li class="item product">
         <div class="product">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>" class="product photo">
-                <?php echo $block->getImage($item, $image)->toHtml(); ?>
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>" class="product photo">
+                <?= $block->getImage($item, $image)->toHtml() ?>
             </a>
             <div class="product details">
-                <strong class="product name"><a title="<?php echo $block->escapeHtml($item->getName()) ?>" href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>">
-                    <?php echo $block->escapeHtml($item->getName()) ?></a>
+                <strong class="product name"><a title="<?= $block->escapeHtml($item->getName()) ?>" href="<?= /* @escapeNotVerified */ $block->getProductUrl($item) ?>">
+                    <?= $block->escapeHtml($item->getName()) ?></a>
                 </strong>
 
                 <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -39,39 +39,39 @@ $rating = 'short';
                 ) ?>
 
                 <?php if ($rating): ?>
-                    <?php echo $block->getReviewsSummaryHtml($item, $rating) ?>
+                    <?= $block->getReviewsSummaryHtml($item, $rating) ?>
                 <?php endif; ?>
 
                 <div class="product actions">
                     <div class="primary">
                         <?php if ($item->isSaleable()): ?>
                             <?php if ($item->getTypeInstance()->hasRequiredOptions($item)): ?>
-                                <button class="action tocart" data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($item) ?>"}}' type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                <button class="action tocart" data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($item) ?>"}}' type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                 </button>
                             <?php else: ?>
                                 <?php $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($item), ['product' => $item->getEntityId()])
                                 ?>
                                 <button class="action tocart"
-                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                 </button>
                             <?php endif; ?>
                         <?php else: ?>
                             <?php if ($item->getIsSalable()): ?>
-                                <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                             <?php else: ?>
-                                <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                             <?php endif; ?>
                         <?php endif; ?>
                     </div>
 
                     <div class="secondary-addto-links" data-role="add-to-links">
                         <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()): ?>
-                            <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($item); ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                            <a href="#" data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($item) ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                             </a>
                         <?php endif; ?>
                         <?php if ($block->getAddToCompareUrl()): ?>
@@ -79,10 +79,10 @@ $rating = 'short';
                             $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
                             ?>
                             <a href="#" class="action tocompare"
-                               data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($item);?>'
+                               data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($item) ?>'
                                data-role="add-to-links"
-                               title="<?php /* @escapeNotVerified */ echo __('Add to Compare'); ?>">
-                                <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                               title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                             </a>
                         <?php endif; ?>
                     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
index 6bdb1be353aa8..999452ebb7cbd 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
@@ -26,26 +26,26 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 }
 ?>
 <?php if ($exist): ?>
-<div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+<div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-compared-<?php /* @escapeNotVerified */ echo $suffix; ?>">
+        <ol class="product-items" id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>">
             <?php $iterator = 1; ?>
             <?php foreach ($items as $_product): ?>
-                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                 <div class="product-item-info">
-                    <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                        <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                    <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                       title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                        <?= $block->getImage($_product, $image)->toHtml() ?>
                     </a>
                     <div class="product-item-details">
                         <strong class="product-item-name">
-                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)">
-                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>)">
+                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
                         <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -61,9 +61,9 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                             <div class="actions-primary">
                             <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
                                 <button class="action tocart primary"
-                                        data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
-                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                        data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
+                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                 </button>
                             <?php else: ?>
                                 <?php
@@ -71,23 +71,23 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
                                 ?>
                                 <button class="action tocart primary"
-                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                        data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                        type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                    <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                 </button>
                             <?php endif; ?>
                             </div>
                         <?php else: ?>
                             <?php if ($_product->getIsSalable()): ?>
-                                <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                             <?php else: ?>
-                                <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                             <?php endif; ?>
                         <?php endif; ?>
                         </div>
                     </div>
                 </div>
-                <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
index 4ea94f4fe13ad..e125467b71f77 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_images_list.phtml
@@ -25,16 +25,16 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 <?php if ($exist): ?>
 <div class="block widget block-compared-products-images">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-compared-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
+        <ol id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
         <?php $i = 0; foreach ($items as $_product): ?>
             <li class="product-item">
-                <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                    title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                    <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                    title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                    <?= $block->getImage($_product, $image)->toHtml() ?>
                 </a>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
index cfc0ad832a1e3..ee24db7d693bd 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
@@ -10,16 +10,16 @@
 <?php if ($_products = $block->getRecentlyComparedProducts()): ?>
 <div class="block widget block-compared-products-names">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Recently Compared') ?></span></strong>
+        <strong><?= /* @escapeNotVerified */ __('Recently Compared') ?></span></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-compared-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-names">
+        <ol id="widget-compared-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
         <?php $i = 0; foreach ($_products as $_product): ?>
             <li class="product-item">
                 <strong class="product-item-name">
-                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product-item-link">
-                        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product-item-link">
+                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                     </a>
                 </strong>
             </li>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
index 7a791a2ee5ff6..f56448b11db0f 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -29,26 +29,26 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -60,7 +60,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                     ]
                                 ) ?>
                                 <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                 <?php endif; ?>
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
                                     <div class="product-item-actions">
@@ -69,9 +69,9 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -79,16 +79,16 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -98,19 +98,19 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                        data-action="add-to-wishlist"
                                                        class="action towishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); ?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -119,11 +119,11 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index 3671cda8487ef..48463f3baaa5c 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -30,26 +30,26 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-compared-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -61,7 +61,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                     ]
                                 ) ?>
                                 <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                 <?php endif; ?>
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
                                     <div class="product-item-actions">
@@ -70,9 +70,9 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -80,16 +80,16 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -99,19 +99,19 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
                                                        data-action="add-to-wishlist"
                                                        class="action towishlist"
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -120,19 +120,19 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 <?php endif; ?>
                                 <?php if ($description):?>
                                     <div class="product-item-description">
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                           class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
index 929085449d5c5..e26dc7ea31761 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
@@ -31,27 +31,27 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 <?php if ($exist): ?>
-<div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+<div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+        <strong><?= /* @escapeNotVerified */ $title ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>">
+        <ol class="product-items" id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>">
             <?php $iterator = 1; ?>
             <?php foreach ($items as $_product): ?>
-                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                 <div class="product-item-info">
-                    <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                        <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                    <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                       title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                        <?= $block->getImage($_product, $image)->toHtml() ?>
                     </a>
                     <div class="product-item-details">
                         <strong class="product-item-name">
-                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
-                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>"
+                            <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>"
+                               title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>"
                                class="product-item-link">
-                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
                         <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -67,31 +67,31 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                             <div class="actions-primary">
                                 <?php if ($_product->getTypeInstance()->hasRequiredOptions($_product)): ?>
                                     <button class="action tocart primary"
-                                            data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'
-                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                            data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_product) ?>"}}'
+                                            type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                     </button>
                                 <?php else: ?>
                                     <?php
                                         $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
                                         $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()]);
                                     ?>
-                                    <button type="button" class="action tocart primary" data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
-                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                    <button type="button" class="action tocart primary" data-post='<?= /* @escapeNotVerified */ $postData ?>'>
+                                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                     </button>
                                 <?php endif; ?>
                             </div>
                             <?php else: ?>
                                 <?php if ($_product->getIsSalable()): ?>
-                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                    <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                 <?php else: ?>
-                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                    <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                 <?php endif; ?>
                             <?php endif; ?>
                         </div>
                     </div>
                 </div>
-                <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
         </ol>
     </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
index 688b991a8d3fa..8a1daebda3049 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_images_list.phtml
@@ -30,18 +30,18 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 <?php if ($exist): ?>
     <div class="block widget block-viewed-products-images">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
+            <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-images">
                 <?php $iterator = 1; ?>
                 <?php foreach ($items as $_product): ?>
-                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
-                            <?php echo $block->getImage($_product, $image)->toHtml(); ?>
+                    <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <a class="product-item-photo" href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" title="<?= /* @escapeNotVerified */ $block->stripTags($_product->getName(), null, true) ?>">
+                            <?= $block->getImage($_product, $image)->toHtml() ?>
                         </a>
-                    <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                    <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
             <?php endforeach; ?>
             </ol>
         </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
index d6f5c503ed044..25cc6c3c921d7 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_names_list.phtml
@@ -15,16 +15,16 @@
 <?php if (($_products = $block->getRecentlyViewedProducts()) && $_products->getSize()): ?>
 <div class="block widget block-viewed-products-names">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Recently Viewed') ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Recently Viewed') ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-names">
+        <ol id="widget-viewed-<?= /* @escapeNotVerified */ $suffix ?>" class="product-items product-items-names">
         <?php foreach ($_products as $_product): ?>
             <li class="product-item">
                 <strong class="product-item-name">
-                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product-item-link">
-                        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                    <a href="<?= /* @escapeNotVerified */ $_product->getProductUrl() ?>" class="product-item-link">
+                        <?= /* @escapeNotVerified */ $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                     </a>
                 </strong>
             </li>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
index bd6831860cc57..de1145a26fe2b 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -31,26 +31,26 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 <?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -62,7 +62,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                     ]
                                 ) ?>
                                 <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                 <?php endif; ?>
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
                                     <div class="product-item-actions">
@@ -71,9 +71,9 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -81,16 +81,16 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -100,17 +100,17 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -119,11 +119,11 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index 5f7a5d94b636b..076c715dc4049 100644
--- a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
+++ b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -33,26 +33,26 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
+    <div class="block widget block-viewed-products-<?= /* @escapeNotVerified */ $mode ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ $title ?></strong>
         </div>
         <div class="block-content">
-            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
-                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
+            <?= /* @escapeNotVerified */ '<!-- ' . $image . '-->' ?>
+            <div class="products-<?= /* @escapeNotVerified */ $mode ?> <?= /* @escapeNotVerified */ $mode ?>">
+                <ol class="product-items <?= /* @escapeNotVerified */ $type ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?= /* @escapeNotVerified */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
-                                <?php echo $block->getImage($_item, $image)->toHtml(); ?>
+                            <a href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-photo">
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
                             <div class="product-item-details">
                                 <strong class="product-item-name">
-                                    <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
-                                        <?php echo $block->escapeHtml($_item->getName()) ?>
+                                    <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                       href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>" class="product-item-link">
+                                        <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
                                 <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
@@ -64,7 +64,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                     ]
                                 ) ?>
                                 <?php if ($rating): ?>
-                                    <?php echo $block->getReviewsSummaryHtml($_item, $rating) ?>
+                                    <?= $block->getReviewsSummaryHtml($_item, $rating) ?>
                                 <?php endif; ?>
                                 <?php if ($showWishlist || $showCompare || $showCart): ?>
                                     <div class="product-item-actions">
@@ -73,9 +73,9 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl": {"url": "<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-mage-init='{"redirectUrl": {"url": "<?= /* @escapeNotVerified */ $block->getAddToCartUrl($_item) ?>"}}'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php else: ?>
                                                         <?php
@@ -83,16 +83,16 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()]);
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
-                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
-                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                                                                data-post='<?= /* @escapeNotVerified */ $postData ?>'
+                                                                type="button" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>">
+                                                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                                                         </button>
                                                         <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?= /* @escapeNotVerified */ __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?= /* @escapeNotVerified */ __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -103,17 +103,17 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $block->getAddToWishlistParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Wish List') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Wish List') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                                 <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                                     <?php  $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');?>
                                                     <a href="#" class="action tocompare"
-                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
-                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
+                                                       data-post='<?= /* @escapeNotVerified */ $compareHelper->getPostDataParams($_item) ?>'
+                                                       title="<?= /* @escapeNotVerified */ __('Add to Compare') ?>">
+                                                        <span><?= /* @escapeNotVerified */ __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -122,19 +122,19 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                 <?php endif; ?>
                                 <?php if ($description):?>
                                     <div class="product-item-description">
-                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
-                                        <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
+                                        <?= /* @escapeNotVerified */ $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
+                                           href="<?= /* @escapeNotVerified */ $block->getProductUrl($_item) ?>"
+                                           class="action more"><?= /* @escapeNotVerified */ __('Learn More') ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
                         </div>
-                        <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
+                        <?= ($iterator == count($items)+1) ? '</li>' : '' ?>
                     <?php endforeach ?>
                 </ol>
             </div>
-            <?php echo $block->getPagerHtml() ?>
+            <?= $block->getPagerHtml() ?>
         </div>
     </div>
 <?php endif;?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/add.phtml b/app/code/Magento/Review/view/adminhtml/templates/add.phtml
index 35a7e921668ed..83017eec57013 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/add.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/add.phtml
@@ -5,14 +5,14 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?php echo $block->getBackButtonHtml() ?>
-    <?php echo $block->getResetButtonHtml() ?>
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getResetButtonHtml() ?>
     <span class="hidden" id="formButtons">
-        <?php echo $block->getSaveButtonHtml() ?>
+        <?= $block->getSaveButtonHtml() ?>
     </span>
 </div>
 <div class="hidden" id="formContainer">
-    <?php echo $block->getFormHtml() ?>
+    <?= $block->getFormHtml() ?>
 </div>
 <script>
 require([
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
index 20c848263b3c3..013c5d87a88bb 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
@@ -12,13 +12,13 @@
 <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
     <?php foreach ($block->getRating() as $_rating): ?>
     <div class="admin__field admin__field-rating">
-        <label class="admin__field-label"><span><?php echo $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
+        <label class="admin__field-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
         <?php $_iterator = 1; ?>
         <?php $_options = ($_rating->getRatingOptions()) ? $_rating->getRatingOptions() : $_rating->getOptions() ?>
         <div class="admin__field-control" data-widget="ratingControl">
         <?php foreach (array_reverse($_options) as $_option): ?>
-            <input type="radio" name="ratings[<?php echo $block->escapeHtmlAttr($_rating->getVoteId() ? $_rating->getVoteId() : $_rating->getId()) ?>]" id="<?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?php echo $block->escapeHtmlAttr($_option->getValue()) ?>" value="<?php echo $block->escapeHtmlAttr($_option->getId()) ?>" <?php if ($block->isSelected($_option, $_rating)): ?>checked="checked"<?php endif; ?> />
-            <label for="<?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?php echo $block->escapeHtmlAttr($_option->getValue()) ?>">&#9733;</label>
+            <input type="radio" name="ratings[<?= $block->escapeHtmlAttr($_rating->getVoteId() ? $_rating->getVoteId() : $_rating->getId()) ?>]" id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>" value="<?= $block->escapeHtmlAttr($_option->getId()) ?>" <?php if ($block->isSelected($_option, $_rating)): ?>checked="checked"<?php endif; ?> />
+            <label for="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>">&#9733;</label>
         <?php $_iterator++ ?>
         <?php endforeach; ?>
         </div>
@@ -37,5 +37,5 @@ require([
 });
 </script>
 <?php else: ?>
-    <?php echo $block->escapeHtml(__("Rating isn't Available")) ?>
+    <?= $block->escapeHtml(__("Rating isn't Available")) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
index 726a13f1cb3e1..0779d0fcbea3e 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
@@ -10,8 +10,8 @@
 ?>
 <div class="messages">
     <div class="message message-notice message-in-rating-edit">
-        <div><?php echo $block->escapeHtml(__('Please specify a rating title for a store, or we\'ll just use the default value.')); ?></div>
+        <div><?= $block->escapeHtml(__('Please specify a rating title for a store, or we\'ll just use the default value.')) ?></div>
     </div>
 </div>
 
-<?php echo $block->getFormHtml() ?>
+<?= $block->getFormHtml() ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
index 4b30a3ad9ed2c..779ee425e26f1 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/options.phtml
@@ -8,21 +8,21 @@
 // @deprecated
 ?>
 <div class="entry-edit-head">
-    <h4 class="icon-head head-edit-form fieldset-legend"><?php echo $block->escapeHtml(__('Assigned Options')) ?></h4>
+    <h4 class="icon-head head-edit-form fieldset-legend"><?= $block->escapeHtml(__('Assigned Options')) ?></h4>
 </div>
 <fieldset id="options_form">
 <?php if (!$options): ?>
     <?php for ($_i = 1; $_i <= 5; $_i++): ?>
         <span class="field-row">
-            <label for="option_<?php /* @noEscape */ echo $_i ?>"><?php echo $block->escapeHtml(__('Option Title:')) ?></label>
-            <input id="option_<?php /* @noEscape */ echo $_i ?>" name="option[<?php /* @noEscape */ echo $_i ?>][code]" value="<?php /* @noEscape */ echo $_i ?>" class="input-text" type="text" />
+            <label for="option_<?= /* @noEscape */ $_i ?>"><?= $block->escapeHtml(__('Option Title:')) ?></label>
+            <input id="option_<?= /* @noEscape */ $_i ?>" name="option[<?= /* @noEscape */ $_i ?>][code]" value="<?= /* @noEscape */ $_i ?>" class="input-text" type="text" />
         </span>
     <?php endfor; ?>
 <?php elseif ($options->getSize() > 0): ?>
     <?php foreach ($options->getItems() as $_item): ?>
         <span class="field-row">
-            <label for="option_<?php echo $block->escapeHtmlAttr($_item->getId()) ?>"><?php echo $block->escapeHtml(__('Option Title:')) ?></label>
-            <input id="option_<?php echo $block->escapeHtmlAttr($_item->getId()) ?>" name="option[<?php echo $block->escapeHtmlAttr($_item->getId()) ?>][code]" value="<?php echo $block->escapeHtmlAttr($_item->getCode()) ?>" class="input-text" type="text" />
+            <label for="option_<?= $block->escapeHtmlAttr($_item->getId()) ?>"><?= $block->escapeHtml(__('Option Title:')) ?></label>
+            <input id="option_<?= $block->escapeHtmlAttr($_item->getId()) ?>" name="option[<?= $block->escapeHtmlAttr($_item->getId()) ?>][code]" value="<?= $block->escapeHtmlAttr($_item->getCode()) ?>" class="input-text" type="text" />
         </span>
     <?php endforeach; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
index 17ce6c641c20b..e36344997c806 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/detailed.phtml
@@ -12,14 +12,14 @@
         <?php foreach ($block->getRating() as $_rating): ?>
         <?php if ($_rating->getPercent()): ?>
             <div class="ratings">
-               <?php echo $block->escapeHtml($_rating->getRatingCode()) ?>
+               <?= $block->escapeHtml($_rating->getRatingCode()) ?>
                 <div class="rating-box">
-                    <div class="rating" style="width:<?php /* @noEscape */ echo ceil($_rating->getPercent()) ?>%;"></div>
+                    <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getPercent()) ?>%;"></div>
                 </div>
             </div>
         <?php endif; ?>
         <?php endforeach; ?>
     </div>
 <?php else: ?>
-    <?php echo $block->escapeHtml(__("Rating isn't Available")) ?>
+    <?= $block->escapeHtml(__("Rating isn't Available")) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
index 33b90512224fb..56f5186b92524 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/stars/summary.phtml
@@ -10,8 +10,8 @@
 ?>
 <?php if ($block->getRatingSummary()->getCount()): ?>
     <div class="rating-box">
-        <div class="rating" style="width:<?php /* @noEscape */ echo ceil($block->getRatingSummary()->getSum() / ($block->getRatingSummary()->getCount())) ?>%;"></div>
+        <div class="rating" style="width:<?= /* @noEscape */ ceil($block->getRatingSummary()->getSum() / ($block->getRatingSummary()->getCount())) ?>%;"></div>
     </div>
 <?php else: ?>
-    <?php echo $block->escapeHtml(__("Rating isn't Available")) ?>
+    <?= $block->escapeHtml(__("Rating isn't Available")) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
index 4f01668942a0c..375e983b267e4 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rss/grid/link.phtml
@@ -9,5 +9,5 @@
 /** @var $block \Magento\Review\Block\Adminhtml\Grid\Rss\Link */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?php echo $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?php echo $block->escapeHtml($block->getLabel()) ?></a>
+<a href="<?= $block->escapeUrl($block->getLink()) ?>" class="link-feed"><?= $block->escapeHtml($block->getLabel()) ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
index fdb2623b3731f..725df702bb465 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -11,41 +11,41 @@
 <?php if ($block->getReviews() && count($block->getReviews())): ?>
     <div class="table-wrapper reviews">
         <table class="data table table-reviews" id="my-reviews-table">
-            <caption class="table-caption"><?php echo $block->escapeHtml(__('Product Reviews')) ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('Product Reviews')) ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col date"><?php echo $block->escapeHtml(__('Created')) ?></th>
-                    <th scope="col" class="col item"><?php echo $block->escapeHtml(__('Product Name')) ?></th>
-                    <th scope="col" class="col summary"><?php echo $block->escapeHtml(__('Rating')) ?></th>
-                    <th scope="col" class="col description"><?php echo $block->escapeHtml(__('Review')) ?></th>
+                    <th scope="col" class="col date"><?= $block->escapeHtml(__('Created')) ?></th>
+                    <th scope="col" class="col item"><?= $block->escapeHtml(__('Product Name')) ?></th>
+                    <th scope="col" class="col summary"><?= $block->escapeHtml(__('Rating')) ?></th>
+                    <th scope="col" class="col description"><?= $block->escapeHtml(__('Review')) ?></th>
                     <th scope="col" class="col actions">&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
                 <?php foreach ($block->getReviews() as $_review): ?>
                 <tr>
-                    <td data-th="<?php echo $block->escapeHtml(__('Created')) ?>" class="col date"><?php echo $block->escapeHtml($block->dateFormat($_review->getReviewCreatedAt())); ?></td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Product Name')) ?>" class="col item">
+                    <td data-th="<?= $block->escapeHtml(__('Created')) ?>" class="col date"><?= $block->escapeHtml($block->dateFormat($_review->getReviewCreatedAt())) ?></td>
+                    <td data-th="<?= $block->escapeHtml(__('Product Name')) ?>" class="col item">
                         <strong class="product-name">
-                            <a href="<?php echo $block->escapeUrl($block->getProductUrl($_review)) ?>"><?php echo $block->escapeHtml($_review->getName()) ?></a>
+                            <a href="<?= $block->escapeUrl($block->getProductUrl($_review)) ?>"><?= $block->escapeHtml($_review->getName()) ?></a>
                         </strong>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Rating')) ?>" class="col summary">
+                    <td data-th="<?= $block->escapeHtml(__('Rating')) ?>" class="col summary">
                     <?php if ($_review->getSum()): ?>
                         <div class="rating-summary">
-                            <span class="label"><span><?php echo $block->escapeHtml(__('Rating')) ?>:</span></span>
-                            <div class="rating-result" title="<?php /* @noEscape */ echo ((int)$_review->getSum() / (int)$_review->getCount()) ?>%">
-                                <span style="width:<?php /* @noEscape */ echo((int)$_review->getSum() / (int)$_review->getCount()) ?>%;"><span><?php /* @noEscape */ echo((int)$_review->getSum() / (int)$_review->getCount()) ?>%</span></span>
+                            <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
+                            <div class="rating-result" title="<?= /* @noEscape */ ((int)$_review->getSum() / (int)$_review->getCount()) ?>%">
+                                <span style="width:<?= /* @noEscape */ ((int)$_review->getSum() / (int)$_review->getCount()) ?>%;"><span><?= /* @noEscape */ ((int)$_review->getSum() / (int)$_review->getCount()) ?>%</span></span>
                             </div>
                         </div>
                     <?php endif; ?>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtmlAttr(__('Review')) ?>" class="col description">
-                        <?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Review')) ?>" class="col description">
+                        <?= $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtmlAttr(__('Actions')) ?>" class="col actions">
-                        <a href="<?php echo $block->escapeUrl($block->getReviewUrl($_review)) ?>" class="action more">
-                            <span><?php echo $block->escapeHtml(__('See Details')) ?></span>
+                    <td data-th="<?= $block->escapeHtmlAttr(__('Actions')) ?>" class="col actions">
+                        <a href="<?= $block->escapeUrl($block->getReviewUrl($_review)) ?>" class="action more">
+                            <span><?= $block->escapeHtml(__('See Details')) ?></span>
                         </a>
                     </td>
                 </tr>
@@ -55,16 +55,16 @@
     </div>
     <?php if ($block->getToolbarHtml()): ?>
         <div class="toolbar products-reviews-toolbar bottom">
-            <?php echo $block->getToolbarHtml() ?>
+            <?= $block->getToolbarHtml() ?>
         </div>
     <?php endif; ?>
 <?php else: ?>
-    <div class="message info empty"><span><?php echo $block->escapeHtml(__('You have submitted no reviews.')) ?></span></div>
+    <div class="message info empty"><span><?= $block->escapeHtml(__('You have submitted no reviews.')) ?></span></div>
 <?php endif; ?>
 <div class="actions-toolbar">
     <div class="secondary">
-        <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>">
-            <span><?php echo $block->escapeHtml(__('Back')) ?></span>
+        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
+            <span><?= $block->escapeHtml(__('Back')) ?></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
index 4f87c335e05ef..ed58e3832577b 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
@@ -11,20 +11,20 @@
 <?php if ($block->getReviews() && count($block->getReviews())): ?>
 <div class="block block-reviews-dashboard">
     <div class="block-title">
-        <strong><?php echo $block->escapeHtml(__('My Recent Reviews')) ?></strong>
-        <a class="action view" href="<?php echo $block->escapeUrl($block->getAllReviewsUrl()) ?>"><span><?php echo $block->escapeHtml(__('View All')) ?></span></a>
+        <strong><?= $block->escapeHtml(__('My Recent Reviews')) ?></strong>
+        <a class="action view" href="<?= $block->escapeUrl($block->getAllReviewsUrl()) ?>"><span><?= $block->escapeHtml(__('View All')) ?></span></a>
     </div>
     <div class="block-content">
         <ol class="items">
         <?php foreach ($block->getReviews() as $_review): ?>
             <li class="item">
-                <strong class="product-name"><a href="<?php echo $block->escapeUrl($block->getReviewUrl($_review->getReviewId())) ?>"><?php echo $block->escapeHtml($_review->getName()) ?></a></strong>
+                <strong class="product-name"><a href="<?= $block->escapeUrl($block->getReviewUrl($_review->getReviewId())) ?>"><?= $block->escapeHtml($_review->getName()) ?></a></strong>
                 <?php if ($_review->getSum()): ?>
                 <?php $rating = $_review->getSum() / $_review->getCount() ?>
                     <div class="rating-summary">
-                         <span class="label"><span><?php echo $block->escapeHtml(__('Rating')) ?>:</span></span>
-                         <div class="rating-result" title="<?php echo $block->escapeHtmlAttr($rating); ?>%">
-                             <span style="width:<?php echo $block->escapeHtmlAttr($rating); ?>%"><span><?php echo $block->escapeHtml($rating); ?>%</span></span>
+                         <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
+                         <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
+                             <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><?= $block->escapeHtml($rating) ?>%</span></span>
                          </div>
                      </div>
                 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
index 8b61933484c38..4903b154d9f13 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
@@ -14,16 +14,16 @@ $product = $block->getProductData();
 <div class="customer-review view">
     <div class="product-details">
         <div class="product-media">
-            <a class="product-photo" href="<?php echo $block->escapeUrl($product->getProductUrl()) ?>">
+            <a class="product-photo" href="<?= $block->escapeUrl($product->getProductUrl()) ?>">
                 <?php /* customer_account_product_review_page */ ?>
-                <?php echo $block->getImage($block->getProductData(), 'customer_account_product_review_page')->toHtml() ?>
+                <?= $block->getImage($block->getProductData(), 'customer_account_product_review_page')->toHtml() ?>
             </a>
         </div>
         <div class="product-info">
-            <h2 class="product-name"><?php echo $block->escapeHtml($product->getName()) ?></h2>
+            <h2 class="product-name"><?= $block->escapeHtml($product->getName()) ?></h2>
             <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-                <span class="rating-average-label"><?php echo $block->escapeHtml(__('Average Customer Rating:')) ?></span>
-                <?php echo $block->getReviewsSummaryHtml($product) ?>
+                <span class="rating-average-label"><?= $block->escapeHtml(__('Average Customer Rating:')) ?></span>
+                <?= $block->getReviewsSummaryHtml($product) ?>
             <?php endif; ?>
         </div>
     </div>
@@ -31,17 +31,17 @@ $product = $block->getProductData();
     <div class="review-details">
         <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
             <div class="title">
-                <strong><?php echo $block->escapeHtml(__('Your Review')); ?></strong>
+                <strong><?= $block->escapeHtml(__('Your Review')) ?></strong>
             </div>
             <div class="customer-review-rating">
                 <?php foreach ($block->getRating() as $_rating): ?>
                 <?php if ($_rating->getPercent()): ?>
                     <?php $rating = ceil($_rating->getPercent()) ?>
                     <div class="rating-summary item">
-                        <span class="rating-label"><span><?php echo $block->escapeHtml($_rating->getRatingCode()) ?></span></span>
-                        <div class="rating-result" title="<?php /* @noEscape */ echo $rating; ?>%">
-                            <span style="width:<?php /* @noEscape */ echo $rating; ?>%">
-                                <span><?php /* @noEscape */ echo $rating; ?>%</span>
+                        <span class="rating-label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></span>
+                        <div class="rating-result" title="<?= /* @noEscape */ $rating ?>%">
+                            <span style="width:<?= /* @noEscape */ $rating ?>%">
+                                <span><?= /* @noEscape */ $rating ?>%</span>
                             </span>
                         </div>
                     </div>
@@ -50,16 +50,16 @@ $product = $block->getProductData();
             </div>
         <?php endif; ?>
 
-        <div class="review-title"><?php echo $block->escapeHtml($block->getReviewData()->getTitle()) ?></div>
-        <div class="review-content"><?php echo nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></div>
+        <div class="review-title"><?= $block->escapeHtml($block->getReviewData()->getTitle()) ?></div>
+        <div class="review-content"><?= nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></div>
         <div class="review-date">
-            <?php echo $block->escapeHtml(__('Submitted on %1', '<time class="date">' . $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>'), ['time']) ?>
+            <?= $block->escapeHtml(__('Submitted on %1', '<time class="date">' . $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>'), ['time']) ?>
         </div>
     </div>
 </div>
 <div class="actions-toolbar">
     <div class="secondary">
-        <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo $block->escapeHtml(__('Back to My Reviews')) ?></span></a>
+        <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back to My Reviews')) ?></span></a>
     </div>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/detailed.phtml b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
index f468ffecf384f..df14955a29ea6 100644
--- a/app/code/Magento/Review/view/frontend/templates/detailed.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
@@ -11,15 +11,15 @@
 <?php if (!empty($collection) && $collection->getSize()): ?>
     <div class="table-wrapper">
         <table class="data table ratings review summary">
-            <caption class="table-caption"><?php echo $block->escapeHtml(__('Ratings Review Summary')); ?></caption>
+            <caption class="table-caption"><?= $block->escapeHtml(__('Ratings Review Summary')) ?></caption>
             <tbody>
             <?php foreach ($collection as $_rating): ?>
                 <?php if ($_rating->getSummary()): ?>
                     <tr>
-                        <th class="label" scope="row"><?php echo $block->escapeHtml(__($_rating->getRatingCode())) ?></th>
+                        <th class="label" scope="row"><?= $block->escapeHtml(__($_rating->getRatingCode())) ?></th>
                         <td class="value">
                             <div class="rating box">
-                                <div class="rating" style="width:<?php /* @noEscape */ echo ceil($_rating->getSummary()) ?>%;"></div>
+                                <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getSummary()) ?>%;"></div>
                             </div>
                         </td>
                     </tr>
diff --git a/app/code/Magento/Review/view/frontend/templates/empty.phtml b/app/code/Magento/Review/view/frontend/templates/empty.phtml
index 483867186aea1..4328a135a98f3 100644
--- a/app/code/Magento/Review/view/frontend/templates/empty.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/empty.phtml
@@ -8,4 +8,4 @@
 
 /** @var \Magento\Review\Block\Rating\Entity\Detailed $block */
 ?>
-<p class="no-rating"><a href="#review-form"><?php echo $block->escapeHtml(__('Be the first to review this product')) ?></a></p>
+<p class="no-rating"><a href="#review-form"><?= $block->escapeHtml(__('Be the first to review this product')) ?></a></p>
diff --git a/app/code/Magento/Review/view/frontend/templates/form.phtml b/app/code/Magento/Review/view/frontend/templates/form.phtml
index b646817897934..22031b3f3a20b 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -9,40 +9,40 @@
 /** @var \Magento\Review\Block\Form $block */
 ?>
 <div class="block review-add">
-    <div class="block-title"><strong><?php echo $block->escapeHtml(__('Write Your Own Review')) ?></strong></div>
+    <div class="block-title"><strong><?= $block->escapeHtml(__('Write Your Own Review')) ?></strong></div>
 <div class="block-content">
 <?php if ($block->getAllowWriteReviewFlag()): ?>
-<form action="<?php echo $block->escapeUrl($block->getAction()) ?>" class="review-form" method="post" id="review-form" data-role="product-review-form" data-bind="scope: 'review-form'">
-    <?php echo $block->getBlockHtml('formkey'); ?>
-    <?php echo $block->getChildHtml('form_fields_before')?>
-    <fieldset class="fieldset review-fieldset" data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')); ?>">
-        <legend class="legend review-legend"><span><?php echo $block->escapeHtml(__("You're reviewing:")); ?></span><strong><?php echo $block->escapeHtml($block->getProductInfo()->getName()) ?></strong></legend><br />
+<form action="<?= $block->escapeUrl($block->getAction()) ?>" class="review-form" method="post" id="review-form" data-role="product-review-form" data-bind="scope: 'review-form'">
+    <?= $block->getBlockHtml('formkey') ?>
+    <?= $block->getChildHtml('form_fields_before') ?>
+    <fieldset class="fieldset review-fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+        <legend class="legend review-legend"><span><?= $block->escapeHtml(__("You're reviewing:")) ?></span><strong><?= $block->escapeHtml($block->getProductInfo()->getName()) ?></strong></legend><br />
         <?php if ($block->getRatings() && $block->getRatings()->getSize()): ?>
         <span id="input-message-box"></span>
         <fieldset class="field required review-field-ratings">
-            <legend class="label"><span><?php echo $block->escapeHtml(__('Your Rating')) ?></span></legend><br/>
+            <legend class="label"><span><?= $block->escapeHtml(__('Your Rating')) ?></span></legend><br/>
             <div class="control">
                 <div class="nested" id="product-review-table">
                     <?php foreach ($block->getRatings() as $_rating): ?>
                         <div class="field choice review-field-rating">
-                            <label class="label" id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_rating_label"><span><?php echo $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
+                            <label class="label" id="<?= $block->escapeHtml($_rating->getRatingCode()) ?>_rating_label"><span><?= $block->escapeHtml($_rating->getRatingCode()) ?></span></label>
                             <div class="control review-control-vote">
                             <?php $options = $_rating->getOptions();?>
                             <?php $iterator = 1; foreach ($options as $_option): ?>
                                 <input
                                     type="radio"
-                                    name="ratings[<?php echo $block->escapeHtmlAttr($_rating->getId()) ?>]"
-                                    id="<?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?php echo $block->escapeHtmlAttr($_option->getValue()) ?>"
-                                    value="<?php echo $block->escapeHtmlAttr($_option->getId()) ?>"
+                                    name="ratings[<?= $block->escapeHtmlAttr($_rating->getId()) ?>]"
+                                    id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
+                                    value="<?= $block->escapeHtmlAttr($_option->getId()) ?>"
                                     class="radio"
                                     data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}"
-                                    aria-labelledby="<?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_rating_label <?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?php echo $block->escapeHtmlAttr($_option->getValue()) ?>_label" />
+                                    aria-labelledby="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_rating_label <?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label" />
                                 <label
-                                    class="rating-<?php echo $block->escapeHtmlAttr($iterator); ?>"
-                                    for="<?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?php echo $block->escapeHtmlAttr($_option->getValue()) ?>"
-                                    title="<?php echo $block->escapeHtmlAttr(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?>"
-                                    id="<?php echo $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?php echo $block->escapeHtmlAttr($_option->getValue()) ?>_label">
-                                    <span><?php echo $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?></span>
+                                    class="rating-<?= $block->escapeHtmlAttr($iterator) ?>"
+                                    for="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>"
+                                    title="<?= $block->escapeHtmlAttr(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?>"
+                                    id="<?= $block->escapeHtmlAttr($_rating->getRatingCode()) ?>_<?= $block->escapeHtmlAttr($_option->getValue()) ?>_label">
+                                    <span><?= $block->escapeHtml(__('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star')) ?></span>
                                 </label>
                             <?php $iterator++; ?>
                             <?php endforeach; ?>
@@ -55,19 +55,19 @@
         </fieldset>
     <?php endif ?>
         <div class="field review-field-nickname required">
-            <label for="nickname_field" class="label"><span><?php echo $block->escapeHtml(__('Nickname')) ?></span></label>
+            <label for="nickname_field" class="label"><span><?= $block->escapeHtml(__('Nickname')) ?></span></label>
             <div class="control">
                 <input type="text" name="nickname" id="nickname_field" class="input-text" data-validate="{required:true}" data-bind="value: nickname()" />
             </div>
         </div>
         <div class="field review-field-summary required">
-            <label for="summary_field" class="label"><span><?php echo $block->escapeHtml(__('Summary')) ?></span></label>
+            <label for="summary_field" class="label"><span><?= $block->escapeHtml(__('Summary')) ?></span></label>
             <div class="control">
                 <input type="text" name="title" id="summary_field" class="input-text" data-validate="{required:true}" data-bind="value: review().title" />
             </div>
         </div>
         <div class="field review-field-text required">
-            <label for="review_field" class="label"><span><?php echo $block->escapeHtml(__('Review')) ?></span></label>
+            <label for="review_field" class="label"><span><?= $block->escapeHtml(__('Review')) ?></span></label>
             <div class="control">
                 <textarea name="detail" id="review_field" cols="5" rows="3" data-validate="{required:true}" data-bind="value: review().detail"></textarea>
             </div>
@@ -75,14 +75,14 @@
     </fieldset>
     <div class="actions-toolbar review-form-actions">
         <div class="primary actions-primary">
-            <button type="submit" class="action submit primary"><span><?php echo $block->escapeHtml(__('Submit Review')) ?></span></button>
+            <button type="submit" class="action submit primary"><span><?= $block->escapeHtml(__('Submit Review')) ?></span></button>
         </div>
     </div>
 </form>
 <script type="text/x-magento-init">
 {
     "[data-role=product-review-form]": {
-        "Magento_Ui/js/core/app": <?php /* @noEscape */ echo $block->getJsLayout(); ?>
+        "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
     },
     "#review-form": {
         "Magento_Review/js/error-placement": {}
@@ -92,7 +92,7 @@
 <?php else: ?>
     <div class="message info notlogged" id="review-form">
         <div>
-            <?php echo $block->escapeHtml(__('Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">create an account</a>', $block->getLoginLink(), $block->getRegisterUrl()), ['a']) ?>
+            <?= $block->escapeHtml(__('Only registered users can write reviews. Please <a href="%1">Sign in</a> or <a href="%2">create an account</a>', $block->getLoginLink(), $block->getRegisterUrl()), ['a']) ?>
         </div>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
index 0749dbbd320f1..bf40127ff1f12 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -13,25 +13,25 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
 <?php if ($block->getReviewsCount()): ?>
 <?php $rating = $block->getRatingSummary(); ?>
-<div class="product-reviews-summary<?php echo !$rating ? ' no-rating' : ''?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
+<div class="product-reviews-summary<?= !$rating ? ' no-rating' : '' ?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
     <?php if ($rating):?>
     <div class="rating-summary">
-         <span class="label"><span><?php echo $block->escapeHtml(__('Rating')) ?>:</span></span>
-         <div class="rating-result" title="<?php echo $block->escapeHtmlAttr($rating); ?>%">
-             <span style="width:<?php echo $block->escapeHtmlAttr($rating); ?>%"><span><span itemprop="ratingValue"><?php echo $block->escapeHtml($rating); ?></span>% of <span itemprop="bestRating">100</span></span></span>
+         <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
+         <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
+             <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><span itemprop="ratingValue"><?= $block->escapeHtml($rating) ?></span>% of <span itemprop="bestRating">100</span></span></span>
          </div>
      </div>
     <?php endif;?>
     <div class="reviews-actions">
-        <a class="action view" href="<?php echo $block->escapeUrl($url) ?>"><span itemprop="reviewCount"><?php echo $block->escapeHtml($block->getReviewsCount()) ?></span>&nbsp;<span><?php echo($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
-        <a class="action add" href="<?php echo $block->escapeUrl($urlForm) ?>"><?php echo $block->escapeHtml(__('Add Your Review')) ?></a>
+        <a class="action view" href="<?= $block->escapeUrl($url) ?>"><span itemprop="reviewCount"><?= $block->escapeHtml($block->getReviewsCount()) ?></span>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
+        <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>"><?= $block->escapeHtml(__('Add Your Review')) ?></a>
     </div>
 </div>
 <?php elseif ($block->getDisplayIfEmpty()): ?>
 <div class="product-reviews-summary empty">
     <div class="reviews-actions">
-        <a class="action add" href="<?php echo $block->escapeUrl($urlForm); ?>">
-            <?php echo $block->escapeHtml(__('Be the first to review this product')) ?>
+        <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
+            <?= $block->escapeHtml(__('Be the first to review this product')) ?>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
index 318dca5ea21fa..c3eb11f03fd7d 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary_short.phtml
@@ -13,24 +13,24 @@ $urlForm = $block->getReviewsUrl() . '#review-form';
 ?>
 <?php if ($block->getReviewsCount()): ?>
 <?php $rating = $block->getRatingSummary(); ?>
-<div class="product-reviews-summary short<?php echo !$rating ? ' no-rating' : ''?>">
+<div class="product-reviews-summary short<?= !$rating ? ' no-rating' : '' ?>">
     <?php if ($rating):?>
     <div class="rating-summary">
-        <span class="label"><span><?php echo $block->escapeHtml(__('Rating')) ?>:</span></span>
-        <div class="rating-result" title="<?php echo $block->escapeHtmlAttr($rating); ?>%">
-            <span style="width:<?php echo $block->escapeHtmlAttr($rating); ?>%"><span><?php echo $block->escapeHtml($rating); ?>%</span></span>
+        <span class="label"><span><?= $block->escapeHtml(__('Rating')) ?>:</span></span>
+        <div class="rating-result" title="<?= $block->escapeHtmlAttr($rating) ?>%">
+            <span style="width:<?= $block->escapeHtmlAttr($rating) ?>%"><span><?= $block->escapeHtml($rating) ?>%</span></span>
         </div>
     </div>
     <?php endif;?>
     <div class="reviews-actions">
-        <a class="action view" href="<?php echo $block->escapeUrl($url) ?>"><?php echo $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?php echo($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
+        <a class="action view" href="<?= $block->escapeUrl($url) ?>"><?= $block->escapeHtml($block->getReviewsCount()) ?>&nbsp;<span><?= ($block->getReviewsCount() == 1) ? $block->escapeHtml(__('Review')) : $block->escapeHtml(__('Reviews')) ?></span></a>
     </div>
 </div>
 <?php elseif ($block->getDisplayIfEmpty()): ?>
 <div class="product-reviews-summary short empty">
     <div class="reviews-actions">
-        <a class="action add" href="<?php echo $block->escapeUrl($urlForm); ?>">
-            <?php echo $block->escapeHtml(__('Be the first to review this product')) ?>
+        <a class="action add" href="<?= $block->escapeUrl($urlForm) ?>">
+            <?= $block->escapeHtml(__('Be the first to review this product')) ?>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
index a3de87f572375..bff1c48508e11 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/count.phtml
@@ -8,5 +8,5 @@
 // @deprecated
 ?>
 <?php if (!empty($count)):?>
-    <a href="#customer-reviews" class="nobr"><?php echo $block->escapeHtml(__('%1 Review(s)', $count)) ?></a>
+    <a href="#customer-reviews" class="nobr"><?= $block->escapeHtml(__('%1 Review(s)', $count)) ?></a>
 <?php endif;?>
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
index 9d87c6f349618..dc02853e77b18 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/list.phtml
@@ -14,26 +14,26 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
 <?php if (count($_items)):?>
 <div class="block review-list" id="customer-reviews">
     <div class="block-title">
-        <strong><?php echo $block->escapeHtml(__('Customer Reviews')) ?></strong>
+        <strong><?= $block->escapeHtml(__('Customer Reviews')) ?></strong>
     </div>
     <div class="block-content">
         <div class="toolbar review-toolbar">
-            <?php echo $block->getChildHtml('toolbar') ?>
+            <?= $block->getChildHtml('toolbar') ?>
         </div>
         <ol class="items review-items">
         <?php foreach ($_items as $_review):?>
             <li class="item review-item" itemscope itemprop="review" itemtype="http://schema.org/Review">
-                <div class="review-title" itemprop="name"><?php echo $block->escapeHtml($_review->getTitle()) ?></div>
+                <div class="review-title" itemprop="name"><?= $block->escapeHtml($_review->getTitle()) ?></div>
                 <?php if (count($_review->getRatingVotes())): ?>
                     <div class="review-ratings">
                     <?php foreach ($_review->getRatingVotes() as $_vote): ?>
                     <div class="rating-summary item" itemprop="reviewRating" itemscope itemtype="http://schema.org/Rating">
-                        <span class="label rating-label"><span><?php echo $block->escapeHtml($_vote->getRatingCode()) ?></span></span>
-                        <div class="rating-result" title="<?php echo $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
+                        <span class="label rating-label"><span><?= $block->escapeHtml($_vote->getRatingCode()) ?></span></span>
+                        <div class="rating-result" title="<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
 	                        <meta itemprop="worstRating" content = "1"/>
 	                        <meta itemprop="bestRating" content = "100"/>
-                            <span style="width:<?php echo $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
-                                <span itemprop="ratingValue"><?php echo $block->escapeHtml($_vote->getPercent()) ?>%</span>
+                            <span style="width:<?= $block->escapeHtmlAttr($_vote->getPercent()) ?>%">
+                                <span itemprop="ratingValue"><?= $block->escapeHtml($_vote->getPercent()) ?>%</span>
                             </span>
                         </div>
                     </div>
@@ -41,23 +41,23 @@ $format = $block->getDateFormat() ?: \IntlDateFormatter::SHORT;
                     </div>
                 <?php endif; ?>
                 <div class="review-content" itemprop="description">
-                    <?php echo nl2br($block->escapeHtml($_review->getDetail())) ?>
+                    <?= nl2br($block->escapeHtml($_review->getDetail())) ?>
                 </div>
                 <div class="review-details">
                     <p class="review-author">
-                        <span class="review-details-label"><?php echo $block->escapeHtml(__('Review by'))?></span>
-                        <strong class="review-details-value" itemprop="author"><?php echo $block->escapeHtml($_review->getNickname()) ?></strong>
+                        <span class="review-details-label"><?= $block->escapeHtml(__('Review by')) ?></span>
+                        <strong class="review-details-value" itemprop="author"><?= $block->escapeHtml($_review->getNickname()) ?></strong>
                     </p>
                     <p class="review-date">
-                        <span class="review-details-label"><?php echo $block->escapeHtml(__('Posted on')) ?></span>
-                        <time class="review-details-value" itemprop="datePublished" datetime="<?php echo $block->escapeHtmlAttr($block->formatDate($_review->getCreatedAt(), $format)) ?>"><?php echo $block->escapeHtml($block->formatDate($_review->getCreatedAt(), $format)) ?></time>
+                        <span class="review-details-label"><?= $block->escapeHtml(__('Posted on')) ?></span>
+                        <time class="review-details-value" itemprop="datePublished" datetime="<?= $block->escapeHtmlAttr($block->formatDate($_review->getCreatedAt(), $format)) ?>"><?= $block->escapeHtml($block->formatDate($_review->getCreatedAt(), $format)) ?></time>
                     </p>
                 </div>
             </li>
         <?php endforeach; ?>
         </ol>
         <div class="toolbar review-toolbar">
-            <?php echo $block->getChildHtml('toolbar') ?>
+            <?= $block->getChildHtml('toolbar') ?>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
index d5800d1266e07..48d668ca85a0d 100644
--- a/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/product/view/other.phtml
@@ -10,5 +10,5 @@
 ?>
 <?php $_product = $block->getProduct(); ?>
 <div class="actions">
-    <a href="<?php echo $block->escapeUrl($_product->getProductUrl()) ?>" class="action back"><span><?php echo $block->escapeHtml(__('Back to Main Product Info')) ?></span></a>
+    <a href="<?= $block->escapeUrl($_product->getProductUrl()) ?>" class="action back"><span><?= $block->escapeHtml(__('Back to Main Product Info')) ?></span></a>
 </div>
diff --git a/app/code/Magento/Review/view/frontend/templates/review.phtml b/app/code/Magento/Review/view/frontend/templates/review.phtml
index 50ed70e210d35..ea4b4bc42a1ed 100644
--- a/app/code/Magento/Review/view/frontend/templates/review.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/review.phtml
@@ -7,13 +7,13 @@
 /** @var \Magento\Review\Block\Product\Review $block */
 ?>
 <div id="product-review-container" data-role="product-review"></div>
-<?php echo $block->getChildHtml(); ?>
+<?= $block->getChildHtml() ?>
 
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Review/js/process-reviews": {
-                "productReviewUrl": "<?php echo $block->escapeJs($block->escapeUrl($block->getProductReviewUrl())); ?>",
+                "productReviewUrl": "<?= $block->escapeJs($block->escapeUrl($block->getProductReviewUrl())) ?>",
                 "reviewsTabSelector": "#tab-label-reviews"
             }
         }
diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
index e5bf6b084a880..564a6e1a7c537 100644
--- a/app/code/Magento/Review/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/view.phtml
@@ -11,31 +11,31 @@
 <?php if ($block->getProductData()->getId()): ?>
 <div class="product-review">
     <div class="page-title-wrapper">
-        <h1><?php echo $block->escapeHtml(__('Review Details')) ?></h1>
+        <h1><?= $block->escapeHtml(__('Review Details')) ?></h1>
     </div>
     <div class="product-img-box">
-        <a href="<?php echo $block->escapeUrl($block->getProductData()->getProductUrl()) ?>">
-            <?php echo $block->getImage($block->getProductData(), 'product_base_image', ['class' => 'product-image'])->toHtml(); ?>
+        <a href="<?= $block->escapeUrl($block->getProductData()->getProductUrl()) ?>">
+            <?= $block->getImage($block->getProductData(), 'product_base_image', ['class' => 'product-image'])->toHtml() ?>
         </a>
         <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-          <p><?php echo $block->escapeHtml(__('Average Customer Rating')) ?>:</p>
-          <?php echo $block->getReviewsSummaryHtml($block->getProductData()) ?>
+          <p><?= $block->escapeHtml(__('Average Customer Rating')) ?>:</p>
+          <?= $block->getReviewsSummaryHtml($block->getProductData()) ?>
         <?php endif; ?>
     </div>
     <div class="details">
-        <h3 class="product-name"><?php echo $block->escapeHtml($block->getProductData()->getName()) ?></h3>
+        <h3 class="product-name"><?= $block->escapeHtml($block->getProductData()->getName()) ?></h3>
         <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-            <h4><?php echo $block->escapeHtml(__('Product Rating:')) ?></h4>
+            <h4><?= $block->escapeHtml(__('Product Rating:')) ?></h4>
             <div class="table-wrapper">
                 <table class="data-table review-summary-table">
-                    <caption class="table-caption"><?php echo $block->escapeHtml(__('Product Rating')); ?></caption>
+                    <caption class="table-caption"><?= $block->escapeHtml(__('Product Rating')) ?></caption>
                     <?php foreach ($block->getRating() as $_rating): ?>
                         <?php if ($_rating->getPercent()): ?>
                             <tr>
-                                <td class="label"><?php echo $block->escapeHtml(__($_rating->getRatingCode())) ?></td>
+                                <td class="label"><?= $block->escapeHtml(__($_rating->getRatingCode())) ?></td>
                                 <td class="value">
                                     <div class="rating-box">
-                                        <div class="rating" style="width:<?php /* @noEscape */ echo ceil($_rating->getPercent()) ?>%;"></div>
+                                        <div class="rating" style="width:<?= /* @noEscape */ ceil($_rating->getPercent()) ?>%;"></div>
                                     </div></td>
                             </tr>
                         <?php endif; ?>
@@ -43,13 +43,13 @@
                 </table>
             </div>
         <?php endif; ?>
-        <p class="date"><?php echo $block->escapeHtml(__('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt()))) ?></p>
-        <p><?php echo nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></p>
+        <p class="date"><?= $block->escapeHtml(__('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt()))) ?></p>
+        <p><?= nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></p>
     </div>
     <div class="actions">
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>">
-                <span><?php echo $block->escapeHtml(__('Back to Product Reviews')) ?></a></span>
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
+                <span><?= $block->escapeHtml(__('Back to Product Reviews')) ?></a></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
index becf95cc74cd9..22328e9188ea5 100644
--- a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
+++ b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
@@ -10,24 +10,24 @@
 
 ?>
 <table class="data table rss">
-    <caption class="table-caption"><?php echo $block->escapeHtml(__('Feed')); ?></caption>
+    <caption class="table-caption"><?= $block->escapeHtml(__('Feed')) ?></caption>
     <tbody>
-        <th colspan="2" scope="col"><?php echo $block->escapeHtml(__('Miscellaneous Feeds')) ?></th>
+        <th colspan="2" scope="col"><?= $block->escapeHtml(__('Miscellaneous Feeds')) ?></th>
     <?php foreach ($block->getFeeds() as $feed): ?>
         <?php if (!isset($feed['group'])): ?>
         <tr>
-            <td class="col feed"><?php echo $block->escapeHtml($feed['label']) ?></td>
+            <td class="col feed"><?= $block->escapeHtml($feed['label']) ?></td>
             <td class="col action">
-                <a href="<?php echo $block->escapeUrl($feed['link']) ?>" class="action get"><span><?php echo $block->escapeHtml(__('Get Feed')); ?></span></a>
+                <a href="<?= $block->escapeUrl($feed['link']) ?>" class="action get"><span><?= $block->escapeHtml(__('Get Feed')) ?></span></a>
             </td>
         </tr>
         <?php else: ?>
-            <th colspan="2" scope="col"><?php echo $block->escapeHtml($feed['group']) ?></th>
+            <th colspan="2" scope="col"><?= $block->escapeHtml($feed['group']) ?></th>
             <?php foreach ($feed['feeds'] as $item) :?>
                 <tr>
-                    <td class="col feed"><?php echo $block->escapeHtml($item['label']) ?></td>
+                    <td class="col feed"><?= $block->escapeHtml($item['label']) ?></td>
                     <td class="col action">
-                        <a href="<?php echo $block->escapeUrl($item['link']) ?>" class="action get"><span><?php echo $block->escapeHtml(__('Get Feed')); ?></span></a>
+                        <a href="<?= $block->escapeUrl($item['link']) ?>" class="action get"><span><?= $block->escapeHtml(__('Get Feed')) ?></span></a>
                     </td>
                 </tr>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
index fdc5abcaee472..e1e6b85542b58 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo/Totals.php
@@ -103,20 +103,20 @@ protected function _initTotals()
         /**
                 <?php if ($this->getCanDisplayTotalPaid()): ?>
                 <tr>
-           <td colspan="6" class="a-right"><strong><?php echo __('Total Paid') ?></strong></td>
-           <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalPaid()) ?></strong></td>
+           <td colspan="6" class="a-right"><strong><?= __('Total Paid') ?></strong></td>
+           <td class="last a-right"><strong><?= $_order->formatPrice($_creditmemo->getTotalPaid()) ?></strong></td>
                 </tr>
                 <?php endif; ?>
                 <?php if ($this->getCanDisplayTotalRefunded()): ?>
                 <tr>
-           <td colspan="6" class="a-right"><strong><?php echo __('Total Refunded') ?></strong></td>
-           <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalRefunded()) ?></strong></td>
+           <td colspan="6" class="a-right"><strong><?= __('Total Refunded') ?></strong></td>
+           <td class="last a-right"><strong><?= $_order->formatPrice($_creditmemo->getTotalRefunded()) ?></strong></td>
                 </tr>
                 <?php endif; ?>
                 <?php if ($this->getCanDisplayTotalDue()): ?>
                 <tr>
-           <td colspan="6" class="a-right"><strong><?php echo __('Total Due') ?></strong></td>
-           <td class="last a-right"><strong><?php echo $_order->formatPrice($_creditmemo->getTotalDue()) ?></strong></td>
+           <td colspan="6" class="a-right"><strong><?= __('Total Due') ?></strong></td>
+           <td class="last a-right"><strong><?= $_order->formatPrice($_creditmemo->getTotalDue()) ?></strong></td>
                 </tr>
                 <?php endif; ?>
         */
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
index 6899a24747467..27b8ca86b1681 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -14,32 +14,32 @@
 ?>
 
 <?php if ($_item = $block->getItem()): ?>
-    <div id="order_item_<?php /* @escapeNotVerified */ echo $_item->getId() ?>_title"
+    <div id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"
          class="product-title">
-        <?php echo $block->escapeHtml($_item->getName()) ?>
+        <?= $block->escapeHtml($_item->getName()) ?>
     </div>
 
     <div class="product-sku-block">
-        <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?>
+        <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))) ?>
     </div>
 
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
             <?php foreach ($block->getOrderOptions() as $_option): ?>
-                <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?>:</dt>
+                <dt><?= /* @escapeNotVerified */ $_option['label'] ?>:</dt>
                 <dd>
                     <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                        <?php /* @escapeNotVerified */ echo $block->getCustomizedOptionValue($_option); ?>
+                        <?= /* @escapeNotVerified */ $block->getCustomizedOptionValue($_option) ?>
                     <?php else: ?>
                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
-                        <?php /* @escapeNotVerified */ echo $_option['value']; ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?php /* @escapeNotVerified */ echo $_dots = 'dots' . uniqid()?>"> ...</span><span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_option['remainder'] ?></span>
+                        <?= /* @escapeNotVerified */ $_option['value'] ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?= /* @escapeNotVerified */ $_dots = 'dots' . uniqid() ?>"> ...</span><span id="<?= /* @escapeNotVerified */ $_id = 'id' . uniqid() ?>"><?= /* @escapeNotVerified */ $_option['remainder'] ?></span>
                             <script>
                                 require(['prototype'], function() {
-                                    $('<?php /* @escapeNotVerified */ echo $_id ?>').hide();
-                                    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').show();});
-                                    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseover', function(){$('<?php /* @escapeNotVerified */ echo $_dots?>').hide();});
-                                    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_id ?>').hide();});
-                                    $('<?php /* @escapeNotVerified */ echo $_id ?>').up().observe('mouseout',  function(){$('<?php /* @escapeNotVerified */ echo $_dots ?>').show();});
+                                    $('<?= /* @escapeNotVerified */ $_id ?>').hide();
+                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_id ?>').show();});
+                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseover', function(){$('<?= /* @escapeNotVerified */ $_dots ?>').hide();});
+                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_id ?>').hide();});
+                                    $('<?= /* @escapeNotVerified */ $_id ?>').up().observe('mouseout',  function(){$('<?= /* @escapeNotVerified */ $_dots ?>').show();});
                                 });
                             </script>
                         <?php endif; ?>
@@ -48,5 +48,5 @@
             <?php endforeach; ?>
         </dl>
     <?php endif; ?>
-    <?php echo $block->escapeHtml($_item->getDescription()) ?>
+    <?= $block->escapeHtml($_item->getDescription()) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
index 38461fcbaf1b8..faa49dca3a8eb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/column/qty.phtml
@@ -10,35 +10,35 @@
 <?php if ($_item = $block->getItem()): ?>
 <table class="qty-table">
     <tr>
-        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
-        <td><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
+        <th><?= /* @escapeNotVerified */ __('Ordered') ?></th>
+        <td><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
     </tr>
 
     <?php if ((float) $_item->getQtyInvoiced()): ?>
         <tr>
-            <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
-            <td><?php /* @escapeNotVerified */ echo $_item->getQtyInvoiced()*1 ?></td>
+            <th><?= /* @escapeNotVerified */ __('Invoiced') ?></th>
+            <td><?= /* @escapeNotVerified */ $_item->getQtyInvoiced()*1 ?></td>
         </tr>
     <?php endif; ?>
 
     <?php if ((float) $_item->getQtyShipped()): ?>
         <tr>
-            <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
-            <td><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></td>
+            <th><?= /* @escapeNotVerified */ __('Shipped') ?></th>
+            <td><?= /* @escapeNotVerified */ $_item->getQtyShipped()*1 ?></td>
         </tr>
     <?php endif; ?>
 
     <?php if ((float) $_item->getQtyRefunded()): ?>
         <tr>
-            <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
-            <td><?php /* @escapeNotVerified */ echo $_item->getQtyRefunded()*1 ?></td>
+            <th><?= /* @escapeNotVerified */ __('Refunded') ?></th>
+            <td><?= /* @escapeNotVerified */ $_item->getQtyRefunded()*1 ?></td>
         </tr>
     <?php endif; ?>
 
     <?php if ((float) $_item->getQtyCanceled()): ?>
         <tr>
-            <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
-            <td><?php /* @escapeNotVerified */ echo $_item->getQtyCanceled()*1 ?></td>
+            <th><?= /* @escapeNotVerified */ __('Canceled') ?></th>
+            <td><?= /* @escapeNotVerified */ $_item->getQtyCanceled()*1 ?></td>
         </tr>
     <?php endif; ?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
index bd0e171463e1e..54e95876d7626 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/row.phtml
@@ -14,5 +14,5 @@ $_item = $block->getItem();
 ?>
 
 <div class="price-excl-tax">
-    <?php /* @escapeNotVerified */ echo $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+    <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
index 54ea77d51a4db..46a0a0926f4c7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/total.phtml
@@ -13,4 +13,4 @@
 $_item = $block->getItem();
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
index ff5dc8f4de439..444310c80884a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/price/unit.phtml
@@ -13,5 +13,5 @@
 $_item = $block->getItem();
 ?>
 <div class="price-excl-tax">
-<?php /* @escapeNotVerified */ echo $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+<?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
index c2d5c539f2042..09f6ee5d6a49a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/items/renderer/default.phtml
@@ -8,21 +8,21 @@
 
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->getItem()->getName() ?>
-<div><strong><?php /* @escapeNotVerified */ echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getItem()->getSku()))); ?></div>
+<?= /* @escapeNotVerified */ $block->getItem()->getName() ?>
+<div><strong><?= /* @escapeNotVerified */ __('SKU') ?>:</strong> <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getItem()->getSku()))) ?></div>
 <?php if ($block->getOrderOptions()): ?>
     <ul class="item-options">
     <?php foreach ($block->getOrderOptions() as $option): ?>
-        <li><strong><?php /* @escapeNotVerified */ echo $option['label'] ?>:</strong><br />
+        <li><strong><?= /* @escapeNotVerified */ $option['label'] ?>:</strong><br />
         <?php if (is_array($option['value'])): ?>
         <?php foreach ($option['value'] as $item): ?>
-            <?php echo $block->getValueHtml($item) ?><br />
+            <?= $block->getValueHtml($item) ?><br />
             <?php endforeach; ?>
         <?php else: ?>
-            <?php echo $block->escapeHtml($option['value']); ?>
+            <?= $block->escapeHtml($option['value']) ?>
         <?php endif; ?>
         </li>
     <?php endforeach; ?>
     </ul>
 <?php endif; ?>
-<?php echo $block->escapeHtml($block->getItem()->getDescription()) ?>
+<?= $block->escapeHtml($block->getItem()->getDescription()) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
index d72f75b0756da..ff79e2f89cd20 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/address/form.phtml
@@ -9,16 +9,16 @@
 ?>
 <div class="message message-notice">
     <div class="message-inner">
-        <div class="message-content"><?php /* @escapeNotVerified */ echo __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
+        <div class="message-content"><?= /* @escapeNotVerified */ __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
     </div>
 </div>
 
 <fieldset class="fieldset admin__fieldset-wrapper">
     <legend class="legend admin__legend">
-        <span><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
+        <span><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
     </legend>
     <br>
     <div class="form-inline" data-mage-init='{"Magento_Sales/order/edit/address/form":{}}'>
-        <?php echo $block->getForm()->toHtml() ?>
+        <?= $block->getForm()->toHtml() ?>
     </div>
 </fieldset>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
index 56c08b224d47b..f01e1c274a1de 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/comments/view.phtml
@@ -12,7 +12,7 @@
     <div class="order-history-block">
         <div class="admin__field field-row">
             <label class="admin__field-label"
-                   for="history_comment"><?php /* @escapeNotVerified */ echo __('Comment Text') ?></label>
+                   for="history_comment"><?= /* @escapeNotVerified */ __('Comment Text') ?></label>
             <div class="admin__field-control">
                 <textarea name="comment[comment]"
                           class="admin__control-textarea"
@@ -31,7 +31,7 @@
                                id="history_notify"
                                value="1" />
                         <label class="admin__field-label"
-                               for="history_notify"><?php /* @escapeNotVerified */ echo __('Notify Customer by Email') ?></label>
+                               for="history_notify"><?= /* @escapeNotVerified */ __('Notify Customer by Email') ?></label>
                     </div>
                 <?php endif; ?>
                 <div class="admin__field admin__field-option">
@@ -41,11 +41,11 @@
                            class="admin__control-checkbox"
                            value="1" />
                     <label class="admin__field-label"
-                           for="history_visible"> <?php /* @escapeNotVerified */ echo __('Visible on Storefront') ?></label>
+                           for="history_visible"> <?= /* @escapeNotVerified */ __('Visible on Storefront') ?></label>
                 </div>
             </div>
             <div class="order-history-comments-actions">
-                <?php echo $block->getChildHtml('submit_button') ?>
+                <?= $block->getChildHtml('submit_button') ?>
             </div>
         </div>
     </div>
@@ -53,17 +53,17 @@
     <ul class="note-list">
         <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
             <li>
-                <span class="note-list-date"><?php /* @noEscape */ echo $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-                <span class="note-list-time"><?php /* @noEscape */ echo $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_comment->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-customer">
-                    <?php /* @escapeNotVerified */ echo __('Customer') ?>
+                    <?= /* @escapeNotVerified */ __('Customer') ?>
                     <?php if ($_comment->getIsCustomerNotified()): ?>
-                        <span class="note-list-customer-notified"><?php /* @escapeNotVerified */ echo __('Notified') ?></span>
+                        <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
                     <?php else: ?>
-                        <span class="note-list-customer-not-notified"><?php /* @escapeNotVerified */ echo __('Not Notified') ?></span>
+                        <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
                     <?php endif; ?>
                 </span>
-                <div class="note-list-comment"><?php echo $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
+                <div class="note-list-comment"><?= $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
             </li>
         <?php endforeach; ?>
     </ul>
@@ -72,7 +72,7 @@
 require(['prototype'], function(){
 
 submitComment = function() {
-    submitAndReloadArea($('comments_block').parentNode, '<?php /* @escapeNotVerified */ echo $block->getSubmitUrl() ?>')
+    submitAndReloadArea($('comments_block').parentNode, '<?= /* @escapeNotVerified */ $block->getSubmitUrl() ?>')
 }
 
 if ($('submit_comment_button')) {
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
index ac10dbc14c465..13433846d6ac4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/abstract.phtml
@@ -9,10 +9,10 @@
 ?>
 
 <div class="admin__page-section-title">
-    <span class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
+    <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
     <?php if($block->getButtonsHtml()): ?>
-        <div class="actions"><?php echo $block->getButtonsHtml() ?></div>
+        <div class="actions"><?= $block->getButtonsHtml() ?></div>
     <?php endif; ?>
 </div>
 
-<?php echo $block->getChildHtml('', true) ?>
+<?= $block->getChildHtml('', true) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
index 0209c43bb72cc..ddf292867ccce 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml
@@ -18,22 +18,22 @@
     <?php foreach ($_methods as $_method): $_code = $_method->getCode(); $_counter++; ?>
         <dt class="admin__field-option">
         <?php if ($_methodsCount > 1): ?>
-            <input id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" type="radio" name="payment[method]"
-                   title="<?php echo $block->escapeHtml($_method->getTitle()) ?>"
-                   onclick="payment.switchMethod('<?php /* @escapeNotVerified */ echo $_code ?>')"<?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?>
+            <input id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" type="radio" name="payment[method]"
+                   title="<?= $block->escapeHtml($_method->getTitle()) ?>"
+                   onclick="payment.switchMethod('<?= /* @escapeNotVerified */ $_code ?>')"<?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?>
                    class="admin__control-radio<?php if ($_counter == $_methodsCount) : ?> validate-one-required-by-name<?php endif; ?>"/>
         <?php else :?>
             <span class="no-display">
-                <input id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" type="radio"
+                <input id="p_method_<?= /* @escapeNotVerified */ $_code ?>" value="<?= /* @escapeNotVerified */ $_code ?>" type="radio"
                        name="payment[method]" class="admin__control-radio"
                        checked="checked"/>
             </span>
         <?php endif;?>
 
-            <label class="admin__field-label" for="p_method_<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
+            <label class="admin__field-label" for="p_method_<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_method->getTitle()) ?></label>
         </dt>
         <dd class="admin__payment-method-wrapper">
-            <?php /* @escapeNotVerified */ echo $block->getChildHtml('payment.method.' . $_code) ?>
+            <?= /* @escapeNotVerified */ $block->getChildHtml('payment.method.' . $_code) ?>
         </dd>
     <?php endforeach; ?>
     </dl>
@@ -41,10 +41,10 @@
     <script>
         require(["Magento_Sales/order/create/form"], function(){
         <?php if ($_methodsCount != 1):?>
-            order.setPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
+            order.setPaymentMethod('<?= /* @escapeNotVerified */ $block->getSelectedMethodCode() ?>');
         <?php endif; ?>
         });
     </script>
 <?php else: ?>
-    <div class="admin__message-empty"><?php /* @escapeNotVerified */ echo __('No Payment Methods') ?></div>
+    <div class="admin__message-empty"><?= /* @escapeNotVerified */ __('No Payment Methods') ?></div>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
index 87c40ad6c3d99..2cf09583bd902 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/comment.phtml
@@ -8,14 +8,14 @@
 
  ?>
 
-<?php /* <h4 class="icon-head fieldset-legend <?php echo $block->getHeaderCssClass() ?>"><?php echo $block->getHeaderText() ?></h4> */ ?>
+<?php /* <h4 class="icon-head fieldset-legend <?= $block->getHeaderCssClass() ?>"><?= $block->getHeaderText() ?></h4> */ ?>
 <div class="admin__field field-comment">
-    <label for="order-comment" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Order Comments') ?></span></label>
+    <label for="order-comment" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Order Comments') ?></span></label>
     <div class="admin__field-control">
         <textarea
             id="order-comment"
             name="order[comment][customer_note]"
-            class="admin__control-textarea"><?php /* @escapeNotVerified */ echo $block->getCommentNote() ?></textarea>
+            class="admin__control-textarea"><?= /* @escapeNotVerified */ $block->getCommentNote() ?></textarea>
     </div>
 </div>
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
index d1bb08b3f88c3..d499df585e565 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/coupons/form.phtml
@@ -15,15 +15,15 @@
 ?>
 
 <div class="admin__field field-apply-coupon-code">
-    <label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Apply Coupon Code') ?></span></label>
+    <label class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Apply Coupon Code') ?></span></label>
     <div class="admin__field-control">
         <input type="text" class="admin__control-text" id="coupons:code" value="" name="coupon_code" />
-        <?php echo $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
+        <?= $block->getButtonHtml(__('Apply'), 'order.applyCoupon($F(\'coupons:code\'))') ?>
         <?php if ($block->getCouponCode()): ?>
         <p class="added-coupon-code">
-            <span><?php echo $block->escapeHtml($block->getCouponCode()) ?></span>
-            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?php /* @escapeNotVerified */ echo __('Remove Coupon Code') ?>"
-               class="action-remove"><span><?php /* @escapeNotVerified */ echo __('Remove') ?></span></a>
+            <span><?= $block->escapeHtml($block->getCouponCode()) ?></span>
+            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?= /* @escapeNotVerified */ __('Remove Coupon Code') ?>"
+               class="action-remove"><span><?= /* @escapeNotVerified */ __('Remove') ?></span></a>
         </p>
         <?php endif; ?>
         <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
index 3c6e31735cc02..fdbaae2347398 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/data.phtml
@@ -10,77 +10,77 @@
 <div class="page-create-order">
     <script>
     require(["Magento_Sales/order/create/form"], function(){
-        order.setCurrencySymbol('<?php /* @escapeNotVerified */ echo $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
+        order.setCurrencySymbol('<?= /* @escapeNotVerified */ $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
     });
 </script>
     <div class="order-details<?php if ($block->getCustomerId()): ?> order-details-existing-customer<?php endif; ?>">
 
         <div id="order-additional_area" style="display: none" class="admin__page-section order-additional-area">
-            <?php echo $block->getChildHtml('additional_area') ?>
+            <?= $block->getChildHtml('additional_area') ?>
         </div>
 
         <div id="order-search" style="display: none" class="admin__page-section order-search-items">
-            <?php echo $block->getChildHtml('search') ?>
+            <?= $block->getChildHtml('search') ?>
         </div>
 
         <section id="order-items" class="admin__page-section order-items" data-mage-init='{"loader": {}}'>
-            <?php echo $block->getChildHtml('items') ?>
+            <?= $block->getChildHtml('items') ?>
         </section>
 
-        <div id="order-errors" class="order-errors"><?php echo $block->getChildHtml('errors') ?></div>
+        <div id="order-errors" class="order-errors"><?= $block->getChildHtml('errors') ?></div>
 
         <section id="order-form_account" class="admin__page-section order-account-information">
-            <?php echo $block->getChildHtml('form_account') ?>
+            <?= $block->getChildHtml('form_account') ?>
         </section>
 
         <section id="order-addresses" class="admin__page-section order-addresses">
             <div class="admin__page-section-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Address Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Address Information') ?></span>
             </div>
             <div class="admin__page-section-content">
                 <div id="order-billing_address" class="admin__page-section-item order-billing-address">
-                    <?php echo $block->getChildHtml('billing_address') ?>
+                    <?= $block->getChildHtml('billing_address') ?>
                 </div>
                 <div id="order-shipping_address" class="admin__page-section-item order-shipping-address">
-                    <?php echo $block->getChildHtml('shipping_address') ?>
+                    <?= $block->getChildHtml('shipping_address') ?>
                 </div>
             </div>
         </section>
 
         <section id="order-methods" class="admin__page-section order-methods">
             <div class="admin__page-section-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Information') ?></span>
             </div>
             <div class="admin__page-section-content">
                 <div id="order-billing_method" class="admin__page-section-item order-billing-method">
-                    <?php echo $block->getChildHtml('billing_method') ?>
+                    <?= $block->getChildHtml('billing_method') ?>
                 </div>
                 <div id="order-shipping_method" class="admin__page-section-item order-shipping-method">
-                    <?php echo $block->getChildHtml('shipping_method') ?>
+                    <?= $block->getChildHtml('shipping_method') ?>
                 </div>
             </div>
         </section>
 
         <?php if ($block->getChildBlock('card_validation')): ?>
         <section id="order-card_validation" class="admin__page-section order-card-validation">
-            <?php echo $block->getChildHtml('card_validation') ?>
+            <?= $block->getChildHtml('card_validation') ?>
         </section>
         <?php endif; ?>
 
-        <?php echo $block->getChildHtml('gift_options') ?>
+        <?= $block->getChildHtml('gift_options') ?>
 
         <section class="admin__page-section order-summary">
             <div class="admin__page-section-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
             </div>
             <div class="admin__page-section-content">
                 <fieldset class="admin__fieldset order-history" id="order-comment">
-                    <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Order History') ?></span></legend>
+                    <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order History') ?></span></legend>
                     <br>
-                    <?php echo $block->getChildHtml('comment') ?>
+                    <?= $block->getChildHtml('comment') ?>
                 </fieldset>
                 <fieldset id="order-totals" class="admin__fieldset order-totals">
-                    <?php echo $block->getChildHtml('totals') ?>
+                    <?= $block->getChildHtml('totals') ?>
                 </fieldset>
             </div>
         </section>
@@ -90,21 +90,21 @@
         <div class="order-sidebar">
             <div class="store-switcher order-currency">
                 <label class="admin__field-label" for="currency_switcher">
-                    <?php /* @escapeNotVerified */ echo __('Order Currency:') ?>
+                    <?= /* @escapeNotVerified */ __('Order Currency:') ?>
                 </label>
                 <select id="currency_switcher"
                         class="admin__control-select"
                         name="order[currency]"
                         onchange="order.setCurrencyId(this.value); order.setCurrencySymbol(this.options[this.selectedIndex].getAttribute('symbol'));">
                     <?php foreach ($block->getAvailableCurrencies() as $_code): ?>
-                        <option value="<?php /* @escapeNotVerified */ echo $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?php /* @escapeNotVerified */ echo $block->getCurrencySymbol($_code) ?>">
-                            <?php /* @escapeNotVerified */ echo $block->getCurrencyName($_code) ?>
+                        <option value="<?= /* @escapeNotVerified */ $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?= /* @escapeNotVerified */ $block->getCurrencySymbol($_code) ?>">
+                            <?= /* @escapeNotVerified */ $block->getCurrencyName($_code) ?>
                         </option>
                     <?php endforeach; ?>
                 </select>
             </div>
             <div class="customer-current-activity" id="order-sidebar">
-                <?php echo $block->getChildHtml('sidebar') ?>
+                <?= $block->getChildHtml('sidebar') ?>
             </div>
         </div>
     <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
index 6b4757380bea9..f46e1f74ca8d5 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form.phtml
@@ -8,18 +8,18 @@
 
 /** @var \Magento\Sales\Block\Adminhtml\Order\Create\Form $block */
 ?>
-<form id="edit_form" data-order-config='<?php echo $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?php /* @escapeNotVerified */ echo $block->getLoadBlockUrl() ?>" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form id="edit_form" data-order-config='<?= $block->escapeHtml($block->getOrderDataJson()) ?>' data-load-base-url="<?= /* @escapeNotVerified */ $block->getLoadBlockUrl() ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data">
+    <?= $block->getBlockHtml('formkey') ?>
     <div id="order-message">
-        <?php echo $block->getChildHtml('message') ?>
+        <?= $block->getChildHtml('message') ?>
     </div>
-    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?php /* @escapeNotVerified */ echo $block->getCustomerSelectorDisplay() ?>">
-        <?php echo $block->getChildHtml('customer.grid.container') ?>
+    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?= /* @escapeNotVerified */ $block->getCustomerSelectorDisplay() ?>">
+        <?= $block->getChildHtml('customer.grid.container') ?>
     </div>
-    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?php /* @escapeNotVerified */ echo $block->getStoreSelectorDisplay() ?>">
-        <?php echo $block->getChildHtml('store') ?>
+    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?= /* @escapeNotVerified */ $block->getStoreSelectorDisplay() ?>">
+        <?= $block->getChildHtml('store') ?>
     </div>
-    <div id="order-data" style="display:<?php /* @escapeNotVerified */ echo $block->getDataSelectorDisplay() ?>">
-        <?php echo $block->getChildHtml('data') ?>
+    <div id="order-data" style="display:<?= /* @escapeNotVerified */ $block->getDataSelectorDisplay() ?>">
+        <?= $block->getChildHtml('data') ?>
     </div>
 </form>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
index 2569675f63097..5954edfbf77b7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/account.phtml
@@ -5,12 +5,12 @@
  */
  ?>
 
-<div class="admin__page-section-title <?php /* @escapeNotVerified */ echo $block->getHeaderCssClass() ?>">
-    <span class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
+<div class="admin__page-section-title <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
+    <span class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
     <div class="actions"></div>
 </div>
 <div id="customer_account_fieds" class="admin__page-section-content">
-    <?php echo $block->getForm()->getHtml() ?>
+    <?= $block->getForm()->getHtml() ?>
 </div>
 
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index 007b3f120ddb7..686e311292ac7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -16,8 +16,8 @@ if ($block->getIsShipping()):
     <script>
     require(["Magento_Sales/order/create/form"], function(){
 
-        order.shippingAddressContainer = '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>';
-        order.setAddresses(<?php /* @escapeNotVerified */ echo $block->getAddressCollectionJson() ?>);
+        order.shippingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
+        order.setAddresses(<?= /* @escapeNotVerified */ $block->getAddressCollectionJson() ?>);
 
     });
     </script>
@@ -28,42 +28,42 @@ else:
     ?>
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-            order.billingAddressContainer = '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>';
+            order.billingAddressContainer = '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>';
         });
     </script>
     <?php
 endif; ?>
 
 <fieldset class="admin__fieldset">
-    <legend class="admin__legend <?php /* @escapeNotVerified */ echo $block->getHeaderCssClass() ?>">
-        <span><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
+    <legend class="admin__legend <?= /* @escapeNotVerified */ $block->getHeaderCssClass() ?>">
+        <span><?= /* @escapeNotVerified */ $block->getHeaderText() ?></span>
     </legend><br>
 
-    <fieldset id="<?php /* @escapeNotVerified */ echo $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
+    <fieldset id="<?= /* @escapeNotVerified */ $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
     <?php if ($block->getIsShipping()): ?>
         <div class="admin__field admin__field-option admin__field-shipping-same-as-billing">
             <input type="checkbox" id="order-shipping_same_as_billing" name="shipping_same_as_billing"
                    onclick="order.setShippingAsBilling(this.checked)" class="admin__control-checkbox"
                    <?php if ($block->getIsAsBilling()): ?>checked<?php endif; ?> />
             <label for="order-shipping_same_as_billing" class="admin__field-label">
-                <?php /* @escapeNotVerified */ echo __('Same As Billing Address') ?>
+                <?= /* @escapeNotVerified */ __('Same As Billing Address') ?>
             </label>
         </div>
     <?php endif; ?>
         <div class="admin__field admin__field-select-from-existing-address">
-            <label class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Select from existing customer addresses:') ?></label>
+            <label class="admin__field-label"><?= /* @escapeNotVerified */ __('Select from existing customer addresses:') ?></label>
             <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
             <div class="admin__field-control">
-                <select id="<?php /* @escapeNotVerified */ echo $_id ?>"
-                        name="<?php echo $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
-                        onchange="order.selectAddress(this, '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>')"
+                <select id="<?= /* @escapeNotVerified */ $_id ?>"
+                        name="<?= $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
+                        onchange="order.selectAddress(this, '<?= /* @escapeNotVerified */ $_fieldsContainerId ?>')"
                         class="admin__control-select">
-                    <option value=""><?php /* @escapeNotVerified */ echo __('Add New Address') ?></option>
+                    <option value=""><?= /* @escapeNotVerified */ __('Add New Address') ?></option>
                     <?php foreach ($block->getAddressCollection() as $_address): ?>
                         <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
                         <option
-                            value="<?php /* @escapeNotVerified */ echo $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
-                            <?php /* @escapeNotVerified */ echo $block->getAddressAsString($_address) ?>
+                            value="<?= /* @escapeNotVerified */ $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
+                            <?= /* @escapeNotVerified */ $block->getAddressAsString($_address) ?>
                         </option>
                         <?php //endif; ?>
                     <?php endforeach; ?>
@@ -72,28 +72,28 @@ endif; ?>
         </div>
     </fieldset>
 
-    <div class="order-address admin__fieldset" id="<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>">
-        <?php echo $block->getForm()->toHtml() ?>
+    <div class="order-address admin__fieldset" id="<?= /* @escapeNotVerified */ $_fieldsContainerId ?>">
+        <?= $block->getForm()->toHtml() ?>
 
         <div class="admin__field admin__field-option order-save-in-address-book">
-            <input name="<?php echo $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox"
-                   id="<?php echo $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
+            <input name="<?= $block->getForm()->getHtmlNamePrefix() ?>[save_in_address_book]" type="checkbox"
+                   id="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
                    value="1"
                    <?php if (!$block->getDontSaveInAddressBook() && $block->getAddress()->getSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
                    class="admin__control-checkbox"/>
-            <label for="<?php echo $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
-                   class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Save in address book') ?></label>
+            <label for="<?= $block->getForm()->getHtmlIdPrefix() ?>save_in_address_book"
+                   class="admin__field-label"><?= /* @escapeNotVerified */ __('Save in address book') ?></label>
         </div>
     </div>
     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
-    <div style="display: none;" id="<?php /* @escapeNotVerified */ echo $hideElement ?>" class="order-methods-overlay">
-        <span><?php /* @escapeNotVerified */ echo __('You don\'t need to select a shipping address.') ?></span>
+    <div style="display: none;" id="<?= /* @escapeNotVerified */ $hideElement ?>" class="order-methods-overlay">
+        <span><?= /* @escapeNotVerified */ __('You don\'t need to select a shipping address.') ?></span>
     </div>
 
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-                order.bindAddressFields('<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>');
-                order.bindAddressFields('<?php /* @escapeNotVerified */ echo $_addressChoiceContainerId ?>');
+                order.bindAddressFields('<?= /* @escapeNotVerified */ $_fieldsContainerId ?>');
+                order.bindAddressFields('<?= /* @escapeNotVerified */ $_addressChoiceContainerId ?>');
                 <?php if ($block->getIsShipping() && $block->getIsAsBilling()): ?>
                 order.disableShippingAddress(true);
                 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
index aff8c53abdf5f..14d020c4763f5 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/giftmessage.phtml
@@ -11,11 +11,11 @@
 <?php $_items = $block->getItems(); ?>
 <div id="order-giftmessage" class="giftmessage-order-create">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Gift Message for the Entire Order') ?></span></legend>
+        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Gift Message for the Entire Order') ?></span></legend>
         <br>
         <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('main', $block->getQuote(), $block->getStoreId())): ?>
-            <p><?php /* @escapeNotVerified */ echo __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
-            <?php echo $block->getFormHtml($block->getQuote(), 'main') ?>
+            <p><?= /* @escapeNotVerified */ __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
+            <?= $block->getFormHtml($block->getQuote(), 'main') ?>
         <?php endif; ?>
     </fieldset>
 <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
index 44c2eb87c4e84..de7af269538d9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items.phtml
@@ -9,9 +9,9 @@
 ?>
 
 <div class="admin__page-section-title">
-    <strong class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></strong>
+    <strong class="title"><?= /* @escapeNotVerified */ $block->getHeaderText() ?></strong>
     <div class="actions">
-        <?php echo $block->getButtonsHtml() ?>
+        <?= $block->getButtonsHtml() ?>
     </div>
 </div>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 726518d8b0f18..02cf697b0e74a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
@@ -20,18 +20,18 @@
             <table class="data-table admin__table-primary order-tables">
                 <thead>
                     <tr class="headings">
-                        <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                        <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                        <th class="col-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
-                        <th class="col-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
-                        <th class="col-discount"><span><?php /* @escapeNotVerified */ echo __('Discount') ?></span></th>
-                        <th class="col-row-total"><span><?php /* @escapeNotVerified */ echo __('Row Subtotal') ?></span></th>
-                        <th class="col-action"><span><?php /* @escapeNotVerified */ echo __('Action') ?></span></th>
+                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                        <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount') ?></span></th>
+                        <th class="col-row-total"><span><?= /* @escapeNotVerified */ __('Row Subtotal') ?></span></th>
+                        <th class="col-action"><span><?= /* @escapeNotVerified */ __('Action') ?></span></th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr class="even">
-                        <td class="empty-text" colspan="100"><?php /* @escapeNotVerified */ echo __('No ordered items') ?></td>
+                        <td class="empty-text" colspan="100"><?= /* @escapeNotVerified */ __('No ordered items') ?></td>
                     </tr>
                 </tbody>
             </table>
@@ -41,27 +41,27 @@
     <div class="admin__table-wrapper" id="order-items_grid">
     <?php if (count($_items)>10): ?>
         <div class="actions update actions-update">
-            <?php echo $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary'); ?>
+            <?= $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary') ?>
         </div>
     <?php endif; ?>
         <table class="data-table admin__table-primary order-tables">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                    <th class="col-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
-                    <th class="col-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
-                    <th class="col-discount"><span><?php /* @escapeNotVerified */ echo __('Discount') ?></span></th>
-                    <th class="col-row-total"><span><?php /* @escapeNotVerified */ echo __('Row Subtotal') ?></span></th>
-                    <th class="col-action"><span><?php /* @escapeNotVerified */ echo __('Action') ?></span></th>
+                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                    <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                    <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                    <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount') ?></span></th>
+                    <th class="col-row-total"><span><?= /* @escapeNotVerified */ __('Row Subtotal') ?></span></th>
+                    <th class="col-action"><span><?= /* @escapeNotVerified */ __('Action') ?></span></th>
                 </tr>
             </thead>
             <tfoot>
                 <tr>
-                    <td class="col-total"><?php /* @escapeNotVerified */ echo __('Total %1 product(s)', count($_items)) ?></td>
-                    <td colspan="2" class="col-subtotal"><?php /* @escapeNotVerified */ echo __('Subtotal:') ?></td>
-                    <td class="col-price"><strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getSubtotal()) ?></strong></td>
-                    <td class="col-price"><strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
+                    <td class="col-total"><?= /* @escapeNotVerified */ __('Total %1 product(s)', count($_items)) ?></td>
+                    <td colspan="2" class="col-subtotal"><?= /* @escapeNotVerified */ __('Subtotal:') ?></td>
+                    <td class="col-price"><strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getSubtotal()) ?></strong></td>
+                    <td class="col-price"><strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
                     <td class="col-price"><strong>
                     <?php
                         /* @escapeNotVerified */ echo $block->formatPrice($block->getSubtotalWithDiscount());
@@ -71,45 +71,45 @@
             </tfoot>
                 <?php $i = 0 ?>
                 <?php foreach ($_items as $_item):$i++ ?>
-                <tbody class="<?php /* @escapeNotVerified */ echo($i%2) ? 'even' : 'odd' ?>">
+                <tbody class="<?= /* @escapeNotVerified */ ($i%2) ? 'even' : 'odd' ?>">
                     <tr>
                         <td class="col-product">
-                            <span id="order_item_<?php /* @escapeNotVerified */ echo $_item->getId() ?>_title"><?php echo $block->escapeHtml($_item->getName()) ?></span>
+                            <span id="order_item_<?= /* @escapeNotVerified */ $_item->getId() ?>_title"><?= $block->escapeHtml($_item->getName()) ?></span>
                             <div class="product-sku-block">
-                                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
-                                <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
+                                <span><?= /* @escapeNotVerified */ __('SKU') ?>:</span>
+                                <?= implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))) ?>
                             </div>
                             <div class="product-configure-block">
-                                <?php echo $block->getConfigureButtonHtml($_item) ?>
+                                <?= $block->getConfigureButtonHtml($_item) ?>
                             </div>
                         </td>
                         <td class="col-price">
 
-                            <?php echo $block->getItemUnitPriceHtml($_item); ?>
+                            <?= $block->getItemUnitPriceHtml($_item) ?>
 
                             <?php $_isCustomPrice = $block->usedCustomPriceForItem($_item) ?>
                             <?php if ($_tier = $block->getTierHtml($_item)): ?>
-                            <div id="item_tier_block_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php if ($_isCustomPrice): ?> style="display:none"<?php endif; ?>>
-                                <a href="#" onclick="$('item_tier_<?php /* @escapeNotVerified */ echo $_item->getId() ?>').toggle();return false;"><?php /* @escapeNotVerified */ echo __('Tier Pricing') ?></a>
-                                <div style="display:none" id="item_tier_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><?php /* @escapeNotVerified */ echo $_tier ?></div>
+                            <div id="item_tier_block_<?= /* @escapeNotVerified */ $_item->getId() ?>"<?php if ($_isCustomPrice): ?> style="display:none"<?php endif; ?>>
+                                <a href="#" onclick="$('item_tier_<?= /* @escapeNotVerified */ $_item->getId() ?>').toggle();return false;"><?= /* @escapeNotVerified */ __('Tier Pricing') ?></a>
+                                <div style="display:none" id="item_tier_<?= /* @escapeNotVerified */ $_item->getId() ?>"><?= /* @escapeNotVerified */ $_tier ?></div>
                             </div>
                             <?php endif; ?>
                             <?php if ($block->canApplyCustomPrice($_item)): ?>
                                 <div class="custom-price-block">
                                     <input type="checkbox"
                                            class="admin__control-checkbox"
-                                           id="item_use_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
+                                           id="item_use_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>"
                                            <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?>
-                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>', 'item_tier_block_<?php /* @escapeNotVerified */ echo $_item->getId() ?>');"/>
+                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>', 'item_tier_block_<?= /* @escapeNotVerified */ $_item->getId() ?>');"/>
                                     <label
                                         class="normal admin__field-label"
-                                        for="item_use_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-                                        <span><?php /* @escapeNotVerified */ echo __('Custom Price') ?>*</span></label>
+                                        for="item_use_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>">
+                                        <span><?= /* @escapeNotVerified */ __('Custom Price') ?>*</span></label>
                                 </div>
                             <?php endif; ?>
-                            <input id="item_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
-                                   name="item[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][custom_price]"
-                                   value="<?php /* @escapeNotVerified */ echo sprintf("%.2f", $block->getOriginalEditablePrice($_item))?>"
+                            <input id="item_custom_price_<?= /* @escapeNotVerified */ $_item->getId() ?>"
+                                   name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][custom_price]"
+                                   value="<?= /* @escapeNotVerified */ sprintf("%.2f", $block->getOriginalEditablePrice($_item)) ?>"
                                    <?php if (!$_isCustomPrice): ?>
                                    style="display:none"
                                    disabled="disabled"
@@ -117,47 +117,47 @@
                                    class="input-text item-price admin__control-text"/>
                         </td>
                         <td class="col-qty">
-                            <input name="item[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][qty]"
+                            <input name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][qty]"
                                    class="input-text item-qty admin__control-text"
-                                   value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"
+                                   value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"
                                    maxlength="12" />
                         </td>
                         <td class="col-subtotal col-price">
-                            <?php echo $block->getItemRowTotalHtml($_item); ?>
+                            <?= $block->getItemRowTotalHtml($_item) ?>
                         </td>
                         <td class="col-discount col-price">
-                            <?php /* @escapeNotVerified */ echo $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
+                            <?= /* @escapeNotVerified */ $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
                             <div class="discount-price-block">
-                                <input id="item_use_discount_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
+                                <input id="item_use_discount_<?= /* @escapeNotVerified */ $_item->getId() ?>"
                                        class="admin__control-checkbox"
-                                       name="item[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][use_discount]"
+                                       name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][use_discount]"
                                        <?php if (!$_item->getNoDiscount()): ?>checked="checked"<?php endif; ?>
                                        value="1"
                                        type="checkbox" />
                                 <label
-                                    for="item_use_discount_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
+                                    for="item_use_discount_<?= /* @escapeNotVerified */ $_item->getId() ?>"
                                     class="normal admin__field-label">
-                                    <span><?php /* @escapeNotVerified */ echo __('Apply') ?></span></label>
+                                    <span><?= /* @escapeNotVerified */ __('Apply') ?></span></label>
                             </div>
 
                         </td>
                         <td class="col-price col-row-subtotal">
-                            <?php echo $block->getItemRowTotalWithDiscountHtml($_item); ?>
+                            <?= $block->getItemRowTotalWithDiscountHtml($_item) ?>
                         </td>
                         <td class="col-actions last">
-                            <select class="admin__control-select" name="item[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][action]">
-                                <option value=""><?php /* @escapeNotVerified */ echo __('Please select') ?></option>
-                                <option value="remove"><?php /* @escapeNotVerified */ echo __('Remove') ?></option>
+                            <select class="admin__control-select" name="item[<?= /* @escapeNotVerified */ $_item->getId() ?>][action]">
+                                <option value=""><?= /* @escapeNotVerified */ __('Please select') ?></option>
+                                <option value="remove"><?= /* @escapeNotVerified */ __('Remove') ?></option>
                                 <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
-                                    <option value="cart"><?php /* @escapeNotVerified */ echo __('Move to Shopping Cart') ?></option>
+                                    <option value="cart"><?= /* @escapeNotVerified */ __('Move to Shopping Cart') ?></option>
                                     <?php if ($block->isMoveToWishlistAllowed($_item)): ?>
                                         <?php $wishlists = $block->getCustomerWishlists();?>
                                         <?php if (count($wishlists) <= 1):?>
-                                            <option value="wishlist"><?php /* @escapeNotVerified */ echo __('Move to Wish List') ?></option>
+                                            <option value="wishlist"><?= /* @escapeNotVerified */ __('Move to Wish List') ?></option>
                                         <?php else: ?>
-                                            <optgroup label="<?php /* @escapeNotVerified */ echo __('Move to Wish List') ?>">
+                                            <optgroup label="<?= /* @escapeNotVerified */ __('Move to Wish List') ?>">
                                                 <?php foreach ($wishlists as $wishlist):?>
-                                                    <option value="wishlist_<?php /* @escapeNotVerified */ echo $wishlist->getId();?>"><?php echo $block->escapeHtml($wishlist->getName());?></option>
+                                                    <option value="wishlist_<?= /* @escapeNotVerified */ $wishlist->getId() ?>"><?= $block->escapeHtml($wishlist->getName()) ?></option>
                                                 <?php endforeach;?>
                                             </optgroup>
                                         <?php endif; ?>
@@ -184,23 +184,23 @@
                                     }
                                     ?>
                                     <div class="message <?php if ($_item->getHasError()): ?>message-error<?php else: ?>message-notice<?php endif; ?>">
-                                        <?php echo $block->escapeHtml($message); ?>
+                                        <?= $block->escapeHtml($message) ?>
                                     </div>
                                 <?php endforeach; ?>
                             </td>
                         </tr>
                     <?php endif;?>
 
-                    <?php echo $block->getItemExtraInfo($_item)->toHtml(); ?>
+                    <?= $block->getItemExtraInfo($_item)->toHtml() ?>
                 </tbody>
                 <?php endforeach; ?>
         </table>
-        <p><small><?php /* @escapeNotVerified */ echo $block->getInclExclTaxMessage(); ?></small></p>
+        <p><small><?= /* @escapeNotVerified */ $block->getInclExclTaxMessage() ?></small></p>
     </div>
 
     <div class="order-discounts">
-        <?php echo $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary'); ?>
-        <div id="order-coupons" class="order-coupons"><?php echo $block->getChildHtml();?></div>
+        <?= $block->getButtonHtml(__('Update Items and Quantities'), 'order.itemsUpdate()', 'action-secondary') ?>
+        <div id="order-coupons" class="order-coupons"><?= $block->getChildHtml() ?></div>
     </div>
 
     <script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
index 217b6a31d6777..2e1f058e17128 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -14,5 +14,5 @@ $_item = $block->getItem();
 ?>
 
 <div class="price-excl-tax">
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
index 2e284a77b911e..aafd3afd2783c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -14,4 +14,4 @@ $_item = $block->getItem();
 ?>
 
 <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
-<?php /* @escapeNotVerified */ echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+<?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
index 7ecc19c7fd0e4..0ecefcf5273f1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -13,5 +13,5 @@
 $_item = $block->getItem();
 ?>
 <div class="price-excl-tax">
-<?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getCalculationPrice()) ?>
+<?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
index 52e730fb111a4..374684d351b49 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
@@ -17,10 +17,10 @@ require([
     order.sidebarHide();
     if (window.productConfigure) {
         productConfigure.addListType('product_to_add', {
-            urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/configureProductToAdd') ?>'
+            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureProductToAdd') ?>'
         });
         productConfigure.addListType('quote_items', {
-            urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/configureQuoteItems') ?>'
+            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureQuoteItems') ?>'
         });
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
index c7a4be58c034e..973758a66947c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/newsletter/form.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?php /* @escapeNotVerified */ echo __('Subscribe to Newsletter'); ?></label><br/>
+<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?= /* @escapeNotVerified */ __('Subscribe to Newsletter') ?></label><br/>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
index fc1c7ca01c075..9e0394f6430bd 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -13,7 +13,7 @@
     <div id="order-shipping-method-choose" class="control" style="display:none">
         <dl class="admin__order-shipment-methods">
         <?php foreach ($_shippingRateGroups as $code => $_rates): ?>
-            <dt class="admin__order-shipment-methods-title"><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></dt>
+            <dt class="admin__order-shipment-methods-title"><?= $block->escapeHtml($block->getCarrierName($code)) ?></dt>
             <dd class="admin__order-shipment-methods-options">
                 <ul class="admin__order-shipment-methods-options-list">
                 <?php foreach ($_rates as $_rate): ?>
@@ -23,23 +23,23 @@
                        <?php if ($_rate->getErrorMessage()): ?>
                            <div class="messages">
                                <div class="message message-error error">
-                                   <div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div>
+                                   <div><?= $block->escapeHtml($_rate->getErrorMessage()) ?></div>
                                </div>
                            </div>
                        <?php else: ?>
                             <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
-                            <input <?php /* @escapeNotVerified */ echo $_radioProperty ?> value="<?php /* @escapeNotVerified */ echo $_code ?>"
-                                                                 id="s_method_<?php /* @escapeNotVerified */ echo $_code ?>" <?php /* @escapeNotVerified */ echo $_checked ?>
+                            <input <?= /* @escapeNotVerified */ $_radioProperty ?> value="<?= /* @escapeNotVerified */ $_code ?>"
+                                                                 id="s_method_<?= /* @escapeNotVerified */ $_code ?>" <?= /* @escapeNotVerified */ $_checked ?>
                                                                  class="admin__control-radio required-entry"/>
-                            <label class="admin__field-label" for="s_method_<?php /* @escapeNotVerified */ echo $_code ?>">
-                                <?php echo $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
+                            <label class="admin__field-label" for="s_method_<?= /* @escapeNotVerified */ $_code ?>">
+                                <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
                                 <strong>
                                     <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
                                     <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                                    <?php /* @escapeNotVerified */ echo $_excl; ?>
+                                    <?= /* @escapeNotVerified */ $_excl ?>
                                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                                     <?php endif; ?>
                                 </strong>
                             </label>
@@ -55,17 +55,17 @@
         <div id="order-shipping-method-info" class="order-shipping-method-info">
             <dl class="admin__order-shipment-methods">
                 <dt class="admin__order-shipment-methods-title">
-                    <?php echo $block->escapeHtml($block->getCarrierName($_rate->getCarrier())) ?>
+                    <?= $block->escapeHtml($block->getCarrierName($_rate->getCarrier())) ?>
                 </dt>
                 <dd class="admin__order-shipment-methods-options">
-                    <?php echo $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
+                    <?= $block->escapeHtml($_rate->getMethodTitle() ? $_rate->getMethodTitle() : $_rate->getMethodDescription()) ?> -
                     <strong>
                         <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
                         <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                        <?php /* @escapeNotVerified */ echo $_excl; ?>
+                        <?= /* @escapeNotVerified */ $_excl ?>
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                            (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                         <?php endif; ?>
                     </strong>
                 </dd>
@@ -73,7 +73,7 @@
             <a href="#"
                onclick="$('order-shipping-method-info').hide();$('order-shipping-method-choose').show();return false"
                class="action-default">
-                <span><?php /* @escapeNotVerified */ echo __('Click to change shipping method') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Click to change shipping method') ?></span>
             </a>
         </div>
     <?php else: ?>
@@ -85,18 +85,18 @@ require(['prototype'], function(){
     <?php endif; ?>
 <?php elseif ($block->getIsRateRequest()): ?>
     <div class="order-shipping-method-summary">
-        <strong class="order-shipping-method-not-available"><?php /* @escapeNotVerified */ echo __('Sorry, no quotes are available for this order.') ?></strong>
+        <strong class="order-shipping-method-not-available"><?= /* @escapeNotVerified */ __('Sorry, no quotes are available for this order.') ?></strong>
     </div>
 <?php else: ?>
     <div id="order-shipping-method-summary" class="order-shipping-method-summary">
         <a href="#" onclick="order.loadShippingRates();return false" class="action-default">
-            <span><?php /* @escapeNotVerified */ echo __('Get shipping methods and rates') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Get shipping methods and rates') ?></span>
         </a>
         <input type="hidden" name="order[has_shipping]" value="" class="required-entry" />
     </div>
 <?php endif; ?>
 <div style="display: none;" id="shipping-method-overlay" class="order-methods-overlay">
-    <span><?php /* @escapeNotVerified */ echo __('You don\'t need to select a shipping method.') ?></span>
+    <span><?= /* @escapeNotVerified */ __('You don\'t need to select a shipping method.') ?></span>
 </div>
 <script>
     require(["Magento_Sales/order/create/form"], function(){
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
index 99c6d10f1a8e5..48823de3f4db2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar.phtml
@@ -9,19 +9,19 @@
 /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
 ?>
 <div class="customer-current-activity-inner">
-    <h4 class="customer-activity-title"><?php /* @escapeNotVerified */ echo __('Customer\'s Activities') ?></h4>
+    <h4 class="customer-activity-title"><?= /* @escapeNotVerified */ __('Customer\'s Activities') ?></h4>
     <div class="create-order-sidebar-container">
-    <?php echo $block->getChildHtml('top_button'); ?>
+    <?= $block->getChildHtml('top_button') ?>
     <?php foreach ($block->getLayout()->getChildBlocks($block->getNameInLayout()) as $_alias => $_child): ?>
         <?php if ($_alias != 'top_button' && $_alias != 'bottom_button'): ?>
             <?php if ($block->canDisplay($_child)): ?>
-                <div class="order-sidebar-block" id="order-sidebar_<?php /* @escapeNotVerified */ echo $_alias ?>">
-                    <?php echo $block->getChildHtml($_alias) ?>
+                <div class="order-sidebar-block" id="order-sidebar_<?= /* @escapeNotVerified */ $_alias ?>">
+                    <?= $block->getChildHtml($_alias) ?>
                 </div>
             <?php endif; ?>
         <?php endif; ?>
     <?php endforeach; ?>
-    <?php echo $block->getChildHtml('bottom_button'); ?>
+    <?= $block->getChildHtml('bottom_button') ?>
     </div>
 </div>
 <script>
@@ -32,12 +32,12 @@ require([
 
     function addSidebarCompositeListType() {
         productConfigure.addListType('sidebar', {
-            urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/configureProductToAdd') ?>',
-            urlConfirm: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/addConfigured') ?>'
+            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/configureProductToAdd') ?>',
+            urlConfirm: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/addConfigured') ?>'
         });
         productConfigure.addListType('sidebar_wishlist', {
-            urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
-            urlConfirm: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/addConfigured') ?>'
+            urlFetch: '<?= /* @escapeNotVerified */ $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
+            urlConfirm: '<?= /* @escapeNotVerified */ $block->getUrl('sales/order_create/addConfigured') ?>'
         });
     }
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
index 6250447bba093..2ca2420934519 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml
@@ -8,16 +8,16 @@
 
 ?>
 <?php /* @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar */ ?>
-<div class="create-order-sidebar-block" id="sidebar_data_<?php /* @escapeNotVerified */ echo $block->getDataId() ?>">
+<div class="create-order-sidebar-block" id="sidebar_data_<?= /* @escapeNotVerified */ $block->getDataId() ?>">
     <div class="head sidebar-title-block">
         <a href="#" class="action-refresh"
-           title="<?php echo $block->escapeHtml(__('Refresh')); ?>"
-           onclick="order.loadArea('sidebar_<?php /* @escapeNotVerified */ echo $block->getDataId() ?>', 'sidebar_data_<?php /* @escapeNotVerified */ echo $block->getDataId() ?>');return false;">
-            <span><?php /* @escapeNotVerified */ echo __('Refresh'); ?></span>
+           title="<?= $block->escapeHtml(__('Refresh')) ?>"
+           onclick="order.loadArea('sidebar_<?= /* @escapeNotVerified */ $block->getDataId() ?>', 'sidebar_data_<?= /* @escapeNotVerified */ $block->getDataId() ?>');return false;">
+            <span><?= /* @escapeNotVerified */ __('Refresh') ?></span>
         </a>
         <h5 class="create-order-sidebar-label">
-            <?php /* @escapeNotVerified */ echo $block->getHeaderText() ?>
-            <span class="normal">(<?php /* @escapeNotVerified */ echo $block->getItemCount() ?>)</span>
+            <?= /* @escapeNotVerified */ $block->getHeaderText() ?>
+            <span class="normal">(<?= /* @escapeNotVerified */ $block->getItemCount() ?>)</span>
         </h5>
     </div>
     <div class="content">
@@ -26,29 +26,29 @@
         <table class="admin__table-primary">
             <thead>
                 <tr>
-                    <th class="col-item"><?php /* @escapeNotVerified */ echo __('Item') ?></th>
+                    <th class="col-item"><?= /* @escapeNotVerified */ __('Item') ?></th>
 
                     <?php if ($block->canDisplayItemQty()): ?>
-                        <th class="col-qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                        <th class="col-qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
                     <?php endif; ?>
 
                     <?php if ($block->canDisplayPrice()): ?>
-                        <th class="col-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
+                        <th class="col-price"><?= /* @escapeNotVerified */ __('Price') ?></th>
                     <?php endif; ?>
 
                     <?php if ($block->canRemoveItems()): ?>
                         <th class="col-remove">
-                            <span title="<?php echo $block->escapeHtml(__('Remove')); ?>"
+                            <span title="<?= $block->escapeHtml(__('Remove')) ?>"
                                   class="icon icon-remove">
-                                <span><?php /* @escapeNotVerified */ echo __('Remove') ?></span>
+                                <span><?= /* @escapeNotVerified */ __('Remove') ?></span>
                             </span>
                         </th>
                     <?php endif; ?>
 
                     <th class="col-add">
-                        <span title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"
+                        <span title="<?= $block->escapeHtml(__('Add To Order')) ?>"
                               class="icon icon-add">
-                            <span><?php /* @escapeNotVerified */ echo __('Add To Order') ?></span>
+                            <span><?= /* @escapeNotVerified */ __('Add To Order') ?></span>
                         </span>
                     </th>
                 </tr>
@@ -57,20 +57,20 @@
             <tbody>
                 <?php foreach ($block->getItems() as $_item): ?>
                     <tr>
-                        <td class="col-item"><?php echo $block->escapeHtml($_item->getName()) ?></td>
+                        <td class="col-item"><?= $block->escapeHtml($_item->getName()) ?></td>
 
                         <?php if ($block->canDisplayItemQty()): ?>
                             <td class="col-qty">
-                                <?php /* @escapeNotVerified */ echo $block->getItemQty($_item); ?>
+                                <?= /* @escapeNotVerified */ $block->getItemQty($_item) ?>
                             </td>
                         <?php endif; ?>
 
                         <?php if ($block->canDisplayPrice()): ?>
                             <td class="col-price">
                                 <?php if ($block->getDataId() == 'cart'): ?>
-                                    <?php /* @noEscape */ echo $block->getItemPrice($_item->getProduct()) ?>
+                                    <?= /* @noEscape */ $block->getItemPrice($_item->getProduct()) ?>
                                 <?php else: ?>
-                                    <?php /* @noEscape */ echo $block->getItemPrice($_item) ?>
+                                    <?= /* @noEscape */ $block->getItemPrice($_item) ?>
                                 <?php endif; ?>
                             </td>
                         <?php endif; ?>
@@ -78,14 +78,14 @@
                         <?php if ($block->canRemoveItems()): ?>
                             <td class="col-remove">
                                 <div class="admin__field-option">
-                                    <input id="sidebar-remove-<?php /* @escapeNotVerified */ echo $block->getSidebarStorageAction() ?>-<?php /* @escapeNotVerified */ echo $block->getItemId($_item) ?>"
+                                    <input id="sidebar-remove-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>"
                                            type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[remove][<?php /* @escapeNotVerified */ echo $block->getItemId($_item) ?>]"
-                                           value="<?php /* @escapeNotVerified */ echo $block->getDataId() ?>"
-                                           title="<?php echo $block->escapeHtml(__('Remove')); ?>" />
+                                           name="sidebar[remove][<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>]"
+                                           value="<?= /* @escapeNotVerified */ $block->getDataId() ?>"
+                                           title="<?= $block->escapeHtml(__('Remove')) ?>" />
                                     <label class="admin__field-label"
-                                           for="sidebar-remove-<?php /* @escapeNotVerified */ echo $block->getSidebarStorageAction() ?>-<?php /* @escapeNotVerified */ echo $block->getItemId($_item) ?>">
+                                           for="sidebar-remove-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getItemId($_item) ?>">
                                     </label>
                                 </div>
                             </td>
@@ -96,26 +96,26 @@
                                 <?php if ($block->isConfigurationRequired($_item->getTypeId()) && $block->getDataId() == 'wishlist'): ?>
                                     <a href="#"
                                        class="icon icon-configure"
-                                       title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
-                                       onclick="order.sidebarConfigureProduct('<?php echo 'sidebar_wishlist' ?>', <?php /* @escapeNotVerified */ echo $block->getProductId($_item) ?>, <?php /* @escapeNotVerified */ echo $block->getItemId($_item) ?>); return false;">
-                                        <span><?php /* @escapeNotVerified */ echo __('Configure and Add to Order') ?></span>
+                                       title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
+                                       onclick="order.sidebarConfigureProduct('<?= 'sidebar_wishlist' ?>', <?= /* @escapeNotVerified */ $block->getProductId($_item) ?>, <?= /* @escapeNotVerified */ $block->getItemId($_item) ?>); return false;">
+                                        <span><?= /* @escapeNotVerified */ __('Configure and Add to Order') ?></span>
                                     </a>
                                 <?php elseif ($block->isConfigurationRequired($_item->getTypeId())): ?>
                                     <a href="#"
                                        class="icon icon-configure"
-                                       title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
-                                       onclick="order.sidebarConfigureProduct('<?php echo 'sidebar' ?>', <?php /* @escapeNotVerified */ echo $block->getProductId($_item) ?>); return false;">
-                                        <span><?php /* @escapeNotVerified */ echo __('Configure and Add to Order') ?></span>
+                                       title="<?= $block->escapeHtml(__('Configure and Add to Order')) ?>"
+                                       onclick="order.sidebarConfigureProduct('<?= 'sidebar' ?>', <?= /* @escapeNotVerified */ $block->getProductId($_item) ?>); return false;">
+                                        <span><?= /* @escapeNotVerified */ __('Configure and Add to Order') ?></span>
                                     </a>
                                 <?php else: ?>
-                                    <input id="sidebar-<?php /* @escapeNotVerified */ echo $block->getSidebarStorageAction() ?>-<?php /* @escapeNotVerified */ echo $block->getIdentifierId($_item) ?>"
+                                    <input id="sidebar-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>"
                                            type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[<?php /* @escapeNotVerified */ echo $block->getSidebarStorageAction() ?>][<?php /* @escapeNotVerified */ echo $block->getIdentifierId($_item) ?>]"
-                                           value="<?php /* @escapeNotVerified */ echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
-                                           title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"/>
+                                           name="sidebar[<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>][<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>]"
+                                           value="<?= /* @escapeNotVerified */ $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
+                                           title="<?= $block->escapeHtml(__('Add To Order')) ?>"/>
                                     <label class="admin__field-label"
-                                           for="sidebar-<?php /* @escapeNotVerified */ echo $block->getSidebarStorageAction() ?>-<?php /* @escapeNotVerified */ echo $block->getIdentifierId($_item) ?>">
+                                           for="sidebar-<?= /* @escapeNotVerified */ $block->getSidebarStorageAction() ?>-<?= /* @escapeNotVerified */ $block->getIdentifierId($_item) ?>">
                                     </label>
                                 <?php endif; ?>
                             </div>
@@ -125,11 +125,11 @@
             </tbody>
         </table>
         <?php else: ?>
-            <span class="no-items"><?php /* @escapeNotVerified */ echo __('No items') ?></span>
+            <span class="no-items"><?= /* @escapeNotVerified */ __('No items') ?></span>
         <?php endif ?>
         </div>
         <?php if ($block->getItemCount() && $block->canRemoveItems()): ?>
-            <?php echo $block->getChildHtml('empty_customer_cart_button'); ?>
+            <?= $block->getChildHtml('empty_customer_cart_button') ?>
         <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
index 947e46db8e542..1de681bdb2084 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml
@@ -20,7 +20,7 @@
                         <?php $showWebsite = true; ?>
                         <div class="admin__field field-website_label">
                             <label class="admin__field-label" for="">
-                                <span><?php echo $block->escapeHtml($_website->getName()) ?></span>
+                                <span><?= $block->escapeHtml($_website->getName()) ?></span>
                             </label>
                             <div class="admin__field-control">
                                 <div class="admin__field admin__field-option">
@@ -36,19 +36,19 @@
                     <?php if ($showGroup == false): ?>
                         <?php $showGroup = true; ?>
                         <div class="admin__field field-group_label">
-                            <label class="admin__field-label" for=""><span><?php echo $block->escapeHtml($_group->getName()) ?></span></label>
+                            <label class="admin__field-label" for=""><span><?= $block->escapeHtml($_group->getName()) ?></span></label>
                             <div class="admin__field-control"></div>
                         </div>
                     <?php endif; ?>
 
                     <div class="admin__field field-store_label">
-                        <label class="admin__field-label" for=""><span><?php echo $block->escapeHtml($_group->getName()) ?></span></label>
+                        <label class="admin__field-label" for=""><span><?= $block->escapeHtml($_group->getName()) ?></span></label>
                         <div class="admin__field-control">
                             <div class="nested">
                                 <div class="admin__field admin__field-option">
-                                    <input type="radio" id="store_<?php /* @escapeNotVerified */ echo $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?php /* @escapeNotVerified */ echo $_store->getId() ?>')"/>
-                                    <label class="admin__field-label" for="store_<?php /* @escapeNotVerified */ echo $_store->getId() ?>">
-                                        <?php echo $block->escapeHtml($_store->getName()) ?>
+                                    <input type="radio" id="store_<?= /* @escapeNotVerified */ $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?= /* @escapeNotVerified */ $_store->getId() ?>')"/>
+                                    <label class="admin__field-label" for="store_<?= /* @escapeNotVerified */ $_store->getId() ?>">
+                                        <?= $block->escapeHtml($_store->getName()) ?>
                                     </label>
                                 </div>
                             </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
index 4cf4d8ed3c620..02433edf82346 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals.phtml
@@ -7,13 +7,13 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Order Totals') ?></span></legend>
+<legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Totals') ?></span></legend>
 <br>
 
 <table class="admin__table-secondary data-table">
     <tbody>
-        <?php /* @escapeNotVerified */ echo $block->renderTotals(); ?>
-        <?php /* @escapeNotVerified */ echo $block->renderTotals('footer'); ?>
+        <?= /* @escapeNotVerified */ $block->renderTotals() ?>
+        <?= /* @escapeNotVerified */ $block->renderTotals('footer') ?>
     </tbody>
 </table>
 
@@ -22,17 +22,17 @@
         <input type="checkbox" id="notify_customer" name="order[comment][customer_note_notify]"
                value="1"<?php if ($block->getNoteNotify()): ?> checked="checked"<?php endif; ?>
                class="admin__control-checkbox"/>
-        <label for="notify_customer" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Append Comments') ?></label>
+        <label for="notify_customer" class="admin__field-label"><?= /* @escapeNotVerified */ __('Append Comments') ?></label>
     </div>
     <?php if ($block->canSendNewOrderConfirmationEmail()): ?>
     <div class="admin__field admin__field-option field-email-order-confirmation">
         <input type="checkbox" id="send_confirmation" name="order[send_confirmation]" value="1" checked="checked"
                class="admin__control-checkbox"/>
-        <label for="send_confirmation" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Email Order Confirmation') ?></label>
+        <label for="send_confirmation" class="admin__field-label"><?= /* @escapeNotVerified */ __('Email Order Confirmation') ?></label>
     </div>
     <?php endif; ?>
     <div class="actions">
-        <?php echo $block->getButtonHtml(__('Submit Order'), 'order.submit()', 'save primary'); ?>
+        <?= $block->getButtonHtml(__('Submit Order'), 'order.submit()', 'save primary') ?>
     </div>
 </div>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
index 86c070c9263f0..9ab8a6552539d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
@@ -7,15 +7,15 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<tr class="<?php /* @escapeNotVerified */ echo $block->getTotal()->getCode(); ?> row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+<tr class="<?= /* @escapeNotVerified */ $block->getTotal()->getCode() ?> row-totals">
+    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-amount">
+    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
index 8653598a2c9e6..7486edd732706 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/grandtotal.phtml
@@ -13,29 +13,29 @@
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <strong><?php /* @escapeNotVerified */ echo __('Grand Total Excl. Tax')?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotalExclTax()) ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotalExclTax()) ?></strong>
     </td>
 </tr>
-<?php /* @escapeNotVerified */ echo $block->renderTotals('taxes', $block->getColspan()); ?>
+<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <strong><?php /* @escapeNotVerified */ echo __('Grand Total Incl. Tax')?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php else:?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <strong><?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <strong><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
index 7241387358bd3..2235a428e1e75 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/shipping.phtml
@@ -13,37 +13,37 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php /* @escapeNotVerified */ echo $block->getExcludeTaxLabel() ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingExcludeTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php /* @escapeNotVerified */ echo $block->getIncludeTaxLabel() ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingIncludeTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php elseif ($block->displayIncludeTax()) : ?>
 <tr>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingIncludeTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php else:?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php echo $block->escapeHtml($block->getTotal()->getTitle()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingExcludeTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
index daea9d1514d1e..380a7dc6fcbf9 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/subtotal.phtml
@@ -13,28 +13,28 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php /* @escapeNotVerified */ echo __('Subtotal (Excl. Tax)') ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php /* @escapeNotVerified */ echo __('Subtotal (Incl. Tax)') ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="admin__total-amount">
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
index 799a61f25727d..05e48b8c205c5 100755
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/tax.phtml
@@ -22,17 +22,17 @@ $taxAmount = $block->getTotal()->getValue();
                 <?php $isFirst = 1; ?>
 
                 <?php foreach ($rates as $rate): ?>
-                <tr class="summary-details-<?php /* @escapeNotVerified */ echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                    <td class="admin__total-mark" style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
-                        <?php echo $block->escapeHtml($rate['title']); ?>
+                <tr class="summary-details-<?= /* @escapeNotVerified */ $taxIter ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
+                    <td class="admin__total-mark" style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
+                        <?= $block->escapeHtml($rate['title']) ?>
                         <?php if (!is_null($rate['percent'])): ?>
-                            (<?php echo (float)$rate['percent']; ?>%)
+                            (<?= (float)$rate['percent'] ?>%)
                         <?php endif; ?>
                         <br />
                     </td>
                     <?php if ($isFirst): ?>
-                        <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?php echo count($rates); ?>">
-                            <?php /* @escapeNotVerified */ echo $block->formatPrice($amount); ?>
+                        <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?= count($rates) ?>">
+                            <?= /* @escapeNotVerified */ $block->formatPrice($amount) ?>
                         </td>
                     <?php endif; ?>
                 </tr>
@@ -42,15 +42,15 @@ $taxAmount = $block->getTotal()->getValue();
         <?php endforeach; ?>
 <?php endif;?>
 <?php $class = "{$block->getTotal()->getCode()} " . ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary() ? 'summary-total' : ''); ?>
-<tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?> onclick="expandDetails(this, '.summary-details-<?php /* @escapeNotVerified */ echo $taxIter;?>')"<?php endif; ?> class="<?php /* @escapeNotVerified */ echo $class;?> row-totals">
-    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+<tr<?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?> onclick="expandDetails(this, '.summary-details-<?= /* @escapeNotVerified */ $taxIter ?>')"<?php endif; ?> class="<?= /* @escapeNotVerified */ $class ?> row-totals">
+    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <div class="summary-collapse"><?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?></div>
+            <div class="summary-collapse"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></div>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
+            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
         <?php endif;?>
     </td>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?></td>
+    <td style="<?= /* @escapeNotVerified */ $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?= /* @escapeNotVerified */ $block->formatPrice($block->getTotal()->getValue()) ?></td>
 </tr>
 <?php endif;?>
 
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
index 404f50017ab1b..2f32483e11a50 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/form.phtml
@@ -7,15 +7,15 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form id="edit_form" method="post" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form id="edit_form" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+    <?= $block->getBlockHtml('formkey') ?>
     <?php  $_order = $block->getCreditmemo()->getOrder() ?>
 
-    <?php echo $block->getChildHtml('order_info') ?>
+    <?= $block->getChildHtml('order_info') ?>
 
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
         </div>
         <div class="admin__page-section-content">
         <?php if (!$_order->getIsVirtual()): ?>
@@ -26,15 +26,15 @@
 
             <?php /* Billing Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
                 <div class="order-payment-currency">
-                    <?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                    <?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
                 </div>
                 <div class="order-payment-additional">
-                    <?php echo $block->getChildHtml('order_payment_additional'); ?>
+                    <?= $block->getChildHtml('order_payment_additional') ?>
                 </div>
             </div>
         </div>
@@ -43,12 +43,12 @@
         <div class="admin__page-section-item order-shipping-address">
             <?php /* Shipping Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
             </div>
             <div class="admin__page-section-item-content shipping-description-wrapper">
-                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                 <div class="shipping-description-content">
-                    <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
+                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
 
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax($block->getSource()->getStoreId())): ?>
                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -57,9 +57,9 @@
                     <?php endif; ?>
                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?php /* @escapeNotVerified */ echo $_excl; ?>
+                    <?= /* @escapeNotVerified */ $_excl ?>
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl): ?>
-                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                     <?php endif; ?>
                 </div>
             </div>
@@ -69,6 +69,6 @@
     </section>
 
     <div id="creditmemo_item_container">
-        <?php echo $block->getChildHtml('order_items') ?>
+        <?= $block->getChildHtml('order_items') ?>
     </div>
 </form>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index 54d3e2648774e..fcf4ccad7060b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
@@ -11,7 +11,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items to Refund') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items to Refund') ?></span>
     </div>
 
     <?php if (count($_items)) : ?>
@@ -19,17 +19,17 @@
         <table class="data-table admin__table-primary order-creditmemo-tables">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                    <th class="col-ordered-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
+                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                    <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                    <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
                     <?php if ($block->canReturnToStock()) : ?>
-                    <th class="col-return-to-stock"><span><?php /* @escapeNotVerified */ echo __('Return to Stock') ?></span></th>
+                    <th class="col-return-to-stock"><span><?= /* @escapeNotVerified */ __('Return to Stock') ?></span></th>
                     <?php endif; ?>
-                    <th class="col-refund"><span><?php /* @escapeNotVerified */ echo __('Qty to Refund') ?></span></th>
-                    <th class="col-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
-                    <th class="col-tax-amount"><span><?php /* @escapeNotVerified */ echo __('Tax Amount') ?></span></th>
-                    <th class="col-discont"><span><?php /* @escapeNotVerified */ echo __('Discount Amount') ?></span></th>
-                    <th class="col-total last"><span><?php /* @escapeNotVerified */ echo __('Row Total') ?></span></th>
+                    <th class="col-refund"><span><?= /* @escapeNotVerified */ __('Qty to Refund') ?></span></th>
+                    <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                    <th class="col-tax-amount"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
+                    <th class="col-discont"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
+                    <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
                 </tr>
             </thead>
             <?php if ($block->canEditQty()): ?>
@@ -37,7 +37,7 @@
                 <tr>
                     <td colspan="3">&nbsp;</td>
                     <td colspan="3">
-                        <?php echo $block->getUpdateButtonHtml() ?>
+                        <?= $block->getUpdateButtonHtml() ?>
                     </td>
                     <td colspan="3" class="last">&nbsp;</td>
                 </tr>
@@ -49,16 +49,16 @@
             } else {
                 $i++;
             } ?>
-                <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
-                    <?php echo $block->getItemHtml($_item) ?>
-                    <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
+                    <?= $block->getItemHtml($_item) ?>
+                    <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                 </tbody>
             <?php endforeach; ?>
         </table>
     </div>
     <?php else : ?>
     <div class="no-items">
-        <?php /* @escapeNotVerified */ echo __('No Items To Refund') ?>
+        <?= /* @escapeNotVerified */ __('No Items To Refund') ?>
     </div>
     <?php endif; ?>
 </section>
@@ -67,40 +67,40 @@
 
 <?php if (!empty($orderTotalBar)): ?>
 <section class="fieldset-wrapper">
-    <?php /* @escapeNotVerified */ echo $orderTotalBar; ?>
+    <?= /* @escapeNotVerified */ $orderTotalBar ?>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <input type="hidden" name="creditmemo[do_offline]" id="creditmemo_do_offline" value="0" />
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Credit Memo Comments') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo Comments') ?></span>
             </div>
             <div id="history_form" class="admin__fieldset-wrapper-content">
                 <div class="admin__field">
                     <label class="normal admin__field-label"
                            for="creditmemo_comment_text">
-                        <span><?php /* @escapeNotVerified */ echo __('Comment Text') ?></span></label>
+                        <span><?= /* @escapeNotVerified */ __('Comment Text') ?></span></label>
                     <div class="admin__field-control">
                         <textarea id="creditmemo_comment_text"
                                   class="admin__control-textarea"
                                   name="creditmemo[comment_text]"
                                   rows="3"
-                                  cols="5"><?php /* @escapeNotVerified */ echo $block->getCreditmemo()->getCommentText(); ?></textarea>
+                                  cols="5"><?= /* @escapeNotVerified */ $block->getCreditmemo()->getCommentText() ?></textarea>
                     </div>
                 </div>
             </div>
         </div>
         <div class="admin__page-section-item order-totals creditmemo-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Refund Totals') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Refund Totals') ?></span>
             </div>
-            <?php echo $block->getChildHtml('creditmemo_totals') ?>
+            <?= $block->getChildHtml('creditmemo_totals') ?>
             <div class="order-totals-actions">
                 <div class="field choice admin__field admin__field-option field-append-comments">
                     <input id="notify_customer"
@@ -109,7 +109,7 @@
                            value="1"
                            type="checkbox" />
                     <label for="notify_customer" class="admin__field-label">
-                        <span><?php /* @escapeNotVerified */ echo __('Append Comments') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Append Comments') ?></span>
                     </label>
                 </div>
                 <?php if ($block->canSendCreditmemoEmail()):?>
@@ -120,15 +120,15 @@
                            value="1"
                            type="checkbox" />
                     <label for="send_email" class="admin__field-label">
-                        <span><?php /* @escapeNotVerified */ echo __('Email Copy of Credit Memo') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Email Copy of Credit Memo') ?></span>
                     </label>
                 </div>
                 <?php endif; ?>
-                <?php echo $block->getChildHtml('submit_before') ?>
+                <?= $block->getChildHtml('submit_before') ?>
                 <div class="actions">
-                    <?php echo $block->getChildHtml('submit_offline') ?>
-                    <?php echo $block->getChildHtml('submit_button') ?>
-                    <?php echo $block->getChildHtml('submit_after') ?>
+                    <?= $block->getChildHtml('submit_offline') ?>
+                    <?= $block->getChildHtml('submit_button') ?>
+                    <?= $block->getChildHtml('submit_after') ?>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
index 6742ad847fa37..b27a07c4bf824 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
@@ -11,17 +11,17 @@
 <?php $_item = $block->getItem() ?>
 <?php $block->setPriceDataObject($_item); ?>
 <tr>
-    <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
+    <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
     <td class="col-price">
-        <?php echo $block->getColumnHtml($_item, 'price'); ?>
+        <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-ordered-qty"><?php echo $block->getColumnHtml($_item, 'qty') ?></td>
+    <td class="col-ordered-qty"><?= $block->getColumnHtml($_item, 'qty') ?></td>
     <?php if ($block->canParentReturnToStock($_item)) : ?>
         <td class="col-return-to-stock">
         <?php if ($block->canReturnItemToStock($_item)) : ?>
             <input type="checkbox"
                    class="admin__control-checkbox"
-                   name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][back_to_stock]"
+                   name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][back_to_stock]"
                    value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
             <label class="admin__field-label"></label>
         <?php endif; ?>
@@ -31,18 +31,18 @@
     <?php if ($block->canEditQty()) : ?>
         <input type="text"
                class="input-text admin__control-text qty-input"
-               name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][qty]"
-               value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"/>
+               name="creditmemo[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>][qty]"
+               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"/>
     <?php else : ?>
-        <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+        <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
-        <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+        <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax-amount"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discont"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax-amount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discont"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
-        <?php echo $block->getColumnHtml($_item, 'total'); ?>
+        <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
index e0e5290ec4436..6401c3207ce40 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
@@ -10,31 +10,31 @@
 <?php $_source  = $block->getSource() ?>
 <?php if ($_source): ?>
     <tr>
-        <td class="label"><?php /* @escapeNotVerified */ echo $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
+        <td class="label"><?= /* @escapeNotVerified */ $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[shipping_amount]"
-                   value="<?php /* @escapeNotVerified */ echo $block->getShippingAmount()?>"
+                   value="<?= /* @escapeNotVerified */ $block->getShippingAmount() ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="shipping_amount" />
         </td>
     </tr>
     <tr>
-        <td class="label"><?php /* @escapeNotVerified */ echo __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
+        <td class="label"><?= /* @escapeNotVerified */ __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_positive]"
-                   value="<?php /* @escapeNotVerified */ echo $_source->getBaseAdjustmentFeePositive()*1 ?>"
+                   value="<?= /* @escapeNotVerified */ $_source->getBaseAdjustmentFeePositive()*1 ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="adjustment_positive" />
         </td>
     </tr>
     <tr>
-        <td class="label"><?php /* @escapeNotVerified */ echo __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
+        <td class="label"><?= /* @escapeNotVerified */ __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_negative]"
-                   value="<?php /* @escapeNotVerified */ echo $_source->getBaseAdjustmentFeeNegative()*1 ?>"
+                   value="<?= /* @escapeNotVerified */ $_source->getBaseAdjustmentFeeNegative()*1 ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="adjustment_negative"/>
             <script>
@@ -42,7 +42,7 @@
 
                 //<![CDATA[
                 Validation.addAllThese([
-                    ['not-negative-amount', '<?php /* @escapeNotVerified */ echo __('Please enter a positive number in this field.') ?>', function(v) {
+                    ['not-negative-amount', '<?= /* @escapeNotVerified */ __('Please enter a positive number in this field.') ?>', function(v) {
                         if(v.length)
                             return /^\s*\d+([,.]\d+)*\s*%?\s*$/.test(v);
                         else
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
index bea0ae8999074..7f5c54a3236e0 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/form.phtml
@@ -8,10 +8,10 @@
 
 ?>
 <?php  $_order = $block->getCreditmemo()->getOrder() ?>
-<?php echo $block->getChildHtml('order_info') ?>
+<?= $block->getChildHtml('order_info') ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
     </div>
     <div class="admin__page-section-content">
 
@@ -22,12 +22,12 @@
         <?php endif; ?>
             <?php /* Billing Address */?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
-                <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-                <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+                <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
             </div>
         </div>
 
@@ -35,12 +35,12 @@
         <div class="admin__page-section-item order-shipping-address">
             <?php /* Shipping Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
             </div>
             <div class="shipping-description-wrapper admin__page-section-item-content">
-                <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                 <div class="shipping-description-content">
-                    <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
+                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
 
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -49,9 +49,9 @@
                     <?php endif; ?>
                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?php /* @escapeNotVerified */ echo $_excl; ?>
+                    <?= /* @escapeNotVerified */ $_excl ?>
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                     <?php endif; ?>
                 </div>
             </div>
@@ -63,33 +63,33 @@
 
 <?php if (count($_items)): ?>
 <div id="creditmemo_items_container">
-    <?php echo $block->getChildHtml('creditmemo_items') ?>
+    <?= $block->getChildHtml('creditmemo_items') ?>
 </div>
 <?php else: ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Refunded') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items Refunded') ?></span>
     </div>
-    <div class="no-items admin__page-section-content"><?php /* @escapeNotVerified */ echo __('No Items') ?></div>
+    <div class="no-items admin__page-section-content"><?= /* @escapeNotVerified */ __('No Items') ?></div>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Memo Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Memo Total') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Credit Memo History') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo History') ?></span>
             </div>
-            <div class="admin__page-section-item-content"><?php echo $block->getChildHtml('order_comments') ?></div>
+            <div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments') ?></div>
         </div>
         <div class="admin__page-section-item order-totals" id="history_form">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Credit Memo Totals') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Credit Memo Totals') ?></span>
             </div>
-            <div class="admin__page-section-content"><?php echo $block->getChildHtml('creditmemo_totals') ?></div>
+            <div class="admin__page-section-content"><?= $block->getChildHtml('creditmemo_totals') ?></div>
         </div>
     </div>
 </section>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index b1b9b0791b36e..d77f2fbde22e4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
@@ -10,20 +10,20 @@
 <?php $_items = $block->getCreditmemo()->getAllItems() ?>
 <div class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Refunded') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items Refunded') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary order-creditmemo-tables">
                 <thead>
                     <tr class="headings">
-                        <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                        <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                        <th class="col-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
-                        <th class="col-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
-                        <th class="col-tax"><span><?php /* @escapeNotVerified */ echo __('Tax Amount') ?></span></th>
-                        <th class="col-discount"><span><?php /* @escapeNotVerified */ echo __('Discount Amount') ?></span></th>
-                        <th class="col-total last"><span><?php /* @escapeNotVerified */ echo __('Row Total') ?></span></th>
+                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                        <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                        <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
+                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
+                        <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
                     </tr>
                 </thead>
                 <?php $i = 0; foreach ($_items as $_item): ?>
@@ -32,9 +32,9 @@
                     } else {
                         $i++;
                     } ?>
-                    <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
-                        <?php echo $block->getItemHtml($_item) ?>
-                        <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                    <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
+                        <?= $block->getItemHtml($_item) ?>
+                        <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                     </tbody>
                 <?php endforeach; ?>
             </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
index a13f718c4882e..d39d41fe9c392 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
@@ -12,17 +12,17 @@
 <?php $_item->setStoreId($_item->getCreditMemo()->getStoreId()) ?>
 <?php $block->setPriceDataObject($_item) ?>
 <tr>
-    <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
+    <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
     <td class="col-price">
-        <?php echo $block->getColumnHtml($_item, 'price'); ?>
+        <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
+    <td class="col-qty"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
     <td class="col-subtotal">
-        <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+        <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
-        <?php echo $block->getColumnHtml($_item, 'total'); ?>
+        <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
index 9770a9926535c..2372087de5d79 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -14,8 +14,8 @@ store name = $_order->getStore()->getGroup()->getName()
 ?>
 <?php $_order = $block->getOrder() ?>
 <div>
-<?php echo __('Customer Name: %1', $block->escapeHtml($_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
-<?php echo __('Purchased From: %1', $block->escapeHtml($_order->getStore()->getGroup()->getName())) ?><br />
+<?= __('Customer Name: %1', $block->escapeHtml($_order->getCustomerFirstname() ? $_order->getCustomerName() : $_order->getBillingAddress()->getName())) ?><br />
+<?= __('Purchased From: %1', $block->escapeHtml($_order->getStore()->getGroup()->getName())) ?><br />
 </div>
 <table cellpadding="0" border="0" width="100%" style="border:1px solid #bebcb7; background:#f8f7f5;">
     <thead>
@@ -28,17 +28,17 @@ store name = $_order->getStore()->getGroup()->getName()
 
     <tbody>
 <?php $i = 0; foreach ($_order->getAllItems() as $_item): $i++ ?>
-        <tr <?php echo $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
-            <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+        <tr <?= $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
+            <td align="left" valign="top" style="padding:3px 9px"><strong><?= $block->escapeHtml($_item->getName()) ?></strong>
             <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-            <br /><strong><?php /* @escapeNotVerified */ echo __('Gift Message') ?></strong>
-            <br /><?php /* @escapeNotVerified */ echo __('From:'); ?> <?php echo $block->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><?php /* @escapeNotVerified */ echo __('To:'); ?> <?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><?php /* @escapeNotVerified */ echo __('Message:'); ?><br /> <?php echo $block->escapeHtml($_giftMessage->getMessage()) ?>
+            <br /><strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>
+            <br /><?= /* @escapeNotVerified */ __('From:') ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><?= /* @escapeNotVerified */ __('To:') ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><?= /* @escapeNotVerified */ __('Message:') ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             <?php endif; ?>
             </td>
-            <td align="center" valign="top" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
-            <td align="right" valign="top" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo $_order->formatPrice($_item->getRowTotal()) ?></td>
+            <td align="center" valign="top" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_item->getQtyOrdered()*1 ?></td>
+            <td align="right" valign="top" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_item->getRowTotal()) ?></td>
         </tr>
 <?php endforeach ?>
     </tbody>
@@ -47,38 +47,38 @@ store name = $_order->getStore()->getGroup()->getName()
     <?php if ($_order->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_order->getGiftMessageId())): ?>
         <tr>
             <td colspan="3" align="left" style="padding:3px 9px">
-            <strong><?php /* @escapeNotVerified */ echo __('Gift Message') ?></strong>
-            <br /><?php /* @escapeNotVerified */ echo __('From:'); ?> <?php echo $block->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><?php /* @escapeNotVerified */ echo __('To:'); ?> <?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><?php /* @escapeNotVerified */ echo __('Message:'); ?><br /> <?php echo $block->escapeHtml($_giftMessage->getMessage()) ?>
+            <strong><?= /* @escapeNotVerified */ __('Gift Message') ?></strong>
+            <br /><?= /* @escapeNotVerified */ __('From:') ?> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+            <br /><?= /* @escapeNotVerified */ __('To:') ?> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+            <br /><?= /* @escapeNotVerified */ __('Message:') ?><br /> <?= $block->escapeHtml($_giftMessage->getMessage()) ?>
             </td>
         </tr>
      <?php endif; ?>
         <tr>
-            <td colspan="2" align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></td>
-            <td align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo $_order->formatPrice($_order->getSubtotal()) ?></td>
+            <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Subtotal') ?></td>
+            <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getSubtotal()) ?></td>
         </tr>
         <?php if ($_order->getDiscountAmount() > 0): ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo(($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount')) ?></td>
-                <td align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
+                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ (($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount')) ?></td>
+                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
             </tr>
         <?php endif; ?>
         <?php if ($_order->getShippingAmount() || $_order->getShippingDescription()) : ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo __('Shipping &amp; Handling') ?></td>
-                <td align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo $_order->formatPrice($_order->getShippingAmount()) ?></td>
+                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling') ?></td>
+                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getShippingAmount()) ?></td>
             </tr>
         <?php endif; ?>
         <?php if ($_order->getTaxAmount() > 0): ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo __('Tax') ?></td>
-                <td align="right" style="padding:3px 9px"><?php /* @escapeNotVerified */ echo $_order->formatPrice($_order->getTaxAmount()) ?></td>
+                <td colspan="2" align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ __('Tax') ?></td>
+                <td align="right" style="padding:3px 9px"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getTaxAmount()) ?></td>
             </tr>
         <?php endif; ?>
         <tr bgcolor="#DEE5E8">
-            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?php /* @escapeNotVerified */ echo __('Grand Total') ?></big></strong></td>
-            <td align="right" style="padding:6px 9px"><strong><big><?php /* @escapeNotVerified */ echo $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
+            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?= /* @escapeNotVerified */ __('Grand Total') ?></big></strong></td>
+            <td align="right" style="padding:6px 9px"><strong><big><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
         </tr>
     </tfoot>
 </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
index 38108583f14d8..acce4571be005 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/giftoptions.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php if ($block->getChildHtml()): ?>
 <section class="admin__page-section order-gift-options">
-    <div class="admin__page-section-title"><strong class="title"><?php /* @escapeNotVerified */ echo __('Gift Options') ?></strong></div>
-    <?php echo $block->getChildHtml() ?>
+    <div class="admin__page-section-title"><strong class="title"><?= /* @escapeNotVerified */ __('Gift Options') ?></strong></div>
+    <?= $block->getChildHtml() ?>
 </section>
 <?php endif ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
index 5cfb3aff31d53..cabbb8df8573c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/form.phtml
@@ -7,37 +7,37 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form id="edit_form" class="order-invoice-edit" method="post" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form id="edit_form" class="order-invoice-edit" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+    <?= $block->getBlockHtml('formkey') ?>
     <?php $_order = $block->getInvoice()->getOrder() ?>
-    <?php echo $block->getChildHtml('order_info') ?>
+    <?= $block->getChildHtml('order_info') ?>
 
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
         </div>
         <div class="admin__page-section-content">
             <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
-                    <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
-                    <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
-                    <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+                    <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
+                    <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                    <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
                 </div>
             </div>
             <?php if (!$_order->getIsVirtual()): ?>
             <div class="admin__page-section-item order-shipping-address">
                 <?php /*Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Information') ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
                     <div class="shipping-description-wrapper">
-                        <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                        <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                         <div class="shipping-description-content">
-                            <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
+                            <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
 
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                                 <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -46,24 +46,24 @@
                             <?php endif; ?>
                             <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                            <?php /* @escapeNotVerified */ echo $_excl; ?>
+                            <?= /* @escapeNotVerified */ $_excl ?>
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                                (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                             <?php endif; ?>
                         </div>
                     </div>
                     <?php if ($block->canCreateShipment() && $block->canShipPartiallyItem()): ?>
                     <div class="admin__field admin__field-option">
                         <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
-                               class="admin__control-checkbox" <?php echo $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
+                               class="admin__control-checkbox" <?= $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
                         <label for="invoice_do_shipment"
-                               class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Create Shipment') ?></span></label>
+                               class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Create Shipment') ?></span></label>
                     </div>
                     <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
-                        <small><?php /* @escapeNotVerified */ echo __('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.') ?></small>
+                        <small><?= /* @escapeNotVerified */ __('Invoice and shipment types do not match for some items on this order. You can create a shipment only after creating the invoice.') ?></small>
                         <?php endif; ?>
                     <?php endif; ?>
-                    <div id="tracking" style="display:none;"><?php echo $block->getChildHtml('tracking', false) ?></div>
+                    <div id="tracking" style="display:none;"><?= $block->getChildHtml('tracking', false) ?></div>
                 </div>
             </div>
             <?php endif; ?>
@@ -71,7 +71,7 @@
     </section>
 
     <section id="invoice_item_container">
-        <?php echo $block->getChildHtml('order_items') ?>
+        <?= $block->getChildHtml('order_items') ?>
     </section>
 </form>
 <script>
@@ -90,7 +90,7 @@ require(['prototype'], function(){
     }
 
     /*forced creating of shipment*/
-    var forcedShipmentCreate = <?php /* @escapeNotVerified */ echo $block->getForcedShipmentCreate() ?>;
+    var forcedShipmentCreate = <?= /* @escapeNotVerified */ $block->getForcedShipmentCreate() ?>;
     var shipmentElement = $('invoice_do_shipment');
     if (forcedShipmentCreate && shipmentElement) {
         shipmentElement.checked = true;
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
index 637d86b9c97d0..fa5ea0568011b 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items.phtml
@@ -11,28 +11,28 @@
 <section class="admin__page-section">
     <div class="admin__page-section-title">
         <?php $_itemsGridLabel = $block->getForcedShipmentCreate() ? 'Items to Invoice and Ship' : 'Items to Invoice'; ?>
-        <span class="title"><?php /* @escapeNotVerified */ echo __('%1', $_itemsGridLabel) ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('%1', $_itemsGridLabel) ?></span>
     </div>
     <div class="admin__page-section-content grid">
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary order-invoice-tables">
                 <thead>
                     <tr class="headings">
-                        <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                        <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                        <th class="col-ordered-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
-                        <th class="col-qty-invoice"><span><?php /* @escapeNotVerified */ echo __('Qty to Invoice') ?></span></th>
-                        <th class="col-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
-                        <th class="col-tax"><span><?php /* @escapeNotVerified */ echo __('Tax Amount') ?></span></th>
-                        <th class="col-discount"><span><?php /* @escapeNotVerified */ echo __('Discount Amount') ?></span></th>
-                        <th class="col-total last"><span><?php /* @escapeNotVerified */ echo __('Row Total') ?></span></th>
+                        <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                        <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                        <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                        <th class="col-qty-invoice"><span><?= /* @escapeNotVerified */ __('Qty to Invoice') ?></span></th>
+                        <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                        <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
+                        <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
+                        <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
                     </tr>
                 </thead>
                 <?php if ($block->canEditQty()): ?>
                 <tfoot>
                     <tr>
                         <td colspan="2">&nbsp;</td>
-                        <td colspan="3"><?php echo $block->getUpdateButtonHtml() ?></td>
+                        <td colspan="3"><?= $block->getUpdateButtonHtml() ?></td>
                         <td colspan="3">&nbsp;</td>
                     </tr>
                 </tfoot>
@@ -44,9 +44,9 @@
                 } else {
                     $_i++;
                 } ?>
-                    <tbody class="<?php /* @escapeNotVerified */ echo $_i%2 ? 'even' : 'odd' ?>">
-                        <?php echo $block->getItemHtml($_item) ?>
-                        <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                    <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'even' : 'odd' ?>">
+                        <?= $block->getItemHtml($_item) ?>
+                        <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                     </tbody>
                 <?php endforeach; ?>
             </table>
@@ -58,27 +58,27 @@
 
 <?php if (!empty($orderTotalBar)): ?>
 <section class="admin__page-section">
-    <?php /* @escapeNotVerified */ echo $orderTotalBar; ?>
+    <?= /* @escapeNotVerified */ $orderTotalBar ?>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice History') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Invoice History') ?></span>
             </div>
             <div id="history_form" class="admin__page-section-item-content order-history-form">
                 <div class="admin__field">
                     <label for="invoice_comment_text" class="admin__field-label">
-                        <span><?php /* @escapeNotVerified */ echo __('Invoice Comments') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Invoice Comments') ?></span>
                     </label>
                     <div class="admin__field-control">
                         <textarea id="invoice_comment_text" name="invoice[comment_text]" class="admin__control-textarea"
-                                  rows="3" cols="5"><?php /* @escapeNotVerified */ echo $block->getInvoice()->getCommentText(); ?></textarea>
+                                  rows="3" cols="5"><?= /* @escapeNotVerified */ $block->getInvoice()->getCommentText() ?></textarea>
                     </div>
                 </div>
             </div>
@@ -86,47 +86,47 @@
 
         <div id="invoice_totals" class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice Totals') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Invoice Totals') ?></span>
             </div>
             <div class="admin__page-section-item-content order-totals-actions">
-                <?php echo $block->getChildHtml('invoice_totals') ?>
+                <?= $block->getChildHtml('invoice_totals') ?>
                 <?php if ($block->isCaptureAllowed()): ?>
                 <?php if ($block->canCapture()):?>
                     <div class="admin__field">
                         <?php
                         /*
-                        <label for="invoice_do_capture" class="normal"><?php echo __('Capture Amount') ?></label>
+                        <label for="invoice_do_capture" class="normal"><?= __('Capture Amount') ?></label>
                         <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
                         */
                         ?>
-                      <label for="invoice_do_capture" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Amount') ?></label>
+                      <label for="invoice_do_capture" class="admin__field-label"><?= /* @escapeNotVerified */ __('Amount') ?></label>
                       <select class="admin__control-select" name="invoice[capture_case]">
-                          <option value="online"><?php /* @escapeNotVerified */ echo __('Capture Online') ?></option>
-                          <option value="offline"><?php /* @escapeNotVerified */ echo __('Capture Offline') ?></option>
-                          <option value="not_capture"><?php /* @escapeNotVerified */ echo __('Not Capture') ?></option>
+                          <option value="online"><?= /* @escapeNotVerified */ __('Capture Online') ?></option>
+                          <option value="offline"><?= /* @escapeNotVerified */ __('Capture Offline') ?></option>
+                          <option value="not_capture"><?= /* @escapeNotVerified */ __('Not Capture') ?></option>
                       </select>
                     </div>
                 <?php elseif ($block->isGatewayUsed()):?>
                     <input type="hidden" name="invoice[capture_case]" value="offline"/>
-                    <div><?php /* @escapeNotVerified */ echo __('The invoice will be created offline without the payment gateway.') ?></div>
+                    <div><?= /* @escapeNotVerified */ __('The invoice will be created offline without the payment gateway.') ?></div>
                 <?php endif?>
                 <?php endif; ?>
                 <div class="admin__field admin__field-option field-append">
                     <input id="notify_customer" name="invoice[comment_customer_notify]" value="1" type="checkbox"
                            class="admin__control-checkbox" />
-                    <label class="admin__field-label" for="notify_customer"><?php /* @escapeNotVerified */ echo __('Append Comments') ?></label>
+                    <label class="admin__field-label" for="notify_customer"><?= /* @escapeNotVerified */ __('Append Comments') ?></label>
                 </div>
                 <?php if ($block->canSendInvoiceEmail()): ?>
                 <div class="admin__field admin__field-option field-email">
                     <input id="send_email" name="invoice[send_email]" value="1" type="checkbox"
                            class="admin__control-checkbox" />
-                    <label class="admin__field-label" for="send_email"><?php /* @escapeNotVerified */ echo __('Email Copy of Invoice') ?></label>
+                    <label class="admin__field-label" for="send_email"><?= /* @escapeNotVerified */ __('Email Copy of Invoice') ?></label>
                 </div>
                 <?php endif; ?>
-                <?php echo $block->getChildHtml('submit_before') ?>
+                <?= $block->getChildHtml('submit_before') ?>
                 <div class="actions">
-                    <?php echo $block->getChildHtml('submit_button') ?>
-                    <?php echo $block->getChildHtml('submit_after') ?>
+                    <?= $block->getChildHtml('submit_button') ?>
+                    <?= $block->getChildHtml('submit_after') ?>
                 </div>
             </div>
         </div>
@@ -139,7 +139,7 @@ require(['jquery', 'prototype'], function(jQuery){
 //<![CDATA[
 var submitButtons = $$('.submit-button');
 var updateButtons = $$('.update-button');
-var enableSubmitButtons = <?php echo (int) !$block->getDisableSubmitButton() ?>;
+var enableSubmitButtons = <?= (int) !$block->getDisableSubmitButton() ?>;
 var fields = $$('.qty-input');
 
 updateButtons.each(function (elem) {elem.disabled=true;elem.addClassName('disabled');});
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
index 5de49804744cc..5bfb5f130cedb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
@@ -10,25 +10,25 @@
 <?php /** @var $block \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $block->setPriceDataObject($_item)?>
-    <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
+    <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
     <td class="col-price">
-        <?php echo $block->getColumnHtml($_item, 'price'); ?>
+        <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?php echo $block->getColumnHtml($_item, 'qty') ?></td>
+    <td class="col-qty"><?= $block->getColumnHtml($_item, 'qty') ?></td>
     <td class="col-qty-invoice">
     <?php if ($block->canEditQty()) : ?>
         <input type="text" class="input-text admin__control-text qty-input"
-               name="invoice[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
-               value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"/>
+               name="invoice[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
+               value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>"/>
     <?php else : ?>
-        <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+        <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
-        <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+        <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
-        <?php echo $block->getColumnHtml($_item, 'total'); ?>
+        <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
index e8f64fec9e535..e86a87f089897 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/form.phtml
@@ -9,24 +9,24 @@
 ?>
 <?php $_invoice = $block->getInvoice() ?>
 <?php $_order = $_invoice->getOrder() ?>
-<?php echo $block->getChildHtml('order_info') ?>
+<?= $block->getChildHtml('order_info') ?>
 
 <section class="admin__page-section order-view-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?> admin__fieldset-wrapper">
             <?php /*Billing Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div class="order-payment-method-title"><?php echo $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-method-title"><?= $block->getChildHtml('order_payment') ?></div>
                 <div class="order-payment-currency">
-                    <?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                    <?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
                 </div>
-                <div class="order-payment-additional"><?php echo $block->getChildHtml('order_payment_additional'); ?></div>
+                <div class="order-payment-additional"><?= $block->getChildHtml('order_payment_additional') ?></div>
             </div>
         </div>
 
@@ -34,14 +34,14 @@
             <div class="admin__page-section-item order-shipping-address">
                 <?php /*Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Information') ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content shipping-description-wrapper">
                     <div class="shipping-description-title">
-                        <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                        <?= $block->escapeHtml($_order->getShippingDescription()) ?>
                     </div>
                     <div class="shipping-description-content">
-                        <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
+                        <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
 
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -50,11 +50,11 @@
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                        <?php /* @escapeNotVerified */ echo $_excl; ?>
+                        <?= /* @escapeNotVerified */ $_excl ?>
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                            (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                         <?php endif; ?>
-                        <div><?php echo $block->getChildHtml('shipment_tracking') ?></div>
+                        <div><?= $block->getChildHtml('shipment_tracking') ?></div>
                     </div>
                 </div>
             </div>
@@ -65,33 +65,33 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Invoiced') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></span>
     </div>
 
     <div id="invoice_item_container" class="admin__page-section-content">
-        <?php echo $block->getChildHtml('invoice_items') ?>
+        <?= $block->getChildHtml('invoice_items') ?>
     </div>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice History') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Invoice History') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <?php echo $block->getChildHtml('order_comments') ?>
+                <?= $block->getChildHtml('order_comments') ?>
             </div>
         </div>
 
         <div id="history_form" class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice Totals') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Invoice Totals') ?></span>
             </div>
-            <?php echo $block->getChildHtml('invoice_totals') ?>
+            <?= $block->getChildHtml('invoice_totals') ?>
         </div>
     </div>
 </section>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index 90e813f3ffd8b..63f33dbb74bad 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
@@ -11,13 +11,13 @@
     <table class="data-table admin__table-primary order-invoice-tables">
         <thead>
             <tr class="headings">
-                <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
-                <th class="col-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
-                <th class="col-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
-                <th class="col-tax"><span><?php /* @escapeNotVerified */ echo __('Tax Amount') ?></span></th>
-                <th class="col-discount"><span><?php /* @escapeNotVerified */ echo __('Discount Amount') ?></span></th>
-                <th class="col-total last"><span><?php /* @escapeNotVerified */ echo __('Row Total') ?></span></th>
+                <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                <th class="col-price"><span><?= /* @escapeNotVerified */ __('Price') ?></span></th>
+                <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
+                <th class="col-subtotal"><span><?= /* @escapeNotVerified */ __('Subtotal') ?></span></th>
+                <th class="col-tax"><span><?= /* @escapeNotVerified */ __('Tax Amount') ?></span></th>
+                <th class="col-discount"><span><?= /* @escapeNotVerified */ __('Discount Amount') ?></span></th>
+                <th class="col-total last"><span><?= /* @escapeNotVerified */ __('Row Total') ?></span></th>
             </tr>
         </thead>
         <?php $_items = $block->getInvoice()->getAllItems() ?>
@@ -27,9 +27,9 @@
         } else {
             $i++;
         } ?>
-            <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
-                <?php echo $block->getItemHtml($_item) ?>
-                <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+            <tbody class="<?= /* @escapeNotVerified */ $i%2 ? 'even' : 'odd' ?>">
+                <?= $block->getItemHtml($_item) ?>
+                <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
             </tbody>
         <?php endforeach; ?>
     </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
index 3e286681bf8c4..af9e5b3bb702d 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
@@ -12,17 +12,17 @@
 <?php $_item->setStoreId($_item->getInvoice()->getStoreId()) ?>
 <?php $block->setPriceDataObject($_item) ?>
 <tr>
-    <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
+    <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
     <td class="col-price">
-        <?php echo $block->getColumnHtml($_item, 'price'); ?>
+        <?= $block->getColumnHtml($_item, 'price') ?>
     </td>
-    <td class="col-qty"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
+    <td class="col-qty"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
     <td class="col-subtotal">
-        <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
+        <?= $block->getColumnHtml($_item, 'subtotal') ?>
     </td>
-    <td class="col-tax"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-discount"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
-        <?php echo $block->getColumnHtml($_item, 'total'); ?>
+        <?= $block->getColumnHtml($_item, 'total') ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index 3017f70566358..b038c72199c7f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
@@ -12,8 +12,8 @@
     <tr>
     <?php foreach ($block->getTotals() as $_total): ?>
         <td <?php if ($_total['grand']): ?>class="grand-total"<?php endif; ?>>
-            <?php /* @escapeNotVerified */ echo $_total['label'] ?><br />
-            <?php /* @escapeNotVerified */ echo $_total['value'] ?>
+            <?= /* @escapeNotVerified */ $_total['label'] ?><br />
+            <?= /* @escapeNotVerified */ $_total['value'] ?>
         </td>
     <?php endforeach; ?>
     </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
index 2781b5b890a22..d23ebac84e6c2 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -11,8 +11,8 @@
 <?php $block->setPriceDataObject($_source) ?>
 <?php if ($_source): ?>
 <table width="100%">
-    <?php echo $block->getChildHtml('main'); ?>
-    <?php echo $block->getChildHtml('footer'); ?>
+    <?= $block->getChildHtml('main') ?>
+    <?= $block->getChildHtml('footer') ?>
 </table>
 <?php endif;*/ ?>
 <table class="data-table admin__table-secondary order-subtotal-table">
@@ -22,14 +22,14 @@
         <tfoot>
             <?php foreach ($block->getTotals('footer') as $_code => $_total): ?>
                 <?php if ($_total->getBlockName()): ?>
-                    <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
+                    <?= $block->getChildHtml($_total->getBlockName(), false) ?>
                 <?php else:?>
-                <tr class="col-<?php /* @escapeNotVerified */ echo $_code?>">
-                    <td <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> class="label">
-                        <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
+                <tr class="col-<?= /* @escapeNotVerified */ $_code ?>">
+                    <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> class="label">
+                        <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
                     </td>
-                    <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?>>
-                        <strong><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></strong>
+                    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
+                        <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
                     </td>
                 </tr>
                 <?php endif?>
@@ -42,24 +42,24 @@
         <tbody>
             <?php foreach ($_totals as $_code => $_total): ?>
                 <?php if ($_total->getBlockName()): ?>
-                    <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
+                    <?= $block->getChildHtml($_total->getBlockName(), false) ?>
                 <?php else:?>
-                    <tr class="col-<?php /* @escapeNotVerified */ echo $_code?>">
-                        <td <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> class="label">
+                    <tr class="col-<?= /* @escapeNotVerified */ $_code ?>">
+                        <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> class="label">
                             <?php if ($_total->getStrong()):?>
-                            <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
+                            <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
                             <?php else:?>
-                            <?php echo $block->escapeHtml($_total->getLabel()); ?>
+                            <?= $block->escapeHtml($_total->getLabel()) ?>
                             <?php endif?>
                         </td>
 
                         <?php if ($_total->getStrong()):?>
-                            <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?>>
-                                <strong><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></strong>
+                            <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
+                                <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
                             </td>
                         <?php else:?>
-                            <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?>>
-                                <span><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></span>
+                            <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?>>
+                                <span><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></span>
                             </td>
                         <?php endif?>
                     </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
index 8c73d6ddc28f2..db2567a5f3dbf 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/discount.phtml
@@ -15,11 +15,11 @@
     <tr>
         <td class="label">
             <?php if ($_order->getCouponCode()): ?>
-                <?php /* @escapeNotVerified */ echo __('Discount (%1)', $_order->getCouponCode()) ?>
+                <?= /* @escapeNotVerified */ __('Discount (%1)', $_order->getCouponCode()) ?>
             <?php else: ?>
-                <?php /* @escapeNotVerified */ echo __('Discount') ?>
+                <?= /* @escapeNotVerified */ __('Discount') ?>
             <?php endif; ?>
         </td>
-        <td><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?></td>
+        <td><?= /* @escapeNotVerified */ $block->displayPriceAttribute('discount_amount') ?></td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
index 8dcee058d74f5..81402e37288ef 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php if ($block->getCanDisplayTotalDue()): ?>
 <tr>
-    <td class="label"><big><strong><?php /* @escapeNotVerified */ echo __('Total Due') ?></strong></big></td>
-    <td class="emph"><big><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('total_due', true) ?></big></td>
+    <td class="label"><big><strong><?= /* @escapeNotVerified */ __('Total Due') ?></strong></big></td>
+    <td class="emph"><big><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_due', true) ?></big></td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/footer.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/footer.phtml
index de9d00e6cd46b..da9d8d7cb84a3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/footer.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/footer.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <tfoot>
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </tfoot>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
index 0eb314ab24344..519aa660fbf12 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
@@ -14,11 +14,11 @@
     <td class="label">
         <strong><big>
         <?php if ($block->getGrandTotalTitle()): ?>
-            <?php /* @escapeNotVerified */ echo $block->getGrandTotalTitle() ?>
+            <?= /* @escapeNotVerified */ $block->getGrandTotalTitle() ?>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo __('Grand Total') ?>
+            <?= /* @escapeNotVerified */ __('Grand Total') ?>
         <?php endif; ?>
         </big></strong>
     </td>
-    <td class="emph"><big><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('grand_total', true) ?></big></td>
+    <td class="emph"><big><?= /* @escapeNotVerified */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
index cb14b7f25845b..6c44e6ec632a7 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/item.phtml
@@ -12,7 +12,7 @@
 
 <?php if ((float) $_source->getDataUsingMethod($block->getSourceField())): ?>
     <tr>
-        <td class="label"><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?php /* @escapeNotVerified */ echo __($block->getLabel()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
-        <td <?php echo $block->getHtmlClass() ? ('class="' . $block->getHtmlClass() . '"') : '';?>><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute($block->getSourceField()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
+        <td class="label"><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?= /* @escapeNotVerified */ __($block->getLabel()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
+        <td <?= $block->getHtmlClass() ? ('class="' . $block->getHtmlClass() . '"') : '' ?>><?php if ($block->getStrong()) : ?><strong><?php endif; ?><?= /* @escapeNotVerified */ $block->displayPriceAttribute($block->getSourceField()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/main.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/main.phtml
index e1317e18e5340..6d43255664456 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/main.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/main.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <tbody>
-    <?php echo $block->getChildHtml() ?>
+    <?= $block->getChildHtml() ?>
 </tbody>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
index b131f620f83b6..8befc7cc0ccb4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
@@ -9,8 +9,8 @@
 ?>
 <?php if ($block->getCanDisplayTotalPaid()): ?>
 <tr>
-    <td class="label"><strong><?php /* @escapeNotVerified */ echo __('Total Paid') ?></strong></td>
-    <td class="emph"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('total_paid', true) ?>
+    <td class="label"><strong><?= /* @escapeNotVerified */ __('Total Paid') ?></strong></td>
+    <td class="emph"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_paid', true) ?>
     </td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
index 799dbac9baebf..e579578f711ae 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/refunded.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php if ($block->getCanDisplayTotalRefunded()): ?>
 <tr>
-    <td class="label"><strong><?php /* @escapeNotVerified */ echo __('Total Refunded') ?></strong></td>
-    <td class="emph"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('total_refunded', true) ?></td>
+    <td class="label"><strong><?= /* @escapeNotVerified */ __('Total Refunded') ?></strong></td>
+    <td class="emph"><?= /* @escapeNotVerified */ $block->displayPriceAttribute('total_refunded', true) ?></td>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
index becb8eb4fb746..47304bf7f4a7e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/shipping.phtml
@@ -12,7 +12,7 @@
 
 <?php if ((float) $_source->getShippingAmount() || $_source->getShippingDescription()): ?>
     <tr>
-        <td class="label"><?php /* @escapeNotVerified */ echo __('Shipping &amp; Handling') ?></td>
-        <td><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('shipping_amount') ?></td>
+        <td class="label"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling') ?></td>
+        <td><?= /* @escapeNotVerified */ $block->displayPriceAttribute('shipping_amount') ?></td>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
index 5bc89ff6a09e3..2565c19d72773 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/tax.phtml
@@ -33,12 +33,12 @@ $_fullInfo  = $block->getFullTaxInfo();
             <?php foreach ($rates as $rate): ?>
             <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
                 <?php if (!is_null($rate['percent'])): ?>
-                    <td class="label"><?php /* @escapeNotVerified */ echo $rate['title']; ?> (<?php echo (float)$rate['percent']; ?>%)<br /></td>
+                    <td class="label"><?= /* @escapeNotVerified */ $rate['title'] ?> (<?= (float)$rate['percent'] ?>%)<br /></td>
                 <?php else: ?>
-                    <td class="label"><?php /* @escapeNotVerified */ echo $rate['title']; ?><br /></td>
+                    <td class="label"><?= /* @escapeNotVerified */ $rate['title'] ?><br /></td>
                 <?php endif; ?>
                 <?php if ($isFirst): ?>
-                    <td rowspan="<?php echo count($rates); ?>"><?php /* @escapeNotVerified */ echo $block->displayAmount($amount, $baseAmount); ?></td>
+                    <td rowspan="<?= count($rates) ?>"><?= /* @escapeNotVerified */ $block->displayAmount($amount, $baseAmount) ?></td>
                 <?php endif; ?>
             </tr>
             <?php
@@ -58,11 +58,11 @@ $_fullInfo  = $block->getFullTaxInfo();
 
             <tr class="summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
                 <?php if (!is_null($info['percent'])): ?>
-                    <td class="label"><?php echo $block->escapeHtml($info['title']); ?> (<?php echo (float)$info['percent']; ?>%)<br /></td>
+                    <td class="label"><?= $block->escapeHtml($info['title']) ?> (<?= (float)$info['percent'] ?>%)<br /></td>
                 <?php else: ?>
-                    <td class="label"><?php echo $block->escapeHtml($info['title']); ?><br /></td>
+                    <td class="label"><?= $block->escapeHtml($info['title']) ?><br /></td>
                 <?php endif; ?>
-                    <td><?php /* @escapeNotVerified */ echo $block->displayAmount($amount, $baseAmount); ?></td>
+                    <td><?= /* @escapeNotVerified */ $block->displayAmount($amount, $baseAmount) ?></td>
             </tr>
             <?php
                 $isFirst = 0;
@@ -79,13 +79,13 @@ $_fullInfo  = $block->getFullTaxInfo();
     <td class="label">
         <div class="summary-collapse">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <?php /* @escapeNotVerified */ echo __('Total Tax') ?>
+            <?= /* @escapeNotVerified */ __('Total Tax') ?>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo __('Tax') ?>
+            <?= /* @escapeNotVerified */ __('Tax') ?>
         <?php endif;?>
         </div>
     </td>
     <td>
-        <?php /* @escapeNotVerified */ echo $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()); ?>
+        <?= /* @escapeNotVerified */ $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
index 3927f00d17d6c..393af3e40d6eb 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/giftmessage.phtml
@@ -9,54 +9,54 @@
 ?>
 <?php if ($block->canDisplayGiftmessage()): ?>
 <?php $_required = $block->getMessage()->getMessage() != ''?>
-<div id="<?php echo $block->getHtmlId() ?>" class="admin__page-section-content giftmessage-whole-order-container">
-    <form class="entry-edit form-inline" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('form') ?>" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
+<div id="<?= $block->getHtmlId() ?>" class="admin__page-section-content giftmessage-whole-order-container">
+    <form class="entry-edit form-inline" id="<?= /* @escapeNotVerified */ $block->getFieldId('form') ?>" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
         <fieldset class="admin__fieldset">
-            <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Gift Message for the Entire Order'); ?></span></legend>
+            <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Gift Message for the Entire Order') ?></span></legend>
             <br/>
 
-            <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('type'); ?>"
-                   name="<?php /* @escapeNotVerified */ echo $block->getFieldName('type'); ?>"
+            <input type="hidden" id="<?= /* @escapeNotVerified */ $block->getFieldId('type') ?>"
+                   name="<?= /* @escapeNotVerified */ $block->getFieldName('type') ?>"
                    value="order"/>
 
-            <div class="admin__field field-from-name<?php echo $_required ? ' required' : ''; ?>">
+            <div class="admin__field field-from-name<?= $_required ? ' required' : '' ?>">
                 <label class="admin__field-label"
-                       for="<?php /* @escapeNotVerified */ echo $block->getFieldId('sender'); ?>"><span><?php /* @escapeNotVerified */ echo __('From Name'); ?></span></label>
+                       for="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>"><span><?= /* @escapeNotVerified */ __('From Name') ?></span></label>
 
                 <div class="admin__field-control">
-                    <input class="admin__control-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text"
-                           id="<?php /* @escapeNotVerified */ echo $block->getFieldId('sender'); ?>"
-                           name="<?php /* @escapeNotVerified */ echo $block->getFieldName('sender'); ?>"
-                           value="<?php echo $block->escapeHtml($block->getMessage()->getSender()); ?>"/>
+                    <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
+                           id="<?= /* @escapeNotVerified */ $block->getFieldId('sender') ?>"
+                           name="<?= /* @escapeNotVerified */ $block->getFieldName('sender') ?>"
+                           value="<?= $block->escapeHtml($block->getMessage()->getSender()) ?>"/>
                 </div>
             </div>
 
-            <div class="admin__field field-to-name<?php echo $_required ? ' required' : ''; ?>">
+            <div class="admin__field field-to-name<?= $_required ? ' required' : '' ?>">
                 <label class="admin__field-label"
-                       for="<?php /* @escapeNotVerified */ echo $block->getFieldId('recipient'); ?>"><span><?php /* @escapeNotVerified */ echo __('To Name'); ?></span></label>
+                       for="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>"><span><?= /* @escapeNotVerified */ __('To Name') ?></span></label>
 
                 <div class="admin__field-control">
-                    <input class="admin__control-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text"
-                           id="<?php /* @escapeNotVerified */ echo $block->getFieldId('recipient'); ?>"
-                           name="<?php /* @escapeNotVerified */ echo $block->getFieldName('recipient'); ?>"
-                           value="<?php echo $block->escapeHtml($block->getMessage()->getRecipient()); ?>"/>
+                    <input class="admin__control-text <?= $_required ? 'required-entry' : '' ?>" type="text"
+                           id="<?= /* @escapeNotVerified */ $block->getFieldId('recipient') ?>"
+                           name="<?= /* @escapeNotVerified */ $block->getFieldName('recipient') ?>"
+                           value="<?= $block->escapeHtml($block->getMessage()->getRecipient()) ?>"/>
                 </div>
             </div>
 
             <div class="admin__field field-gift-message">
                 <label class="admin__field-label"
-                       for="<?php /* @escapeNotVerified */ echo $block->getFieldId('message'); ?>"><span><?php /* @escapeNotVerified */ echo __('Gift Message'); ?></span></label>
+                       for="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>"><span><?= /* @escapeNotVerified */ __('Gift Message') ?></span></label>
                 <div class="admin__field-control">
-                    <textarea id="<?php /* @escapeNotVerified */ echo $block->getFieldId('message'); ?>"
-                              name="<?php /* @escapeNotVerified */ echo $block->getFieldName('message') ?>"
+                    <textarea id="<?= /* @escapeNotVerified */ $block->getFieldId('message') ?>"
+                              name="<?= /* @escapeNotVerified */ $block->getFieldName('message') ?>"
                               class="admin__control-textarea"
                               rows="2"
-                              cols="15"><?php echo $block->escapeHtml($block->getMessage()->getMessage()); ?></textarea>
+                              cols="15"><?= $block->escapeHtml($block->getMessage()->getMessage()) ?></textarea>
                 </div>
             </div>
 
             <div class="actions">
-                <?php echo $block->getSaveButtonHtml(); ?>
+                <?= $block->getSaveButtonHtml() ?>
             </div>
         </fieldset>
     </form>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
index 7473bf7bce459..e5810a81f71e4 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/history.phtml
@@ -12,11 +12,11 @@
         <div class="order-history-block" id="history_form">
 
             <div class="admin__field">
-                <label for="history_status" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Status') ?></label>
+                <label for="history_status" class="admin__field-label"><?= /* @escapeNotVerified */ __('Status') ?></label>
                 <div class="admin__field-control">
                     <select name="history[status]" id="history_status" class="admin__control-select">
                         <?php foreach ($block->getStatuses() as $_code => $_label): ?>
-                            <option value="<?php /* @escapeNotVerified */ echo $_code ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo $_label ?></option>
+                            <option value="<?= /* @escapeNotVerified */ $_code ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?= /* @escapeNotVerified */ $_label ?></option>
                         <?php endforeach; ?>
                     </select>
                 </div>
@@ -24,7 +24,7 @@
 
             <div class="admin__field">
                 <label for="history_comment" class="admin__field-label">
-                    <?php /* @escapeNotVerified */ echo __('Comment') ?>
+                    <?= /* @escapeNotVerified */ __('Comment') ?>
                 </label>
                 <div class="admin__field-control">
                     <textarea name="history[comment]"
@@ -45,7 +45,7 @@
                                    class="admin__control-checkbox"
                                    value="1" />
                             <label class="admin__field-label" for="history_notify">
-                                <?php /* @escapeNotVerified */ echo __('Notify Customer by Email') ?>
+                                <?= /* @escapeNotVerified */ __('Notify Customer by Email') ?>
                             </label>
                         <?php endif; ?>
                     </div>
@@ -57,13 +57,13 @@
                                class="admin__control-checkbox"
                                value="1" />
                         <label class="admin__field-label" for="history_visible">
-                            <?php /* @escapeNotVerified */ echo __('Visible on Storefront') ?>
+                            <?= /* @escapeNotVerified */ __('Visible on Storefront') ?>
                         </label>
                     </div>
                 </div>
 
                 <div class="order-history-comments-actions">
-                    <?php echo $block->getChildHtml('submit_button') ?>
+                    <?= $block->getChildHtml('submit_button') ?>
                 </div>
             </div>
         </div>
@@ -72,21 +72,21 @@
     <ul class="note-list">
     <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?php /* @noEscape */ echo $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?php /* @noEscape */ echo $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-status"><?php /* @escapeNotVerified */ echo $_item->getStatusLabel() ?></span>
+            <span class="note-list-date"><?= /* @noEscape */ $block->formatDate($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-time"><?= /* @noEscape */ $block->formatTime($_item->getCreatedAt(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-status"><?= /* @escapeNotVerified */ $_item->getStatusLabel() ?></span>
             <span class="note-list-customer">
-                <?php /* @escapeNotVerified */ echo __('Customer') ?>
+                <?= /* @escapeNotVerified */ __('Customer') ?>
                 <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                    <span class="note-list-customer-notapplicable"><?php /* @escapeNotVerified */ echo __('Notification Not Applicable') ?></span>
+                    <span class="note-list-customer-notapplicable"><?= /* @escapeNotVerified */ __('Notification Not Applicable') ?></span>
                 <?php elseif ($_item->getIsCustomerNotified()): ?>
-                    <span class="note-list-customer-notified"><?php /* @escapeNotVerified */ echo __('Notified') ?></span>
+                    <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
                 <?php else: ?>
-                    <span class="note-list-customer-not-notified"><?php /* @escapeNotVerified */ echo __('Not Notified') ?></span>
+                    <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
                 <?php endif; ?>
             </span>
             <?php if ($_item->getComment()): ?>
-                <div class="note-list-comment"><?php echo $block->escapeHtml($_item->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
+                <div class="note-list-comment"><?= $block->escapeHtml($_item->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
             <?php endif; ?>
         </li>
     <?php endforeach; ?>
@@ -94,7 +94,7 @@
     <script>
 require(['prototype'], function(){
 
-        if($('order_status'))$('order_status').update('<?php /* @escapeNotVerified */ echo $block->getOrder()->getStatusLabel() ?>');
+        if($('order_status'))$('order_status').update('<?= /* @escapeNotVerified */ $block->getOrder()->getStatusLabel() ?>');
 
 });
 </script>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
index 1993eba3c3645..d911d20f25565 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml
@@ -25,7 +25,7 @@ $orderStoreDate = $block->formatDate(
 
 <section class="admin__page-section order-view-account-information">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Order & Account Information') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Order & Account Information') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-information">
@@ -38,18 +38,18 @@ $orderStoreDate = $block->formatDate(
             <div class="admin__page-section-item-title">
                 <span class="title">
                     <?php if ($block->getNoUseOrderLink()): ?>
-                        <?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php echo $block->escapeHtml($_email) ?></span>)
+                        <?= /* @escapeNotVerified */ __('Order # %1', $_order->getRealOrderId()) ?> (<span><?= $block->escapeHtml($_email) ?></span>)
                     <?php else: ?>
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order->getId()) ?>"><?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?></a>
-                        <span>(<?php echo $block->escapeHtml($_email) ?>)</span>
+                        <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order->getId()) ?>"><?= /* @escapeNotVerified */ __('Order # %1', $_order->getRealOrderId()) ?></a>
+                        <span>(<?= $block->escapeHtml($_email) ?>)</span>
                     <?php endif; ?>
                 </span>
             </div>
             <div class="admin__page-section-item-content">
                 <table class="admin__table-secondary order-information-table">
                 <tr>
-                    <th><?php /* @escapeNotVerified */ echo __('Order Date') ?></th>
-                    <td><?php echo $block->escapeHtml($orderAdminDate) ?></td>
+                    <th><?= /* @escapeNotVerified */ __('Order Date') ?></th>
+                    <td><?= $block->escapeHtml($orderAdminDate) ?></td>
                 </tr>
                 <?php if ($orderAdminDate != $orderStoreDate):?>
                     <tr>
@@ -57,52 +57,52 @@ $orderStoreDate = $block->formatDate(
                                 'Order Date (%1)',
                                 $block->getTimezoneForStore($_order->getStore())
                             ) ?></th>
-                        <td><?php echo $block->escapeHtml($orderStoreDate) ?></td>
+                        <td><?= $block->escapeHtml($orderStoreDate) ?></td>
                     </tr>
                 <?php endif;?>
                 <tr>
-                    <th><?php /* @escapeNotVerified */ echo __('Order Status') ?></th>
-                    <td><span id="order_status"><?php echo $block->escapeHtml($_order->getStatusLabel()) ?></span></td>
+                    <th><?= /* @escapeNotVerified */ __('Order Status') ?></th>
+                    <td><span id="order_status"><?= $block->escapeHtml($_order->getStatusLabel()) ?></span></td>
                 </tr>
-                <?php echo $block->getChildHtml(); ?>
+                <?= $block->getChildHtml() ?>
                 <?php if ($block->isSingleStoreMode() == false):?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Purchased From') ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $block->getOrderStoreName() ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Purchased From') ?></th>
+                        <td><?= /* @escapeNotVerified */ $block->getOrderStoreName() ?></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRelationChildId()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Link to the New Order') ?></th>
-                        <td><a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order->getRelationChildId()) ?>">
-                                <?php /* @escapeNotVerified */ echo $_order->getRelationChildRealId() ?>
+                        <th><?= /* @escapeNotVerified */ __('Link to the New Order') ?></th>
+                        <td><a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order->getRelationChildId()) ?>">
+                                <?= /* @escapeNotVerified */ $_order->getRelationChildRealId() ?>
                             </a></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRelationParentId()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Link to the Previous Order') ?></th>
-                        <td><a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order->getRelationParentId()) ?>">
-                                <?php /* @escapeNotVerified */ echo $_order->getRelationParentRealId() ?>
+                        <th><?= /* @escapeNotVerified */ __('Link to the Previous Order') ?></th>
+                        <td><a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order->getRelationParentId()) ?>">
+                                <?= /* @escapeNotVerified */ $_order->getRelationParentRealId() ?>
                             </a></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRemoteIp() && $block->shouldDisplayCustomerIp()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Placed from IP') ?></th>
-                        <td><?php echo $block->escapeHtml($_order->getRemoteIp()); echo($_order->getXForwardedFor()) ? ' (' . $block->escapeHtml($_order->getXForwardedFor()) . ')' : ''; ?></td>
+                        <th><?= /* @escapeNotVerified */ __('Placed from IP') ?></th>
+                        <td><?= $block->escapeHtml($_order->getRemoteIp()); echo($_order->getXForwardedFor()) ? ' (' . $block->escapeHtml($_order->getXForwardedFor()) . ')' : '' ?></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('%1 / %2 rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
-                        <td><?php /* @escapeNotVerified */ echo $_order->getBaseToGlobalRate() ?></td>
+                        <th><?= /* @escapeNotVerified */ __('%1 / %2 rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
+                        <td><?= /* @escapeNotVerified */ $_order->getBaseToGlobalRate() ?></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getBaseCurrencyCode() != $_order->getOrderCurrencyCode() && $_order->getGlobalCurrencyCode() != $_order->getOrderCurrencyCode()): ?>
                     <tr>
-                        <th><?php echo $block->escapeHtml(__('%1 / %2 rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode())) ?></th>
-                        <td><?php echo $block->escapeHtml($_order->getBaseToOrderRate()) ?></td>
+                        <th><?= $block->escapeHtml(__('%1 / %2 rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode())) ?></th>
+                        <td><?= $block->escapeHtml($_order->getBaseToOrderRate()) ?></td>
                     </tr>
                 <?php endif; ?>
             </table>
@@ -112,40 +112,40 @@ $orderStoreDate = $block->formatDate(
         <div class="admin__page-section-item order-account-information">
             <?php /* Account Information */?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Account Information') ?></span>
-                <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAccountEditLink()?></div>
+                <span class="title"><?= /* @escapeNotVerified */ __('Account Information') ?></span>
+                <div class="actions"><?= /* @escapeNotVerified */ $block->getAccountEditLink() ?></div>
             </div>
             <div class="admin__page-section-item-content">
                 <table class="admin__table-secondary order-account-information-table">
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Customer Name') ?></th>
+                        <th><?= /* @escapeNotVerified */ __('Customer Name') ?></th>
                         <td>
                             <?php if ($_customerUrl = $block->getCustomerViewUrl()) : ?>
-                                <a href="<?php /* @escapeNotVerified */ echo $_customerUrl ?>" target="_blank">
-                                    <span><?php echo $block->escapeHtml($_order->getCustomerName()) ?></span>
+                                <a href="<?= /* @escapeNotVerified */ $_customerUrl ?>" target="_blank">
+                                    <span><?= $block->escapeHtml($_order->getCustomerName()) ?></span>
                                 </a>
                             <?php else: ?>
-                                <?php echo $block->escapeHtml($_order->getCustomerName()) ?>
+                                <?= $block->escapeHtml($_order->getCustomerName()) ?>
                             <?php endif; ?>
                         </td>
                     </tr>
                     <tr>
-                        <th><?php /* @escapeNotVerified */ echo __('Email') ?></th>
-                        <td><a href="mailto:<?php echo $block->escapeHtml($_order->getCustomerEmail()) ?>"><?php echo $block->escapeHtml($_order->getCustomerEmail()) ?></a></td>
+                        <th><?= /* @escapeNotVerified */ __('Email') ?></th>
+                        <td><a href="mailto:<?= $block->escapeHtml($_order->getCustomerEmail()) ?>"><?= $block->escapeHtml($_order->getCustomerEmail()) ?></a></td>
                     </tr>
                     <?php if ($_groupName = $block->getCustomerGroupName()) : ?>
                         <tr>
-                            <th><?php /* @escapeNotVerified */ echo __('Customer Group') ?></th>
-                            <td><?php echo $block->escapeHtml($_groupName) ?></td>
+                            <th><?= /* @escapeNotVerified */ __('Customer Group') ?></th>
+                            <td><?= $block->escapeHtml($_groupName) ?></td>
                         </tr>
                     <?php endif; ?>
                     <?php foreach ($block->getCustomerAccountData() as $data):?>
                         <tr>
-                            <th><?php echo $block->escapeHtml($data['label']) ?></th>
-                            <td><?php echo $block->escapeHtml($data['value']) ?></td>
+                            <th><?= $block->escapeHtml($data['label']) ?></th>
+                            <td><?= $block->escapeHtml($data['value']) ?></td>
                         </tr>
                     <?php endforeach;?>
-                    <?php echo $block->getChildHtml('extra_customer_info') ?>
+                    <?= $block->getChildHtml('extra_customer_info') ?>
                 </table>
             </div>
         </div>
@@ -154,25 +154,25 @@ $orderStoreDate = $block->formatDate(
 
 <section class="admin__page-section order-addresses">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Address Information') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Address Information') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-billing-address">
             <?php /* Billing Address */?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
-                <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAddressEditLink($_order->getBillingAddress()); ?></div>
+                <span class="title"><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
+                <div class="actions"><?= /* @escapeNotVerified */ $block->getAddressEditLink($_order->getBillingAddress()) ?></div>
             </div>
-            <address class="admin__page-section-item-content"><?php /* @escapeNotVerified */ echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
+            <address class="admin__page-section-item-content"><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getBillingAddress()) ?></address>
         </div>
         <?php if (!$block->getOrder()->getIsVirtual()): ?>
             <div class="admin__page-section-item order-shipping-address">
                 <?php /* Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></span>
-                    <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAddressEditLink($_order->getShippingAddress()); ?></div>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Address') ?></span>
+                    <div class="actions"><?= /* @escapeNotVerified */ $block->getAddressEditLink($_order->getShippingAddress()) ?></div>
                 </div>
-                <address class="admin__page-section-item-content"><?php /* @escapeNotVerified */ echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
+                <address class="admin__page-section-item-content"><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
             </div>
         <?php endif; ?>
     </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
index 5a2a0a17629e6..dc62bce78ea1e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items.phtml
@@ -20,7 +20,7 @@ $_order = $block->getOrder() ?>
                 $lastItemNumber = count($columns) ?>
                 <?php foreach ($columns as $columnName => $columnTitle):?>
                     <?php $i++; ?>
-                    <th class="col-<?php /* @noEscape */ echo $columnName ?><?php /* @noEscape */ echo ($i === $lastItemNumber ? ' last' : '')?>"><span><?php /* @noEscape */ echo $columnTitle ?></span></th>
+                    <th class="col-<?= /* @noEscape */ $columnName ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><span><?= /* @noEscape */ $columnTitle ?></span></th>
                 <?php endforeach; ?>
             </tr>
         </thead>
@@ -31,9 +31,9 @@ $_order = $block->getOrder() ?>
             } else {
                 $i++;
             }?>
-            <tbody class="<?php /* @noEscape */ echo $i%2 ? 'even' : 'odd' ?>">
-                <?php echo $block->getItemHtml($_item) ?>
-                <?php echo $block->getItemExtraInfoHtml($_item) ?>
+            <tbody class="<?= /* @noEscape */ $i%2 ? 'even' : 'odd' ?>">
+                <?= $block->getItemHtml($_item) ?>
+                <?= $block->getItemExtraInfoHtml($_item) ?>
             </tbody>
         <?php endforeach; ?>
     </table>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
index 4e1135c576fd5..387aab3d9616f 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/items/renderer/default.phtml
@@ -16,6 +16,6 @@
     $lastItemNumber = count($columns) ?>
     <?php foreach ($columns as $columnName => $columnClass):?>
         <?php $i++; ?>
-        <td class="<?php echo /* @noEscape */ $columnClass?><?php /* @noEscape */ echo ($i === $lastItemNumber ? ' last' : '')?>"><?php /* @escapeNotVerified */ echo $block->getColumnHtml($_item, $columnName) ?></td>
+        <td class="<?= /* @noEscape */ $columnClass ?><?= /* @noEscape */ ($i === $lastItemNumber ? ' last' : '') ?>"><?= /* @escapeNotVerified */ $block->getColumnHtml($_item, $columnName) ?></td>
     <?php endforeach; ?>
 </tr>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
index 2f81950c457fe..87feaa857ef0e 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml
@@ -11,18 +11,18 @@
     <ul class="note-list">
     <?php foreach ($block->getFullHistory() as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->getItemCreatedAt($_item) ?></span>
-            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->getItemCreatedAt($_item, 'time') ?></span>
-            <span class="note-list-status"><?php /* @escapeNotVerified */ echo $block->getItemTitle($_item) ?></span>
+            <span class="note-list-date"><?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item) ?></span>
+            <span class="note-list-time"><?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item, 'time') ?></span>
+            <span class="note-list-status"><?= /* @escapeNotVerified */ $block->getItemTitle($_item) ?></span>
             <?php if ($block->isItemNotified($_item, false)): ?>
                 <span class="note-list-customer">
-                    <?php /* @escapeNotVerified */ echo __('Customer') ?>
+                    <?= /* @escapeNotVerified */ __('Customer') ?>
                     <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                        <span class="note-list-customer-notapplicable"><?php /* @escapeNotVerified */ echo __('Notification Not Applicable') ?></span>
+                        <span class="note-list-customer-notapplicable"><?= /* @escapeNotVerified */ __('Notification Not Applicable') ?></span>
                     <?php elseif ($block->isItemNotified($_item)): ?>
-                        <span class="note-list-customer-notified"><?php /* @escapeNotVerified */ echo __('Notified') ?></span>
+                        <span class="note-list-customer-notified"><?= /* @escapeNotVerified */ __('Notified') ?></span>
                     <?php else: ?>
-                        <span class="note-list-customer-not-notified"><?php /* @escapeNotVerified */ echo __('Not Notified') ?></span>
+                        <span class="note-list-customer-not-notified"><?= /* @escapeNotVerified */ __('Not Notified') ?></span>
                     <?php endif; ?>
                 </span>
             <?php endif; ?>
@@ -31,18 +31,18 @@
     </ul>
     <div class="edit-order-comments-block">
         <div class="edit-order-comments-block-title">
-            <?php /* @escapeNotVerified */ echo __('Notes for this Order') ?>
+            <?= /* @escapeNotVerified */ __('Notes for this Order') ?>
         </div>
         <?php foreach ($block->getFullHistory() as $_item): ?>
             <?php if ($_comment = $block->getItemComment($_item)): ?>
                 <div class="comments-block-item">
                     <div class="comments-block-item-comment">
-                        <?php /* @escapeNotVerified */ echo $_comment ?>
+                        <?= /* @escapeNotVerified */ $_comment ?>
                     </div>
                     <span class="comments-block-item-date-time">
-                        <?php /* @escapeNotVerified */ echo __('Comment added') ?>
-                        <?php /* @escapeNotVerified */ echo $block->getItemCreatedAt($_item) ?>
-                        <?php /* @escapeNotVerified */ echo $block->getItemCreatedAt($_item, 'time') ?>
+                        <?= /* @escapeNotVerified */ __('Comment added') ?>
+                        <?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item) ?>
+                        <?= /* @escapeNotVerified */ $block->getItemCreatedAt($_item, 'time') ?>
                     </span>
                 </div>
             <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
index eced7b93bb2c9..434ca127832a1 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/info.phtml
@@ -11,68 +11,68 @@
 <?php $_order = $block->getOrder() ?>
 
 <div id="order-messages">
-    <?php echo $block->getChildHtml('order_messages') ?>
+    <?= $block->getChildHtml('order_messages') ?>
 </div>
 
-<?php echo $block->getChildHtml('order_info') ?>
-<input type="hidden" name="order_id" value="<?php /* @escapeNotVerified */ echo $_order->getId() ?>"/>
+<?= $block->getChildHtml('order_info') ?>
+<input type="hidden" name="order_id" value="<?= /* @escapeNotVerified */ $_order->getId() ?>"/>
 
 <section class="admin__page-section order-view-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-payment-method<?php if ($_order->getIsVirtual()): ?> order-payment-method-virtual<?php endif; ?>">
             <?php /* Payment Method */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div class="order-payment-method-title"><?php echo $block->getPaymentHtml() ?></div>
-                <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-method-title"><?= $block->getPaymentHtml() ?></div>
+                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
                 <div class="order-payment-additional">
-                    <?php echo $block->getChildHtml('order_payment_additional'); ?>
-                    <?php echo $block->getChildHtml('payment_additional_info'); ?>
+                    <?= $block->getChildHtml('order_payment_additional') ?>
+                    <?= $block->getChildHtml('payment_additional_info') ?>
                 </div>
             </div>
         </div>
-        <?php echo $block->getChildHtml('order_shipping_view') ?>
+        <?= $block->getChildHtml('order_shipping_view') ?>
     </div>
 </section>
 
-<?php echo $block->getChildHtml('order_additional_info') ?>
+<?= $block->getChildHtml('order_additional_info') ?>
 
-<?php echo $block->getGiftOptionsHtml() ?>
+<?= $block->getGiftOptionsHtml() ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Ordered') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items Ordered') ?></span>
     </div>
-    <?php echo $block->getItemsHtml() ?>
+    <?= $block->getItemsHtml() ?>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Notes for this Order') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Notes for this Order') ?></span>
             </div>
-            <?php echo $block->getChildHtml('order_history') ?>
+            <?= $block->getChildHtml('order_history') ?>
         </div>
 
         <div class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Order Totals') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Order Totals') ?></span>
             </div>
-            <?php echo $block->getChildHtml('order_totals') ?>
+            <?= $block->getChildHtml('order_totals') ?>
         </div>
     </div>
 </section>
 
-<?php echo $block->getChildHtml('popup_window');?>
+<?= $block->getChildHtml('popup_window') ?>
 
 <script>
 require([
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
index 57e6bff3241d3..1194e72e27c62 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/page/js/components.phtml
@@ -9,4 +9,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
index b5c3c6111c2d2..872f70d1d693a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/rss/order/grid/link.phtml
@@ -9,5 +9,5 @@
 /** @var $block \Magento\Sales\Block\Adminhtml\Rss\Order\Grid\Link */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="link-feed"><?php /* @escapeNotVerified */ echo $block->getLabel() ?></a>
+<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="link-feed"><?= /* @escapeNotVerified */ $block->getLabel() ?></a>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
index fbe4c6609c7ee..b3708edf1d098 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -7,49 +7,49 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getButtonsHtml() ?></div>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?= $block->getButtonsHtml() ?></div>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Transaction Data'); ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Transaction Data') ?></span>
     </div>
     <div id="log_details_fieldset" class="admin__page-section-content log-details">
         <table class="log-info data-table admin__table-secondary">
             <tbody>
             <tr>
-                <th><?php /* @escapeNotVerified */ echo __('Transaction ID'); ?></th>
-                <td><?php echo $block->getTxnIdHtml() ?></td>
+                <th><?= /* @escapeNotVerified */ __('Transaction ID') ?></th>
+                <td><?= $block->getTxnIdHtml() ?></td>
             </tr>
             <tr>
-                <th><?php /* @escapeNotVerified */ echo __('Parent Transaction ID'); ?></th>
+                <th><?= /* @escapeNotVerified */ __('Parent Transaction ID') ?></th>
                 <td>
                     <?php if ($block->getParentTxnIdHtml()): ?>
-                    <a href="<?php echo $block->getParentTxnIdUrlHtml() ?>">
-                        <?php echo $block->getParentTxnIdHtml(); ?>
+                    <a href="<?= $block->getParentTxnIdUrlHtml() ?>">
+                        <?= $block->getParentTxnIdHtml() ?>
                     </a>
                     <?php else : ?>
-                    <?php /* @escapeNotVerified */ echo __('N/A'); ?>
+                    <?= /* @escapeNotVerified */ __('N/A') ?>
                     <?php endif; ?>
                 </td>
             </tr>
             <tr>
-                <th><?php /* @escapeNotVerified */ echo __('Order ID'); ?></th>
+                <th><?= /* @escapeNotVerified */ __('Order ID') ?></th>
                 <td>
-                    <a href="<?php echo $block->getOrderIdUrlHtml(); ?>">
-                        <?php echo $block->getOrderIncrementIdHtml() ?>
+                    <a href="<?= $block->getOrderIdUrlHtml() ?>">
+                        <?= $block->getOrderIncrementIdHtml() ?>
                     </a>
                 </td>
             </tr>
             <tr>
-                <th><?php /* @escapeNotVerified */ echo __('Transaction Type'); ?></th>
-                <td><?php echo $block->getTxnTypeHtml() ?></td>
+                <th><?= /* @escapeNotVerified */ __('Transaction Type') ?></th>
+                <td><?= $block->getTxnTypeHtml() ?></td>
             </tr>
             <tr>
-                <th><?php /* @escapeNotVerified */ echo __('Is Closed'); ?></th>
-                <td><?php echo $block->getIsClosedHtml(); ?></td>
+                <th><?= /* @escapeNotVerified */ __('Is Closed') ?></th>
+                <td><?= $block->getIsClosedHtml() ?></td>
             </tr>
             <tr>
-                <th><?php /* @escapeNotVerified */ echo __('Created At'); ?></th>
-                <td><?php echo $block->getCreatedAtHtml(); ?></td>
+                <th><?= /* @escapeNotVerified */ __('Created At') ?></th>
+                <td><?= $block->getCreatedAtHtml() ?></td>
             </tr>
             </tbody>
         </table>
@@ -58,18 +58,18 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title""><?php /* @escapeNotVerified */ echo __('Child Transactions'); ?></span>
+        <span class="title""><?= /* @escapeNotVerified */ __('Child Transactions') ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
-        <?php echo $block->getChildHtml('child_grid') ?>
+        <?= $block->getChildHtml('child_grid') ?>
     </div>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Transaction Details'); ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Transaction Details') ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
-        <?php echo $block->getChildHtml('detail_grid') ?>
+        <?= $block->getChildHtml('detail_grid') ?>
     </div>
 </section>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
index 072d529427e97..297e31d6d2c98 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/creditmemo/items.phtml
@@ -14,13 +14,13 @@
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items') ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty') ?>
                 </th>
                 <th class="item-subtotal">
-                    <?= /* @escapeNotVerified */  __('Subtotal'); ?>
+                    <?= /* @escapeNotVerified */  __('Subtotal') ?>
                 </th>
             </tr>
         </thead>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
index ce7e417c89582..10e07d1365470 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/invoice/items.phtml
@@ -14,13 +14,13 @@
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items') ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty') ?>
                 </th>
                 <th class="item-subtotal">
-                    <?= /* @escapeNotVerified */  __('Subtotal'); ?>
+                    <?= /* @escapeNotVerified */  __('Subtotal') ?>
                 </th>
             </tr>
         </thead>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
index 280d6069d3e01..358264463d49a 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items.phtml
@@ -14,13 +14,13 @@
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items') ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty') ?>
                 </th>
                 <th class="item-price">
-                    <?= /* @escapeNotVerified */  __('Price'); ?>
+                    <?= /* @escapeNotVerified */  __('Price') ?>
                 </th>
             </tr>
         </thead>
@@ -46,9 +46,9 @@
                 <tr>
                     <td>
                         <h3><?= /* @escapeNotVerified */  __('Gift Message for this Order') ?></h3>
-                        <strong><?= /* @escapeNotVerified */  __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                        <br /><strong><?= /* @escapeNotVerified */  __('Message:'); ?></strong>
+                        <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                        <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                        <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                     </td>
                 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
index 5b701762e04a2..20c2c1869fedb 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/creditmemo/default.phtml
@@ -12,7 +12,7 @@
 <tr>
     <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
             <dl>
                 <?php foreach ($block->getItemOptions() as $option): ?>
@@ -31,6 +31,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
index 5b701762e04a2..20c2c1869fedb 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/invoice/default.phtml
@@ -12,7 +12,7 @@
 <tr>
     <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
             <dl>
                 <?php foreach ($block->getItemOptions() as $option): ?>
@@ -31,6 +31,6 @@
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
index 71bdc2098581e..2974e4cd7ad80 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/order/default.phtml
@@ -15,7 +15,7 @@ $_order = $_item->getOrder();
 <tr>
     <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
             <dl class="item-options">
             <?php foreach ($block->getItemOptions() as $option): ?>
@@ -34,7 +34,7 @@ $_order = $_item->getOrder();
     </td>
     <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
     <td class="item-price">
-        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
 <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
@@ -44,9 +44,9 @@ $_order = $_item->getOrder();
             <tr>
                 <td>
                     <h3><?= /* @escapeNotVerified */  __('Gift Message') ?></h3>
-                    <strong><?= /* @escapeNotVerified */  __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                    <br /><strong><?= /* @escapeNotVerified */  __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                    <br /><strong><?= /* @escapeNotVerified */  __('Message:'); ?></strong>
+                    <strong><?= /* @escapeNotVerified */  __('From:') ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
+                    <br /><strong><?= /* @escapeNotVerified */  __('To:') ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
+                    <br /><strong><?= /* @escapeNotVerified */  __('Message:') ?></strong>
                     <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                 </td>
             </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
index 921dc62748be5..f41a09f5da0f3 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
@@ -11,7 +11,7 @@ $_item = $block->getItem() ?>
 <tr>
     <td class="item-info<?php if ($block->getItemOptions()): ?> has-extra<?php endif; ?>">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+        <p class="sku"><?= /* @escapeNotVerified */  __('SKU') ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
         <?php if ($block->getItemOptions()): ?>
             <dl class="item-options">
                 <?php foreach ($block->getItemOptions() as $option): ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
index e3e4752bf2183..2d2b7b2c2b26e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
@@ -14,10 +14,10 @@
         <thead>
             <tr>
                 <th class="item-info">
-                    <?= /* @escapeNotVerified */  __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items') ?>
                 </th>
                 <th class="item-qty">
-                    <?= /* @escapeNotVerified */  __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty') ?>
                 </th>
             </tr>
         </thead>
diff --git a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
index f53c16c68982a..3ebca4d08b349 100644
--- a/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/guest/form.phtml
@@ -7,14 +7,14 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?php /* @escapeNotVerified */ echo $block->getActionUrl() ?>"
+<form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>"
       method="post" name="guest_post">
     <fieldset class="fieldset">
-        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Order Information') ?></span></legend>
+        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Order Information') ?></span></legend>
         <br>
 
         <div class="field id required">
-            <label class="label" for="oar-order-id"><span><?php /* @escapeNotVerified */ echo __('Order ID') ?></span></label>
+            <label class="label" for="oar-order-id"><span><?= /* @escapeNotVerified */ __('Order ID') ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar-order-id" name="oar_order_id"
@@ -22,7 +22,7 @@
             </div>
         </div>
         <div class="field lastname required">
-            <label class="label" for="oar-billing-lastname"><span><?php /* @escapeNotVerified */ echo __('Billing Last Name') ?></span></label>
+            <label class="label" for="oar-billing-lastname"><span><?= /* @escapeNotVerified */ __('Billing Last Name') ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
@@ -30,17 +30,17 @@
             </div>
         </div>
         <div class="field find required">
-            <label class="label" for="quick-search-type-id"><span><?php /* @escapeNotVerified */ echo __('Find Order By') ?></span></label>
+            <label class="label" for="quick-search-type-id"><span><?= /* @escapeNotVerified */ __('Find Order By') ?></span></label>
 
             <div class="control">
                 <select name="oar_type" id="quick-search-type-id" class="select">
-                    <option value="email"><?php /* @escapeNotVerified */ echo __('Email'); ?></option>
-                    <option value="zip"><?php /* @escapeNotVerified */ echo __('ZIP Code'); ?></option>
+                    <option value="email"><?= /* @escapeNotVerified */ __('Email') ?></option>
+                    <option value="zip"><?= /* @escapeNotVerified */ __('ZIP Code') ?></option>
                 </select>
             </div>
         </div>
         <div id="oar-email" class="field email required">
-            <label class="label" for="oar_email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
+            <label class="label" for="oar_email"><span><?= /* @escapeNotVerified */ __('Email') ?></span></label>
 
             <div class="control">
                 <input type="email" class="input-text" id="oar_email" name="oar_email"
@@ -48,7 +48,7 @@
             </div>
         </div>
         <div id="oar-zip" class="field zip required">
-            <label class="label" for="oar_zip"><span><?php /* @escapeNotVerified */ echo __('Billing ZIP Code') ?></span></label>
+            <label class="label" for="oar_zip"><span><?= /* @escapeNotVerified */ __('Billing ZIP Code') ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text" id="oar_zip" name="oar_zip" data-validate="{required:true}"/>
@@ -57,8 +57,8 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Continue') ?>" class="action submit primary">
-                <span><?php /* @escapeNotVerified */ echo __('Continue') ?></span>
+            <button type="submit" title="<?= /* @escapeNotVerified */ __('Continue') ?>" class="action submit primary">
+                <span><?= /* @escapeNotVerified */ __('Continue') ?></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
index 9013048acd155..bcf740307af15 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/row.phtml
@@ -9,8 +9,8 @@
 /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
 $_item = $block->getItem();
 ?>
-<span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+<span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?php /* @escapeNotVerified */ echo $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
+        <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
index a349234832bfd..dfb476ee381c1 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/total_after_discount.phtml
@@ -10,4 +10,4 @@
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?php /* @escapeNotVerified */ echo $_order->formatPrice($block->getTotalAmount($_item))?>
+<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
index 8bc27d80ce1e3..7a484fed719f8 100644
--- a/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/items/price/unit.phtml
@@ -9,8 +9,8 @@
 /** @var \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer $block */
 $_item = $block->getItem();
 ?>
-<span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+<span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <span class="cart-price">
-        <?php /* @escapeNotVerified */ echo $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
+        <?= /* @escapeNotVerified */ $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
index de20251f37712..589b857239971 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
@@ -15,11 +15,11 @@
 ?>
 <?php if ($block->hasComments()):?>
     <div class="order additional details comments">
-        <h3 class="subtitle"><?php /* @escapeNotVerified */ echo $block->getTitle() ?></h3>
+        <h3 class="subtitle"><?= /* @escapeNotVerified */ $block->getTitle() ?></h3>
         <dl class="order comments">
             <?php foreach ($block->getComments() as $_commentItem): ?>
-                <dt class="comment date"><?php /* @escapeNotVerified */ echo $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
-                <dd class="comment text"><?php echo $block->escapeHtml($_commentItem->getComment()) ?></dd>
+                <dt class="comment date"><?= /* @escapeNotVerified */ $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
+                <dd class="comment text"><?= $block->escapeHtml($_commentItem->getComment()) ?></dd>
             <?php endforeach; ?>
         </dl>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
index d85a77e9f7ffd..a6a9b64d2c784 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
@@ -5,11 +5,11 @@
  */
 ?>
 <div class="order-details-items creditmemo">
-    <?php echo $block->getChildHtml('creditmemo_items') ?>
+    <?= $block->getChildHtml('creditmemo_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back">
-                <span><?php /* @escapeNotVerified */ echo $block->getBackTitle() ?></span>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
+                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
index 84e03886e2259..a90300efaf5c9 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items.phtml
@@ -9,34 +9,34 @@
 ?>
 <?php $_order = $block->getOrder() ?>
 <div class="actions-toolbar">
-    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintAllCreditmemosUrl($_order) ?>"
+    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllCreditmemosUrl($_order) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php /* @escapeNotVerified */ echo __('Print All Refunds') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print All Refunds') ?></span>
     </a>
 </div>
 <?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
 <div class="order-title">
-    <strong><?php /* @escapeNotVerified */ echo __('Refund #') ?><?php /* @escapeNotVerified */ echo $_creditmemo->getIncrementId(); ?> </strong>
-    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintCreditmemoUrl($_creditmemo) ?>"
+    <strong><?= /* @escapeNotVerified */ __('Refund #') ?><?= /* @escapeNotVerified */ $_creditmemo->getIncrementId() ?> </strong>
+    <a href="<?= /* @escapeNotVerified */ $block->getPrintCreditmemoUrl($_creditmemo) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php /* @escapeNotVerified */ echo __('Print Refund') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print Refund') ?></span>
     </a>
 </div>
 
 <div class="table-wrapper order-items-creditmemo">
-    <table class="data table table-order-items creditmemo" id="my-refund-table-<?php /* @escapeNotVerified */ echo $_creditmemo->getId(); ?>">
-        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Refunded') ?></caption>
+    <table class="data table table-order-items creditmemo" id="my-refund-table-<?= /* @escapeNotVerified */ $_creditmemo->getId() ?>">
+        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Refunded') ?></caption>
         <thead>
             <tr>
-                <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                <th class="col price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th class="col qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
-                <th class="col subtotal"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
-                <th class="col discount"><?php /* @escapeNotVerified */ echo __('Discount Amount') ?></th>
-                <th class="col total"><?php /* @escapeNotVerified */ echo __('Row Total') ?></th>
+                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
+                <th class="col discount"><?= /* @escapeNotVerified */ __('Discount Amount') ?></th>
+                <th class="col total"><?= /* @escapeNotVerified */ __('Row Total') ?></th>
             </tr>
         </thead>
         <?php $_items = $_creditmemo->getAllItems(); ?>
@@ -46,13 +46,13 @@
     continue;
 } ?>
         <tbody>
-            <?php echo $block->getItemHtml($_item) ?>
+            <?= $block->getItemHtml($_item) ?>
         </tbody>
         <?php endforeach; ?>
         <tfoot>
-            <?php echo $block->getTotalsHtml($_creditmemo);?>
+            <?= $block->getTotalsHtml($_creditmemo) ?>
         </tfoot>
     </table>
 </div>
-<?php echo $block->getCommentsHtml($_creditmemo)?>
+<?= $block->getCommentsHtml($_creditmemo) ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
index e9f260bd0980d..5542439da17fd 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml
@@ -10,28 +10,28 @@
 <?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="tooltip content">
                         <dl class="item options">
-                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
@@ -40,9 +40,9 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item options">
-                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
+                <dt><?= /* @escapeNotVerified */ $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
-                    <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
+                    <dd><?= $block->escapeHtml($link->getLinkTitle()) ?></dd>
                 <?php endforeach; ?>
             </dl>
         <?php endif; ?>
@@ -50,20 +50,20 @@
 
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+            <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-        <?php echo $block->getItemPriceHtml(); ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+        <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
-        <?php echo $block->getItemRowTotalHtml(); ?>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+        <?= $block->getItemRowTotalHtml() ?>
     </td>
-    <td class="col discount" data-th="<?php echo $block->escapeHtml(__('Discount Amount')); ?>"><?php /* @escapeNotVerified */ echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
-    <td class="col total" data-th="<?php echo $block->escapeHtml(__('Row Total')); ?>">
-        <?php echo $block->getItemRowTotalAfterDiscountHtml(); ?>
+    <td class="col discount" data-th="<?= $block->escapeHtml(__('Discount Amount')) ?>"><?= /* @escapeNotVerified */ $_order->formatPrice(-$_item->getDiscountAmount()) ?></td>
+    <td class="col total" data-th="<?= $block->escapeHtml(__('Row Total')) ?>">
+        <?= $block->getItemRowTotalAfterDiscountHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
index d48918c58e4c8..1c02a5c31ea6b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -8,45 +8,45 @@
 
 ?>
 <?php $_orders = $block->getOrders(); ?>
-<?php echo $block->getChildHtml('info');?>
+<?= $block->getChildHtml('info') ?>
 <?php if ($_orders && count($_orders)): ?>
     <div class="table-wrapper orders-history">
         <table class="data table table-order-items history" id="my-orders-table">
-            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Orders') ?></caption>
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Orders') ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php /* @escapeNotVerified */ echo __('Order #') ?></th>
-                    <th scope="col" class="col date"><?php /* @escapeNotVerified */ echo __('Date') ?></th>
-                    <?php /* @noEscape */ echo $block->getChildHtml('extra.column.header');?>
-                    <th scope="col" class="col shipping"><?php /* @escapeNotVerified */ echo __('Ship To') ?></th>
-                    <th scope="col" class="col total"><?php /* @escapeNotVerified */ echo __('Order Total') ?></th>
-                    <th scope="col" class="col status"><?php /* @escapeNotVerified */ echo __('Status') ?></th>
-                    <th scope="col" class="col actions"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
+                    <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
+                    <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
+                    <?= /* @noEscape */ $block->getChildHtml('extra.column.header') ?>
+                    <th scope="col" class="col shipping"><?= /* @escapeNotVerified */ __('Ship To') ?></th>
+                    <th scope="col" class="col total"><?= /* @escapeNotVerified */ __('Order Total') ?></th>
+                    <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
+                    <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
                 </tr>
             </thead>
             <tbody>
                 <?php foreach ($_orders as $_order): ?>
                     <tr>
-                        <td data-th="<?php echo $block->escapeHtml(__('Order #')) ?>" class="col id"><?php /* @escapeNotVerified */ echo $_order->getRealOrderId() ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php /* @escapeNotVerified */ echo $block->formatDate($_order->getCreatedAt()) ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= /* @escapeNotVerified */ $_order->getRealOrderId() ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_order->getCreatedAt()) ?></td>
                         <?php $extra = $block->getChildBlock('extra.container'); ?>
                         <?php if ($extra): ?>
                             <?php $extra->setOrder($_order); ?>
-                            <?php /* @noEscape */ echo $extra->getChildHtml() ?>
+                            <?= /* @noEscape */ $extra->getChildHtml() ?>
                         <?php endif; ?>
-                        <td data-th="<?php echo $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?php echo $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Order Total')) ?>" class="col total"><?php /* @escapeNotVerified */ echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Status')) ?>" class="col status"><?php /* @escapeNotVerified */ echo $_order->getStatusLabel() ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Actions')) ?>" class="col actions">
-                            <a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order) ?>" class="action view">
-                                <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
+                        <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?= $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ $_order->getStatusLabel() ?></td>
+                        <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
+                            <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order) ?>" class="action view">
+                                <span><?= /* @escapeNotVerified */ __('View Order') ?></span>
                             </a>
                             <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
                                 <a href="#" data-post='<?php /* @escapeNotVerified */ echo
                                 $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
                                     ->getPostData($block->getReorderUrl($_order))
                                 ?>' class="action order">
-                                    <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
+                                    <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
                                 </a>
                             <?php endif ?>
                         </td>
@@ -56,8 +56,8 @@
         </table>
     </div>
     <?php if ($block->getPagerHtml()): ?>
-        <div class="order-products-toolbar toolbar bottom"><?php echo $block->getPagerHtml(); ?></div>
+        <div class="order-products-toolbar toolbar bottom"><?= $block->getPagerHtml() ?></div>
     <?php endif ?>
 <?php else: ?>
-    <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('You have placed no orders.'); ?></span></div>
+    <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have placed no orders.') ?></span></div>
 <?php endif ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
index 6282ea8d10795..2a31814d9a054 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info.phtml
@@ -11,26 +11,26 @@
 <?php $_order = $block->getOrder() ?>
 <div class="block block-order-details-view">
     <div class="block-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Order Information') ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
     </div>
     <div class="block-content">
     <?php if (!$_order->getIsVirtual()): ?>
         <div class="box box-order-shipping-address">
-            <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></span></strong>
+            <strong class="box-title"><span><?= /* @escapeNotVerified */ __('Shipping Address') ?></span></strong>
             <div class="box-content">
-                <address><?php /* @escapeNotVerified */ echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
+                <address><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getShippingAddress()) ?></address>
             </div>
         </div>
 
         <div class="box box-order-shipping-method">
             <strong class="box-title">
-                <span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Shipping Method') ?></span>
             </strong>
             <div class="box-content">
             <?php if ($_order->getShippingDescription()): ?>
-                <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                <?= $block->escapeHtml($_order->getShippingDescription()) ?>
             <?php else: ?>
-                <?php /* @escapeNotVerified */ echo __('No shipping information available'); ?>
+                <?= /* @escapeNotVerified */ __('No shipping information available') ?>
             <?php endif; ?>
             </div>
         </div>
@@ -38,18 +38,18 @@
 
         <div class="box box-order-billing-address">
             <strong class="box-title">
-                <span><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Billing Address') ?></span>
             </strong>
             <div class="box-content">
-                <address><?php /* @escapeNotVerified */ echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
+                <address><?= /* @escapeNotVerified */ $block->getFormattedAddress($_order->getBillingAddress()) ?></address>
             </div>
         </div>
         <div class="box box-order-billing-method">
             <strong class="box-title">
-                <span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Payment Method') ?></span>
             </strong>
             <div class="box-content">
-                <?php echo $block->getPaymentInfoHtml() ?>
+                <?= $block->getPaymentInfoHtml() ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
index 574c7ee4c97de..fa3f63b61cd07 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
@@ -14,13 +14,13 @@
         $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
             ->getPostData($block->getReorderUrl($_order))
         ?>' class="action order">
-            <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
+            <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
         </a>
     <?php endif ?>
     <a class="action print"
-       href="<?php /* @escapeNotVerified */ echo $block->getPrintUrl($_order) ?>"
+       href="<?= /* @escapeNotVerified */ $block->getPrintUrl($_order) ?>"
        onclick="this.target='_blank';">
-        <span><?php /* @escapeNotVerified */ echo __('Print Order') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print Order') ?></span>
     </a>
-    <?php echo $block->getChildHtml(); ?>
+    <?= $block->getChildHtml() ?>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
index fd44eab34af81..3ea1bf6452c03 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons/rss.phtml
@@ -9,7 +9,7 @@
 /** @var $block \Magento\Sales\Block\Order\Info\Buttons\Rss */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink()): ?>
-<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="action rss">
-    <span><?php /* @escapeNotVerified */ echo $block->getLabel() ?></span>
+<a href="<?= /* @escapeNotVerified */ $block->getLink() ?>" class="action rss">
+    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
 </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
index fad04efb04bee..699067dc9612c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
@@ -5,11 +5,11 @@
  */
 ?>
 <div class="order-details-items invoice">
-    <?php echo $block->getChildHtml('invoice_items') ?>
+    <?= $block->getChildHtml('invoice_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back">
-                <span><?php /* @escapeNotVerified */ echo $block->getBackTitle() ?></span>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
+                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
index 36d62e161c1ab..980710569fa3b 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items.phtml
@@ -9,31 +9,31 @@
 ?>
 <?php $_order = $block->getOrder() ?>
 <div class="actions-toolbar">
-    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintAllInvoicesUrl($_order) ?>"
+    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllInvoicesUrl($_order) ?>"
        target="_blank"
        class="action print">
-        <span><?php /* @escapeNotVerified */ echo __('Print All Invoices') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print All Invoices') ?></span>
     </a>
 </div>
 <?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
 <div class="order-title">
-    <strong><?php /* @escapeNotVerified */ echo __('Invoice #') ?><?php /* @escapeNotVerified */ echo $_invoice->getIncrementId(); ?></strong>
-    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintInvoiceUrl($_invoice) ?>"
+    <strong><?= /* @escapeNotVerified */ __('Invoice #') ?><?= /* @escapeNotVerified */ $_invoice->getIncrementId() ?></strong>
+    <a href="<?= /* @escapeNotVerified */ $block->getPrintInvoiceUrl($_invoice) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php /* @escapeNotVerified */ echo __('Print Invoice') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print Invoice') ?></span>
     </a>
 </div>
 <div class="table-wrapper table-order-items invoice">
-    <table class="data table table-order-items invoice" id="my-invoice-table-<?php /* @escapeNotVerified */ echo $_invoice->getId(); ?>">
-        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Invoiced') ?></caption>
+    <table class="data table table-order-items invoice" id="my-invoice-table-<?= /* @escapeNotVerified */ $_invoice->getId() ?>">
+        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
         <thead>
             <tr>
-                <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                <th class="col price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th class="col qty"><?php /* @escapeNotVerified */ echo __('Qty Invoiced') ?></th>
-                <th class="col subtotal"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
+                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Invoiced') ?></th>
+                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
             </tr>
         </thead>
         <?php $_items = $_invoice->getAllItems(); ?>
@@ -43,13 +43,13 @@
     continue;
 } ?>
         <tbody>
-            <?php echo $block->getItemHtml($_item) ?>
+            <?= $block->getItemHtml($_item) ?>
         </tbody>
         <?php endforeach; ?>
         <tfoot>
-            <?php echo $block->getInvoiceTotalsHtml($_invoice)?>
+            <?= $block->getInvoiceTotalsHtml($_invoice) ?>
         </tfoot>
     </table>
 </div>
-<?php echo $block->getInvoiceCommentsHtml($_invoice)?>
+<?= $block->getInvoiceCommentsHtml($_invoice) ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
index d946c5a702288..4f95f3d93e2c2 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml
@@ -10,46 +10,46 @@
 <?php /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */ ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="tooltip content">
                         <dl class="item options">
-                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+            <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-        <?php echo $block->getItemPriceHtml(); ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+        <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>">
-        <span class="qty summary"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></span>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Invoiced')) ?>">
+        <span class="qty summary"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></span>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
-        <?php echo $block->getItemRowTotalHtml(); ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+        <?= $block->getItemRowTotalHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
index 8e6a5b4575103..e43d32760febb 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
@@ -9,22 +9,22 @@
 /** @var \Magento\Sales\Block\Order\Items $block */
 ?>
 <div class="table-wrapper order-items">
-    <table class="data table table-order-items" id="my-orders-table" summary="<?php /* @escapeNotVerified */ echo __('Items Ordered') ?>">
-        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Ordered') ?></caption>
+    <table class="data table table-order-items" id="my-orders-table" summary="<?= /* @escapeNotVerified */ __('Items Ordered') ?>">
+        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Ordered') ?></caption>
         <thead>
             <?php if($block->isPagerDisplayed()): ?>
                 <tr>
                     <td colspan="5" data-block="order-items-pager-top" class="order-pager-wrapper order-pager-wrapper-top">
-                        <?php echo $block->getPagerHtml() ?>
+                        <?= $block->getPagerHtml() ?>
                     </td>
                 </tr>
             <?php endif ?>
             <tr>
-                <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                <th class="col price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th class="col qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
-                <th class="col subtotal"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
+                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
             </tr>
         </thead>
         <?php $items = $block->getItems(); ?>
@@ -32,31 +32,31 @@
         <?php foreach ($items as $item): ?>
             <?php if ($item->getParentItem()) continue; ?>
             <tbody>
-                <?php echo $block->getItemHtml($item) ?>
+                <?= $block->getItemHtml($item) ?>
                 <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order_item', $item) && $item->getGiftMessageId()): ?>
                     <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
                     <tr>
                         <td class="col options" colspan="5">
                             <a href="#"
-                               id="order-item-gift-message-link-<?php /* @escapeNotVerified */ echo $item->getId() ?>"
+                               id="order-item-gift-message-link-<?= /* @escapeNotVerified */ $item->getId() ?>"
                                class="action show"
-                               aria-controls="order-item-gift-message-<?php /* @escapeNotVerified */ echo $item->getId() ?>"
-                               data-item-id="<?php /* @escapeNotVerified */ echo $item->getId() ?>">
-                                <?php /* @escapeNotVerified */ echo __('Gift Message') ?>
+                               aria-controls="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>"
+                               data-item-id="<?= /* @escapeNotVerified */ $item->getId() ?>">
+                                <?= /* @escapeNotVerified */ __('Gift Message') ?>
                             </a>
                             <?php $giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($item); ?>
-                            <div class="order-gift-message" id="order-item-gift-message-<?php /* @escapeNotVerified */ echo $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
+                            <div class="order-gift-message" id="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
                                 <a href="#"
-                                   title="<?php /* @escapeNotVerified */ echo __('Close') ?>"
-                                   aria-controls="order-item-gift-message-<?php /* @escapeNotVerified */ echo $item->getId()?>"
-                                   data-item-id="<?php /* @escapeNotVerified */ echo $item->getId()?>"
+                                   title="<?= /* @escapeNotVerified */ __('Close') ?>"
+                                   aria-controls="order-item-gift-message-<?= /* @escapeNotVerified */ $item->getId() ?>"
+                                   data-item-id="<?= /* @escapeNotVerified */ $item->getId() ?>"
                                    class="action close">
-                                    <?php /* @escapeNotVerified */ echo __('Close') ?>
+                                    <?= /* @escapeNotVerified */ __('Close') ?>
                                 </a>
                                 <dl class="item-options">
-                                    <dt class="item-sender"><strong class="label"><?php /* @escapeNotVerified */ echo __('From') ?></strong><?php echo $block->escapeHtml($giftMessage->getSender()) ?></dt>
-                                    <dt class="item-recipient"><strong class="label"><?php /* @escapeNotVerified */ echo __('To') ?></strong><?php echo $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
-                                    <dd class="item-message"><?php /* @escapeNotVerified */ echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($item) ?></dd>
+                                    <dt class="item-sender"><strong class="label"><?= /* @escapeNotVerified */ __('From') ?></strong><?= $block->escapeHtml($giftMessage->getSender()) ?></dt>
+                                    <dt class="item-recipient"><strong class="label"><?= /* @escapeNotVerified */ __('To') ?></strong><?= $block->escapeHtml($giftMessage->getRecipient()) ?></dt>
+                                    <dd class="item-message"><?= /* @escapeNotVerified */ $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($item) ?></dd>
                                 </dl>
                             </div>
                         </td>
@@ -68,11 +68,11 @@
             <?php if($block->isPagerDisplayed()): ?>
                 <tr>
                     <td colspan="5" data-block="order-items-pager-bottom" class="order-pager-wrapper order-pager-wrapper-bottom">
-                        <?php echo $block->getPagerHtml();?>
+                        <?= $block->getPagerHtml() ?>
                     </td>
                 </tr>
             <?php endif ?>
-            <?php echo $block->getChildHtml('order_totals') ?>
+            <?= $block->getChildHtml('order_totals') ?>
         </tfoot>
     </table>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
index efb0447045727..d4550dd4f01c3 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml
@@ -9,25 +9,25 @@
 /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */
 $_item = $block->getItem();
 ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
         <dl class="item-options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                        <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
+                        <?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?>
                     <?php else: ?>
-                        <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                        <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
                 <dd>
-                    <?php echo nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
+                    <?= nl2br($block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value']))) ?>
                 </dd>
             <?php endif; ?>
         <?php endforeach; ?>
@@ -35,43 +35,43 @@ $_item = $block->getItem();
         <?php endif; ?>
         <?php $addtInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addtInfoBlock) :?>
-            <?php echo $addtInfoBlock->setItem($_item)->toHtml(); ?>
+            <?= $addtInfoBlock->setItem($_item)->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
-        <?php echo $block->getItemPriceHtml(); ?>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col price" data-th="<?= $block->escapeHtml(__('Price')) ?>">
+        <?= $block->getItemPriceHtml() ?>
     </td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty')) ?>">
         <ul class="items-qty">
         <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
             <li class="item">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Ordered'); ?></span>
-                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyOrdered()*1 ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Ordered') ?></span>
+                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyOrdered()*1 ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyShipped() > 0): ?>
             <li class="item">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
-                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyShipped()*1 ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipped') ?></span>
+                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyShipped()*1 ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
             <li class="item">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Canceled'); ?></span>
-                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyCanceled()*1 ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Canceled') ?></span>
+                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyCanceled()*1 ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
             <li class="item">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Refunded'); ?></span>
-                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyRefunded()*1 ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Refunded') ?></span>
+                <span class="content"><?= /* @escapeNotVerified */ $block->getItem()->getQtyRefunded()*1 ?></span>
             </li>
         <?php endif; ?>
         </ul>
     </td>
-    <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
-        <?php echo $block->getItemRowTotalHtml(); ?>
+    <td class="col subtotal" data-th="<?= $block->escapeHtml(__('Subtotal')) ?>">
+        <?= $block->getItemRowTotalHtml() ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
index bd37772020946..8a8e7b1194caa 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
@@ -12,12 +12,12 @@
 <?php $_history = $block->getOrder()->getVisibleStatusHistory() ?>
 <?php if (count($_history)): ?>
     <div class="block block-order-details-comments">
-        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('About Your Order') ?></strong></div>
+        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('About Your Order') ?></strong></div>
         <div class="block-content">
             <dl class="order-comments">
                 <?php foreach ($_history as $_historyItem): ?>
-                    <dt class="comment-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
-                    <dd class="comment-content"><?php echo $block->escapeHtml($_historyItem->getComment()) ?></dd>
+                    <dt class="comment-date"><?= /* @escapeNotVerified */ $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
+                    <dd class="comment-content"><?= $block->escapeHtml($_historyItem->getComment()) ?></dd>
                 <?php endforeach; ?>
             </dl>
 
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
index ea11996231e13..bcd7cc6e0260d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_date.phtml
@@ -9,5 +9,5 @@
 ?>
 
 <div class="order-date">
-    <?php /* @escapeNotVerified */ echo __('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>') ?>
+    <?= /* @escapeNotVerified */ __('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>') ?>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
index f010cb8a6d47a..c77014d1bf8c9 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_status.phtml
@@ -6,4 +6,4 @@
 ?>
 <?php /** @var $block \Magento\Sales\Block\Order\Info */ ?>
 
-<span class="order-status"><?php /* @escapeNotVerified */ echo $block->getOrder()->getStatusLabel() ?></span>
+<span class="order-status"><?= /* @escapeNotVerified */ $block->getOrder()->getStatusLabel() ?></span>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
index e9f9a917750e1..d68b4cdb62fcc 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/creditmemo.phtml
@@ -17,20 +17,20 @@
 <?php foreach ($_creditmemos as $_creditmemo): ?>
 <div class="order-details-items creditmemo">
     <div class="order-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
     </div>
     <div class="table-wrapper order-items-creditmemo">
-        <table class="data table table-order-items creditmemo" id="my-refund-table-<?php /* @escapeNotVerified */ echo $_creditmemo->getId(); ?>">
-            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Refunded') ?></caption>
+        <table class="data table table-order-items creditmemo" id="my-refund-table-<?= /* @escapeNotVerified */ $_creditmemo->getId() ?>">
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Refunded') ?></caption>
             <thead>
                 <tr>
-                    <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                    <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                    <th class="col price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                    <th class="col qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
-                    <th class="col subtotal"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
-                    <th class="col discount"><?php /* @escapeNotVerified */ echo __('Discount Amount') ?></th>
-                    <th class="col rowtotal"><?php /* @escapeNotVerified */ echo __('Row Total') ?></th>
+                    <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                    <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                    <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                    <th class="col qty"><?= /* @escapeNotVerified */ __('Qty') ?></th>
+                    <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
+                    <th class="col discount"><?= /* @escapeNotVerified */ __('Discount Amount') ?></th>
+                    <th class="col rowtotal"><?= /* @escapeNotVerified */ __('Row Total') ?></th>
                 </tr>
             </thead>
             <?php $_items = $_creditmemo->getAllItems(); ?>
@@ -40,53 +40,53 @@
     continue;
 } ?>
             <tbody>
-                <?php echo $block->getItemHtml($_item) ?>
+                <?= $block->getItemHtml($_item) ?>
             </tbody>
             <?php endforeach; ?>
             <tfoot>
-                <?php echo $block->getTotalsHtml($_creditmemo);?>
+                <?= $block->getTotalsHtml($_creditmemo) ?>
             </tfoot>
         </table>
     </div>
     <div class="block block-order-details-view">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo __('Order Information') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
         </div>
         <div class="block-content">
         <?php if (!$_order->getIsVirtual()): ?>
             <div class="box box-order-shipping-address">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_shipping = $_creditmemo->getShippingAddress() ?>
-                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_shipping, 'html') ?></address>
+                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_shipping, 'html') ?></address>
                 </div>
             </div>
             <div class="box box-order-shipping-method">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
                 </div>
                 <div class="box-content">
-                    <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                    <?= $block->escapeHtml($_order->getShippingDescription()) ?>
                 </div>
             </div>
         <?php endif; ?>
             <div class="box box-order-billing-address">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Billing Address') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_billing = $_creditmemo->getbillingAddress() ?>
-                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
+                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
                 </div>
             </div>
             <div class="box box-order-billing-method">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Payment Method') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
                 </div>
                 <div class="box-content">
-                    <?php echo $block->getPaymentInfoHtml() ?>
+                    <?= $block->getPaymentInfoHtml() ?>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index afa3f015caf94..5aa1cab686e2c 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
@@ -17,18 +17,18 @@
 <?php foreach ($_invoices as $_invoice): ?>
 <div class="order-details-items invoice">
     <div class="order-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Invoice #') ?><?php /* @escapeNotVerified */ echo $_invoice->getIncrementId(); ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Invoice #') ?><?= /* @escapeNotVerified */ $_invoice->getIncrementId() ?></strong>
     </div>
     <div class="table-wrapper table-order-items invoice">
-        <table class="data table table-order-items invoice" id="my-invoice-table-<?php /* @escapeNotVerified */ echo $_invoice->getId(); ?>">
-            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Invoiced') ?></caption>
+        <table class="data table table-order-items invoice" id="my-invoice-table-<?= /* @escapeNotVerified */ $_invoice->getId() ?>">
+            <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
             <thead>
             <tr>
-                <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                <th class="col price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
-                <th class="col qty"><?php /* @escapeNotVerified */ echo __('Qty Invoiced') ?></th>
-                <th class="col subtotal"><?php /* @escapeNotVerified */ echo __('Subtotal') ?></th>
+                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th class="col price"><?= /* @escapeNotVerified */ __('Price') ?></th>
+                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Invoiced') ?></th>
+                <th class="col subtotal"><?= /* @escapeNotVerified */ __('Subtotal') ?></th>
             </tr>
             </thead>
             <?php $_items = $_invoice->getItemsCollection(); ?>
@@ -38,59 +38,59 @@
     continue;
 } ?>
             <tbody>
-                <?php echo $block->getItemHtml($_item) ?>
+                <?= $block->getItemHtml($_item) ?>
             </tbody>
             <?php endforeach; ?>
             <tfoot>
-                <?php echo $block->getInvoiceTotalsHtml($_invoice)?>
+                <?= $block->getInvoiceTotalsHtml($_invoice) ?>
             </tfoot>
         </table>
     </div>
     <div class="block block-order-details-view">
         <div class="block-title">
-            <strong><?php /* @escapeNotVerified */ echo __('Order Information') ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
         </div>
         <div class="block-content">
         <?php if (!$_order->getIsVirtual()): ?>
             <div class="box box-order-shipping-address">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_shipping = $_invoice->getShippingAddress() ?>
-                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_shipping, 'html') ?></address>
+                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_shipping, 'html') ?></address>
                 </div>
             </div>
 
             <div class="box box-order-shipping-method">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php if ($_order->getShippingDescription()): ?>
-                        <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                        <?= $block->escapeHtml($_order->getShippingDescription()) ?>
                     <?php else: ?>
-                        <?php /* @escapeNotVerified */ echo __('No shipping information available'); ?>
+                        <?= /* @escapeNotVerified */ __('No shipping information available') ?>
                     <?php endif; ?>
                 </div>
             </div>
         <?php endif; ?>
             <div class="box box-order-billing-address">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Billing Address') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_billing = $_invoice->getbillingAddress() ?>
-                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
+                    <address><?= /* @escapeNotVerified */ $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
                 </div>
             </div>
 
             <div class="box box-order-billing-method">
                 <div class="box-title">
-                    <strong><?php /* @escapeNotVerified */ echo __('Payment Method') ?></strong>
+                    <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
                 </div>
                 <div class="box-content">
-                    <?php echo $block->getPaymentInfoHtml() ?>
+                    <?= $block->getPaymentInfoHtml() ?>
                 </div>
             </div>
         </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index 8d33e2a7c6586..d1110d1a8d380 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
@@ -13,51 +13,51 @@
 <?php foreach ($block->getShipmentsCollection() as $shipment): ?>
     <div class="order-details-items shipments">
         <div class="order-title">
-            <strong><?php /* @escapeNotVerified */ echo __('Shipment #%1', $block->getObjectData($shipment, 'increment_id')); ?></strong>
+            <strong><?= /* @escapeNotVerified */ __('Shipment #%1', $block->getObjectData($shipment, 'increment_id')) ?></strong>
         </div>
         <div class="table-wrapper order-items-shipment">
-            <table class="data table table-order-items shipment" id="my-shipment-table-<?php /* @escapeNotVerified */ echo $block->getObjectData($shipment, 'id') ?>">
-                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Invoiced') ?></caption>
+            <table class="data table table-order-items shipment" id="my-shipment-table-<?= /* @escapeNotVerified */ $block->getObjectData($shipment, 'id') ?>">
+                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Invoiced') ?></caption>
                 <thead>
                 <tr>
-                    <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                    <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                    <th class="col price"><?php /* @escapeNotVerified */ echo __('Qty Shipped') ?></th>
+                    <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                    <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                    <th class="col price"><?= /* @escapeNotVerified */ __('Qty Shipped') ?></th>
                 </tr>
                 </thead>
                 <?php foreach ($block->getShipmentItems($shipment) as $item): ?>
                 <tbody>
-                    <?php echo $block->getItemHtml($item) ?>
+                    <?= $block->getItemHtml($item) ?>
                 </tbody>
                 <?php endforeach; ?>
             </table>
         </div>
         <div class="block block-order-details-view">
             <div class="block-title">
-                <strong><?php /* @escapeNotVerified */ echo __('Order Information') ?></strong>
+                <strong><?= /* @escapeNotVerified */ __('Order Information') ?></strong>
             </div>
             <div class="block-content">
                 <div class="box box-order-shipping-address">
                     <div class="box-title">
-                        <strong><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></strong>
+                        <strong><?= /* @escapeNotVerified */ __('Shipping Address') ?></strong>
                     </div>
                     <div class="box-content">
-                        <address><?php echo $block->getShipmentAddressFormattedHtml($shipment); ?></address>
+                        <address><?= $block->getShipmentAddressFormattedHtml($shipment) ?></address>
                     </div>
                 </div>
 
                 <div class="box box-order-shipping-method">
                     <div class="box-title">
-                        <strong><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></strong>
+                        <strong><?= /* @escapeNotVerified */ __('Shipping Method') ?></strong>
                     </div>
                     <div class="box-content">
-                    <?php echo $block->escapeHtml($block->getObjectData($order, 'shipping_description')); ?>
+                    <?= $block->escapeHtml($block->getObjectData($order, 'shipping_description')) ?>
                     <?php $tracks = $block->getShipmentTracks($shipment);
                     if ($tracks): ?>
                         <dl class="order-tracking">
                         <?php foreach ($tracks as $track): ?>
-                            <dt class="tracking-title"><?php echo $block->escapeHtml($block->getObjectData($track, 'title')); ?></dt>
-                            <dd class="tracking-content"><?php echo $block->escapeHtml($block->getObjectData($track, 'number')); ?></dd>
+                            <dt class="tracking-title"><?= $block->escapeHtml($block->getObjectData($track, 'title')) ?></dt>
+                            <dd class="tracking-content"><?= $block->escapeHtml($block->getObjectData($track, 'number')) ?></dd>
                             <?php endforeach; ?>
                         </dl>
                     <?php endif; ?>
@@ -66,19 +66,19 @@
 
                 <div class="box box-order-billing-method">
                     <div class="box-title">
-                        <strong><?php /* @escapeNotVerified */ echo __('Billing Address') ?></strong>
+                        <strong><?= /* @escapeNotVerified */ __('Billing Address') ?></strong>
                     </div>
                     <div class="box-content">
-                        <address><?php echo $block->getBillingAddressFormattedHtml($order); ?></address>
+                        <address><?= $block->getBillingAddressFormattedHtml($order) ?></address>
                     </div>
                 </div>
 
                 <div class="box box-order-billing-method">
                     <div class="box-title">
-                        <strong><?php /* @escapeNotVerified */ echo __('Payment Method') ?></strong>
+                        <strong><?= /* @escapeNotVerified */ __('Payment Method') ?></strong>
                     </div>
                     <div class="box-content">
-                        <?php echo $block->getPaymentInfoHtml() ?>
+                        <?= $block->getPaymentInfoHtml() ?>
                     </div>
                 </div>
             </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
index 5a2b2a9a08723..df7e6bf334d9a 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -10,47 +10,47 @@
 <div class="block block-dashboard-orders">
 <?php $_orders = $block->getOrders(); ?>
     <div class="block-title order">
-        <strong><?php /* @escapeNotVerified */ echo __('Recent Orders') ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Recent Orders') ?></strong>
         <?php if (sizeof($_orders->getItems()) > 0): ?>
-            <a class="action view" href="<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order/history') ?>">
-                <span><?php /* @escapeNotVerified */ echo __('View All') ?></span>
+            <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('sales/order/history') ?>">
+                <span><?= /* @escapeNotVerified */ __('View All') ?></span>
             </a>
         <?php endif; ?>
     </div>
     <div class="block-content">
-    <?php echo $block->getChildHtml()?>
+    <?= $block->getChildHtml() ?>
     <?php if (sizeof($_orders->getItems()) > 0): ?>
         <div class="table-wrapper orders-recent">
             <table class="data table table-order-items recent" id="my-orders-table">
-                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Recent Orders') ?></caption>
+                <caption class="table-caption"><?= /* @escapeNotVerified */ __('Recent Orders') ?></caption>
                 <thead>
                     <tr>
-                        <th scope="col" class="col id"><?php /* @escapeNotVerified */ echo __('Order #') ?></th>
-                        <th scope="col" class="col date"><?php /* @escapeNotVerified */ echo __('Date') ?></th>
-                        <th scope="col" class="col shipping"><?php /* @escapeNotVerified */ echo __('Ship To') ?></th>
-                        <th scope="col" class="col total"><?php /* @escapeNotVerified */ echo __('Order Total') ?></th>
-                        <th scope="col" class="col status"><?php /* @escapeNotVerified */ echo __('Status') ?></th>
-                        <th scope="col" class="col actions"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
+                        <th scope="col" class="col id"><?= /* @escapeNotVerified */ __('Order #') ?></th>
+                        <th scope="col" class="col date"><?= /* @escapeNotVerified */ __('Date') ?></th>
+                        <th scope="col" class="col shipping"><?= /* @escapeNotVerified */ __('Ship To') ?></th>
+                        <th scope="col" class="col total"><?= /* @escapeNotVerified */ __('Order Total') ?></th>
+                        <th scope="col" class="col status"><?= /* @escapeNotVerified */ __('Status') ?></th>
+                        <th scope="col" class="col actions"><?= /* @escapeNotVerified */ __('Action') ?></th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php foreach ($_orders as $_order): ?>
                         <tr>
-                            <td data-th="<?php echo $block->escapeHtml(__('Order #')) ?>" class="col id"><?php /* @escapeNotVerified */ echo $_order->getRealOrderId() ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php /* @escapeNotVerified */ echo $block->formatDate($_order->getCreatedAt()) ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?php echo $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Order Total')) ?>" class="col total"><?php /* @escapeNotVerified */ echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Status')) ?>" class="col status"><?php /* @escapeNotVerified */ echo $_order->getStatusLabel() ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Actions')) ?>" class="col actions">
-                                <a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order) ?>" class="action view">
-                                    <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
+                            <td data-th="<?= $block->escapeHtml(__('Order #')) ?>" class="col id"><?= /* @escapeNotVerified */ $_order->getRealOrderId() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date"><?= /* @escapeNotVerified */ $block->formatDate($_order->getCreatedAt()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Ship To')) ?>" class="col shipping"><?= $_order->getShippingAddress() ? $block->escapeHtml($_order->getShippingAddress()->getName()) : '&nbsp;' ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Order Total')) ?>" class="col total"><?= /* @escapeNotVerified */ $_order->formatPrice($_order->getGrandTotal()) ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Status')) ?>" class="col status"><?= /* @escapeNotVerified */ $_order->getStatusLabel() ?></td>
+                            <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
+                                <a href="<?= /* @escapeNotVerified */ $block->getViewUrl($_order) ?>" class="action view">
+                                    <span><?= /* @escapeNotVerified */ __('View Order') ?></span>
                                 </a>
                                 <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
                                     <a href="#" data-post='<?php /* @escapeNotVerified */ echo
                                     $this->helper(\Magento\Framework\Data\Helper\PostHelper::class)
                                         ->getPostData($block->getReorderUrl($_order))
                                     ?>' class="action order">
-                                        <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
+                                        <span><?= /* @escapeNotVerified */ __('Reorder') ?></span>
                                     </a>
                                 <?php endif ?>
                             </td>
@@ -60,7 +60,7 @@
             </table>
         </div>
     <?php else: ?>
-        <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('You have placed no orders.'); ?></span></div>
+        <div class="message info empty"><span><?= /* @escapeNotVerified */ __('You have placed no orders.') ?></span></div>
     <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
index aee1e0754abd1..b46e8d115480e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml
@@ -9,38 +9,38 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
-    <td class="col name" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>">
-        <strong class="product name product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
+<tr id="order-item-row-<?= /* @escapeNotVerified */ $_item->getId() ?>">
+    <td class="col name" data-th="<?= $block->escapeHtml(__('Product Name')) ?>">
+        <strong class="product name product-item-name"><?= $block->escapeHtml($_item->getName()) ?></strong>
         <?php if ($_options = $block->getItemOptions()): ?>
         <dl class="item options">
         <?php foreach ($_options as $_option) : ?>
-            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
+            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
+                    <?= /* @escapeNotVerified */ $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <div class="tooltip content">
                         <dl class="item options">
-                            <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dt><?= $block->escapeHtml($_option['label']) ?></dt>
+                            <dd><?= /* @escapeNotVerified */ $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
-                <dd><?php echo $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
+                <dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
             <?php endif; ?>
         <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
         <?php if ($addInfoBlock) :?>
-            <?php echo $addInfoBlock->setItem($_item->getOrderItem())->toHtml(); ?>
+            <?= $addInfoBlock->setItem($_item->getOrderItem())->toHtml() ?>
         <?php endif; ?>
-        <?php echo $block->escapeHtml($_item->getDescription()) ?>
+        <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php /* @escapeNotVerified */ echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Shipped')); ?>"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
+    <td class="col sku" data-th="<?= $block->escapeHtml(__('SKU')) ?>"><?= /* @escapeNotVerified */ $block->prepareSku($block->getSku()) ?></td>
+    <td class="col qty" data-th="<?= $block->escapeHtml(__('Qty Shipped')) ?>"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
index 86550dd767716..8f0e884a22953 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
@@ -13,21 +13,21 @@
 ?>
 <?php foreach ($block->getTotals() as $_code => $_total): ?>
     <?php if ($_total->getBlockName()): ?>
-        <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
+        <?= $block->getChildHtml($_total->getBlockName(), false) ?>
     <?php else:?>
-    <tr class="<?php /* @escapeNotVerified */ echo $_code?>">
-        <th <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> scope="row">
+    <tr class="<?= /* @escapeNotVerified */ $_code ?>">
+        <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
             <?php if ($_total->getStrong()):?>
-            <strong><?php echo $block->escapeHtml($_total->getLabel());?></strong>
+            <strong><?= $block->escapeHtml($_total->getLabel()) ?></strong>
             <?php else:?>
-            <?php echo $block->escapeHtml($_total->getLabel());?>
+            <?= $block->escapeHtml($_total->getLabel()) ?>
             <?php endif?>
         </th>
-        <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?> data-th="<?php echo $block->escapeHtml($_total->getLabel());?>">
+        <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml($_total->getLabel()) ?>">
             <?php if ($_total->getStrong()):?>
-            <strong><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></strong>
+            <strong><?= /* @escapeNotVerified */ $block->formatValue($_total) ?></strong>
             <?php else:?>
-            <?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?>
+            <?= /* @escapeNotVerified */ $block->formatValue($_total) ?>
             <?php endif?>
         </td>
     </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
index af52a797e014e..1cb8533763759 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
@@ -12,23 +12,23 @@
     <?php $_order = $block->getOrder() ?>
 
     <div class="order-title">
-        <strong><?php /* @escapeNotVerified */ echo __('Items Ordered') ?></strong>
+        <strong><?= /* @escapeNotVerified */ __('Items Ordered') ?></strong>
         <?php if ($_order->getTracksCollection()->count()) : ?>
-            <?php echo $block->getChildHtml('tracking-info-link') ?>
+            <?= $block->getChildHtml('tracking-info-link') ?>
         <?php endif; ?>
     </div>
 
-    <?php echo $block->getChildHtml('order_items') ?>
+    <?= $block->getChildHtml('order_items') ?>
 
     <?php if ($this->helper('Magento\GiftMessage\Helper\Message')->isMessagesAllowed('order', $_order) && $_order->getGiftMessageId()): ?>
     <div class="block block-order-details-gift-message">
-        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Gift Message for This Order') ?></strong></div>
+        <div class="block-title"><strong><?= /* @escapeNotVerified */ __('Gift Message for This Order') ?></strong></div>
         <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_order); ?>
         <div class="block-content">
             <dl class="item-options">
-                <dt class="item-sender"><strong class="label"><?php /* @escapeNotVerified */ echo __('From') ?></strong><?php echo $block->escapeHtml($_giftMessage->getSender()) ?></dt>
-                <dt class="item-recipient"><strong class="label"><?php /* @escapeNotVerified */ echo __('To') ?></strong><?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-                <dd class="item-message"><?php /* @escapeNotVerified */ echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
+                <dt class="item-sender"><strong class="label"><?= /* @escapeNotVerified */ __('From') ?></strong><?= $block->escapeHtml($_giftMessage->getSender()) ?></dt>
+                <dt class="item-recipient"><strong class="label"><?= /* @escapeNotVerified */ __('To') ?></strong><?= $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
+                <dd class="item-message"><?= /* @escapeNotVerified */ $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
             </dl>
         </div>
     </div>
@@ -36,8 +36,8 @@
 
     <div class="actions-toolbar">
         <div class="secondary">
-            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>">
-                <span><?php /* @escapeNotVerified */ echo $block->getBackTitle() ?></span>
+            <a class="action back" href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>">
+                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
index c1c916a36cd19..5ecf1ebe893bc 100644
--- a/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml
@@ -15,25 +15,25 @@
 <div class="block block-reorder" data-bind="scope: 'lastOrderedItems'">
     <div class="block-title no-display"
          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}">
-        <strong id="block-reorder-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Recently Ordered') ?></strong>
+        <strong id="block-reorder-heading" role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Recently Ordered') ?></strong>
     </div>
     <div class="block-content no-display"
          data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}"
          aria-labelledby="block-reorder-heading">
         <form method="post" class="form reorder"
-              action="<?php /* @escapeNotVerified */ echo $block->getFormActionUrl() ?>" id="reorder-validate-detail">
-            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('Last Ordered Items') ?></strong>
+              action="<?= /* @escapeNotVerified */ $block->getFormActionUrl() ?>" id="reorder-validate-detail">
+            <strong class="subtitle"><?= /* @escapeNotVerified */ __('Last Ordered Items') ?></strong>
             <ol id="cart-sidebar-reorder" class="product-items product-items-names"
                 data-bind="foreach: lastOrderedItems().items">
                 <li class="product-item">
                     <div class="field item choice no-display" data-bind="css: {'no-display': !is_saleable}">
                         <label class="label" data-bind="attr: {'for': 'reorder-item-' + id}">
-                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                            <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                         </label>
                         <div class="control">
                             <input type="checkbox" name="order_items[]"
                                    data-bind="attr: {id: 'reorder-item-' + id, value: id}"
-                                   title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                   title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>"
                                    class="checkbox" data-validate='{"validate-one-checkbox-required-by-name": true}'/>
                         </div>
                     </div>
@@ -48,13 +48,13 @@
             <div class="actions-toolbar">
                 <div class="primary no-display"
                      data-bind="css: {'no-display': !lastOrderedItems().isShowAddToCart}">
-                    <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>" class="action tocart primary">
-                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
+                    <button type="submit" title="<?= /* @escapeNotVerified */ __('Add to Cart') ?>" class="action tocart primary">
+                        <span><?= /* @escapeNotVerified */ __('Add to Cart') ?></span>
                     </button>
                 </div>
                 <div class="secondary">
-                    <a class="action view" href="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/account') ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('View All'); ?></span>
+                    <a class="action view" href="<?= /* @escapeNotVerified */ $block->getUrl('customer/account') ?>">
+                        <span><?= /* @escapeNotVerified */ __('View All') ?></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
index 27c0d0bc47679..ac428283dfcb0 100644
--- a/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/widget/guest/form.phtml
@@ -11,24 +11,24 @@
 <?php if ($block->isEnable()): ?>
     <div class="widget block block-orders-returns">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Orders and Returns') ?></strong>
+            <strong role="heading" aria-level="2"><?= /* @escapeNotVerified */ __('Orders and Returns') ?></strong>
         </div>
         <div class="block-content">
-            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?php /* @escapeNotVerified */ echo $block->getActionUrl() ?>" method="post"
+            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?= /* @escapeNotVerified */ $block->getActionUrl() ?>" method="post"
                   class="form form-orders-search" name="guest_post">
                 <fieldset class="fieldset">
                     <div class="field find required">
-                        <label class="label"><span><?php /* @escapeNotVerified */ echo __('Find Order By') ?></span></label>
+                        <label class="label"><span><?= /* @escapeNotVerified */ __('Find Order By') ?></span></label>
 
                         <div class="control">
                             <select name="oar_type" id="quick-search-type-id" class="select" title="">
-                                <option value="email"><?php /* @escapeNotVerified */ echo __('Email') ?></option>
-                                <option value="zip"><?php /* @escapeNotVerified */ echo __('ZIP Code') ?></option>
+                                <option value="email"><?= /* @escapeNotVerified */ __('Email') ?></option>
+                                <option value="zip"><?= /* @escapeNotVerified */ __('ZIP Code') ?></option>
                             </select>
                         </div>
                     </div>
                     <div class="field id required">
-                        <label for="oar-order-id" class="label"><span><?php /* @escapeNotVerified */ echo __('Order ID') ?></span></label>
+                        <label for="oar-order-id" class="label"><span><?= /* @escapeNotVerified */ __('Order ID') ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar-order-id" name="oar_order_id" autocomplete="off"
@@ -37,7 +37,7 @@
                     </div>
                     <div class="field lastname required">
                         <label for="oar-billing-lastname"
-                               class="label"><span><?php /* @escapeNotVerified */ echo __('Billing Last Name') ?></span></label>
+                               class="label"><span><?= /* @escapeNotVerified */ __('Billing Last Name') ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar-billing-lastname" name="oar_billing_lastname"
@@ -45,7 +45,7 @@
                         </div>
                     </div>
                     <div id="oar-email" class="field email required">
-                        <label for="oar_email" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
+                        <label for="oar_email" class="label"><span><?= /* @escapeNotVerified */ __('Email') ?></span></label>
 
                         <div class="control">
                             <input type="email" class="input-text" id="oar_email" name="oar_email" autocomplete="off"
@@ -53,7 +53,7 @@
                         </div>
                     </div>
                     <div id="oar-zip" style="display: none;" class="field zip required">
-                        <label for="oar_zip" class="label"><span><?php /* @escapeNotVerified */ echo __('Billing ZIP Code') ?></span></label>
+                        <label for="oar_zip" class="label"><span><?= /* @escapeNotVerified */ __('Billing ZIP Code') ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar_zip" name="oar_zip"
@@ -63,8 +63,8 @@
                 </fieldset>
                 <div class="actions-toolbar">
                     <div class="primary">
-                        <button type="submit" title="<?php echo $block->escapeHtml(__('Search')) ?>" class="action search">
-                            <span><?php /* @escapeNotVerified */ echo __('Search') ?></span>
+                        <button type="submit" title="<?= $block->escapeHtml(__('Search')) ?>" class="action search">
+                            <span><?= /* @escapeNotVerified */ __('Search') ?></span>
                         </button>
                     </div>
                 </div>
diff --git a/app/code/Magento/SalesRule/view/adminhtml/templates/tab/coupons.phtml b/app/code/Magento/SalesRule/view/adminhtml/templates/tab/coupons.phtml
index 858aefcd9e675..5924053617159 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/templates/tab/coupons.phtml
+++ b/app/code/Magento/SalesRule/view/adminhtml/templates/tab/coupons.phtml
@@ -5,6 +5,6 @@
  */
 ?>
 <div id="sales-rule-form-tab-coupons">
-    <?php echo $block->getChildHtml('promo_quote_edit_tab_coupons_form') ?>
-    <?php echo $block->getChildHtml('promo_quote_edit_tab_coupons_grid') ?>
+    <?= $block->getChildHtml('promo_quote_edit_tab_coupons_form') ?>
+    <?= $block->getChildHtml('promo_quote_edit_tab_coupons_grid') ?>
 </div>
diff --git a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
index a2590e6f8c505..c4297b404717c 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -12,39 +12,39 @@
 $helper = $this->helper('Magento\Search\Helper\Data');
 ?>
 <div class="block block-search">
-    <div class="block block-title"><strong><?php /* @escapeNotVerified */ echo __('Search'); ?></strong></div>
+    <div class="block block-title"><strong><?= /* @escapeNotVerified */ __('Search') ?></strong></div>
     <div class="block block-content">
-        <form class="form minisearch" id="search_mini_form" action="<?php /* @escapeNotVerified */ echo $helper->getResultUrl() ?>" method="get">
+        <form class="form minisearch" id="search_mini_form" action="<?= /* @escapeNotVerified */ $helper->getResultUrl() ?>" method="get">
             <div class="field search">
                 <label class="label" for="search" data-role="minisearch-label">
-                    <span><?php /* @escapeNotVerified */ echo __('Search'); ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
                 </label>
                 <div class="control">
                     <input id="search"
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
-                                "url":"<?php /* @escapeNotVerified */ echo $block->getUrl('search/ajax/suggest', ['_secure' => $block->getRequest()->isSecure()]); ?>",
+                                "url":"<?= /* @escapeNotVerified */ $block->getUrl('search/ajax/suggest', ['_secure' => $block->getRequest()->isSecure()]) ?>",
                                 "destinationSelector":"#search_autocomplete"}
                            }'
                            type="text"
-                           name="<?php /* @escapeNotVerified */ echo $helper->getQueryParamName() ?>"
-                           value="<?php /* @escapeNotVerified */ echo $helper->getEscapedQueryText() ?>"
-                           placeholder="<?php /* @escapeNotVerified */ echo __('Search entire store here...'); ?>"
+                           name="<?= /* @escapeNotVerified */ $helper->getQueryParamName() ?>"
+                           value="<?= /* @escapeNotVerified */ $helper->getEscapedQueryText() ?>"
+                           placeholder="<?= /* @escapeNotVerified */ __('Search entire store here...') ?>"
                            class="input-text"
-                           maxlength="<?php /* @escapeNotVerified */ echo $helper->getMaxQueryLength();?>"
+                           maxlength="<?= /* @escapeNotVerified */ $helper->getMaxQueryLength() ?>"
                            role="combobox"
                            aria-haspopup="false"
                            aria-autocomplete="both"
                            autocomplete="off"/>
                     <div id="search_autocomplete" class="search-autocomplete"></div>
-                    <?php echo $block->getChildHtml() ?>
+                    <?= $block->getChildHtml() ?>
                 </div>
             </div>
             <div class="actions">
                 <button type="submit"
-                        title="<?php echo $block->escapeHtml(__('Search')) ?>"
+                        title="<?= $block->escapeHtml(__('Search')) ?>"
                         class="action search">
-                    <span><?php /* @escapeNotVerified */ echo __('Search'); ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
                 </button>
             </div>
         </form>
diff --git a/app/code/Magento/Search/view/frontend/templates/term.phtml b/app/code/Magento/Search/view/frontend/templates/term.phtml
index a2b15b0f09f21..4285b42fa0329 100644
--- a/app/code/Magento/Search/view/frontend/templates/term.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
@@ -11,15 +11,15 @@
     <ul class="search-terms">
         <?php foreach ($block->getTerms() as $_term): ?>
             <li class="item">
-                <a href="<?php /* @escapeNotVerified */ echo $block->getSearchUrl($_term) ?>"
-                   style="font-size:<?php /* @escapeNotVerified */ echo $_term->getRatio()*70+75 ?>%;">
-                    <?php echo $block->escapeHtml($_term->getName()) ?>
+                <a href="<?= /* @escapeNotVerified */ $block->getSearchUrl($_term) ?>"
+                   style="font-size:<?= /* @escapeNotVerified */ $_term->getRatio()*70+75 ?>%;">
+                    <?= $block->escapeHtml($_term->getName()) ?>
                 </a>
             </li>
         <?php endforeach; ?>
     </ul>
 <?php else: ?>
     <div class="message notice">
-        <div><?php /* @escapeNotVerified */ echo __('There are no search terms available.'); ?></div>
+        <div><?= /* @escapeNotVerified */ __('There are no search terms available.') ?></div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Security/view/adminhtml/templates/page/activity_link.phtml b/app/code/Magento/Security/view/adminhtml/templates/page/activity_link.phtml
index 8fa7b7a033a4f..e8e060a5c775e 100644
--- a/app/code/Magento/Security/view/adminhtml/templates/page/activity_link.phtml
+++ b/app/code/Magento/Security/view/adminhtml/templates/page/activity_link.phtml
@@ -11,12 +11,12 @@
  */
 ?>
 <a class="link-account-activity"
-    href="<?php echo $block->escapeUrl($block->getUrl('security/session/activity')) ?>"
+    href="<?= $block->escapeUrl($block->getUrl('security/session/activity')) ?>"
     id="footer_account_activity"
     target="_blank"
     data-mage-init='{"popupWindow": {
-        "windowURL": "<?php echo $block->escapeJs($block->escapeUrl($block->getUrl('security/session/activity'))) ?>",
+        "windowURL": "<?= $block->escapeJs($block->escapeUrl($block->getUrl('security/session/activity'))) ?>",
         "windowName": "session-activity",
         "width": 600, "height": 600, "top": 50, "left": 50, "resizable": 1, "scrollbars": 1}}'>
-    <?php echo $block->escapeHtml(__('Account Activity')) ?>
+    <?= $block->escapeHtml(__('Account Activity')) ?>
 </a> |
diff --git a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
index da4c4e3df294d..f1f34f1caee39 100644
--- a/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
+++ b/app/code/Magento/Security/view/adminhtml/templates/session/activity.phtml
@@ -14,7 +14,7 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
 ?>
 <header>
     <div class="page-title-wrapper">
-        <h1 class="page-title" align="center"><?php echo $block->escapeHtml(__('Account Activity')) ?></h1>
+        <h1 class="page-title" align="center"><?= $block->escapeHtml(__('Account Activity')) ?></h1>
         <?php
         if ($block->areMultipleSessionsActive()) {
             echo $block->escapeHtml(__(
@@ -26,22 +26,22 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
 </header>
 
 <div class="page-content">
-    <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
+    <?= $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <div>
-        <div class="information-title"><?php echo $block->escapeHtml(__('Concurrent session information:'))?></div>
+        <div class="information-title"><?= $block->escapeHtml(__('Concurrent session information:')) ?></div>
         <table cellspacing="0" border="1" class="information-table">
             <thead>
                 <tr>
-                    <th><?php echo $block->escapeHtml(__('IP Address')) ?></th>
-                    <th><?php echo $block->escapeHtml(__('Time of session start')) ?></th>
+                    <th><?= $block->escapeHtml(__('IP Address')) ?></th>
+                    <th><?= $block->escapeHtml(__('Time of session start')) ?></th>
                 </tr>
             </thead>
             <tbody>
             <?php
             foreach ($sessionInfoCollection as $item):?>
                 <tr>
-                    <td><?php echo $block->escapeHtml($item->getFormattedIp()) ?></td>
-                    <td><?php echo $block->escapeHtml($block->formatDateTime($item->getCreatedAt())) ?></td>
+                    <td><?= $block->escapeHtml($item->getFormattedIp()) ?></td>
+                    <td><?= $block->escapeHtml($block->formatDateTime($item->getCreatedAt())) ?></td>
                 </tr>
             <?php
             endforeach;
@@ -54,22 +54,21 @@ $sessionInfoCollection = $block->getSessionInfoCollection();
                 <?php
                 if ($block->areMultipleSessionsActive()): ?>
                     data-mage-init='{"confirmRedirect":{
-                        "message": "<?php
-                            echo $block->escapeJs(__('Are you sure that you want to log out all other sessions?'))
+                        "message": "<?=
+                            $block->escapeJs(__('Are you sure that you want to log out all other sessions?'))
                         ?>",
-                        "url":"<?php
-                            echo $block->escapeJs($block->escapeUrl($block->getUrl('security/session/logoutAll')))
+                        "url":"<?=
+                            $block->escapeJs($block->escapeUrl($block->getUrl('security/session/logoutAll')))
                         ?>"
                     }}'
                 <?php
                 else: ?>disabled<?php
                 endif ?>
-                title="<?php echo $block->escapeHtmlAttr(__('Log out all other sessions')) ?>">
-                <?php echo $block->escapeHtml(__('Log out all other sessions')) ?>
+                title="<?= $block->escapeHtmlAttr(__('Log out all other sessions')) ?>">
+                <?= $block->escapeHtml(__('Log out all other sessions')) ?>
             </button>
         </div>
 
-        <div><?php
-            echo $block->escapeHtml(__('This computer is using IP address %1.', $block->getRemoteIp())) ?></div>
+        <div><?= $block->escapeHtml(__('This computer is using IP address %1.', $block->getRemoteIp())) ?></div>
     </div>
 </div>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index b953c6e9ea0d9..7a972cd5f01c5 100644
--- a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
+++ b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
@@ -16,24 +16,24 @@
     <div class="actions-toolbar">
         <div class="secondary">
             <button type="button" id="btn-remove<%- data._index_ %>" class="action remove"
-               title="<?php echo $block->escapeHtmlAttr(__('Remove Recipent')) ?>">
-               <span><?php echo $block->escapeJs($block->escapeHtml(__('Remove'))) ?></span>
+               title="<?= $block->escapeHtmlAttr(__('Remove Recipent')) ?>">
+               <span><?= $block->escapeJs($block->escapeHtml(__('Remove'))) ?></span>
             </button>
         </div>
     </div>
     <fieldset class="fieldset">
         <div class="field name required">
-            <label for="recipients-name<%- data._index_ %>" class="label"><span><?php echo $block->escapeJs($block->escapeHtml(__('Name'))) ?></span></label>
+            <label for="recipients-name<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Name'))) ?></span></label>
             <div class="control">
-                <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?php echo $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
+                <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?= $block->escapeHtmlAttr(__('Name')) ?>" class="input-text"
                        id="recipients-name<%- data._index_ %>" data-validate="{required:true}"/>
             </div>
         </div>
 
         <div class="field email required">
-            <label for="recipients-email<%- data._index_ %>" class="label"><span><?php echo $block->escapeJs($block->escapeHtml(__('Email'))) ?></span></label>
+            <label for="recipients-email<%- data._index_ %>" class="label"><span><?= $block->escapeJs($block->escapeHtml(__('Email'))) ?></span></label>
             <div class="control">
-                <input name="recipients[email][<%- data._index_ %>]" title="<?php echo $block->escapeHtmlAttr(__('Email')) ?>"
+                <input name="recipients[email][<%- data._index_ %>]" title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
                        id="recipients-email<%- data._index_ %>" type="email" class="input-text"
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
@@ -41,7 +41,7 @@
     </fieldset>
 </script>
 
-<form action="<?php echo $block->escapeUrl($block->getSendUrl()) ?>" method="post" id="product-sendtofriend-form"
+<form action="<?= $block->escapeUrl($block->getSendUrl()) ?>" method="post" id="product-sendtofriend-form"
       data-mage-init='{
         "rowBuilder":{
             "rowTemplate":"#add-recipient-tmpl",
@@ -49,71 +49,71 @@
             "rowParentElem":"<div></div>",
             "remEventSelector":"button",
             "btnRemoveSelector":".action.remove",
-            "maxRows":"<?php /* @noEscape */ echo (int)$block->getMaxRecipients() ?>",
+            "maxRows":"<?= /* @noEscape */ (int)$block->getMaxRecipients() ?>",
             "maxRowsMsg":"#max-recipient-message",
             "addRowBtn":"#add-recipient-button",
             "additionalRowClass":"additional"},
         "validation":{}}'
-      class="form send friend" data-hasRequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+      class="form send friend" data-hasRequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
     <fieldset class="fieldset sender" id="sender_options">
-        <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Sender')) ?></span></legend>
+        <?= $block->getBlockHtml('formkey') ?>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Sender')) ?></span></legend>
         <br>
         <div class="field sender required">
-            <label for="sender-name" class="label"><span><?php echo $block->escapeHtml(__('Name')) ?></span></label>
+            <label for="sender-name" class="label"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
             <div class="control">
-                <input name="sender[name]" value="<?php echo $block->escapeHtmlAttr($block->getUserName()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr(__('Name')) ?>" id="sender-name" type="text" class="input-text"
+                <input name="sender[name]" value="<?= $block->escapeHtmlAttr($block->getUserName()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Name')) ?>" id="sender-name" type="text" class="input-text"
                        data-validate="{required:true}"/>
             </div>
         </div>
 
         <div class="field email required">
-            <label for="sender-email" class="label"><span><?php echo $block->escapeHtml(__('Email')) ?></span></label>
+            <label for="sender-email" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
             <div class="control">
-                <input name="sender[email]" value="<?php echo $block->escapeHtmlAttr($block->getEmail()) ?>"
-                       title="<?php echo $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="text" class="input-text"
+                <input name="sender[email]" value="<?= $block->escapeHtmlAttr($block->getEmail()) ?>"
+                       title="<?= $block->escapeHtmlAttr(__('Email')) ?>" id="sender-email" type="text" class="input-text"
                        data-validate="{required:true, 'validate-email':true}"/>
             </div>
         </div>
 
         <div class="field text required">
-            <label for="sender-message" class="label"><span><?php echo $block->escapeHtml(__('Message')) ?></span></label>
+            <label for="sender-message" class="label"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
             <div class="control">
                 <textarea name="sender[message]" class="input-text" id="sender-message" cols="3" rows="3"
-                          data-validate="{required:true}"><?php echo $block->escapeHtml($block->getMessage()) ?></textarea>
+                          data-validate="{required:true}"><?= $block->escapeHtml($block->getMessage()) ?></textarea>
             </div>
         </div>
     </fieldset>
 
     <fieldset class="fieldset recipients">
-        <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Invitee')) ?></span></legend>
+        <?= $block->getBlockHtml('formkey') ?>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Invitee')) ?></span></legend>
         <br />
         <div id="recipients-options"></div>
         <?php if ($block->getMaxRecipients()): ?>
             <div id="max-recipient-message" style="display: none;" class="message notice limit" role="alert">
-                <span><?php echo $block->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?></span>
+                <span><?= $block->escapeHtml(__('Maximum %1 email addresses allowed.', $block->getMaxRecipients())) ?></span>
             </div>
         <?php endif; ?>
         <div class="actions-toolbar">
             <div class="secondary">
             <?php if (1 < $block->getMaxRecipients()): ?>
                 <button type="button" id="add-recipient-button" class="action add">
-                    <span><?php echo $block->escapeHtml(__('Add Invitee')) ?></span></button>
+                    <span><?= $block->escapeHtml(__('Add Invitee')) ?></span></button>
             <?php endif; ?>
             </div>
         </div>
-        <?php echo $block->getChildHtml('form_additional_info'); ?>
+        <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
                     class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
-                <span><?php echo $block->escapeHtml(__('Send Email')) ?></span></button>
+                <span><?= $block->escapeHtml(__('Send Email')) ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="#" role="back"><span><?php echo $block->escapeHtml(__('Back')) ?></span></a>
+            <a class="action back" href="#" role="back"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
index 2c7335c8e5001..0b40bf40e97a3 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml
@@ -7,34 +7,34 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form id="edit_form" method="post" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form id="edit_form" method="post" action="<?= /* @escapeNotVerified */ $block->getSaveUrl() ?>">
+    <?= $block->getBlockHtml('formkey') ?>
     <?php  $_order = $block->getShipment()->getOrder() ?>
-    <?php echo $block->getChildHtml('order_info') ?>
+    <?= $block->getChildHtml('order_info') ?>
     <div class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
         </div>
         <div class="admin__page-section-content">
             <div class="admin__page-section-item order-payment-method">
                 <?php /* Billing Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
-                    <div><?php echo $block->getPaymentHtml() ?></div>
-                    <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                    <div><?= $block->getPaymentHtml() ?></div>
+                    <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
                 </div>
             </div>
             <div class="admin__page-section-item order-shipping-address">
                 <?php /* Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Information') ?></span>
+                    <span class="title"><?= /* @escapeNotVerified */ __('Shipping Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content shipping-description-wrapper">
-                    <div class="shipping-description-title"><?php echo $block->escapeHtml($_order->getShippingDescription()) ?></div>
+                    <div class="shipping-description-title"><?= $block->escapeHtml($_order->getShippingDescription()) ?></div>
                     <div class="shipping-description-content">
-                        <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
+                        <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
 
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -42,18 +42,18 @@
                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?php /* @escapeNotVerified */ echo $_excl; ?>
+                        <?= /* @escapeNotVerified */ $_excl ?>
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                         <?php endif; ?>
                     </div>
                 </div>
-                <div><?php echo $block->getChildHtml('shipment_tracking') ?></div>
+                <div><?= $block->getChildHtml('shipment_tracking') ?></div>
             </div>
         </div>
     </div>
     <div id="ship_items_container">
-        <?php echo $block->getItemsHtml() ?>
+        <?= $block->getItemsHtml() ?>
     </div>
 </form>
 <script>
@@ -66,4 +66,4 @@ require([
 
 });
 </script>
-<?php echo $block->getChildHtml('shipment_packaging');
+<?= $block->getChildHtml('shipment_packaging');
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
index 899af5a842ca6..89cc760bb8290 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -10,27 +10,27 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items to Ship') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items to Ship') ?></span>
     </div>
     <div class="admin__table-wrapper">
         <table class="data-table admin__table-primary order-shipment-table">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                    <th class="col-ordered-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
+                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                    <th class="col-ordered-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
                     <th class="col-qty<?php if ($block->isShipmentRegular()): ?> last<?php endif; ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Qty to Ship') ?></span>
+                        <span><?= /* @escapeNotVerified */ __('Qty to Ship') ?></span>
                     </th>
                     <?php if (!$block->canShipPartiallyItem()): ?>
-                    <th class="col-ship last"><span><?php /* @escapeNotVerified */ echo __('Ship') ?></span></th>
+                    <th class="col-ship last"><span><?= /* @escapeNotVerified */ __('Ship') ?></span></th>
                     <?php endif; ?>
                 </tr>
             </thead>
             <?php $_items = $block->getShipment()->getAllItems() ?>
             <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
-                <tbody class="<?php /* @escapeNotVerified */ echo $_i%2 ? 'odd' : 'even' ?>">
-                    <?php echo $block->getItemHtml($_item) ?>
-                    <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+                <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
+                    <?= $block->getItemHtml($_item) ?>
+                    <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                 </tbody>
             <?php endforeach; ?>
         </table>
@@ -39,24 +39,24 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Shipment Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Shipment Total') ?></span>
     </div>
     <div class="admin__page-section-content order-comments-history">
         <div class="admin__page-section-item">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipment Comments') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipment Comments') ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div id="order-history_form" class="admin__field">
                     <label class="admin__field-label"
                            for="shipment_comment_text">
-                        <span><?php /* @escapeNotVerified */ echo __('Comment Text') ?></span></label>
+                        <span><?= /* @escapeNotVerified */ __('Comment Text') ?></span></label>
                     <div class="admin__field-control">
                         <textarea id="shipment_comment_text"
                                   class="admin__control-textarea"
                                   name="shipment[comment_text]"
                                   rows="3"
-                                  cols="5"><?php /* @escapeNotVerified */ echo $block->getShipment()->getCommentText(); ?></textarea>
+                                  cols="5"><?= /* @escapeNotVerified */ $block->getShipment()->getCommentText() ?></textarea>
                     </div>
                 </div>
             </div>
@@ -64,7 +64,7 @@
     </div>
     <div class="admin__page-section-item order-totals order-totals-actions">
         <div class="admin__page-section-item-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Shipment Options') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Shipment Options') ?></span>
         </div>
         <div class="admin__page-section-item-content">
             <?php if ($block->canCreateShippingLabel()): ?>
@@ -77,7 +77,7 @@
                            onclick="toggleCreateLabelCheckbox();"/>
                     <label class="admin__field-label"
                            for="create_shipping_label">
-                        <span><?php /* @escapeNotVerified */ echo __('Create Shipping Label') ?></span></label>
+                        <span><?= /* @escapeNotVerified */ __('Create Shipping Label') ?></span></label>
                 </div>
             <?php endif ?>
 
@@ -89,7 +89,7 @@
                        type="checkbox"/>
                 <label class="admin__field-label"
                        for="notify_customer">
-                    <span><?php /* @escapeNotVerified */ echo __('Append Comments') ?></span></label>
+                    <span><?= /* @escapeNotVerified */ __('Append Comments') ?></span></label>
             </div>
 
             <?php if ($block->canSendShipmentEmail()): ?>
@@ -101,13 +101,13 @@
                            type="checkbox"/>
                     <label class="admin__field-label"
                            for="send_email">
-                        <span><?php /* @escapeNotVerified */ echo __('Email Copy of Shipment') ?></span></label>
+                        <span><?= /* @escapeNotVerified */ __('Email Copy of Shipment') ?></span></label>
                 </div>
             <?php endif; ?>
-            <?php echo $block->getChildHtml('submit_before') ?>
+            <?= $block->getChildHtml('submit_before') ?>
             <div class="order-history-comments-actions actions">
-                <?php echo $block->getChildHtml('submit_button') ?>
-                <?php echo $block->getChildHtml('submit_after') ?>
+                <?= $block->getChildHtml('submit_button') ?>
+                <?= $block->getChildHtml('submit_after') ?>
             </div>
         </div>
     </div>
@@ -147,7 +147,7 @@ window.toggleCreateLabelCheckbox = function() {
 window.submitShipment = function(btn) {
     if (!validQtyItems()) {
         alert({
-            content: '<?php /* @escapeNotVerified */ echo __('Invalid value(s) for Qty to Ship') ?>'
+            content: '<?= /* @escapeNotVerified */ __('Invalid value(s) for Qty to Ship') ?>'
         });
         return;
     }
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
index a245c9172c73d..b5d2aafe18ea6 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items/renderer/default.phtml
@@ -9,22 +9,22 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <tr>
-    <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
-    <td class="col-ordered-qty"><?php echo $block->getColumnHtml($_item, 'qty') ?></td>
+    <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
+    <td class="col-ordered-qty"><?= $block->getColumnHtml($_item, 'qty') ?></td>
     <td class="col-qty <?php if ($block->isShipmentRegular()): ?>last<?php endif; ?>">
         <?php if ($block->canShipPartiallyItem()): ?>
             <input type="text"
                    class="input-text admin__control-text qty-item"
-                   name="shipment[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
-                   value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
+                   name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]"
+                   value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" />
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
+            <?= /* @escapeNotVerified */ $_item->getQty()*1 ?>
         <?php endif; ?>
     </td>
     <?php if (!$block->canShipPartiallyItem()): ?>
     <td class="col-ship last">
-        <input type="hidden" name="shipment[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]" value="0" />
-        <input type="checkbox" name="shipment[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]" value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" checked />
+        <input type="hidden" name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]" value="0" />
+        <input type="checkbox" name="shipment[items][<?= /* @escapeNotVerified */ $_item->getOrderItemId() ?>]" value="<?= /* @escapeNotVerified */ $_item->getQty()*1 ?>" checked />
     </td>
     <?php endif; ?>
 </tr>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
index cd59f96ea0165..1a9d44c19db40 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/grid.phtml
@@ -16,20 +16,20 @@
                     <th class="data-grid-checkbox-cell">
                         <label class="data-grid-checkbox-cell-inner">
                             <input type="checkbox"
-                                   id="select-items-<?php /* @noEscape */ echo $randomId; ?>"
+                                   id="select-items-<?= /* @noEscape */ $randomId ?>"
                                    onchange="packaging.checkAllItems(this);"
                                    class="checkbox admin__control-checkbox"
-                                   title="<?php /* @escapeNotVerified */ echo __('Select All') ?>">
-                            <label for="select-items-<?php /* @noEscape */ echo $randomId; ?>"></label>
+                                   title="<?= /* @escapeNotVerified */ __('Select All') ?>">
+                            <label for="select-items-<?= /* @noEscape */ $randomId ?>"></label>
                         </label>
                     </th>
-                    <th class="data-grid-th"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                    <th class="data-grid-th"><?php /* @escapeNotVerified */ echo __('Weight') ?></th>
-                    <th class="data-grid-th" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                        <?php /* @escapeNotVerified */ echo __('Customs Value') ?>
+                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Weight') ?></th>
+                    <th class="data-grid-th" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
+                        <?= /* @escapeNotVerified */ __('Customs Value') ?>
                     </th>
-                    <th class="data-grid-th"><?php /* @escapeNotVerified */ echo __('Qty Ordered') ?></th>
-                    <th class="data-grid-th"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
+                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Qty Ordered') ?></th>
+                    <th class="data-grid-th"><?= /* @escapeNotVerified */ __('Qty') ?></th>
                 </tr>
             </thead>
             <tbody>
@@ -44,23 +44,23 @@
                     || (!$_orderItem->isShipSeparately() && ($_orderItem->getParentItemId() || $_orderItem->getParentItem()))): ?>
                     <?php continue; ?>
                 <?php endif; ?>
-                <tr class="data-grid-controls-row data-row <?php echo ($i++ % 2 != 0) ? '_odd-row' : ''; ?>">
+                <tr class="data-grid-controls-row data-row <?= ($i++ % 2 != 0) ? '_odd-row' : '' ?>">
                     <td class="data-grid-checkbox-cell">
                         <?php $id = $item->getId() ? $item->getId() : $item->getOrderItemId(); ?>
                         <label class="data-grid-checkbox-cell-inner">
                             <input type="checkbox"
                                    name=""
-                                   id="select-item-<?php /* @noEscape */ echo $randomId . '-' . $id; ?>"
-                                   value="<?php /* @escapeNotVerified */ echo $id; ?>"
+                                   id="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"
+                                   value="<?= /* @escapeNotVerified */ $id ?>"
                                    class="checkbox admin__control-checkbox">
-                            <label for="select-item-<?php /* @noEscape */ echo $randomId . '-' . $id; ?>"></label>
+                            <label for="select-item-<?= /* @noEscape */ $randomId . '-' . $id ?>"></label>
                         </label>
                     </td>
                     <td>
-                        <?php /* @escapeNotVerified */ echo $item->getName(); ?>
+                        <?= /* @escapeNotVerified */ $item->getName() ?>
                     </td>
                     <td data-role="item-weight">
-                        <?php /* @escapeNotVerified */ echo $item->getWeight(); ?>
+                        <?= /* @escapeNotVerified */ $item->getWeight() ?>
                     </td>
                     <?php
                     if ($block->displayCustomsValue()) {
@@ -72,25 +72,25 @@
                     }
 
                     ?>
-                    <td <?php /* @escapeNotVerified */ echo $customsValueDisplay ?>>
+                    <td <?= /* @escapeNotVerified */ $customsValueDisplay ?>>
                         <input type="text"
                                name="customs_value"
-                               class="input-text admin__control-text <?php /* @escapeNotVerified */ echo $customsValueValidation ?>"
-                               value="<?php /* @escapeNotVerified */ echo $block->formatPrice($item->getPrice()); ?>"
+                               class="input-text admin__control-text <?= /* @escapeNotVerified */ $customsValueValidation ?>"
+                               value="<?= /* @escapeNotVerified */ $block->formatPrice($item->getPrice()) ?>"
                                size="10"
                                onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
                     </td>
                     <td>
-                        <?php /* @escapeNotVerified */ echo $item->getOrderItem()->getQtyOrdered()*1; ?>
+                        <?= /* @escapeNotVerified */ $item->getOrderItem()->getQtyOrdered()*1 ?>
                     </td>
                     <td>
-                        <input type="hidden" name="price" value="<?php /* @escapeNotVerified */ echo $item->getPrice(); ?>">
+                        <input type="hidden" name="price" value="<?= /* @escapeNotVerified */ $item->getPrice() ?>">
                         <input type="text"
                                name="qty"
-                               value="<?php /* @escapeNotVerified */ echo $item->getQty()*1; ?>"
+                               value="<?= /* @escapeNotVerified */ $item->getQty()*1 ?>"
                                class="input-text admin__control-text qty<?php if ($item->getOrderItem()->getIsQtyDecimal()): ?> qty-decimal<?php endif ?>">&nbsp;
                         <button type="button" class="action-delete" data-action="package-delete-item" onclick="packaging.deleteItem(this);" style="display:none;">
-                            <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
+                            <span><?= /* @escapeNotVerified */ __('Delete') ?></span>
                         </button>
                     </td>
                 </tr>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
index 3f97bd8909063..1d9cf5688be2d 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/packed.phtml
@@ -14,7 +14,7 @@
     <?php $params = new \Magento\Framework\DataObject($package->getParams()) ?>
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Package') . ' ' . $packageId ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Package') . ' ' . $packageId ?></span>
         </div>
         <div class="admin__page-section-content">
             <div class="row row-gutter">
@@ -22,22 +22,22 @@
                     <table class="admin__table-secondary">
                         <tbody>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Type') ?></th>
-                                <td><?php /* @escapeNotVerified */ echo $block->getContainerTypeByCode($params->getContainer()) ?></td>
+                                <th><?= /* @escapeNotVerified */ __('Type') ?></th>
+                                <td><?= /* @escapeNotVerified */ $block->getContainerTypeByCode($params->getContainer()) ?></td>
                             </tr>
                             <tr>
                             <?php if ($block->displayCustomsValue()): ?>
-                                <th><?php /* @escapeNotVerified */ echo __('Customs Value') ?></th>
-                                <td><?php /* @escapeNotVerified */ echo $block->displayCustomsPrice($params->getCustomsValue()) ?></td>
+                                <th><?= /* @escapeNotVerified */ __('Customs Value') ?></th>
+                                <td><?= /* @escapeNotVerified */ $block->displayCustomsPrice($params->getCustomsValue()) ?></td>
                             <?php else: ?>
-                                <th><?php /* @escapeNotVerified */ echo __('Total Weight') ?></th>
-                                <td><?php /* @escapeNotVerified */ echo $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
+                                <th><?= /* @escapeNotVerified */ __('Total Weight') ?></th>
+                                <td><?= /* @escapeNotVerified */ $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
                             <?php endif; ?>
                             </tr>
                         <?php if ($params->getSize()): ?>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Size') ?></th>
-                                <td><?php /* @escapeNotVerified */ echo ucfirst(strtolower($params->getSize())) ?></td>
+                                <th><?= /* @escapeNotVerified */ __('Size') ?></th>
+                                <td><?= /* @escapeNotVerified */ ucfirst(strtolower($params->getSize())) ?></td>
                             </tr>
                         <?php endif; ?>
                         </tbody>
@@ -47,30 +47,30 @@
                     <table class="admin__table-secondary">
                         <tbody>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Length') ?></th>
+                                <th><?= /* @escapeNotVerified */ __('Length') ?></th>
                                 <td>
                                 <?php if ($params->getLength() != null): ?>
-                                    <?php /* @escapeNotVerified */ echo $params->getLength() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
+                                    <?= /* @escapeNotVerified */ $params->getLength() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
                                 <?php else: ?>
                                     --
                                 <?php endif; ?>
                                 </td>
                             </tr>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Width') ?></th>
+                                <th><?= /* @escapeNotVerified */ __('Width') ?></th>
                                 <td>
                                 <?php if ($params->getWidth() != null): ?>
-                                    <?php /* @escapeNotVerified */ echo $params->getWidth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
+                                    <?= /* @escapeNotVerified */ $params->getWidth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
                                 <?php else: ?>
                                     --
                                 <?php endif; ?>
                                 </td>
                             </tr>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Height') ?></th>
+                                <th><?= /* @escapeNotVerified */ __('Height') ?></th>
                                 <td>
                                 <?php if ($params->getHeight() != null): ?>
-                                    <?php /* @escapeNotVerified */ echo $params->getHeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
+                                    <?= /* @escapeNotVerified */ $params->getHeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
                                 <?php else: ?>
                                     --
                                 <?php endif; ?>
@@ -84,24 +84,24 @@
                         <tbody>
                         <?php if ($params->getDeliveryConfirmation() != null): ?>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Signature Confirmation') ?></th>
-                                <td><?php /* @escapeNotVerified */ echo $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation()) ?></td>
+                                <th><?= /* @escapeNotVerified */ __('Signature Confirmation') ?></th>
+                                <td><?= /* @escapeNotVerified */ $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation()) ?></td>
                             </tr>
                         <?php endif; ?>
                         <?php if ($params->getContentType() != null): ?>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Contents') ?></th>
+                                <th><?= /* @escapeNotVerified */ __('Contents') ?></th>
                                 <?php if ($params->getContentType() == 'OTHER'): ?>
-                                    <td><?php echo $block->escapeHtml($params->getContentTypeOther()) ?></td>
+                                    <td><?= $block->escapeHtml($params->getContentTypeOther()) ?></td>
                                 <?php else: ?>
-                                    <td><?php /* @escapeNotVerified */ echo $block->getContentTypeByCode($params->getContentType()) ?></td>
+                                    <td><?= /* @escapeNotVerified */ $block->getContentTypeByCode($params->getContentType()) ?></td>
                                 <?php endif; ?>
                             </tr>
                         <?php endif; ?>
                         <?php if ($params->getGirth()): ?>
                             <tr>
-                                <th><?php /* @escapeNotVerified */ echo __('Girth') ?></th>
-                                <td><?php /* @escapeNotVerified */ echo $params->getGirth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getGirthDimensionUnits()) ?></td>
+                                <th><?= /* @escapeNotVerified */ __('Girth') ?></th>
+                                <td><?= /* @escapeNotVerified */ $params->getGirth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getGirthDimensionUnits()) ?></td>
                             </tr>
                         <?php endif; ?>
                         </tbody>
@@ -110,19 +110,19 @@
             </div>
         </div>
         <div class="admin__page-section-item-title">
-            <span class="title"><?php /* @escapeNotVerified */ echo __('Items in the Package') ?></span>
+            <span class="title"><?= /* @escapeNotVerified */ __('Items in the Package') ?></span>
         </div>
         <div class="admin__table-wrapper">
             <table class="data-table admin__table-primary">
                 <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                    <th class="col-weight"><span><?php /* @escapeNotVerified */ echo __('Weight') ?></span></th>
+                    <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                    <th class="col-weight"><span><?= /* @escapeNotVerified */ __('Weight') ?></span></th>
                     <?php if ($block->displayCustomsValue()): ?>
-                        <th class="col-custom"><span><?php /* @escapeNotVerified */ echo __('Customs Value') ?></span></th>
+                        <th class="col-custom"><span><?= /* @escapeNotVerified */ __('Customs Value') ?></span></th>
                     <?php endif; ?>
-                    <th class="col-qty"><span><?php /* @escapeNotVerified */ echo __('Qty Ordered') ?></span></th>
-                    <th class="col-qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
+                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty Ordered') ?></span></th>
+                    <th class="col-qty"><span><?= /* @escapeNotVerified */ __('Qty') ?></span></th>
                 </tr>
                 </thead>
                 <tbody id="">
@@ -130,19 +130,19 @@
                     <?php $item = new \Magento\Framework\DataObject($item) ?>
                     <tr title="#" id="">
                         <td class="col-product">
-                            <?php /* @escapeNotVerified */ echo $item->getName(); ?>
+                            <?= /* @escapeNotVerified */ $item->getName() ?>
                         </td>
                         <td class="col-weight">
-                            <?php /* @escapeNotVerified */ echo $item->getWeight(); ?>
+                            <?= /* @escapeNotVerified */ $item->getWeight() ?>
                         </td>
                         <?php if ($block->displayCustomsValue()): ?>
-                            <td class="col-custom"><?php /* @escapeNotVerified */ echo $block->displayCustomsPrice($item->getCustomsValue()) ?></td>
+                            <td class="col-custom"><?= /* @escapeNotVerified */ $block->displayCustomsPrice($item->getCustomsValue()) ?></td>
                         <?php endif; ?>
                         <td class="col-qty">
-                            <?php /* @escapeNotVerified */ echo $block->getQtyOrderedItem($item->getOrderItemId()); ?>
+                            <?= /* @escapeNotVerified */ $block->getQtyOrderedItem($item->getOrderItemId()) ?>
                         </td>
                         <td class="col-qty">
-                            <?php /* @escapeNotVerified */ echo $item->getQty()*1; ?>
+                            <?= /* @escapeNotVerified */ $item->getQty()*1 ?>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -164,7 +164,7 @@
             "Magento_Shipping/js/packages":{
                 "type":"slide",
                 "title":"<?= /* @escapeNotVerified */  __('Packages') ?>",
-                "url": "<?= /* @escapeNotVerified */ $block->getPrintButton(); ?>"
+                "url": "<?= /* @escapeNotVerified */ $block->getPrintButton() ?>"
             }
         }
     }
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
index aad8f05840161..cb63b3549a440 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -21,11 +21,11 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         "Magento_Ui/js/modal/modal"
     ], function(jQuery){
 
-        packaging = new Packaging(<?php /* @escapeNotVerified */ echo $block->getConfigDataJson() ?>);
+        packaging = new Packaging(<?= /* @escapeNotVerified */ $block->getConfigDataJson() ?>);
         packaging.changeContainerType($$('select[name=package_container]')[0]);
         packaging.checkSizeAndGirthParameter(
             $$('select[name=package_container]')[0],
-            <?php /* @escapeNotVerified */ echo $girthEnabled; ?>
+            <?= /* @escapeNotVerified */ $girthEnabled ?>
         );
         packaging.setConfirmPackagingCallback(function(){
             packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
@@ -52,23 +52,23 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
         });
         jQuery('#packaging_window').modal({
             type: 'slide',
-            title: '<?php /* @escapeNotVerified */ echo __('Create Packages') ?>',
+            title: '<?= /* @escapeNotVerified */ __('Create Packages') ?>',
             buttons: [{
-                text: '<?php /* @escapeNotVerified */ echo __('Cancel') ?>',
+                text: '<?= /* @escapeNotVerified */ __('Cancel') ?>',
                 'class': 'action-secondary',
                 click: function () {
                     packaging.cancelPackaging();
                     this.closeModal();
                     }
                 }, {
-                text: '<?php /* @escapeNotVerified */ echo __('Save') ?>',
+                text: '<?= /* @escapeNotVerified */ __('Save') ?>',
                 'attr': {'disabled':'disabled', 'data-action':'save-packages'},
                 'class': 'action-primary _disabled',
                 click: function () {
                     packaging.confirmPackaging();
                     }
                 }, {
-                    text: '<?php /* @escapeNotVerified */ echo __('Add Package') ?>',
+                    text: '<?= /* @escapeNotVerified */ __('Add Package') ?>',
                     'attr': {'data-action':'add-packages'},
                     'class': 'action-secondary',
                     click: function () {
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
index 1407818248b28..c32b63bddab56 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup_content.phtml
@@ -13,14 +13,14 @@
     <section class="admin__page-section" id="package_template" style="display:none;">
         <div class="admin__page-section-title">
             <span class="title">
-                <?php /* @escapeNotVerified */ echo __('Package') ?> <span data-role="package-number"></span>
+                <?= /* @escapeNotVerified */ __('Package') ?> <span data-role="package-number"></span>
             </span>
             <div class="actions _primary">
                 <button type="button" class="action-secondary" data-action="package-save-items" onclick="packaging.packItems(this);">
-                    <span><?php /* @escapeNotVerified */ echo __('Add Selected Product(s) to Package') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Add Selected Product(s) to Package') ?></span>
                 </button>
                 <button type="button" class="action-secondary" data-action="package-add-items" onclick="packaging.getItemsForPack(this);">
-                    <span><?php /* @escapeNotVerified */ echo __('Add Products to Package') ?></span>
+                    <span><?= /* @escapeNotVerified */ __('Add Products to Package') ?></span>
                 </button>
             </div>
         </div>
@@ -28,22 +28,22 @@
             <table class="data-table admin__control-table">
                 <thead>
                     <tr>
-                        <th class="col-type"><?php /* @escapeNotVerified */ echo __('Type') ?></th>
+                        <th class="col-type"><?= /* @escapeNotVerified */ __('Type') ?></th>
                         <?php if ($girthEnabled == 1): ?>
-                        <th class="col-size"><?php /* @escapeNotVerified */ echo __('Size') ?></th>
-                        <th class="col-girth"><?php /* @escapeNotVerified */ echo __('Girth') ?></th>
+                        <th class="col-size"><?= /* @escapeNotVerified */ __('Size') ?></th>
+                        <th class="col-girth"><?= /* @escapeNotVerified */ __('Girth') ?></th>
                         <th>&nbsp;</th>
                         <?php endif; ?>
-                        <th class="col-custom" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                            <?php /* @escapeNotVerified */ echo __('Customs Value') ?>
+                        <th class="col-custom" <?= $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
+                            <?= /* @escapeNotVerified */ __('Customs Value') ?>
                         </th>
-                        <th class="col-total-weight"><?php /* @escapeNotVerified */ echo __('Total Weight') ?></th>
-                        <th class="col-length"><?php /* @escapeNotVerified */ echo __('Length') ?></th>
-                        <th class="col-width"><?php /* @escapeNotVerified */ echo __('Width') ?></th>
-                        <th class="col-height"><?php /* @escapeNotVerified */ echo __('Height') ?></th>
+                        <th class="col-total-weight"><?= /* @escapeNotVerified */ __('Total Weight') ?></th>
+                        <th class="col-length"><?= /* @escapeNotVerified */ __('Length') ?></th>
+                        <th class="col-width"><?= /* @escapeNotVerified */ __('Width') ?></th>
+                        <th class="col-height"><?= /* @escapeNotVerified */ __('Height') ?></th>
                         <th>&nbsp;</th>
                         <?php if ($block->getDeliveryConfirmationTypes()): ?>
-                        <th class="col-signature"><?php /* @escapeNotVerified */ echo __('Signature Confirmation') ?></th>
+                        <th class="col-signature"><?= /* @escapeNotVerified */ __('Signature Confirmation') ?></th>
                             <?php endif; ?>
                         <th class="col-actions">&nbsp;</th>
                     </tr>
@@ -53,17 +53,17 @@
                         <td class="col-type">
                             <?php $containers = $block->getContainers(); ?>
                             <select name="package_container"
-                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?php /* @escapeNotVerified */ echo  $girthEnabled ?>);"
+                                    onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?= /* @escapeNotVerified */ $girthEnabled ?>);"
                                     <?php if (empty($containers)):?>
-                                        title="<?php /* @escapeNotVerified */ echo __('USPS domestic shipments don\'t use package types.') ?>"
+                                        title="<?= /* @escapeNotVerified */ __('USPS domestic shipments don\'t use package types.') ?>"
                                         disabled=""
                                         class="admin__control-select disabled"
                                     <?php else: ?>
                                         class="admin__control-select"
                                     <?php endif; ?>>
                                 <?php foreach ($block->getContainers() as $key => $value): ?>
-                                    <option value="<?php /* @escapeNotVerified */ echo $key ?>" >
-                                        <?php /* @escapeNotVerified */ echo $value ?>
+                                    <option value="<?= /* @escapeNotVerified */ $key ?>" >
+                                        <?= /* @escapeNotVerified */ $value ?>
                                     </option>
                                 <?php endforeach; ?>
                             </select>
@@ -72,10 +72,10 @@
                         <td>
                             <select name="package_size"
                                     class="admin__control-select"
-                                    onchange="packaging.checkSizeAndGirthParameter(this, <?php /* @escapeNotVerified */ echo  $girthEnabled ?>);">
+                                    onchange="packaging.checkSizeAndGirthParameter(this, <?= /* @escapeNotVerified */ $girthEnabled ?>);">
                                 <?php foreach ($sizeSource as $key => $value): ?>
-                                <option value="<?php /* @escapeNotVerified */ echo $sizeSource[$key]['value'] ?>">
-                                    <?php /* @escapeNotVerified */ echo $sizeSource[$key]['label'] ?>
+                                <option value="<?= /* @escapeNotVerified */ $sizeSource[$key]['value'] ?>">
+                                    <?= /* @escapeNotVerified */ $sizeSource[$key]['label'] ?>
                                 </option>
                                 <?php endforeach; ?>
                             </select>
@@ -89,8 +89,8 @@
                             <select name="container_girth_dimension_units"
                                     class="options-units-dimensions measures admin__control-select"
                                     onchange="packaging.changeMeasures(this);">
-                                <option value="<?php /* @escapeNotVerified */ echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php /* @escapeNotVerified */ echo __('in') ?></option>
-                                <option value="<?php /* @escapeNotVerified */ echo Zend_Measure_Length::CENTIMETER ?>" ><?php /* @escapeNotVerified */ echo __('cm') ?></option>
+                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= /* @escapeNotVerified */ __('in') ?></option>
+                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::CENTIMETER ?>" ><?= /* @escapeNotVerified */ __('cm') ?></option>
                             </select>
                         </td>
                             <?php endif; ?>
@@ -103,13 +103,13 @@
                             $customsValueValidation = '';
                         }
                         ?>
-                        <td class="col-custom" <?php /* @escapeNotVerified */ echo $customsValueDisplay ?>>
+                        <td class="col-custom" <?= /* @escapeNotVerified */ $customsValueDisplay ?>>
                             <div class="admin__control-addon">
                                 <input type="text"
-                                       class="customs-value input-text admin__control-text <?php /* @escapeNotVerified */ echo $customsValueValidation ?>"
+                                       class="customs-value input-text admin__control-text <?= /* @escapeNotVerified */ $customsValueValidation ?>"
                                        name="package_customs_value" />
                                 <span class="admin__addon-suffix">
-                                    <span class="customs-value-currency"><?php /* @escapeNotVerified */ echo $block->getCustomValueCurrencyCode(); ?></span>
+                                    <span class="customs-value-currency"><?= /* @escapeNotVerified */ $block->getCustomValueCurrencyCode() ?></span>
                                 </span>
                             </div>
                         </td>
@@ -121,8 +121,8 @@
                                     <select name="container_weight_units"
                                             class="options-units-weight measures admin__control-select"
                                             onchange="packaging.changeMeasures(this);">
-                                        <option value="<?php /* @escapeNotVerified */ echo Zend_Measure_Weight::POUND ?>" selected="selected"  ><?php /* @escapeNotVerified */ echo __('lb') ?></option>
-                                        <option value="<?php /* @escapeNotVerified */ echo Zend_Measure_Weight::KILOGRAM ?>" ><?php /* @escapeNotVerified */ echo __('kg') ?></option>
+                                        <option value="<?= /* @escapeNotVerified */ Zend_Measure_Weight::POUND ?>" selected="selected"  ><?= /* @escapeNotVerified */ __('lb') ?></option>
+                                        <option value="<?= /* @escapeNotVerified */ Zend_Measure_Weight::KILOGRAM ?>" ><?= /* @escapeNotVerified */ __('kg') ?></option>
                                     </select>
                                 <span class="admin__addon-prefix"></span>
                             </div>
@@ -146,16 +146,16 @@
                             <select name="container_dimension_units"
                                     class="options-units-dimensions measures admin__control-select"
                                     onchange="packaging.changeMeasures(this);">
-                                <option value="<?php /* @escapeNotVerified */ echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php /* @escapeNotVerified */ echo __('in') ?></option>
-                                <option value="<?php /* @escapeNotVerified */ echo Zend_Measure_Length::CENTIMETER ?>" ><?php /* @escapeNotVerified */ echo __('cm') ?></option>
+                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::INCH ?>" selected="selected" ><?= /* @escapeNotVerified */ __('in') ?></option>
+                                <option value="<?= /* @escapeNotVerified */ Zend_Measure_Length::CENTIMETER ?>" ><?= /* @escapeNotVerified */ __('cm') ?></option>
                             </select>
                         </td>
                         <?php if ($block->getDeliveryConfirmationTypes()): ?>
                         <td>
                             <select name="delivery_confirmation_types" class="admin__control-select">
                                 <?php foreach ($block->getDeliveryConfirmationTypes() as $key => $value): ?>
-                                <option value="<?php /* @escapeNotVerified */ echo $key ?>" >
-                                    <?php /* @escapeNotVerified */ echo $value ?>
+                                <option value="<?= /* @escapeNotVerified */ $key ?>" >
+                                    <?= /* @escapeNotVerified */ $value ?>
                                 </option>
                                 <?php endforeach; ?>
                             </select>
@@ -163,7 +163,7 @@
                             <?php endif; ?>
                         <td class="col-actions">
                             <button type="button" class="action-delete DeletePackageBtn" onclick="packaging.deletePackage(this);">
-                                <span><?php /* @escapeNotVerified */ echo __('Delete Package') ?></span>
+                                <span><?= /* @escapeNotVerified */ __('Delete Package') ?></span>
                             </button>
                         </td>
                     </tr>
@@ -173,8 +173,8 @@
                 <table class="data-table admin__control-table" cellspacing="0">
                     <thead>
                         <tr>
-                            <th><?php /* @escapeNotVerified */ echo __('Contents') ?></th>
-                            <th><?php /* @escapeNotVerified */ echo __('Explanation') ?></th>
+                            <th><?= /* @escapeNotVerified */ __('Contents') ?></th>
+                            <th><?= /* @escapeNotVerified */ __('Explanation') ?></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -184,8 +184,8 @@
                                     class="admin__control-select"
                                     onchange="packaging.changeContentTypes(this);">
                                 <?php foreach ($block->getContentTypes() as $key => $value): ?>
-                                    <option value="<?php /* @escapeNotVerified */ echo $key ?>" >
-                                        <?php /* @escapeNotVerified */ echo $value ?>
+                                    <option value="<?= /* @escapeNotVerified */ $key ?>" >
+                                        <?= /* @escapeNotVerified */ $value ?>
                                     </option>
                                 <?php endforeach; ?>
                             </select>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
index 8a88f343f58b2..02cdca120fdbc 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking.phtml
@@ -69,7 +69,7 @@ require(['prototype'], function(){
                     class="select admin__control-select carrier"
                     disabled="disabled">
                 <?php foreach ($block->getCarriers() as $_code => $_name): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
+                    <option value="<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_name) ?></option>
                 <?php endforeach; ?>
             </select>
         </td>
@@ -94,7 +94,7 @@ require(['prototype'], function(){
                 type="button"
                 class="action-default action-delete"
                 onclick="trackingControl.deleteRow(event);return false">
-                <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
+                <span><?= /* @escapeNotVerified */ __('Delete') ?></span>
             </button>
         </td>
     </tr>
@@ -104,15 +104,15 @@ require(['prototype'], function(){
     <table class="data-table admin__control-table" id="tracking_numbers_table">
         <thead>
         <tr class="headings">
-            <th class="col-carrier"><?php /* @escapeNotVerified */ echo __('Carrier') ?></th>
-            <th class="col-title"><?php /* @escapeNotVerified */ echo __('Title') ?></th>
-            <th class="col-number"><?php /* @escapeNotVerified */ echo __('Number') ?></th>
-            <th class="col-delete"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
+            <th class="col-carrier"><?= /* @escapeNotVerified */ __('Carrier') ?></th>
+            <th class="col-title"><?= /* @escapeNotVerified */ __('Title') ?></th>
+            <th class="col-number"><?= /* @escapeNotVerified */ __('Number') ?></th>
+            <th class="col-delete"><?= /* @escapeNotVerified */ __('Action') ?></th>
         </tr>
         </thead>
         <tfoot>
         <tr>
-            <td colspan="4" class="col-actions-add"><?php echo $block->getChildHtml('add_button') ?></td>
+            <td colspan="4" class="col-actions-add"><?= $block->getChildHtml('add_button') ?></td>
         </tr>
         </tfoot>
         <tbody id="track_row_container">
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
index 09e0e704a1248..0587d5eabe681 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/tracking/view.phtml
@@ -12,10 +12,10 @@
     <table class="data-table admin__control-table" id="shipment_tracking_info">
         <thead>
             <tr class="headings">
-                <th class="col-carrier"><?php /* @escapeNotVerified */ echo __('Carrier') ?></th>
-                <th class="col-title"><?php /* @escapeNotVerified */ echo __('Title') ?></th>
-                <th class="col-number"><?php /* @escapeNotVerified */ echo __('Number') ?></th>
-                <th class="col-delete last"><?php /* @escapeNotVerified */ echo __('Action') ?></th>
+                <th class="col-carrier"><?= /* @escapeNotVerified */ __('Carrier') ?></th>
+                <th class="col-title"><?= /* @escapeNotVerified */ __('Title') ?></th>
+                <th class="col-number"><?= /* @escapeNotVerified */ __('Number') ?></th>
+                <th class="col-delete last"><?= /* @escapeNotVerified */ __('Action') ?></th>
             </tr>
         </thead>
         <tfoot>
@@ -25,7 +25,7 @@
                             class="select admin__control-select"
                             onchange="selectCarrier(this)">
                         <?php foreach ($block->getCarriers() as $_code => $_name): ?>
-                        <option value="<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
+                        <option value="<?= /* @escapeNotVerified */ $_code ?>"><?= $block->escapeHtml($_name) ?></option>
                         <?php endforeach; ?>
                     </select>
                 </td>
@@ -43,24 +43,24 @@
                            name="number"
                            value="" />
                 </td>
-                <td class="col-delete last"><?php echo $block->getSaveButtonHtml() ?></td>
+                <td class="col-delete last"><?= $block->getSaveButtonHtml() ?></td>
             </tr>
         </tfoot>
     <?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
         <tbody>
         <?php $i = 0; foreach ($_tracks as $_track):$i++ ?>
-            <tr class="<?php /* @escapeNotVerified */ echo($i%2 == 0) ? 'even' : 'odd' ?>">
-                <td class="col-carrier"><?php echo $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?></td>
-                <td class="col-title"><?php echo $block->escapeHtml($_track->getTitle()) ?></td>
+            <tr class="<?= /* @escapeNotVerified */ ($i%2 == 0) ? 'even' : 'odd' ?>">
+                <td class="col-carrier"><?= $block->escapeHtml($block->getCarrierTitle($_track->getCarrierCode())) ?></td>
+                <td class="col-title"><?= $block->escapeHtml($_track->getTitle()) ?></td>
                 <td class="col-number">
                     <?php if ($_track->isCustom()): ?>
-                    <?php echo $block->escapeHtml($_track->getNumber()) ?>
+                    <?= $block->escapeHtml($_track->getNumber()) ?>
                     <?php else: ?>
-                    <a href="#" onclick="popWin('<?php /* @escapeNotVerified */ echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_track) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?php echo $block->escapeHtml($_track->getNumber()) ?></a>
-                    <div id="shipment_tracking_info_response_<?php /* @escapeNotVerified */ echo $_track->getId() ?>"></div>
+                    <a href="#" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_track) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')"><?= $block->escapeHtml($_track->getNumber()) ?></a>
+                    <div id="shipment_tracking_info_response_<?= /* @escapeNotVerified */ $_track->getId() ?>"></div>
                     <?php endif; ?>
                 </td>
-                <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?php /* @escapeNotVerified */ echo $block->getRemoveUrl($_track) ?>'); return false;"><span><?php /* @escapeNotVerified */ echo __('Delete') ?></span></button></td>
+                <td class="col-delete last"><button class="action-delete" type="button" onclick="deleteTrackingNumber('<?= /* @escapeNotVerified */ $block->getRemoveUrl($_track) ?>'); return false;"><span><?= /* @escapeNotVerified */ __('Delete') ?></span></button></td>
             </tr>
         <?php endforeach; ?>
         </tbody>
@@ -78,7 +78,7 @@ function selectCarrier(elem) {
 }
 
 function deleteTrackingNumber(url) {
-    if (confirm('<?php /* @escapeNotVerified */ echo __('Are you sure?') ?>')) {
+    if (confirm('<?= /* @escapeNotVerified */ __('Are you sure?') ?>')) {
         submitAndReloadArea($('shipment_tracking_info').parentNode, url)
     }
 }
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
index d4d14cf5a7ad5..b7281f16cd353 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/view/info.phtml
@@ -14,14 +14,14 @@
 <?php /* Shipping Method */ ?>
 <div class="admin__page-section-item order-shipping-method">
     <div class="admin__page-section-item-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping &amp; Handling Information') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Shipping &amp; Handling Information') ?></span>
     </div>
     <div class="admin__page-section-item-content">
         <?php  if ($order->getTracksCollection()->count()) : ?>
-            <p><a href="#" id="linkId" onclick="popWin('<?php /* @escapeNotVerified */ echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php /* @escapeNotVerified */ echo __('Track Order') ?>"><?php /* @escapeNotVerified */ echo __('Track Order') ?></a></p>
+            <p><a href="#" id="linkId" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= /* @escapeNotVerified */ __('Track Order') ?>"><?= /* @escapeNotVerified */ __('Track Order') ?></a></p>
         <?php endif; ?>
         <?php if ($order->getShippingDescription()): ?>
-            <strong><?php echo $block->escapeHtml($order->getShippingDescription()) ?></strong>
+            <strong><?= $block->escapeHtml($order->getShippingDescription()) ?></strong>
 
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                 <?php $_excl = $block->displayShippingPriceInclTax($order); ?>
@@ -30,12 +30,12 @@
             <?php endif; ?>
             <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
 
-            <?php /* @escapeNotVerified */ echo $_excl; ?>
+            <?= /* @escapeNotVerified */ $_excl ?>
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
             <?php endif; ?>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo __('No shipping information available'); ?>
+            <?= /* @escapeNotVerified */ __('No shipping information available') ?>
         <?php endif; ?>
     </div>
 </div>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
index 3f8c95320a861..fb904f1e840ad 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -8,41 +8,41 @@
 
 ?>
 <?php  $_order = $block->getShipment()->getOrder() ?>
-<?php echo $block->getChildHtml('order_info') ?>
+<?= $block->getChildHtml('order_info') ?>
 <section class="admin__page-section order-shipment-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Payment &amp; Shipping Method') ?></span>
     </div>
     <div class="admin__page-section-content">
 
         <?php /* Billing Address */ ?>
         <div class="admin__page-section-item order-payment-method">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Payment Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
-                <div><?php echo $block->getChildHtml('order_payment') ?></div>
-                <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div><?= $block->getChildHtml('order_payment') ?></div>
+                <div class="order-payment-currency"><?= /* @escapeNotVerified */ __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
             </div>
         </div>
 
         <?php /* Shipping Address */ ?>
         <div class="admin__page-section-item order-shipping-address">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping and Tracking Information') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipping and Tracking Information') ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <div class="shipping-description-wrapper">
                     <?php if ($block->getShipment()->getTracksCollection()->count()): ?>
                         <p>
-                            <a href="#" id="linkId" onclick="popWin('<?php /* @escapeNotVerified */ echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php /* @escapeNotVerified */ echo __('Track this shipment') ?>"><?php /* @escapeNotVerified */ echo __('Track this shipment') ?></a>
+                            <a href="#" id="linkId" onclick="popWin('<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?= /* @escapeNotVerified */ __('Track this shipment') ?>"><?= /* @escapeNotVerified */ __('Track this shipment') ?></a>
                         </p>
                     <?php endif; ?>
                     <div class="shipping-description-title">
-                        <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
+                        <?= $block->escapeHtml($_order->getShippingDescription()) ?>
                     </div>
 
-                    <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
+                    <?= /* @escapeNotVerified */ __('Total Shipping Charges') ?>:
 
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -51,25 +51,25 @@
                     <?php endif; ?>
                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?php /* @escapeNotVerified */ echo $_excl; ?>
+                    <?= /* @escapeNotVerified */ $_excl ?>
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
+                        (<?= /* @escapeNotVerified */ __('Incl. Tax') ?> <?= /* @escapeNotVerified */ $_incl ?>)
                     <?php endif; ?>
                 </div>
                 <?php if ($block->canCreateShippingLabel()): ?>
                 <p>
-                    <?php /* @escapeNotVerified */ echo $block->getCreateLabelButton()?>
+                    <?= /* @escapeNotVerified */ $block->getCreateLabelButton() ?>
                     <?php if ($block->getShipment()->getShippingLabel()): ?>
-                        <?php /* @escapeNotVerified */ echo $block->getPrintLabelButton() ?>
+                        <?= /* @escapeNotVerified */ $block->getPrintLabelButton() ?>
                     <?php endif ?>
                     <?php if ($block->getShipment()->getPackages()): ?>
-                        <?php /* @escapeNotVerified */ echo $block->getShowPackagesButton() ?>
+                        <?= /* @escapeNotVerified */ $block->getShowPackagesButton() ?>
                     <?php endif ?>
                 </p>
                 <?php endif ?>
-                <?php echo $block->getChildHtml('shipment_tracking') ?>
+                <?= $block->getChildHtml('shipment_tracking') ?>
 
-                <?php echo $block->getChildHtml('shipment_packaging') ?>
+                <?= $block->getChildHtml('shipment_packaging') ?>
 <script>
     require([
         'prototype'
@@ -96,23 +96,23 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Shipped') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Items Shipped') ?></span>
     </div>
-    <?php echo $block->getChildHtml('shipment_items') ?>
+    <?= $block->getChildHtml('shipment_items') ?>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
+        <span class="title"><?= /* @escapeNotVerified */ __('Order Total') ?></span>
     </div>
     <div class="admin__page-section-content">
-        <?php echo $block->getChildHtml('shipment_packed') ?>
+        <?= $block->getChildHtml('shipment_packed') ?>
 
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipment History') ?></span>
+                <span class="title"><?= /* @escapeNotVerified */ __('Shipment History') ?></span>
             </div>
-            <div class="admin__page-section-item-content"><?php echo $block->getChildHtml('order_comments') ?></div>
+            <div class="admin__page-section-item-content"><?= $block->getChildHtml('order_comments') ?></div>
         </div>
     </div>
 </section>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
index 157598a345fd3..202e96bc425c9 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -11,15 +11,15 @@
     <table class="data-table admin__table-primary order-shipment-table">
         <thead>
             <tr class="headings">
-                <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
-                <th class="col-qty last"><span><?php /* @escapeNotVerified */ echo __('Qty Shipped') ?></span></th>
+                <th class="col-product"><span><?= /* @escapeNotVerified */ __('Product') ?></span></th>
+                <th class="col-qty last"><span><?= /* @escapeNotVerified */ __('Qty Shipped') ?></span></th>
             </tr>
         </thead>
         <?php $_items = $block->getShipment()->getAllItems() ?>
         <?php $_i = 0; foreach ($_items as $_item): if ($_item->getOrderItem()->getIsVirtual() || $_item->getOrderItem()->getParentItem()): continue; endif; $_i++ ?>
-            <tbody class="<?php /* @escapeNotVerified */ echo $_i%2 ? 'odd' : 'even' ?>">
-                <?php echo $block->getItemHtml($_item) ?>
-                <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
+            <tbody class="<?= /* @escapeNotVerified */ $_i%2 ? 'odd' : 'even' ?>">
+                <?= $block->getItemHtml($_item) ?>
+                <?= $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
             </tbody>
         <?php endforeach; ?>
     </table>
diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
index 2525f833c9766..c035295f77d45 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items/renderer/default.phtml
@@ -9,6 +9,6 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <tr class="border">
-    <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
-    <td class="col-qty last"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
+    <td class="col-product"><?= $block->getColumnHtml($_item, 'name') ?></td>
+    <td class="col-qty last"><?= /* @escapeNotVerified */ $_item->getQty()*1 ?></td>
 </tr>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/items.phtml b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
index 0b0a2cd3eb36c..1f4958d1775fb 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -11,44 +11,44 @@
 <?php  $_order = $block->getOrder() ?>
 <div class="actions-toolbar">
     <?php if ($_order->getTracksCollection()->count()) : ?>
-        <?php echo $block->getChildHtml('track-all-link') ?>
+        <?= $block->getChildHtml('track-all-link') ?>
     <?php endif; ?>
-    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintAllShipmentsUrl($_order) ?>"
+    <a href="<?= /* @escapeNotVerified */ $block->getPrintAllShipmentsUrl($_order) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php /* @escapeNotVerified */ echo __('Print All Shipments') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print All Shipments') ?></span>
     </a>
 </div>
 <?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
 <div class="order-title">
-    <strong><?php /* @escapeNotVerified */ echo __('Shipment #') ?><?php /* @escapeNotVerified */ echo $_shipment->getIncrementId(); ?></strong>
-    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintShipmentUrl($_shipment) ?>"
+    <strong><?= /* @escapeNotVerified */ __('Shipment #') ?><?= /* @escapeNotVerified */ $_shipment->getIncrementId() ?></strong>
+    <a href="<?= /* @escapeNotVerified */ $block->getPrintShipmentUrl($_shipment) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php /* @escapeNotVerified */ echo __('Print Shipment') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Print Shipment') ?></span>
     </a>
     <a href="#"
-       data-mage-init='{"popupWindow": {"windowURL":"<?php /* @escapeNotVerified */ echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
-       title="<?php /* @escapeNotVerified */ echo __('Track this shipment') ?>"
+       data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($_shipment) ?>","windowName":"trackshipment","width":800,"height":600,"top":0,"left":0,"resizable":1,"scrollbars":1}}'
+       title="<?= /* @escapeNotVerified */ __('Track this shipment') ?>"
        class="action track">
-        <span><?php /* @escapeNotVerified */ echo __('Track this shipment') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Track this shipment') ?></span>
     </a>
 </div>
 <?php $tracks = $_shipment->getTracksCollection(); ?>
 <?php  if ($tracks->count()): ?>
-    <dl class="order-tracking" id="my-tracking-table-<?php /* @escapeNotVerified */ echo $_shipment->getId(); ?>">
+    <dl class="order-tracking" id="my-tracking-table-<?= /* @escapeNotVerified */ $_shipment->getId() ?>">
         <dt class="tracking-title">
-            <?php /* @escapeNotVerified */ echo __('Tracking Number(s):') ?>
+            <?= /* @escapeNotVerified */ __('Tracking Number(s):') ?>
         </dt>
         <dd class="tracking-content">
             <?php
             $i = 1;
             $_size = $tracks->count();
             foreach ($tracks as $track): ?>
-                <?php if ($track->isCustom()): ?><?php echo $block->escapeHtml($track->getNumber()) ?><?php else: ?><a
+                <?php if ($track->isCustom()): ?><?= $block->escapeHtml($track->getNumber()) ?><?php else: ?><a
                     href="#"
-                    data-mage-init='{"popupWindow": {"windowURL":"<?php /* @escapeNotVerified */ echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
-                    class="action track"><span><?php echo $block->escapeHtml($track->getNumber()) ?></span>
+                    data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
+                    class="action track"><span><?= $block->escapeHtml($track->getNumber()) ?></span>
                     </a><?php endif; ?><?php if ($i != $_size): ?>, <?php endif; ?>
                 <?php $i++;
             endforeach; ?>
@@ -56,13 +56,13 @@
     </dl>
 <?php  endif; ?>
 <div class="table-wrapper order-items-shipment">
-    <table class="data table table-order-items shipment" id="my-shipment-table-<?php /* @escapeNotVerified */ echo $_shipment->getId(); ?>">
-        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items Shipped') ?></caption>
+    <table class="data table table-order-items shipment" id="my-shipment-table-<?= /* @escapeNotVerified */ $_shipment->getId() ?>">
+        <caption class="table-caption"><?= /* @escapeNotVerified */ __('Items Shipped') ?></caption>
         <thead>
             <tr>
-                <th class="col name"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
-                <th class="col sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
-                <th class="col qty"><?php /* @escapeNotVerified */ echo __('Qty Shipped') ?></th>
+                <th class="col name"><?= /* @escapeNotVerified */ __('Product Name') ?></th>
+                <th class="col sku"><?= /* @escapeNotVerified */ __('SKU') ?></th>
+                <th class="col qty"><?= /* @escapeNotVerified */ __('Qty Shipped') ?></th>
             </tr>
         </thead>
         <?php $_items = $_shipment->getAllItems(); ?>
@@ -72,10 +72,10 @@
     continue;
 } ?>
         <tbody>
-            <?php echo $block->getItemHtml($_item) ?>
+            <?= $block->getItemHtml($_item) ?>
         </tbody>
         <?php endforeach; ?>
     </table>
 </div>
-<?php echo $block->getCommentsHtml($_shipment)?>
+<?= $block->getCommentsHtml($_shipment) ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
index 40a377272b759..512c06626d758 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
@@ -5,11 +5,11 @@
  */
 ?>
 <div class="order-details-items shipments">
-    <?php echo $block->getChildHtml('shipment_items') ?>
+    <?= $block->getChildHtml('shipment_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back">
-                <span><?php /* @escapeNotVerified */ echo $block->getBackTitle() ?></span>
+            <a href="<?= /* @escapeNotVerified */ $block->getBackUrl() ?>" class="action back">
+                <span><?= /* @escapeNotVerified */ $block->getBackTitle() ?></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
index f34b053d0034b..344ad2a87e4f4 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/details.phtml
@@ -21,47 +21,47 @@ $fields = [
 ];
 $number = is_object($track) ? $track->getTracking() : $track['number'];
 ?>
-<table class="data table order tracking" id="tracking-table-popup-<?php /* @noEscape */ echo $number; ?>">
-    <caption class="table-caption"><?php echo $block->escapeHtml(__('Order tracking')); ?></caption>
+<table class="data table order tracking" id="tracking-table-popup-<?= /* @noEscape */ $number ?>">
+    <caption class="table-caption"><?= $block->escapeHtml(__('Order tracking')) ?></caption>
     <tbody>
     <?php if (is_object($track)): ?>
         <tr>
-            <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Tracking Number:')); ?></th>
-            <td class="col value"><?php echo $block->escapeHtml($number); ?></td>
+            <th class="col label" scope="row"><?= $block->escapeHtml(__('Tracking Number:')) ?></th>
+            <td class="col value"><?= $block->escapeHtml($number) ?></td>
         </tr>
         <?php if ($track->getCarrierTitle()): ?>
             <tr>
-                <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Carrier:')); ?></th>
-                <td class="col value"><?php echo $block->escapeHtml($track->getCarrierTitle()); ?></td>
+                <th class="col label" scope="row"><?= $block->escapeHtml(__('Carrier:')) ?></th>
+                <td class="col value"><?= $block->escapeHtml($track->getCarrierTitle()) ?></td>
             </tr>
         <?php endif; ?>
         <?php if ($track->getErrorMessage()): ?>
             <tr>
-                <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Error:')); ?></th>
+                <th class="col label" scope="row"><?= $block->escapeHtml(__('Error:')) ?></th>
                 <td class="col error">
-                    <?php echo $block->escapeHtml(__('Tracking information is currently not available. Please ')); ?>
+                    <?= $block->escapeHtml(__('Tracking information is currently not available. Please ')) ?>
                     <?php if ($parentBlock->getContactUsEnabled()) : ?>
-                        <a href="<?php echo $block->escapeUrl($parentBlock->getContactUs()); ?>" target="_blank"
-                           title="<?php echo $block->escapeHtml(__('contact us')); ?>">
-                            <?php echo $block->escapeHtml(__('contact us')); ?>
+                        <a href="<?= $block->escapeUrl($parentBlock->getContactUs()) ?>" target="_blank"
+                           title="<?= $block->escapeHtml(__('contact us')) ?>">
+                            <?= $block->escapeHtml(__('contact us')) ?>
                         </a>
-                        <?php echo $block->escapeHtml(__(' for more information or ')); ?>
+                        <?= $block->escapeHtml(__(' for more information or ')) ?>
                     <?php endif; ?>
-                    <?php echo $block->escapeHtml(__('email us at ')); ?>
-                    <a href="mailto:<?php /* @noEscape */ echo $email; ?>"><?php /* @noEscape */ echo $email; ?></a>
+                    <?= $block->escapeHtml(__('email us at ')) ?>
+                    <a href="mailto:<?= /* @noEscape */ $email ?>"><?= /* @noEscape */ $email ?></a>
                 </td>
             </tr>
         <?php elseif ($track->getTrackSummary()): ?>
             <tr>
-                <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Info:')); ?></th>
-                <td class="col value"><?php echo $block->escapeHtml($track->getTrackSummary()); ?></td>
+                <th class="col label" scope="row"><?= $block->escapeHtml(__('Info:')) ?></th>
+                <td class="col value"><?= $block->escapeHtml($track->getTrackSummary()) ?></td>
             </tr>
         <?php elseif ($track->getUrl()): ?>
             <tr>
-                <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Track:')); ?></th>
+                <th class="col label" scope="row"><?= $block->escapeHtml(__('Track:')) ?></th>
                 <td class="col value">
-                    <a href="<?php echo $block->escapeUrl($track->getUrl()); ?>" target="_blank">
-                        <?php echo $block->escapeUrl($track->getUrl()); ?>
+                    <a href="<?= $block->escapeUrl($track->getUrl()) ?>" target="_blank">
+                        <?= $block->escapeUrl($track->getUrl()) ?>
                     </a>
                 </td>
             </tr>
@@ -69,17 +69,17 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
             <?php foreach ($fields as $title => $property): ?>
                 <?php if (!empty($track->$property())): ?>
                     <tr>
-                        <th class="col label" scope="row"><?php /* @noEscape */ echo $block->escapeHtml(__($title . ':')); ?></th>
-                        <td class="col value"><?php echo $block->escapeHtml($track->$property()); ?></td>
+                        <th class="col label" scope="row"><?= /* @noEscape */ $block->escapeHtml(__($title . ':')) ?></th>
+                        <td class="col value"><?= $block->escapeHtml($track->$property()) ?></td>
                     </tr>
                 <?php endif;?>
             <?php endforeach; ?>
 
             <?php if ($track->getDeliverydate()): ?>
                 <tr>
-                    <th class="col label" scope="row"><?php echo $block->escapeHtml(__('Delivered on:')); ?></th>
+                    <th class="col label" scope="row"><?= $block->escapeHtml(__('Delivered on:')) ?></th>
                     <td class="col value">
-                        <?php /* @noEscape */ echo $parentBlock->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()); ?>
+                        <?= /* @noEscape */ $parentBlock->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()) ?>
                     </td>
                 </tr>
             <?php endif; ?>
@@ -88,9 +88,9 @@ $number = is_object($track) ? $track->getTracking() : $track['number'];
         <?php /* if the tracking is custom value */ ?>
         <tr>
             <th class="col label" scope="row">
-                <?php echo($track['title'] ? $block->escapeHtml($track['title']) : $block->escapeHtml(__('N/A'))); ?>:
+                <?= ($track['title'] ? $block->escapeHtml($track['title']) : $block->escapeHtml(__('N/A'))) ?>:
             </th>
-            <td class="col value"><?php echo(isset($track['number']) ? $block->escapeHtml($track['number']) : ''); ?></td>
+            <td class="col value"><?= (isset($track['number']) ? $block->escapeHtml($track['number']) : '') ?></td>
         </tr>
     <?php endif; ?>
     </tbody>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
index c1a56f7a01f0e..188e24ee11515 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/link.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php /** @var $block \Magento\Shipping\Block\Tracking\Link */ ?>
 <?php $order = $block->getOrder() ?>
-<a href="#" class="action track" title="<?php /* @escapeNotVerified */ echo $block->getLabel() ?>"
-   data-mage-init='{"popupWindow": {"windowURL":"<?php /* @escapeNotVerified */ echo $block->getWindowUrl($order) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'>
-    <span><?php /* @escapeNotVerified */ echo $block->getLabel()?></span>
+<a href="#" class="action track" title="<?= /* @escapeNotVerified */ $block->getLabel() ?>"
+   data-mage-init='{"popupWindow": {"windowURL":"<?= /* @escapeNotVerified */ $block->getWindowUrl($order) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'>
+    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
 </a>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
index 2a1e9a15e8b46..60c31198291b4 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -16,7 +16,7 @@ $results = $block->getTrackingInfo();
     <?php if (!empty($results)): ?>
         <?php foreach ($results as $shipId => $result): ?>
             <?php if ($shipId): ?>
-                <div class="order subtitle caption"><?php /* @noEscape */ echo $block->escapeHtml(__('Shipment #')) . $shipId; ?></div>
+                <div class="order subtitle caption"><?= /* @noEscape */ $block->escapeHtml(__('Shipment #')) . $shipId ?></div>
             <?php endif; ?>
             <?php if (!empty($result)): ?>
                 <?php foreach ($result as $counter => $track): ?>
@@ -29,7 +29,7 @@ $results = $block->getTrackingInfo();
                             ]
                         );
                         ?>
-                        <?php /* @noEscape */ echo $block->getChildHtml('shipping.tracking.details.' . $counter); ?>
+                        <?= /* @noEscape */ $block->getChildHtml('shipping.tracking.details.' . $counter) ?>
                     </div>
                     <?php if (is_object($track) && !empty($track->getProgressdetail())): ?>
                         <?php
@@ -38,26 +38,26 @@ $results = $block->getTrackingInfo();
                                 'template' => 'Magento_Shipping::tracking/progress.phtml'
                             ]);
                         ?>
-                        <?php /* @noEscape  */echo $block->getChildHtml('shipping.tracking.progress.' . $counter); ?>
+                        <?= /* @noEscape  */ $block->getChildHtml('shipping.tracking.progress.' . $counter) ?>
                     <?php endif; ?>
                 <?php endforeach; ?>
             <?php else: ?>
                 <div class="message info empty">
-                    <div><?php echo $block->escapeHtml(__('There is no tracking available for this shipment.')); ?></div>
+                    <div><?= $block->escapeHtml(__('There is no tracking available for this shipment.')) ?></div>
                 </div>
             <?php endif; ?>
         <?php endforeach; ?>
     <?php else: ?>
         <div class="message info empty">
-            <div><?php echo $block->escapeHtml(__('There is no tracking available.')); ?></div>
+            <div><?= $block->escapeHtml(__('There is no tracking available.')) ?></div>
         </div>
     <?php endif; ?>
     <div class="actions">
         <button type="button"
-                title="<?php echo $block->escapeHtml(__('Close Window')); ?>"
+                title="<?= $block->escapeHtml(__('Close Window')) ?>"
                 class="action close"
                 onclick="window.close(); window.opener.focus();">
-            <span><?php echo $block->escapeHtml(__('Close Window')); ?></span>
+            <span><?= $block->escapeHtml(__('Close Window')) ?></span>
         </button>
     </div>
 </div>
diff --git a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
index e8b34cb71321b..8a9d5fc0fe371 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/progress.phtml
@@ -11,14 +11,14 @@ $parentBlock = $block->getParentBlock();
 $track = $block->getData('track');
 ?>
 <div class="table-wrapper">
-    <table class="data table order tracking" id="track-history-table-<?php /* @noEscape */ echo $track->getTracking(); ?>">
-        <caption class="table-caption"><?php echo $block->escapeHtml(__('Track history')); ?></caption>
+    <table class="data table order tracking" id="track-history-table-<?= /* @noEscape */ $track->getTracking() ?>">
+        <caption class="table-caption"><?= $block->escapeHtml(__('Track history')) ?></caption>
         <thead>
         <tr>
-            <th class="col location" scope="col"><?php echo $block->escapeHtml(__('Location')); ?></th>
-            <th class="col date" scope="col"><?php echo $block->escapeHtml(__('Date')); ?></th>
-            <th class="col time" scope="col"><?php echo $block->escapeHtml(__('Local Time')); ?></th>
-            <th class="col description" scope="col"><?php echo $block->escapeHtml(__('Description')); ?></th>
+            <th class="col location" scope="col"><?= $block->escapeHtml(__('Location')) ?></th>
+            <th class="col date" scope="col"><?= $block->escapeHtml(__('Date')) ?></th>
+            <th class="col time" scope="col"><?= $block->escapeHtml(__('Local Time')) ?></th>
+            <th class="col description" scope="col"><?= $block->escapeHtml(__('Description')) ?></th>
         </tr>
         </thead>
         <tbody>
@@ -26,16 +26,16 @@ $track = $block->getData('track');
             <?php $detailDate = (!empty($detail['deliverydate']) ? $parentBlock->formatDeliveryDate($detail['deliverydate']) : ''); ?>
             <?php $detailTime = (!empty($detail['deliverytime']) ? $parentBlock->formatDeliveryTime($detail['deliverytime'], $detail['deliverydate']) : ''); ?>
             <tr>
-                <td data-th="<?php echo $block->escapeHtml(__('Location')); ?>" class="col location">
-                    <?php echo(!empty($detail['deliverylocation']) ? $block->escapeHtml($detail['deliverylocation']) : ''); ?>
+                <td data-th="<?= $block->escapeHtml(__('Location')) ?>" class="col location">
+                    <?= (!empty($detail['deliverylocation']) ? $block->escapeHtml($detail['deliverylocation']) : '') ?>
                 </td>
-                <td data-th="<?php echo $block->escapeHtml(__('Date')); ?>" class="col date">
-                    <?php /* @noEscape */ echo $detailDate; ?>
+                <td data-th="<?= $block->escapeHtml(__('Date')) ?>" class="col date">
+                    <?= /* @noEscape */ $detailDate ?>
                 </td>
-                <td data-th="<?php echo $block->escapeHtml(__('Local Time')); ?>" class="col time">
-                    <?php /* @noEscape */ echo $detailTime; ?></td>
-                <td data-th="<?php echo $block->escapeHtml(__('Description')); ?>" class="col description">
-                    <?php echo(!empty($detail['activity']) ? $block->escapeHtml($detail['activity']) : ''); ?>
+                <td data-th="<?= $block->escapeHtml(__('Local Time')) ?>" class="col time">
+                    <?= /* @noEscape */ $detailTime ?></td>
+                <td data-th="<?= $block->escapeHtml(__('Description')) ?>" class="col description">
+                    <?= (!empty($detail['activity']) ? $block->escapeHtml($detail['activity']) : '') ?>
                 </td>
             </tr>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
index 15d62c0f61de0..5ceb4b3f856d7 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
@@ -10,11 +10,11 @@
 ?>
 <?php if (count($block->getStores())>1): ?>
 <div class="form-language">
-    <label for="select-language"><?php echo $block->escapeHtml(__('Your Language:')) ?></label>
-    <select id="select-language" title="<?php echo $block->escapeHtmlAttr(__('Your Language')) ?>" onchange="window.location.href=this.value" class="flags">
+    <label for="select-language"><?= $block->escapeHtml(__('Your Language:')) ?></label>
+    <select id="select-language" title="<?= $block->escapeHtmlAttr(__('Your Language')) ?>" onchange="window.location.href=this.value" class="flags">
     <?php foreach ($block->getStores() as $_lang): ?>
         <?php $_selected = ($_lang->getId() == $block->getCurrentStoreId()) ? ' selected="selected"' : '' ?>
-        <option value="<?php echo $block->escapeUrl($_lang->getCurrentUrl()) ?>" style="background-image:url('<?php echo $block->escapeUrl($block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif')); ?>');"<?php /* @noEscape */ echo $_selected ?>><?php echo $block->escapeHtml($_lang->getName()) ?></option>
+        <option value="<?= $block->escapeUrl($_lang->getCurrentUrl()) ?>" style="background-image:url('<?= $block->escapeUrl($block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif')) ?>');"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($_lang->getName()) ?></option>
     <?php endforeach; ?>
     </select>
 </div>
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
index 70cc80f73f3d6..80152dbb9a08f 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
@@ -10,25 +10,25 @@
 ?>
 <?php if (count($block->getStores())>1): ?>
 <?php $id = $block->getIdModifier() ? '-' . $block->getIdModifier() : '' ?>
-<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?php echo $block->escapeHtmlAttr($id) ?>">
-    <strong class="label switcher-label"><span><?php echo $block->escapeHtml(__('Language')) ?></span></strong>
+<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?= $block->escapeHtmlAttr($id) ?>">
+    <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Language')) ?></span></strong>
     <div class="actions dropdown options switcher-options">
         <div class="action toggle switcher-trigger"
-             id="switcher-language-trigger<?php echo $block->escapeHtmlAttr($id) ?>"
+             id="switcher-language-trigger<?= $block->escapeHtmlAttr($id) ?>"
              data-mage-init='{"dropdown":{}}'
              data-toggle="dropdown"
              data-trigger-keypress-button="true">
-            <strong class="view-<?php echo $block->escapeHtml($block->getCurrentStoreCode()) ?>">
-                <span><?php echo $block->escapeHtml($block->getStoreName()) ?></span>
+            <strong class="view-<?= $block->escapeHtml($block->getCurrentStoreCode()) ?>">
+                <span><?= $block->escapeHtml($block->getStoreName()) ?></span>
             </strong>
         </div>
         <ul class="dropdown switcher-dropdown"
             data-target="dropdown">
             <?php foreach ($block->getStores() as $_lang): ?>
                 <?php if ($_lang->getId() != $block->getCurrentStoreId()): ?>
-                    <li class="view-<?php echo $block->escapeHtml($_lang->getCode()); ?> switcher-option">
-                        <a href="#" data-post='<?php /* @noEscape */ echo $block->getTargetStorePostData($_lang); ?>'>
-                            <?php echo $block->escapeHtml($_lang->getName()) ?>
+                    <li class="view-<?= $block->escapeHtml($_lang->getCode()) ?> switcher-option">
+                        <a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_lang) ?>'>
+                            <?= $block->escapeHtml($_lang->getName()) ?>
                         </a>
                     </li>
                 <?php endif; ?>
diff --git a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
index 1215bdd06fdef..fb3f316bc16c8 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
@@ -10,7 +10,7 @@
 ?>
 <?php if (count($block->getGroups())>1): ?>
 <div class="switcher store switcher-store" id="switcher-store">
-    <strong class="label switcher-label"><span><?php echo $block->escapeHtml(__('Select Store')) ?></span></strong>
+    <strong class="label switcher-label"><span><?= $block->escapeHtml(__('Select Store')) ?></span></strong>
     <div class="actions dropdown options switcher-options">
         <?php foreach ($block->getGroups() as $_group): ?>
         <?php if ($_group->getId() == $block->getCurrentGroupId()): ?>
@@ -22,7 +22,7 @@
                  data-trigger-keypress-button="true"
                  id="switcher-store-trigger">
                 <strong>
-                    <span><?php echo $block->escapeHtml($_group->getName()) ?></span>
+                    <span><?= $block->escapeHtml($_group->getName()) ?></span>
                 </strong>
             </div>
         <?php endif; ?>
@@ -31,8 +31,8 @@
             <?php foreach ($block->getGroups() as $_group): ?>
             <?php if (!($_group->getId() == $block->getCurrentGroupId())): ?>
                 <li class="switcher-option">
-                    <a href="#" data-post='<?php /* @noEscape */ echo $block->getTargetStorePostData($_group->getDefaultStore()); ?>'>
-                        <?php echo $block->escapeHtml($_group->getName()) ?>
+                    <a href="#" data-post='<?= /* @noEscape */ $block->getTargetStorePostData($_group->getDefaultStore()) ?>'>
+                        <?= $block->escapeHtml($_group->getName()) ?>
                     </a>
                 </li>
             <?php endif; ?>
diff --git a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
index f8353d51d4cc2..79040081f115d 100644
--- a/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
+++ b/app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml
@@ -21,7 +21,7 @@ $schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/all/schema?services=all';
     <div class="swagger-ui-wrap">
         <a id="logo" href="http://swagger.io">swagger</a>
         <form id='api_selector'>
-            <input id="input_baseUrl" type="hidden" value="<?php /* @escapeNotVerified */ echo $schemaUrl ?>"/>
+            <input id="input_baseUrl" type="hidden" value="<?= /* @escapeNotVerified */ $schemaUrl ?>"/>
             <div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>
             <div class='input'><a id="explore" href="#" data-sw-translate>apply</a></div>
         </form>
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
index 277b7fffc1ed0..13037e3aeea8e 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml
@@ -11,7 +11,7 @@
     {
         "*": {
             "swatchesProductAttributes": {
-                "hiddenFields": <?php /* @escapeNotVerified */ echo json_encode($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields()); ?>
+                "hiddenFields": <?= /* @escapeNotVerified */ json_encode($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields()) ?>
             },
             "swatchesTypeChange": { }
         }
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
index d9d7d114d1cb5..8d4400b3d0477 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml
@@ -12,19 +12,19 @@ $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="fieldset">
     <legend class="legend">
-        <span><?php echo $block->escapeHtml(__('Manage Swatch (Values of Your Attribute)')) ?></span>
+        <span><?= $block->escapeHtml(__('Manage Swatch (Values of Your Attribute)')) ?></span>
     </legend>
     <div id="swatch-text-options-panel">
         <table class="data-table clearfix" cellspacing="0">
             <thead>
             <tr id="swatch-text-options-table">
                 <th class="col-draggable"></th>
-                <th class="col-default"><span><?php echo $block->escapeHtml(__('Is Default')) ?></span></th>
+                <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
                 <?php foreach ($stores as $_store): ?>
                     <th class="col-swatch col-<%- data.id %>
                         <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> _required<?php endif; ?>"
                         colspan="2">
-                        <span><?php echo $block->escapeHtml($_store->getName()) ?></span>
+                        <span><?= $block->escapeHtml($_store->getName()) ?></span>
                     </th>
                 <?php endforeach; ?>
                 <?php $colTotal = count($stores) * 2 + 3; ?>
@@ -34,18 +34,18 @@ $stores = $block->getStoresSortedBySortOrder();
             <tbody data-role="swatch-text-options-container" class="ignore-validate"></tbody>
             <tfoot>
             <tr>
-                <th colspan="<?php echo (int)$colTotal; ?>">
+                <th colspan="<?= (int)$colTotal ?>">
                     <input type="hidden" class="required-text-swatch-entry" name="text_swatch_validation"/>
                     <input type="hidden" class="required-text-swatch-unique" name="text_swatch_validation_unique"/>
                 </th>
             </tr>
             <tr>
-                <th colspan="<?php echo (int)$colTotal; ?>" class="col-actions-add">
+                <th colspan="<?= (int)$colTotal ?>" class="col-actions-add">
                     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
                         <button id="add_new_swatch_text_option_button"
-                                title="<?php echo $block->escapeHtml(__('Add Swatch')); ?>"
+                                title="<?= $block->escapeHtml(__('Add Swatch')) ?>"
                                 type="button" class="action- scalable add">
-                            <span><?php echo $block->escapeHtml(__('Add Swatch')); ?></span>
+                            <span><?= $block->escapeHtml(__('Add Swatch')) ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -60,7 +60,7 @@ $stores = $block->getStoresSortedBySortOrder();
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
                     <div data-role="draggable-handle"
                          class="draggable-handle"
-                         title="<?php echo $block->escapeHtml(__('Sort Option')); ?>"></div>
+                         title="<?= $block->escapeHtml(__('Sort Option')) ?>"></div>
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="optiontext[order][<%- data.id %>]"
                        value="<%- data.sort_order %>"
@@ -77,26 +77,26 @@ $stores = $block->getStoresSortedBySortOrder();
                 <?php $storeId = (int)$_store->getId(); ?>
                 <td class="col-swatch col-<%- data.id %>">
                     <input class="input-text
-                        swatch-text-field-<?php /* @noEscape */ echo $storeId; ?>
+                        swatch-text-field-<?= /* @noEscape */ $storeId ?>
                         <?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
-                           name="swatchtext[value][<%- data.id %>][<?php /* @noEscape */ echo $storeId; ?>]"
-                           type="text" value="<%- data.swatch<?php /* @noEscape */ echo $storeId; ?> %>"
-                           placeholder="<?php echo $block->escapeHtml(__("Swatch")); ?>"/>
+                           name="swatchtext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
+                           type="text" value="<%- data.swatch<?= /* @noEscape */ $storeId ?> %>"
+                           placeholder="<?= $block->escapeHtml(__("Swatch")) ?>"/>
                 </td>
                 <td class="swatch-col-<%- data.id %>">
-                    <input name="optiontext[value][<%- data.id %>][<?php /* @noEscape */ echo $storeId; ?>]"
-                           value="<%- data.store<?php /* @noEscape */ echo $storeId; ?> %>"
+                    <input name="optiontext[value][<%- data.id %>][<?= /* @noEscape */ $storeId ?>]"
+                           value="<%- data.store<?= /* @noEscape */ $storeId ?> %>"
                            class="input-text<?php if ($storeId == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>"
                            type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>
-                           placeholder="<?php echo $block->escapeHtml(__("Description")); ?>"/>
+                           placeholder="<?= $block->escapeHtml(__("Description")) ?>"/>
                 </td>
             <?php endforeach; ?>
             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="optiontext[delete][<%- data.id %>]" value="" />
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button title="<?php echo $block->escapeHtml(__('Delete')); ?>" type="button"
+                    <button title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
                             class="action- scalable delete delete-option">
-                        <span><?php echo $block->escapeHtml(__('Delete')); ?></span>
+                        <span><?= $block->escapeHtml(__('Delete')) ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -105,10 +105,10 @@ $stores = $block->getStoresSortedBySortOrder();
     <script type="text/x-magento-init">
         {
             "*": {
-                "Magento_Swatches/js/text": <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?> ,
+                "Magento_Swatches/js/text": <?= /* @escapeNotVerified */ $block->getJsonConfig() ?> ,
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-text-swatch-unique",
-                    "message": "<?php echo $block->escapeHtml(__("The value of Admin must be unique.")); ?>"
+                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
index f1900ed0e88cc..5b971d9a99a3b 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml
@@ -12,18 +12,18 @@ $stores = $block->getStoresSortedBySortOrder();
 ?>
 <fieldset class="admin__fieldset fieldset">
     <legend class="legend">
-        <span><?php echo $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')); ?></span>
+        <span><?= $block->escapeHtml( __('Manage Swatch (Values of Your Attribute)')) ?></span>
     </legend><br />
     <div class="admin__control-table-wrapper" id="swatch-visual-options-panel">
         <table class="data-table clearfix" cellspacing="0">
             <thead>
             <tr id="swatch-visual-options-table">
                 <th class="col-draggable"></th>
-                <th class="col-default"><span><?php echo $block->escapeHtml(__('Is Default')) ?></span></th>
-                <th><span><?php echo $block->escapeHtml(__('Swatch')) ?></span></th>
+                <th class="col-default"><span><?= $block->escapeHtml(__('Is Default')) ?></span></th>
+                <th><span><?= $block->escapeHtml(__('Swatch')) ?></span></th>
                 <?php foreach ($stores as $_store): ?>
                     <th<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> class="_required"<?php endif; ?>>
-                        <span><?php echo $block->escapeHtml($_store->getName()) ?></span>
+                        <span><?= $block->escapeHtml($_store->getName()) ?></span>
                     </th>
                 <?php endforeach;
                 $colTotal = count($stores) * 2 + 3;
@@ -34,18 +34,18 @@ $stores = $block->getStoresSortedBySortOrder();
             <tbody data-role="swatch-visual-options-container" class="ignore-validate"></tbody>
             <tfoot>
             <tr>
-                <th colspan="<?php echo (int)$colTotal; ?>">
+                <th colspan="<?= (int)$colTotal ?>">
                     <input type="hidden" class="required-visual-swatch-entry" name="visual_swatch_validation"/>
                     <input type="hidden" class="required-visual-swatch-unique" name="visual_swatch_validation_unique"/>
                 </th>
             </tr>
             <tr>
-                <th colspan="<?php echo (int)$colTotal; ?>" class="col-actions-add">
+                <th colspan="<?= (int)$colTotal ?>" class="col-actions-add">
                     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
                         <button id="add_new_swatch_visual_option_button"
-                                title="<?php echo $block->escapeHtml(__('Add Swatch')); ?>"
+                                title="<?= $block->escapeHtml(__('Add Swatch')) ?>"
                                 type="button" class="action- scalable add">
-                            <span><?php echo $block->escapeHtml(__('Add Swatch')); ?></span>
+                            <span><?= $block->escapeHtml(__('Add Swatch')) ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -59,7 +59,7 @@ $stores = $block->getStoresSortedBySortOrder();
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
                     <div data-role="draggable-handle" class="draggable-handle"
-                         title="<?php echo $block->escapeHtml(__('Sort Option')); ?>"></div>
+                         title="<?= $block->escapeHtml(__('Sort Option')) ?>"></div>
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="optionvisual[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
             </td>
@@ -73,25 +73,25 @@ $stores = $block->getStoresSortedBySortOrder();
                 <div class="swatch_sub-menu_container" id="swatch_container_option_<%- data.id %>">
                     <div class="swatch_row position-relative">
                         <div class="swatch_row_name colorpicker_handler">
-                            <p><?php echo $block->escapeHtml(__('Choose a color')); ?></p>
+                            <p><?= $block->escapeHtml(__('Choose a color')) ?></p>
                         </div>
                     </div>
                     <div class="swatch_row">
                         <div class="swatch_row_name btn_choose_file_upload" id="swatch_choose_file_option_<%- data.id %>">
-                            <p><?php echo $block->escapeHtml(__('Upload a file')); ?></p>
+                            <p><?= $block->escapeHtml(__('Upload a file')) ?></p>
                         </div>
                     </div>
                     <div class="swatch_row">
                         <div class="swatch_row_name btn_remove_swatch">
-                            <p><?php echo $block->escapeHtml(__('Clear')); ?></p>
+                            <p><?= $block->escapeHtml(__('Clear')) ?></p>
                         </div>
                     </div>
                 </div>
             </td>
             <?php foreach ($stores as $_store): ?>
                 <td class="swatch-col-<%- data.id %>">
-                    <input name="optionvisual[value][<%- data.id %>][<?php echo (int)$_store->getId() ?>]"
-                           value="<%- data.store<?php echo (int) $_store->getId() ?> %>"
+                    <input name="optionvisual[value][<%- data.id %>][<?= (int)$_store->getId() ?>]"
+                           value="<%- data.store<?= (int) $_store->getId() ?> %>"
                            class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option required-unique<?php endif; ?>"
                            type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
                 </td>
@@ -99,9 +99,9 @@ $stores = $block->getStoresSortedBySortOrder();
             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="optionvisual[delete][<%- data.id %>]" value="" />
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button title="<?php echo $block->escapeHtml(__('Delete')) ?>" type="button"
+                    <button title="<?= $block->escapeHtml(__('Delete')) ?>" type="button"
                             class="action- scalable delete delete-option">
-                        <span><?php echo $block->escapeHtml(__('Delete')) ?></span>
+                        <span><?= $block->escapeHtml(__('Delete')) ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -110,10 +110,10 @@ $stores = $block->getStoresSortedBySortOrder();
     <script type="text/x-magento-init">
         {
             "*": {
-                "Magento_Swatches/js/visual": <?php /* @noEscape */ echo $block->getJsonConfig(); ?> ,
+                "Magento_Swatches/js/visual": <?= /* @noEscape */ $block->getJsonConfig() ?> ,
                 "Magento_Catalog/catalog/product/attribute/unique-validate": {
                     "element": "required-visual-swatch-unique",
-                    "message": "<?php echo $block->escapeHtml(__("The value of Admin must be unique.")); ?>"
+                    "message": "<?= $block->escapeHtml(__("The value of Admin must be unique.")) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
index 5f4f3115c8af9..9cbda396b2624 100644
--- a/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
+++ b/app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/edit/attribute/steps/attributes_values.phtml
@@ -8,7 +8,7 @@
 
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
 ?>
-<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
+<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName() ?>'">
     <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 2: Attribute Values') ?></h2>
     <div class="steps-wizard-info">
         <span><?= $block->escapeHtml(__('Select from the following attribute values for this product. Each unique combination of values creates a unique product SKU.')) ?></span>
@@ -101,11 +101,11 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
+                    "<?= /* @escapeNotVerified */  $block->getComponentName() ?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/attributes_values",
-                        "appendTo": "<?= /* @escapeNotVerified */  $block->getParentComponentName()?>",
-                        "optionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/getAttributes')?>",
-                        "createOptionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/createOptions')?>"
+                        "appendTo": "<?= /* @escapeNotVerified */  $block->getParentComponentName() ?>",
+                        "optionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/getAttributes') ?>",
+                        "createOptionsUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product_attribute/createOptions') ?>"
                     }
                 }
             }
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
index 76c33a7df86c3..3492f83fd1828 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/layered/renderer.phtml
@@ -9,23 +9,23 @@
 /** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
-<div class="swatch-attribute swatch-layered <?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>"
-     attribute-code="<?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>"
-     attribute-id="<?php /* @escapeNotVerified */ echo $swatchData['attribute_id'] ?>">
+<div class="swatch-attribute swatch-layered <?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
+     attribute-code="<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>"
+     attribute-id="<?= /* @escapeNotVerified */ $swatchData['attribute_id'] ?>">
     <div class="swatch-attribute-options clearfix">
         <?php foreach ($swatchData['options'] as $option => $label): ?>
-            <a href="<?php /* @escapeNotVerified */ echo $label['link'] ?>"
-               aria-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
+            <a href="<?= /* @escapeNotVerified */ $label['link'] ?>"
+               aria-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
                class="swatch-option-link-layered">
                 <?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
                     <?php switch ($swatchData['swatches'][$option]['type']) {
                         case '3':
                             ?>
-                            <div class="swatch-option <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
+                            <div class="swatch-option <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="3"
-                                 option-id="<?php /* @escapeNotVerified */ echo $option ?>"
-                                 option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
+                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
+                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
                                  option-tooltip-thumb=""
                                  option-tooltip-value=""
                                 ></div>
@@ -36,37 +36,37 @@
                             $swatchData['swatches'][$option]['value']); ?>
                             <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
                             $swatchData['swatches'][$option]['value']); ?>
-                            <div class="swatch-option image <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
+                            <div class="swatch-option image <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="2"
-                                 option-id="<?php /* @escapeNotVerified */ echo $option ?>"
-                                 option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
-                                 option-tooltip-thumb="<?php /* @escapeNotVerified */ echo $swatchThumbPath ?>"
+                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
+                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
+                                 option-tooltip-thumb="<?= /* @escapeNotVerified */ $swatchThumbPath ?>"
                                  option-tooltip-value=""
-                                 style="background: url(<?php /* @escapeNotVerified */ echo $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
+                                 style="background: url(<?= /* @escapeNotVerified */ $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
                             <?php    break;
                         case '1':
                             ?>
-                            <div class="swatch-option color <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
+                            <div class="swatch-option color <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
                                  tabindex="-1"
                                  option-type="1"
-                                 option-id="<?php /* @escapeNotVerified */ echo $option ?>"
-                                 option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
+                                 option-id="<?= /* @escapeNotVerified */ $option ?>"
+                                 option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
                                  option-tooltip-thumb=""
-                                 option-tooltip-value="<?php /* @escapeNotVerified */ echo $swatchData['swatches'][$option]['value'] ?>"
-                                 style="background: <?php /* @escapeNotVerified */ echo $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
+                                 option-tooltip-value="<?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?>"
+                                 style="background: <?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
                             <?php    break;
                         case '0':
                         default:
                             ?>
-                                <div class="swatch-option text <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
+                                <div class="swatch-option text <?= /* @escapeNotVerified */ $label['custom_style'] ?>"
                                      tabindex="-1"
                                      option-type="0"
-                                     option-id="<?php /* @escapeNotVerified */ echo $option ?>"
-                                     option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
+                                     option-id="<?= /* @escapeNotVerified */ $option ?>"
+                                     option-label="<?= /* @escapeNotVerified */ $label['label'] ?>"
                                      option-tooltip-thumb=""
                                      option-tooltip-value=""
-                                    ><?php /* @escapeNotVerified */ echo $swatchData['swatches'][$option]['value'] ?></div>
+                                    ><?= /* @escapeNotVerified */ $swatchData['swatches'][$option]['value'] ?></div>
                             <?php    break;
                     } ?>
                 <?php } ?>
@@ -77,7 +77,7 @@
 
 <script>
     require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
-        $('.swatch-layered.<?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>')
+        $('.swatch-layered.<?= /* @escapeNotVerified */ $swatchData['attribute_code'] ?>')
             .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
             .SwatchRendererTooltip();
     });
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 0bbde404ab130..7ecd6558ef6ea 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
-<div class="swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>"></div>
+<div class="swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>"></div>
 <script>
     require([
         'jquery',
@@ -14,20 +14,20 @@
         'Magento_Swatches/js/catalog-add-to-cart',
         'priceBox'
     ], function ($) {
-        var jsonConfig = <?php /* @escapeNotVerified */ echo $block->getJsonConfig(); ?>;
+        var jsonConfig = <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>;
 
-        $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
+        $('.swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>').SwatchRenderer({
             selectorProduct: '.product-item-details',
             onlySwatches: true,
             enableControlLabel: false,
-            numberToShow: <?php /* @escapeNotVerified */ echo $block->getNumberSwatchesPerProduct(); ?>,
+            numberToShow: <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct() ?>,
             jsonConfig: jsonConfig,
-            jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $block->getJsonSwatchConfig(); ?>,
-            mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
+            jsonSwatchConfig: <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig() ?>,
+            mediaCallback: '<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>'
         });
 
         var dataPriceBoxSelector = '[data-role=priceBox]',
-            dataProductIdSelector = '[data-product-id=<?php echo $block->escapeHtml($block->getProduct()->getId())?>]',
+            dataProductIdSelector = '[data-product-id=<?= $block->escapeHtml($block->getProduct()->getId()) ?>]',
             priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
         priceBoxes.priceBox({
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
index a1f1fa0e2b2d9..fc1de530a66bd 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/view/renderer.phtml
@@ -13,10 +13,10 @@
     {
         "[data-role=swatch-options]": {
             "Magento_Swatches/js/swatch-renderer": {
-                "jsonConfig": <?php /* @escapeNotVerified */ echo $swatchOptions = $block->getJsonConfig(); ?>,
+                "jsonConfig": <?= /* @escapeNotVerified */ $swatchOptions = $block->getJsonConfig() ?>,
                 "jsonSwatchConfig": <?php /* @escapeNotVerified */
                     echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
-                "mediaCallback": "<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>",
+                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>",
                 "gallerySwitchStrategy": "<?php /* @escapeNotVerified */ echo $block->getVar('gallery_switch_strategy',
                     'Magento_ConfigurableProduct') ?: 'replace'; ?>"
             }
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/CustomerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/CustomerTest.php
index 89b30ccb25aef..9c098b2aa330b 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/CustomerTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/CustomerTest.php
@@ -286,7 +286,7 @@ public function dataProviderGetAllOptionsNameIntegrity()
                 'value' => ['value' => 5, 'label' => 'comment <!-- comment -->'],
             ],
             [
-                'value' => ['value' => 6, 'label' => 'php tag <?php echo "2"; ?>'],
+                'value' => ['value' => 6, 'label' => 'php tag <?= "2"; ?>'],
             ],
 
         ];
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php
index 689c96f70ea4f..7892c25d784bf 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Source/ProductTest.php
@@ -207,7 +207,7 @@ public function dataProviderGetAllOptionsNameIntegrity()
                 'value' => ['value' => 5, 'label' => 'comment <!-- comment -->'],
             ],
             [
-                'value' => ['value' => 6, 'label' => 'php tag <?php echo "2"; ?>'],
+                'value' => ['value' => 6, 'label' => 'php tag <?= "2"; ?>'],
             ],
 
         ];
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
index 32f692c32fccf..8930a4de28fe5 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
@@ -5,16 +5,16 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?php echo $block->getBackButtonHtml(); ?>
-    <?php echo $block->getResetButtonHtml(); ?>
-    <?php echo $block->getDeleteButtonHtml(); ?>
-    <?php echo $block->getSaveButtonHtml(); ?>
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getResetButtonHtml() ?>
+    <?= $block->getDeleteButtonHtml() ?>
+    <?= $block->getSaveButtonHtml() ?>
 </div>
-<?php echo $block->getRenameFormHtml(); ?>
+<?= $block->getRenameFormHtml() ?>
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php /* @escapeNotVerified */ echo $block->getRenameFormId() ?>').mage('form').mage('validation');
+    jQuery('#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>').mage('form').mage('validation');
 
 });
 </script>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
index 75025db93607d..5e914fdc5a558 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/row.phtml
@@ -16,18 +16,18 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
         <?php endif; ?>
-        <?php /* @escapeNotVerified */ echo $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
     </div>
 <?php endif; ?>
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
         <?php endif; ?>
         <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
         <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBaseSubtotalInclTax($_item); ?>
-        <?php /* @escapeNotVerified */ echo $block->displayPrices($_baseIncl, $_incl) ?>
+        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
index f138c1d03b372..501ec61d34815 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/total.phtml
@@ -13,4 +13,4 @@
 $_item = $block->getItem();
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
index f2e7e517130e2..82d82192d45e4 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/items/price/unit.phtml
@@ -16,21 +16,21 @@ $_item = $block->getItem();
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
         <?php endif; ?>
 
-        <?php /* @escapeNotVerified */ echo $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+        <?= /* @escapeNotVerified */ $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
     </div>
 <?php endif; ?>
 <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices() || $this->helper('Magento\Tax\Helper\Data')->displaySalesPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
         <?php endif; ?>
         <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
         <?php $_baseIncl = $this->helper('Magento\Checkout\Helper\Data')->getBasePriceInclTax($_item); ?>
 
-        <?php /* @escapeNotVerified */ echo $block->displayPrices($_baseIncl, $_incl) ?>
+        <?= /* @escapeNotVerified */ $block->displayPrices($_baseIncl, $_incl) ?>
 
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
index 41ef21ae43564..17f7f39529a74 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -15,15 +15,15 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($_incl) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
index a74279b2e21ad..860b4662fd369 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -16,16 +16,16 @@ $_item = $block->getItem();
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php $_rowTotalWithoutDiscount = $_item->getRowTotal() - $_item->getTotalDiscountAmount(); ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($_incl) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
index 35862d7449bb2..2846307979df0 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -15,16 +15,16 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getCalculationPrice()) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($_item->getCalculationPrice()) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($_incl) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
index 75a5936226ce5..30b5e954da5d2 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/form.phtml
@@ -8,6 +8,6 @@
 
 ?>
 <div class="entry-edit form-inline">
-    <?php echo $block->getFormHtml() ?>
+    <?= $block->getFormHtml() ?>
 </div>
-<?php echo $block->getChildHtml('form_after');?>
+<?= $block->getChildHtml('form_after') ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
index 35c2df3a3f3da..16c23624c38e6 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/js.phtml
@@ -13,7 +13,7 @@ require([
     "mage/adminhtml/form"
 ], function(jQuery){
 
-    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?= /* @escapeNotVerified */ $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
     updater.disableRegionValidation();
 
     (function ($) {
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
index 91384f2687ab1..682968e34479b 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rate/title.phtml
@@ -11,13 +11,13 @@
     <?php $_labels = $block->getTitles() ?>
     <?php foreach ($block->getStores() as $_store): ?>
         <div class="admin__field">
-            <label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo $_store->getName() ?></span></label>
+            <label class="admin__field-label"><span><?= /* @escapeNotVerified */ $_store->getName() ?></span></label>
             <div class="admin__field-control">
                 <input
                     class="admin__control-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>"
                     type="text"
-                    name="title[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]"
-                    value="<?php /* @escapeNotVerified */ echo $_labels[$_store->getId()] ?>" />
+                    name="title[<?= /* @escapeNotVerified */ $_store->getId() ?>]"
+                    value="<?= /* @escapeNotVerified */ $_labels[$_store->getId()] ?>" />
             </div>
         </div>
     <?php endforeach; ?>
@@ -25,8 +25,8 @@
     <div class="messages">
         <div class="message message-notice">
             <div>
-                <strong><?php /* @escapeNotVerified */ echo __('Note:'); ?></strong>
-                <?php /* @escapeNotVerified */ echo __('Leave this field empty if you wish to use the tax identifier.'); ?>
+                <strong><?= /* @escapeNotVerified */ __('Note:') ?></strong>
+                <?= /* @escapeNotVerified */ __('Leave this field empty if you wish to use the tax identifier.') ?>
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
index 5dfab24a6d1fd..f8caabed32f3f 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -80,7 +80,7 @@ require([
             $.ajax({
                 type: "POST",
                 data: {id:id},
-                url: '<?php /* @escapeNotVerified */ echo $block->getTaxRateLoadUrl()?>',
+                url: '<?= /* @escapeNotVerified */ $block->getTaxRateLoadUrl() ?>',
                 success: function(result, status) {
                     $('body').trigger('processStop');
                     if (result.success) {
@@ -97,14 +97,14 @@ require([
                             });
                         else
                             alert({
-                                content: '<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>'
+                                content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
                             });
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
                     alert({
-                        content: '<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>'
+                        content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
                     });
                 },
                 dataType: "json"
@@ -114,7 +114,7 @@ require([
         TaxRateEditableMultiselect.prototype.init = function () {
             var options = {
                 toggleAddButton:false,
-                addText: '<?php /* @escapeNotVerified */ echo __('Add New Tax Rate'); ?>',
+                addText: '<?= /* @escapeNotVerified */ __('Add New Tax Rate') ?>',
                 parse: null,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
@@ -136,7 +136,7 @@ require([
             var taxRate = $('#tax_rate'),
                 taxRateField = taxRate.parent(),
                 taxRateForm = $('#tax-rate-form'),
-                taxRateFormElement = $('#<?php /* @escapeNotVerified */ echo \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
+                taxRateFormElement = $('#<?= /* @escapeNotVerified */ \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
 
             if (!this.isEntityEditable) {
                 // Override default layout of editable multiselect
@@ -160,7 +160,7 @@ require([
             taxRateField.find('.mselect-list')
                     .on('click.mselect-edit', '.mselect-edit', this.edit)
                     .on("click.mselect-delete", ".mselect-delete", function () {
-                        if (!confirm('<?php /* @escapeNotVerified */ echo __('Do you really want to delete this tax rate?'); ?>')) {
+                        if (!confirm('<?= /* @escapeNotVerified */ __('Do you really want to delete this tax rate?') ?>')) {
                             return;
                         }
 
@@ -176,7 +176,7 @@ require([
                                 form_key: $('input[name="form_key"]').val()
                             },
                             dataType: 'json',
-                            url: '<?php /* @escapeNotVerified */ echo $block->getTaxRateDeleteUrl()?>',
+                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateDeleteUrl() ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -189,14 +189,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>'
+                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>'
+                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
                                 });
                             }
                         };
@@ -217,15 +217,15 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?php /* @escapeNotVerified */ echo __('Tax Rate'); ?>',
+                title: '<?= /* @escapeNotVerified */ __('Tax Rate') ?>',
                 type: 'slide',
-                id: '<?php /* @escapeNotVerified */ echo $block->getJsId() ?>',
+                id: '<?= /* @escapeNotVerified */ $block->getJsId() ?>',
                 modalClass: 'tax-rate-popup',
                 closed: function () {
                     taxRateFormElement.data('validation').clearError();
                 },
                 buttons: [{
-                    text: '<?php /* @escapeNotVerified */ echo __('Save'); ?>',
+                    text: '<?= /* @escapeNotVerified */ __('Save') ?>',
                     'class': 'action-save action-primary',
                     click: function() {
                         this.updateItemRate();
@@ -245,7 +245,7 @@ require([
                             type: 'POST',
                             data: itemRateData,
                             dataType: 'json',
-                            url: '<?php /* @escapeNotVerified */ echo $block->getTaxRateSaveUrl()?>',
+                            url: '<?= /* @escapeNotVerified */ $block->getTaxRateSaveUrl() ?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -271,14 +271,14 @@ require([
                                         });
                                     else
                                         alert({
-                                            content: '<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>'
+                                            content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
                                         });
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
                                 alert({
-                                    content: '<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>'
+                                    content: '<?= /* @escapeNotVerified */ __('An error occurred') ?>'
                                 });
                             }
                         };
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
index 79dabb62bbe54..c0d185c36b0d6 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/rate/form.phtml
@@ -10,8 +10,8 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?php /* @escapeNotVerified */ echo $block->getNameInLayout() ?>" style="display:none">
-    <?php echo $block->getFormHtml();?>
-    <?php echo $block->getChildHtml('form_after');?>
+<div class="form-inline" id="<?= /* @escapeNotVerified */ $block->getNameInLayout() ?>" style="display:none">
+    <?= $block->getFormHtml() ?>
+    <?= $block->getChildHtml('form_after') ?>
 </div>
 
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
index fc976e6fc6d8d..ed7e543989e78 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/add.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?php /* @escapeNotVerified */ echo $createUrl ?>'">
-        <?php /* @escapeNotVerified */ echo __('Add New Class') ?>
+    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
+        <?= /* @escapeNotVerified */ __('Add New Class') ?>
     </button>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
index fbfde0f3cb86c..e0255d52e4dc3 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/class/save.phtml
@@ -8,16 +8,16 @@
 
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?php echo $block->getBackButtonHtml() ?>
-    <?php echo $block->getResetButtonHtml() ?>
-    <?php echo $block->getSaveButtonHtml() ?>
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getResetButtonHtml() ?>
+    <?= $block->getSaveButtonHtml() ?>
 </div>
 <?php if ($form): ?>
-<?php echo $form->toHtml(); ?>
+<?= $form->toHtml() ?>
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php /* @escapeNotVerified */ echo $form->getForm()->getId() ?>').mage('form').mage('validation');
+    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
 
 });
 </script>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
index bb3f69ead1c2d..902c6932f0ae1 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/add.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml('grid') ?>
+<?= $block->getChildHtml('grid') ?>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
index 6ed527e16595a..3128b82b69e60 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rate/save.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($form): ?>
-<?php echo $form->toHtml();?>
+<?= $form->toHtml() ?>
 
 <script>
 require([
@@ -16,7 +16,7 @@ require([
     "mage/mage"
 ], function($){
 
-    $('#<?php /* @escapeNotVerified */ echo $form->getForm()->getId() ?>').mage('form').mage('validation');
+    $('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
 
     $(document).ready(function () {
         'use strict';
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
index c582644a402c0..b3d8a01e1eff1 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/add.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <button type="button" onclick="window.location.href='<?php /* @escapeNotVerified */ echo $createUrl ?>'">
-        <?php /* @escapeNotVerified */ echo __('Add New Tax Rule') ?>
+    <button type="button" onclick="window.location.href='<?= /* @escapeNotVerified */ $createUrl ?>'">
+        <?= /* @escapeNotVerified */ __('Add New Tax Rule') ?>
     </button>
 </div>
diff --git a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
index 951f050f4ce75..10c0e796ea4f1 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/toolbar/rule/save.phtml
@@ -8,17 +8,17 @@
 
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions">
-    <?php echo $block->getBackButtonHtml(); ?>
-    <?php echo $block->getResetButtonHtml(); ?>
-    <?php echo $block->getSaveButtonHtml(); ?>
-    <?php echo $block->getDeleteButtonHtml(); ?>
+    <?= $block->getBackButtonHtml() ?>
+    <?= $block->getResetButtonHtml() ?>
+    <?= $block->getSaveButtonHtml() ?>
+    <?= $block->getDeleteButtonHtml() ?>
 </div>
 <?php if ($form): ?>
-<?php echo $form->toHtml(); ?>
+<?= $form->toHtml() ?>
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php /* @escapeNotVerified */ echo $form->getForm()->getId() ?>').mage('form').mage('validation');
+    jQuery('#<?= /* @escapeNotVerified */ $form->getForm()->getId() ?>').mage('form').mage('validation');
 
 });
 </script>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
index 20e47f3c063a2..c6d3d51ff22a8 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -11,10 +11,10 @@
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 
 <?php if ($block->displayBothPrices()): ?>
-    <span id="<?php /* @escapeNotVerified */ echo $block->buildIdWithPrefix('price-excluding-tax-') ?>"
-          data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>"
-          data-price-amount="<?php /* @escapeNotVerified */ echo $block->getRawAmount() ?>"
+    <span id="<?= /* @escapeNotVerified */ $block->buildIdWithPrefix('price-excluding-tax-') ?>"
+          data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>"
+          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawAmount() ?>"
           data-price-type="basePrice"
           class="price-wrapper price-excluding-tax">
-        <span class="price"><?php /* @escapeNotVerified */ echo $block->getDisplayAmountExclTax() ?></span></span>
+        <span class="price"><?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
index cba9fcedff096..999af81186fae 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment/bundle.phtml
@@ -10,12 +10,12 @@
 
 <?php /** @var \Magento\Tax\Pricing\Render\Adjustment $block */ ?>
 <?php if ($block->displayPriceIncludingTax()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getDisplayAmount() ?>
+    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
 <?php elseif ($block->displayPriceExcludingTax()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getDisplayAmountExclTax() ?>
+    <?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?>
 <?php elseif ($block->displayBothPrices()): ?>
-    <?php /* @escapeNotVerified */ echo $block->getDisplayAmount() ?>
+    <?= /* @escapeNotVerified */ $block->getDisplayAmount() ?>
     <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()): ?>
-        (+<?php /* @escapeNotVerified */ echo $block->getDisplayAmountExclTax() ?> Excl. Tax)
+        (+<?= /* @escapeNotVerified */ $block->getDisplayAmountExclTax() ?> Excl. Tax)
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index a01867532b4e7..9395bd47ca3e7 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -10,13 +10,13 @@
 ?>
 <?php $_item = $block->getItem() ?>
     <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax')?>">
+        <span class="price-wrapper price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
             <?php $_incl = $_item->getPriceInclTax(); ?>
-            <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
         </span>
     <?php endif; ?>
     <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-        <span class="price-wrapper price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax')?>">
-            <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <span class="price-wrapper price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>">
+            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
index 941aef40593e0..5bcbde0e24c4e 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml
@@ -12,29 +12,29 @@
 ?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0):?>
 <tr class="grand totals excl">
-    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-        <strong><?php /* @escapeNotVerified */ echo __('Grand Total Excl. Tax')?></strong>
+    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <strong><?= /* @escapeNotVerified */ __('Grand Total Excl. Tax') ?></strong>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Grand Total Excl. Tax')); ?>">
-        <strong><?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?>">
+        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
     </td>
 </tr>
-<?php /* @escapeNotVerified */ echo $block->renderTotals('taxes', $block->getColspan()); ?>
+<?= /* @escapeNotVerified */ $block->renderTotals('taxes', $block->getColspan()) ?>
 <tr class="grand totals incl">
-    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-        <strong><?php /* @escapeNotVerified */ echo __('Grand Total Incl. Tax')?></strong>
+    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <strong><?= /* @escapeNotVerified */ __('Grand Total Incl. Tax') ?></strong>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Grand Total Incl. Tax')); ?>">
-        <strong><?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Grand Total Incl. Tax')) ?>">
+        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php else:?>
 <tr class="grand totals">
-    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-        <strong><?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?></strong>
+    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <strong><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></strong>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <strong><?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <strong><?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
index 1fd28e9ba72e9..203dd72041296 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -14,37 +14,37 @@
 <?php if ($block->displayShipping()):?>
     <?php if ($block->displayBoth()):?>
     <tr class="totals shipping excl">
-        <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-            <?php /* @escapeNotVerified */ echo $block->getExcludeTaxLabel() ?>
+        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+            <?= /* @escapeNotVerified */ $block->getExcludeTaxLabel() ?>
         </th>
-        <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getExcludeTaxLabel()); ?>">
-            <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getExcludeTaxLabel()) ?>">
+            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <tr class="totals shipping incl">
-        <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-            <?php /* @escapeNotVerified */ echo $block->getIncludeTaxLabel() ?>
+        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+            <?= /* @escapeNotVerified */ $block->getIncludeTaxLabel() ?>
         </th>
-        <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getIncludeTaxLabel()); ?>">
-            <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getIncludeTaxLabel()) ?>">
+            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php elseif ($block->displayIncludeTax()) : ?>
     <tr class="totals shipping incl">
-        <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-            <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
+        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
         </th>
-        <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-            <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
         </td>
     </tr>
     <?php else:?>
     <tr class="totals shipping excl">
-        <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-            <?php echo $block->escapeHtml($block->getTotal()->getTitle()) ?>
+        <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+            <?= $block->escapeHtml($block->getTotal()->getTitle()) ?>
         </th>
-        <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-            <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+        <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+            <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
         </td>
     </tr>
     <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
index 566405d9736a7..2aedc85221344 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping/price.phtml
@@ -12,16 +12,16 @@
 <?php $_excl = $block->getShippingPriceExclTax(); ?>
 <?php $_incl = $block->getShippingPriceInclTax(); ?>
 <?php if ($block->displayShippingPriceExclTax()): ?>
-    <span class="price"><?php /* @escapeNotVerified */ echo $_excl; ?></span>
+    <span class="price"><?= /* @escapeNotVerified */ $_excl ?></span>
 <?php else: ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>">
+    <span class="price-including-tax" data-label="<?= /* @escapeNotVerified */ __('Incl. Tax') ?>">
 <?php endif; ?>
-    <span class="price"><?php /* @escapeNotVerified */ echo $_incl; ?></span>
+    <span class="price"><?= /* @escapeNotVerified */ $_incl ?></span>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
     </span>
 <?php endif; ?>
 <?php endif; ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>"><span class="price"><?php /* @escapeNotVerified */ echo $_excl; ?></span></span>
+    <span class="price-excluding-tax" data-label="<?= /* @escapeNotVerified */ __('Excl. Tax') ?>"><span class="price"><?= /* @escapeNotVerified */ $_excl ?></span></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
index 071e827c55a18..d295ba7bc7bbc 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml
@@ -13,28 +13,28 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="totals sub excl">
-    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-        <?php /* @escapeNotVerified */ echo __('Subtotal (Excl. Tax)') ?>
+    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <?= /* @escapeNotVerified */ __('Subtotal (Excl. Tax)') ?>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Subtotal (Excl. Tax)')); ?>">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>">
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="totals sub incl">
-    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-        <?php /* @escapeNotVerified */ echo __('Subtotal (Incl. Tax)') ?>
+    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <?= /* @escapeNotVerified */ __('Subtotal (Incl. Tax)') ?>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Subtotal (Incl. Tax)')); ?>">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml(__('Subtotal (Incl. Tax)')) ?>">
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="totals sub">
-    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
+    <th style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+        <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
+    <td style="<?= /* @escapeNotVerified */ $block->getStyle() ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
     </td>
 </tr>
 <?php endif;?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
index cadc04f388776..5409aa1822bdf 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/tax.phtml
@@ -24,16 +24,16 @@
     }
 ?>
 
-<tr <?php /* @escapeNotVerified */ echo $attributes; ?>>
-    <th style="<?php /* @escapeNotVerified */ echo $_style ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+<tr <?= /* @escapeNotVerified */ $attributes ?>>
+    <th style="<?= /* @escapeNotVerified */ $_style ?>" class="mark" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <span class="detailed"><?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?></span>
+            <span class="detailed"><?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?></span>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
+            <?= /* @escapeNotVerified */ $block->getTotal()->getTitle() ?>
         <?php endif;?>
     </th>
-    <td style="<?php /* @escapeNotVerified */ echo $_style ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
+    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" data-th="<?= $block->escapeHtml($block->getTotal()->getTitle()) ?>">
+        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
     </td>
 </tr>
 
@@ -49,17 +49,17 @@
         <?php $isFirst = 1; ?>
 
         <?php foreach ($rates as $rate): ?>
-            <tr class="totals-tax-details details-<?php /* @escapeNotVerified */ echo $taxIter; ?>">
-                <th class="mark" style="<?php /* @escapeNotVerified */ echo $_style ?>" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
-                    <?php echo $block->escapeHtml($rate['title']); ?>
+            <tr class="totals-tax-details details-<?= /* @escapeNotVerified */ $taxIter ?>">
+                <th class="mark" style="<?= /* @escapeNotVerified */ $_style ?>" colspan="<?= /* @escapeNotVerified */ $block->getColspan() ?>" scope="row">
+                    <?= $block->escapeHtml($rate['title']) ?>
                     <?php if (!is_null($rate['percent'])): ?>
-                        (<?php echo (float)$rate['percent']; ?>%)
+                        (<?= (float)$rate['percent'] ?>%)
                     <?php endif; ?>
                 </th>
                 <?php if ($isFirst): ?>
-                    <td style="<?php /* @escapeNotVerified */ echo $_style ?>" class="amount" rowspan="<?php echo count($rates); ?>"
-                       data-th="<?php echo $block->escapeHtml($rate['title']); ?><?php if (!is_null($rate['percent'])): ?>(<?php echo (float)$rate['percent']; ?>%)<?php endif; ?>">
-                        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
+                    <td style="<?= /* @escapeNotVerified */ $_style ?>" class="amount" rowspan="<?= count($rates) ?>"
+                       data-th="<?= $block->escapeHtml($rate['title']) ?><?php if (!is_null($rate['percent'])): ?>(<?= (float)$rate['percent'] ?>%)<?php endif; ?>">
+                        <?= /* @escapeNotVerified */ $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount) ?>
                     </td>
                 <?php endif; ?>
             </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index 92c8ff7a3c061..856909cbb4240 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
@@ -11,17 +11,17 @@
 $_item = $block->getItem();
 ?>
 <?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax'));?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <span class="cart-price">
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getRowTotalInclTax()) ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotalInclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
 
 <?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
-    <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax'));?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <span class="cart-price">
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getRowTotal()) ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($_item->getRowTotal()) ?>
         </span>
     </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
index 8bfce205aea40..f0066d9024139 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/total_after_discount.phtml
@@ -10,4 +10,4 @@
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?php /* @escapeNotVerified */ echo $_order->formatPrice($block->getTotalAmount($_item))?>
+<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
index 943d8c2c59152..5fd1fed49c33c 100644
--- a/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/item/price/unit.phtml
@@ -12,18 +12,18 @@ $_item = $block->getItem();
 ?>
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php $_incl = $_item->getPriceInclTax(); ?>
         <span class="cart-price">
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($_incl) ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($_incl) ?>
         </span>
     </span>
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <span class="cart-price">
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
index 69ad4f67e51a2..b329f00973b5a 100644
--- a/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/order/tax.phtml
@@ -22,16 +22,16 @@
                 $baseAmount = $info['base_tax_amount'];
                 $title      = $info['title'];
             ?>
-            <tr class="totals tax details details-<?php /* @escapeNotVerified */ echo $taxIter; ?> <?php echo($block->getIsPlaneMode()) ? ' plane' : '';?>">
-                <td <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?>>
-                    <?php echo $block->escapeHtml($title); ?>
+            <tr class="totals tax details details-<?= /* @escapeNotVerified */ $taxIter ?> <?= ($block->getIsPlaneMode()) ? ' plane' : '' ?>">
+                <td <?= /* @escapeNotVerified */ $block->getLabelProperties() ?>>
+                    <?= $block->escapeHtml($title) ?>
                     <?php if (!is_null($percent)): ?>
-                        (<?php echo (float)$percent; ?>%)
+                        (<?= (float)$percent ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
-                <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?> rowspan="1">
-                    <?php /* @escapeNotVerified */ echo $_order->formatPrice($amount); ?>
+                <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> rowspan="1">
+                    <?= /* @escapeNotVerified */ $_order->formatPrice($amount) ?>
                 </td>
             </tr>
         <?php endforeach; ?>
@@ -44,14 +44,14 @@
 <?php else: ?>
 <tr class="totals-tax">
 <?php endif; ?>
-    <th <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> scope="row">
+    <th <?= /* @escapeNotVerified */ $block->getLabelProperties() ?> scope="row">
         <?php if ($block->displayFullSummary()): ?>
-            <div class="detailed"><?php /* @escapeNotVerified */ echo __('Tax'); ?></div>
+            <div class="detailed"><?= /* @escapeNotVerified */ __('Tax') ?></div>
         <?php else: ?>
-            <?php /* @escapeNotVerified */ echo __('Tax'); ?>
+            <?= /* @escapeNotVerified */ __('Tax') ?>
         <?php endif;?>
     </th>
-    <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?> data-th="<?php echo $block->escapeHtml(__('Tax')); ?>">
-        <?php /* @escapeNotVerified */ echo $_order->formatPrice($_source->getTaxAmount()) ?>
+    <td <?= /* @escapeNotVerified */ $block->getValueProperties() ?> data-th="<?= $block->escapeHtml(__('Tax')) ?>">
+        <?= /* @escapeNotVerified */ $_order->formatPrice($_source->getTaxAmount()) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index ec4a9352258ce..f1d41e0c969a2 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -11,14 +11,14 @@
     <?php if (!$block->getIsReadonly()): ?>
     <div class="import-tax-rates">
         <?php if ($block->getUseContainer()): ?>
-        <form id="import-form" class="admin__fieldset" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
+        <form id="import-form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
         <?php endif; ?>
-            <?php echo $block->getBlockHtml('formkey')?>
+            <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <label for="import_rates_file" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Import Tax Rates') ?></span></label>
+                <label for="import_rates_file" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Import Tax Rates') ?></span></label>
                 <div class="admin__field-control">
                     <input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
-                    <?php echo $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
+                    <?= $block->getButtonHtml(__('Import Tax Rates'), '', 'import-submit') ?>
                 </div>
             </div>
         <?php if ($block->getUseContainer()): ?>
@@ -46,13 +46,13 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
     <?php endif; ?>
     <div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
         <?php if ($block->getUseContainer()): ?>
-        <form id="export_form" class="admin__fieldset" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
+        <form id="export_form" class="admin__fieldset" action="<?= /* @escapeNotVerified */ $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
         <?php endif; ?>
-            <?php echo $block->getBlockHtml('formkey')?>
+            <?= $block->getBlockHtml('formkey') ?>
             <div class="fieldset admin__field">
-                <span class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Export Tax Rates') ?></span></span>
+                <span class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Export Tax Rates') ?></span></span>
                 <div class="admin__field-control">
-                    <?php echo $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
+                    <?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
                 </div>
             </div>
         <?php if ($block->getUseContainer()): ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
index 820cd016c2a28..4ce0d766ee3f3 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
@@ -11,8 +11,8 @@
  * @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content
  */
 ?>
-<?php echo $block->getChildHtml('wysiwyg_files.js') ?>
+<?= $block->getChildHtml('wysiwyg_files.js') ?>
 
-<div id="contents-uploader" class="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_files.uploader') ?></div>
+<div id="contents-uploader" class="contents-uploader"><?= $block->getChildHtml('wysiwyg_files.uploader') ?></div>
 <div id="contents"></div>
-<div id="contents-newfolder" class="no-display"><?php echo $block->getChildHtml('wysiwyg_files.newfolder') ?></div>
+<div id="contents-newfolder" class="no-display"><?= $block->getChildHtml('wysiwyg_files.newfolder') ?></div>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
index 8f594e6c7e2d6..e5f0efd7917be 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml
@@ -14,15 +14,15 @@
 
 <?php if ($block->getFilesCount() > 0): ?>
     <?php foreach ($block->getFiles() as $file): ?>
-        <div class="filecnt file-font" id="<?php /* @escapeNotVerified */ echo $file['id'] ?>">
+        <div class="filecnt file-font" id="<?= /* @escapeNotVerified */ $file['id'] ?>">
             <p class="nm">
-                <?php /* @escapeNotVerified */ echo $file['text'] ?>
+                <?= /* @escapeNotVerified */ $file['text'] ?>
                 <?php if (isset($file['thumbnailParams'])): ?>
-                    <img src="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
+                    <img src="<?= /* @escapeNotVerified */ $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
                 <?php endif; ?>
             </p>
         </div>
     <?php endforeach; ?>
 <?php else: ?>
-    <?php /* @escapeNotVerified */ echo __('We found no files.') ?>
+    <?= /* @escapeNotVerified */ __('We found no files.') ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
index b7d2a3a8919b4..722ade94d97fd 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml
@@ -10,14 +10,14 @@
 /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
 ?>
 
-<div id="<?php echo $block->getHtmlId() ?>" class="uploader">
+<div id="<?= $block->getHtmlId() ?>" class="uploader">
     <span class="fileinput-button form-buttons">
-        <span><?php /* @escapeNotVerified */ echo __('Browse Files') ?></span>
-        <input id="fileupload" type="file" name="<?php /* @escapeNotVerified */ echo $block->getConfig()->getFileField() ?>"
-            data-url="<?php /* @escapeNotVerified */ echo $block->getConfig()->getUrl() ?>" multiple>
+        <span><?= /* @escapeNotVerified */ __('Browse Files') ?></span>
+        <input id="fileupload" type="file" name="<?= /* @escapeNotVerified */ $block->getConfig()->getFileField() ?>"
+            data-url="<?= /* @escapeNotVerified */ $block->getConfig()->getUrl() ?>" multiple>
     </span>
     <div class="clear"></div>
-    <script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template">
+    <script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
         <div id="<%- data.id %>" class="file-row">
             <span class="file-info"><%- data.name %> (<%- data.size %>)</span>
             <div class="progressbar-container">
@@ -44,9 +44,9 @@ require([
             form_key: FORM_KEY
         },
         sequentialUploads: true,
-        maxFileSize: <?php /* @escapeNotVerified */ echo $block->getFileSizeService()->getMaxFileSize() ?> ,
+        maxFileSize: <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?> ,
         add: function (e, data) {
-            var progressTmpl = mageTemplate('#<?php echo $block->getHtmlId(); ?>-template'),
+            var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
                 fileSize,
                 tmpl;
 
@@ -65,7 +65,7 @@ require([
                     }
                 });
 
-                $(tmpl).appendTo('#<?php echo $block->getHtmlId() ?>');
+                $(tmpl).appendTo('#<?= $block->getHtmlId() ?>');
             });
 
             $(this).fileupload('process', data).done(function () {
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
index b20554f34d35b..7bd5c70f0bfda 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml
@@ -10,6 +10,6 @@
 ?>
 
 <div class="store-view">
-    <span class="store-switcher-label"><?php /* @escapeNotVerified */ echo __('Scope:'); ?></span>
-    <span class="store-switcher-value"><?php /* @escapeNotVerified */ echo $block->getScopeTitle(); ?></span>
+    <span class="store-switcher-label"><?= /* @escapeNotVerified */ __('Scope:') ?></span>
+    <span class="store-switcher-value"><?= /* @escapeNotVerified */ $block->getScopeTitle() ?></span>
 </div>
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
index 138b43126b6ad..1c1a7ea204b2b 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
@@ -7,7 +7,7 @@
 
 <?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */ ?>
 
-<?php echo $block->getFormHtml(); ?>
+<?= $block->getFormHtml() ?>
 
 <script>
 require([
@@ -20,7 +20,7 @@ require([
     $( '#css_file_uploader' ).fileupload({
         dataType: 'json',
         replaceFileInput: false,
-        url : '<?php /* @escapeNotVerified */ echo $block->getUrl('*/system_design_theme/uploadcss') ?>',
+        url : '<?= /* @escapeNotVerified */ $block->getUrl('*/system_design_theme/uploadcss') ?>',
         acceptFileTypes: /(.|\/)(css)$/i,
 
         /**
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
index d6b8274a4d2fc..992bd73bf0b4a 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml
@@ -32,7 +32,7 @@
                 id="remove_js_files_<%- data.id %>"
                 name="js_removed_files[]"
                 value="<%- data.id %>" />
-            <label for="remove_js_files_<%- data.id %>"><?php /* @escapeNotVerified */ echo __('Remove') ?></label>
+            <label for="remove_js_files_<%- data.id %>"><?= /* @escapeNotVerified */ __('Remove') ?></label>
         </div>
     </div>
 
@@ -60,7 +60,7 @@ jQuery(function($) {
     });
     $('body').trigger(
         'refreshJsList',
-        {jsList: <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>}
+        {jsList: <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>}
     );
 });
 
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
index 4fdd7101f8fbf..b13e1320d0bd3 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */ ?>
-<?php echo $block->getFormHtml(); ?>
+<?= $block->getFormHtml() ?>
 
 <script>
 require([
@@ -21,7 +21,7 @@ require([
         dataType: 'json',
         replaceFileInput: false,
         sequentialUploads: true,
-        url: '<?php /* @escapeNotVerified */ echo $block->getJsUploadUrl(); ?>',
+        url: '<?= /* @escapeNotVerified */ $block->getJsUploadUrl() ?>',
 
         /**
          * Add data
diff --git a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
index cb1074e18443d..e3a85b64586d0 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
@@ -14,7 +14,7 @@ $titleClass = ($block->getTitleClass()) ? ' ' . $block->getTitleClass() : '';
 $title = $block->escapeHtml($block->getPageTitle());
 ?>
 
-<div class="page-title-wrapper<?php /* @escapeNotVerified */ echo $titleClass; ?>">
-    <h1 class="page-title"<?php /* @escapeNotVerified */ echo $titleId?>><?php /* @escapeNotVerified */ echo $title ?></h1>
-    <?php echo $block->getChildHtml(); ?>
+<div class="page-title-wrapper<?= /* @escapeNotVerified */ $titleClass ?>">
+    <h1 class="page-title"<?= /* @escapeNotVerified */ $titleId ?>><?= /* @escapeNotVerified */ $title ?></h1>
+    <?= $block->getChildHtml() ?>
 </div>
diff --git a/app/code/Magento/Theme/view/base/templates/root.phtml b/app/code/Magento/Theme/view/base/templates/root.phtml
index a999b4fc084a2..4923ce9ded7df 100644
--- a/app/code/Magento/Theme/view/base/templates/root.phtml
+++ b/app/code/Magento/Theme/view/base/templates/root.phtml
@@ -8,13 +8,13 @@
 
 ?>
 <!doctype html>
-<html <?php /* @escapeNotVerified */ echo $htmlAttributes ?>>
-    <head <?php /* @escapeNotVerified */ echo $headAttributes ?>>
-        <?php /* @escapeNotVerified */ echo $requireJs ?>
-        <?php /* @escapeNotVerified */ echo $headContent ?>
-        <?php /* @escapeNotVerified */ echo $headAdditional ?>
+<html <?= /* @escapeNotVerified */ $htmlAttributes ?>>
+    <head <?= /* @escapeNotVerified */ $headAttributes ?>>
+        <?= /* @escapeNotVerified */ $requireJs ?>
+        <?= /* @escapeNotVerified */ $headContent ?>
+        <?= /* @escapeNotVerified */ $headAdditional ?>
     </head>
-    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?php /* @escapeNotVerified */ echo $loaderIcon; ?>"}}' <?php /* @escapeNotVerified */ echo $bodyAttributes ?>>
-        <?php /* @escapeNotVerified */ echo $layoutContent ?>
+    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @escapeNotVerified */ $loaderIcon ?>"}}' <?= /* @escapeNotVerified */ $bodyAttributes ?>>
+        <?= /* @escapeNotVerified */ $layoutContent ?>
     </body>
 </html>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
index b542a7488bd4b..0df0fcfbc5e83 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/left_col.phtml
@@ -10,11 +10,11 @@
 <div class="block block-banner">
     <div class="block-content">
         <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getLinkUrl() ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
+            <a href="<?= /* @escapeNotVerified */ $block->getLinkUrl() ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
         <?php elseif ($block->getLinkUrl()): ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl($block->getLinkUrl()) ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
+            <a href="<?= /* @escapeNotVerified */ $block->getUrl($block->getLinkUrl()) ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
         <?php endif; ?>
-            <img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>" />
+            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>" />
         <?php if ($block->getLinkUrl()): ?>
         </a>
         <?php endif ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
index b542a7488bd4b..0df0fcfbc5e83 100644
--- a/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/callouts/right_col.phtml
@@ -10,11 +10,11 @@
 <div class="block block-banner">
     <div class="block-content">
         <?php if (strtolower(substr($block->getLinkUrl(), 0, 4)) === 'http'): ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getLinkUrl() ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
+            <a href="<?= /* @escapeNotVerified */ $block->getLinkUrl() ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
         <?php elseif ($block->getLinkUrl()): ?>
-            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl($block->getLinkUrl()) ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
+            <a href="<?= /* @escapeNotVerified */ $block->getUrl($block->getLinkUrl()) ?>" title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>">
         <?php endif; ?>
-            <img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>" />
+            <img src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?= /* @escapeNotVerified */ __($block->getImgAlt()) ?>" />
         <?php if ($block->getLinkUrl()): ?>
         </a>
         <?php endif ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
index 69fdbdda7e007..708f0e0ef19f2 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/absolute_footer.phtml
@@ -4,4 +4,4 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /* @escapeNotVerified */ echo $block->getMiscellaneousHtml();
+<?= /* @escapeNotVerified */ $block->getMiscellaneousHtml();
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
index ce5cedb570f7d..8b28a8cd4e32d 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/block.phtml
@@ -7,9 +7,9 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<div class="block <?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>">
-    <div class="block-title <?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>-title"><strong><?php /* @escapeNotVerified */ echo $block->getBlockTitle(); ?></strong></div>
-    <div class="block-content <?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>-content">
-        <?php echo $block->getChildHtml(); ?>
+<div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
+    <div class="block-title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title"><strong><?= /* @escapeNotVerified */ $block->getBlockTitle() ?></strong></div>
+    <div class="block-content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content">
+        <?= $block->getChildHtml() ?>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
index ec7a1d775bb20..710c622ce26c4 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
@@ -11,13 +11,13 @@
 <div class="breadcrumbs">
     <ul class="items">
         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
-            <li class="item <?php /* @escapeNotVerified */ echo $crumbName ?>">
+            <li class="item <?= /* @escapeNotVerified */ $crumbName ?>">
             <?php if ($crumbInfo['link']) : ?>
-                <a href="<?php /* @escapeNotVerified */ echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>"><?php echo $block->escapeHtml($crumbInfo['label']) ?></a>
+                <a href="<?= /* @escapeNotVerified */ $crumbInfo['link'] ?>" title="<?= $block->escapeHtml($crumbInfo['title']) ?>"><?= $block->escapeHtml($crumbInfo['label']) ?></a>
             <?php elseif ($crumbInfo['last']) : ?>
-                <strong><?php echo $block->escapeHtml($crumbInfo['label']) ?></strong>
+                <strong><?= $block->escapeHtml($crumbInfo['label']) ?></strong>
             <?php else: ?>
-                <?php echo $block->escapeHtml($crumbInfo['label']) ?>
+                <?= $block->escapeHtml($crumbInfo['label']) ?>
             <?php endif; ?>
             </li>
         <?php endforeach; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
index 12eb87dab0b62..5d8203244256e 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/bugreport.phtml
@@ -5,9 +5,9 @@
  */
 ?>
 <small class="bugs">
-    <span><?php /* @escapeNotVerified */ echo __('Help Us Keep Magento Healthy') ?></span>
+    <span><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?></span>
     <a href="http://www.magentocommerce.com/bug-tracking"
        target="_blank">
-        <?php /* @escapeNotVerified */ echo __('Report All Bugs') ?>
+        <?= /* @escapeNotVerified */ __('Report All Bugs') ?>
     </a>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
index f2a043d06450f..318bcc8f2cc7c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/collapsible.phtml
@@ -8,11 +8,11 @@
 
 ?>
 
-<div class="block <?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>">
-    <div class="title <?php /* @escapeNotVerified */ echo $block->getBlockCss();?>-title" data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>", "selectorsToggleClass": "active"}}'>
-        <strong><?php /* @escapeNotVerified */ echo $block->getBlockTitle(); ?></strong>
+<div class="block <?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
+    <div class="title <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-title" data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?= /* @escapeNotVerified */ $block->getBlockCss() ?>", "selectorsToggleClass": "active"}}'>
+        <strong><?= /* @escapeNotVerified */ $block->getBlockTitle() ?></strong>
     </div>
-    <div class="content <?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>-content" id="<?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>">
-        <?php echo $block->getChildHtml(); ?>
+    <div class="content <?= /* @escapeNotVerified */ $block->getBlockCss() ?>-content" id="<?= /* @escapeNotVerified */ $block->getBlockCss() ?>">
+        <?= $block->getChildHtml() ?>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
index 27d62f18f5bb5..bad5acc209b5f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/container.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml(); ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
index b80f261292ed8..af2e43d51fa58 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/copyright.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <small class="copyright">
-    <span><?php /* @escapeNotVerified */ echo $block->getCopyright() ?></span>
+    <span><?= /* @escapeNotVerified */ $block->getCopyright() ?></span>
 </small>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
index 331c46f622b03..093663e3bb71b 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
@@ -9,11 +9,11 @@
 ?>
 <div class="footer-container">
     <div class="footer">
-        <?php echo $block->getChildHtml() ?>
-        <p class="bugs"><?php /* @escapeNotVerified */ echo __('Help Us Keep Magento Healthy') ?> - <a
+        <?= $block->getChildHtml() ?>
+        <p class="bugs"><?= /* @escapeNotVerified */ __('Help Us Keep Magento Healthy') ?> - <a
             href="http://www.magentocommerce.com/bug-tracking"
-            target="_blank"><strong><?php /* @escapeNotVerified */ echo __('Report All Bugs') ?></strong></a>
+            target="_blank"><strong><?= /* @escapeNotVerified */ __('Report All Bugs') ?></strong></a>
         </p>
-        <address><?php /* @escapeNotVerified */ echo $block->getCopyright() ?></address>
+        <address><?= /* @escapeNotVerified */ $block->getCopyright() ?></address>
     </div>
 </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
index dc04eef5c0a1f..df3cc457d59b4 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header.phtml
@@ -15,11 +15,11 @@ $welcomeMessage = $block->getWelcome();
     case 'welcome': ?>
         <li class="greet welcome" data-bind="scope: 'customer'">
             <!-- ko if: customer().fullname  -->
-            <span data-bind="text: new String('<?php echo $block->escapeHtml(__('Welcome, %1!', '%1'));?>').replace('%1', customer().firstname)">
+            <span data-bind="text: new String('<?= $block->escapeHtml(__('Welcome, %1!', '%1')) ?>').replace('%1', customer().firstname)">
             </span>
             <!-- /ko -->
             <!-- ko ifnot: customer().fullname  -->
-            <span data-bind="html:'<?=$block->escapeHtml($welcomeMessage) ?>'"></span>
+            <span data-bind="html:'<?= $block->escapeHtml($welcomeMessage) ?>'"></span>
             <!-- /ko -->
         </li>
         <script type="text/x-magento-init">
@@ -38,7 +38,7 @@ $welcomeMessage = $block->getWelcome();
     <?php break; ?>
 
     <?php case 'other': ?>
-        <?php echo $block->getChildHtml(); ?>
+        <?= $block->getChildHtml() ?>
     <?php break; ?>
 
 <?php endswitch; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
index ed52bc2c5a5e9..8c3663337cbbe 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/header/logo.phtml
@@ -11,16 +11,16 @@
  */
 ?>
 <?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
-<span data-action="toggle-nav" class="action nav-toggle"><span><?php /* @escapeNotVerified */ echo __('Toggle Nav') ?></span></span>
+<span data-action="toggle-nav" class="action nav-toggle"><span><?= /* @escapeNotVerified */ __('Toggle Nav') ?></span></span>
 <?php if ($block->isHomePage()):?>
     <strong class="logo">
 <?php else: ?>
-    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php /* @escapeNotVerified */ echo $storeName ?>">
+    <a class="logo" href="<?= $block->getUrl('') ?>" title="<?= /* @escapeNotVerified */ $storeName ?>">
 <?php endif ?>
-        <img src="<?php /* @escapeNotVerified */ echo $block->getLogoSrc() ?>"
-             alt="<?php /* @escapeNotVerified */ echo $block->getLogoAlt() ?>"
-             <?php echo $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
-             <?php echo $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
+        <img src="<?= /* @escapeNotVerified */ $block->getLogoSrc() ?>"
+             alt="<?= /* @escapeNotVerified */ $block->getLogoAlt() ?>"
+             <?= $block->getLogoWidth() ? 'width="' . $block->getLogoWidth() . '"' : '' ?>
+             <?= $block->getLogoHeight() ? 'height="' . $block->getLogoHeight() . '"' : '' ?>
         />
 <?php if ($block->isHomePage()):?>
     </strong>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
index fd5fba5a13609..3e74362851cfe 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/notices.phtml
@@ -17,8 +17,8 @@
         <div class="message global noscript">
             <div class="content">
                 <p>
-                    <strong><?php /* @escapeNotVerified */ echo __('JavaScript seems to be disabled in your browser.'); ?></strong>
-                    <span><?php /* @escapeNotVerified */ echo __('For the best experience on our site, be sure to turn on Javascript in your browser.'); ?></span>
+                    <strong><?= /* @escapeNotVerified */ __('JavaScript seems to be disabled in your browser.') ?></strong>
+                    <span><?= /* @escapeNotVerified */ __('For the best experience on our site, be sure to turn on Javascript in your browser.') ?></span>
                 </p>
             </div>
         </div>
@@ -28,8 +28,8 @@
     <div class="notice global site local_storage" style="display: none;">
         <div class="content">
             <p>
-                <strong><?php /* @escapeNotVerified */ echo __('Local Storage seems to be disabled in your browser.'); ?></strong><br />
-                <?php /* @escapeNotVerified */ echo __('For the best experience on our site, be sure to turn on Local Storage in your browser.'); ?>
+                <strong><?= /* @escapeNotVerified */ __('Local Storage seems to be disabled in your browser.') ?></strong><br />
+                <?= /* @escapeNotVerified */ __('For the best experience on our site, be sure to turn on Local Storage in your browser.') ?>
             </p>
         </div>
     </div>
@@ -54,7 +54,7 @@ require(['jquery'], function(jQuery){
 <?php if ($block->displayDemoNotice()): ?>
     <div class="message global demo">
         <div class="content">
-            <p><?php /* @escapeNotVerified */ echo __('This is demo store. No orders will be fulfilled.') ?></p>
+            <p><?= /* @escapeNotVerified */ __('This is demo store. No orders will be fulfilled.') ?></p>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
index feffac773a095..69edfa081df65 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/pager.phtml
@@ -24,11 +24,11 @@
         <p class="toolbar-amount">
             <span class="toolbar-number">
             <?php if ($block->getLastPageNum()>1): ?>
-                <?php /* @escapeNotVerified */ echo __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum()) ?>
+                <?= /* @escapeNotVerified */ __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum()) ?>
             <?php elseif ($block->getTotalNum() == 1): ?>
-                <?php /* @escapeNotVerified */ echo __('%1 Item', $block->getTotalNum()) ?>
+                <?= /* @escapeNotVerified */ __('%1 Item', $block->getTotalNum()) ?>
             <?php else: ?>
-                <?php /* @escapeNotVerified */ echo __('%1 Item(s)', $block->getTotalNum()) ?>
+                <?= /* @escapeNotVerified */ __('%1 Item(s)', $block->getTotalNum()) ?>
             <?php endif; ?>
             </span>
         </p>
@@ -36,22 +36,22 @@
 
         <?php if ($block->getLastPageNum()>1): ?>
         <div class="pages">
-            <strong class="label pages-label" id="paging-label"><?php /* @escapeNotVerified */ echo __('Page') ?></strong>
+            <strong class="label pages-label" id="paging-label"><?= /* @escapeNotVerified */ __('Page') ?></strong>
             <ul class="items pages-items" aria-labelledby="paging-label">
             <?php if (!$block->isFirstPage()): ?>
                 <li class="item pages-item-previous">
                     <?php $text = $block->getAnchorTextForPrevious() ? $block->getAnchorTextForPrevious() : '';?>
-                    <a class="<?php /* @escapeNotVerified */ echo $text ? 'link ' : 'action '?> previous" href="<?php /* @escapeNotVerified */ echo $block->getPreviousPageUrl() ?>" title="<?php /* @escapeNotVerified */ echo $text ? $text : __('Previous') ?>">
-                        <span class="label"><?php /* @escapeNotVerified */ echo __('Page') ?></span>
-                        <span><?php /* @escapeNotVerified */ echo $text ? $text : __('Previous') ?></span>
+                    <a class="<?= /* @escapeNotVerified */ $text ? 'link ' : 'action ' ?> previous" href="<?= /* @escapeNotVerified */ $block->getPreviousPageUrl() ?>" title="<?= /* @escapeNotVerified */ $text ? $text : __('Previous') ?>">
+                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
+                        <span><?= /* @escapeNotVerified */ $text ? $text : __('Previous') ?></span>
                     </a>
                 </li>
             <?php endif;?>
 
             <?php if ($block->canShowFirst()): ?>
                 <li class="item">
-                    <a class="page first" href="<?php /* @escapeNotVerified */ echo $block->getFirstPageUrl() ?>">
-                        <span class="label"><?php /* @escapeNotVerified */ echo __('Page') ?></span>
+                    <a class="page first" href="<?= /* @escapeNotVerified */ $block->getFirstPageUrl() ?>">
+                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
                         <span>1</span>
                     </a>
                 </li>
@@ -59,7 +59,7 @@
 
             <?php if ($block->canShowPreviousJump()): ?>
                 <li class="item">
-                    <a class="page previous jump" title="" href="<?php /* @escapeNotVerified */ echo $block->getPreviousJumpUrl() ?>">
+                    <a class="page previous jump" title="" href="<?= /* @escapeNotVerified */ $block->getPreviousJumpUrl() ?>">
                         <span>...</span>
                     </a>
                 </li>
@@ -69,15 +69,15 @@
                 <?php if ($block->isPageCurrent($_page)): ?>
                     <li class="item current">
                         <strong class="page">
-                            <span class="label"><?php /* @escapeNotVerified */ echo __('You\'re currently reading page') ?></span>
-                            <span><?php /* @escapeNotVerified */ echo $_page ?></span>
+                            <span class="label"><?= /* @escapeNotVerified */ __('You\'re currently reading page') ?></span>
+                            <span><?= /* @escapeNotVerified */ $_page ?></span>
                         </strong>
                     </li>
                 <?php else: ?>
                     <li class="item">
-                        <a href="<?php /* @escapeNotVerified */ echo $block->getPageUrl($_page) ?>" class="page">
-                            <span class="label"><?php /* @escapeNotVerified */ echo __('Page') ?></span>
-                            <span><?php /* @escapeNotVerified */ echo $_page ?></span>
+                        <a href="<?= /* @escapeNotVerified */ $block->getPageUrl($_page) ?>" class="page">
+                            <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
+                            <span><?= /* @escapeNotVerified */ $_page ?></span>
                         </a>
                     </li>
                 <?php endif;?>
@@ -85,7 +85,7 @@
 
             <?php if ($block->canShowNextJump()): ?>
                 <li class="item">
-                    <a class="page next jump" title="" href="<?php /* @escapeNotVerified */ echo $block->getNextJumpUrl() ?>">
+                    <a class="page next jump" title="" href="<?= /* @escapeNotVerified */ $block->getNextJumpUrl() ?>">
                         <span>...</span>
                     </a>
                 </li>
@@ -93,9 +93,9 @@
 
             <?php if ($block->canShowLast()): ?>
               <li class="item">
-                  <a class="page last" href="<?php /* @escapeNotVerified */ echo $block->getLastPageUrl() ?>">
-                      <span class="label"><?php /* @escapeNotVerified */ echo __('Page') ?></span>
-                      <span><?php /* @escapeNotVerified */ echo $block->getLastPageNum() ?></span>
+                  <a class="page last" href="<?= /* @escapeNotVerified */ $block->getLastPageUrl() ?>">
+                      <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
+                      <span><?= /* @escapeNotVerified */ $block->getLastPageNum() ?></span>
                   </a>
               </li>
             <?php endif;?>
@@ -103,9 +103,9 @@
             <?php if (!$block->isLastPage()): ?>
                 <li class="item pages-item-next">
                     <?php $text = $block->getAnchorTextForNext() ? $block->getAnchorTextForNext() : '';?>
-                    <a class="<?php /* @escapeNotVerified */ echo $text ? 'link ' : 'action '?> next" href="<?php /* @escapeNotVerified */ echo $block->getNextPageUrl() ?>" title="<?php /* @escapeNotVerified */ echo $text ? $text : __('Next') ?>">
-                        <span class="label"><?php /* @escapeNotVerified */ echo __('Page') ?></span>
-                        <span><?php /* @escapeNotVerified */ echo $text ? $text : __('Next') ?></span>
+                    <a class="<?= /* @escapeNotVerified */ $text ? 'link ' : 'action ' ?> next" href="<?= /* @escapeNotVerified */ $block->getNextPageUrl() ?>" title="<?= /* @escapeNotVerified */ $text ? $text : __('Next') ?>">
+                        <span class="label"><?= /* @escapeNotVerified */ __('Page') ?></span>
+                        <span><?= /* @escapeNotVerified */ $text ? $text : __('Next') ?></span>
                     </a>
                 </li>
             <?php endif;?>
@@ -115,16 +115,16 @@
 
     <?php if ($block->isShowPerPage()): ?>
         <div class="limiter">
-            <strong class="limiter-label"><?php /* @escapeNotVerified */ echo __('Show') ?></strong>
+            <strong class="limiter-label"><?= /* @escapeNotVerified */ __('Show') ?></strong>
             <select id="limiter" data-mage-init='{"redirectUrl": {"event":"change"}}' class="limiter-options">
                 <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
+                    <option value="<?= /* @escapeNotVerified */ $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
                         selected="selected"<?php endif ?>>
-                        <?php /* @escapeNotVerified */ echo $_limit ?>
+                        <?= /* @escapeNotVerified */ $_limit ?>
                     </option>
                 <?php endforeach; ?>
             </select>
-            <span class="limiter-text"><?php /* @escapeNotVerified */ echo __('per page') ?></span>
+            <span class="limiter-text"><?= /* @escapeNotVerified */ __('per page') ?></span>
         </div>
     <?php endif ?>
 
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
index a8b82527ee69f..0c31164f4459e 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -18,9 +18,9 @@ $groupCss = $block->getGroupCss();
 $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"tabs":{"openedState":"active"}}';
 ?>
 <?php if ($detailedInfoGroup = $block->getGroupChildNames($group, 'getChildHtml')):?>
-    <div class="sections <?php /* @escapeNotVerified */ echo $groupCss ?>">
+    <div class="sections <?= /* @escapeNotVerified */ $groupCss ?>">
         <?php $layout = $block->getLayout(); ?>
-        <div class="section-items <?php /* @escapeNotVerified */ echo $groupCss ?>-items" data-mage-init='<?php /* @escapeNotVerified */ echo $groupBehavior ?>'>
+        <div class="section-items <?= /* @escapeNotVerified */ $groupCss ?>-items" data-mage-init='<?= /* @escapeNotVerified */ $groupBehavior ?>'>
             <?php foreach ($detailedInfoGroup as $name):?>
                 <?php
                     $html = $layout->renderElement($name);
@@ -30,10 +30,10 @@ $groupBehavior = $block->getGroupBehaviour() ? $block->getGroupBehaviour() : '{"
                     $alias = $layout->getElementAlias($name);
                     $label = $block->getChildData($alias, 'title');
                 ?>
-                <div class="section-item-title <?php /* @escapeNotVerified */ echo $groupCss ?>-item-title" data-role="collapsible">
-                    <a class="<?php /* @escapeNotVerified */ echo $groupCss ?>-item-switch" data-toggle="switch" href="#<?php /* @escapeNotVerified */ echo $alias; ?>"><?php /* @escapeNotVerified */ echo $label; ?></a>
+                <div class="section-item-title <?= /* @escapeNotVerified */ $groupCss ?>-item-title" data-role="collapsible">
+                    <a class="<?= /* @escapeNotVerified */ $groupCss ?>-item-switch" data-toggle="switch" href="#<?= /* @escapeNotVerified */ $alias ?>"><?= /* @escapeNotVerified */ $label ?></a>
                 </div>
-                <div class="section-item-content <?php /* @escapeNotVerified */ echo $groupCss ?>-item-content" id="<?php /* @escapeNotVerified */ echo $alias; ?>" data-role="content"><?php /* @escapeNotVerified */ echo $html; ?></div>
+                <div class="section-item-content <?= /* @escapeNotVerified */ $groupCss ?>-item-content" id="<?= /* @escapeNotVerified */ $alias ?>" data-role="content"><?= /* @escapeNotVerified */ $html ?></div>
             <?php endforeach;?>
         </div>
     </div>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
index 6c66667893a42..198943530f9bb 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
@@ -8,4 +8,4 @@
 $target = $block->getTarget();
 $label = $block->getLabel();
 ?>
-<a class="action skip <?php /* @escapeNotVerified */ echo $target?>" href="#<?php /* @escapeNotVerified */ echo $target?>"><span><?php /* @escapeNotVerified */ echo $label ?></span></a>
+<a class="action skip <?= /* @escapeNotVerified */ $target ?>" href="#<?= /* @escapeNotVerified */ $target ?>"><span><?= /* @escapeNotVerified */ $label ?></span></a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
index 979972c6b59f9..8a7f35183f3e7 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml
@@ -8,4 +8,4 @@
 
 $target_id = $block->getTargetId();
 ?>
-<a id="<?php /* @escapeNotVerified */ echo $target_id?>" tabindex="-1"></a>
+<a id="<?= /* @escapeNotVerified */ $target_id ?>" tabindex="-1"></a>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
index f7de77fd9d486..69ff4c8909f8c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -17,14 +17,14 @@ if (trim($block->getPageHeading())) {
 }
 ?>
 <?php if ($title): ?>
-<div class="page-title-wrapper<?php /* @escapeNotVerified */ echo $cssClass; ?>">
+<div class="page-title-wrapper<?= /* @escapeNotVerified */ $cssClass ?>">
     <h1 class="page-title"
-        <?php if ($block->getId()): ?> id="<?php /* @escapeNotVerified */ echo $block->getId();?>" <?php endif; ?>
+        <?php if ($block->getId()): ?> id="<?= /* @escapeNotVerified */ $block->getId() ?>" <?php endif; ?>
         <?php if ($block->getAddBaseAttributeAria()): ?>
-            aria-labelledby="<?php /* @escapeNotVerified */ echo $block->getAddBaseAttributeAria(); ?>"
+            aria-labelledby="<?= /* @escapeNotVerified */ $block->getAddBaseAttributeAria() ?>"
         <?php endif; ?>>
-        <?php /* @escapeNotVerified */ echo $title ?>
+        <?= /* @escapeNotVerified */ $title ?>
     </h1>
-    <?php echo $block->getChildHtml(); ?>
+    <?= $block->getChildHtml() ?>
 </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
index ad6f33bebccf0..129fd755637ac 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
@@ -19,7 +19,7 @@
 
 <nav class="navigation" data-action="navigation">
     <ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
-        <?php /* @escapeNotVerified */ echo $_menu; ?>
-        <?php /* @escapeNotVerified */ echo $block->getChildHtml(); ?>
+        <?= /* @escapeNotVerified */ $_menu ?>
+        <?= /* @escapeNotVerified */ $block->getChildHtml() ?>
     </ul>
 </nav>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
index 8d49bd7a2a46f..7d18ed17303b9 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/calendar.phtml
@@ -21,20 +21,20 @@ require([
 //<![CDATA[
     $.extend(true, $, {
         calendarConfig: {
-            dayNames: <?php /* @escapeNotVerified */ echo $days['wide']?>,
-            dayNamesMin: <?php /* @escapeNotVerified */ echo $days['abbreviated']?>,
-            monthNames: <?php /* @escapeNotVerified */ echo $months['wide']?>,
-            monthNamesShort: <?php /* @escapeNotVerified */ echo $months['abbreviated']?>,
-            infoTitle: "<?php /* @escapeNotVerified */ echo __('About the calendar');?>",
-            firstDay: <?php /* @escapeNotVerified */ echo $firstDay?>,
-            closeText: "<?php /* @escapeNotVerified */ echo __('Close');?>",
-            currentText: "<?php /* @escapeNotVerified */ echo __('Go Today'); ?>",
-            prevText: "<?php /* @escapeNotVerified */ echo __('Previous');?>",
-            nextText: "<?php /* @escapeNotVerified */ echo __('Next');?>",
-            weekHeader: "<?php /* @escapeNotVerified */ echo __('WK'); ?>",
-            timeText: "<?php /* @escapeNotVerified */ echo __('Time');?>",
-            hourText: "<?php /* @escapeNotVerified */ echo __('Hour');?>",
-            minuteText: "<?php /* @escapeNotVerified */ echo __('Minute');?>",
+            dayNames: <?= /* @escapeNotVerified */ $days['wide'] ?>,
+            dayNamesMin: <?= /* @escapeNotVerified */ $days['abbreviated'] ?>,
+            monthNames: <?= /* @escapeNotVerified */ $months['wide'] ?>,
+            monthNamesShort: <?= /* @escapeNotVerified */ $months['abbreviated'] ?>,
+            infoTitle: "<?= /* @escapeNotVerified */ __('About the calendar') ?>",
+            firstDay: <?= /* @escapeNotVerified */ $firstDay ?>,
+            closeText: "<?= /* @escapeNotVerified */ __('Close') ?>",
+            currentText: "<?= /* @escapeNotVerified */ __('Go Today') ?>",
+            prevText: "<?= /* @escapeNotVerified */ __('Previous') ?>",
+            nextText: "<?= /* @escapeNotVerified */ __('Next') ?>",
+            weekHeader: "<?= /* @escapeNotVerified */ __('WK') ?>",
+            timeText: "<?= /* @escapeNotVerified */ __('Time') ?>",
+            hourText: "<?= /* @escapeNotVerified */ __('Hour') ?>",
+            minuteText: "<?= /* @escapeNotVerified */ __('Minute') ?>",
             dateFormat: $.datepicker.RFC_2822,
             showOn: "button",
             showAnim: "",
@@ -51,7 +51,7 @@ require([
         }
     });
 
-    enUS = <?php /* @escapeNotVerified */ echo $enUS?>; // en_US locale reference
+    enUS = <?= /* @escapeNotVerified */ $enUS ?>; // en_US locale reference
 //]]>
 
 });
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
index 5ce04099309e6..72d93003c1ae7 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
@@ -17,10 +17,10 @@
         "*": {
             "mage/cookies": {
                 "expires": null,
-                "path": "<?php /* @escapeNotVerified */ echo $block->getPath()?>",
-                "domain": "<?php /* @escapeNotVerified */ echo $block->getDomain()?>",
+                "path": "<?= /* @escapeNotVerified */ $block->getPath() ?>",
+                "domain": "<?= /* @escapeNotVerified */ $block->getDomain() ?>",
                 "secure": false,
-                "lifetime": "<?php /* @escapeNotVerified */ echo $block->getLifetime()?>"
+                "lifetime": "<?= /* @escapeNotVerified */ $block->getLifetime() ?>"
             }
         }
     }
diff --git a/app/code/Magento/Theme/view/frontend/templates/link.phtml b/app/code/Magento/Theme/view/frontend/templates/link.phtml
index a64483993d4f4..9fdcbcb367056 100644
--- a/app/code/Magento/Theme/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/link.phtml
@@ -12,9 +12,9 @@
 ?>
 <?php if (!$block->getIsDisabled()): ?>
 <li>
-    <a href="<?php echo $block->escapeHtml($block->getHref())?>"
-        <?php if ($title = $block->getTitle()):?> title="<?php echo $block->escapeHtml(__($title))?>"<?php endif;?>>
-        <?php echo $block->escapeHtml(__($block->getLabel()))?>
+    <a href="<?= $block->escapeHtml($block->getHref()) ?>"
+        <?php if ($title = $block->getTitle()):?> title="<?= $block->escapeHtml(__($title)) ?>"<?php endif;?>>
+        <?= $block->escapeHtml(__($block->getLabel())) ?>
     </a>
 </li>
 <?php endif; ?>
diff --git a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
index 657e47edd801c..67265de90da77 100644
--- a/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/page/js/require_js.phtml
@@ -6,6 +6,6 @@
 ?>
 <script>
     var require = {
-        "baseUrl": "<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('/') ?>"
+        "baseUrl": "<?= /* @escapeNotVerified */ $block->getViewFileUrl('/') ?>"
     };
 </script>
diff --git a/app/code/Magento/Theme/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
index 85c6a4e54826e..ba3d1c939cb02 100644
--- a/app/code/Magento/Theme/view/frontend/templates/template.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/template.phtml
@@ -4,4 +4,5 @@
  * See COPYING.txt for license details.
  */
 /** @var $block \Magento\Framework\View\Element\Template */
-echo $block->getChildHtml('', false);
+?>
+<?= $block->getChildHtml('', false);
diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
index 82ec031ea3a50..0d6582d0b21e9 100644
--- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
@@ -8,8 +8,8 @@
 
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
+<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
+<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
 
 <script id="translate-inline-icon" type="text/x-magento-template">
     <img src="<%- data.img %>" height="16" width="16" class="translate-edit-icon">
@@ -53,7 +53,7 @@
     <% } %>
 </script>
 
-<div data-role="translate-dialog" data-mage-init='{"translateInline":{"ajaxUrl":"<?php echo $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
+<div data-role="translate-dialog" data-mage-init='{"translateInline":{"ajaxUrl":"<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
 <script>
 require([
     "jquery",
@@ -62,7 +62,7 @@ require([
 ], function($){
         $('body').editTrigger(
             {
-                img: '<?php echo $block->escapeJs($block->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>',
+                img: '<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>',
                 alwaysShown: true,
                 singleElement: false
             }
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
index d5a24575bdf24..9e1021022d876 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -28,9 +28,9 @@
 
                 <?php $version = sha1($block->getTranslationFileTimestamp() . $block->getTranslationFilePath()); ?>
 
-                if (versionObj.version !== '<?php /* @noEscape */ echo $version ?>') {
+                if (versionObj.version !== '<?= /* @noEscape */ $version ?>') {
                     dependencies.push(
-                        'text!<?php /* @noEscape */ echo Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
+                        'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
                     );
 
                 }
@@ -44,7 +44,7 @@
                             $.localStorage.set(
                                 'mage-translation-file-version',
                                 {
-                                    version: '<?php /* @noEscape */ echo $version ?>'
+                                    version: '<?= /* @noEscape */ $version ?>'
                                 }
                             );
                         } else {
diff --git a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
index 59bdadef9787e..5b082d32c40d6 100644
--- a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
@@ -8,9 +8,9 @@
 
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->escapeUrl($block->getViewFileUrl('Magento_Theme::prototype/magento.css')) ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
+<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('prototype/windows/themes/default.css')) ?>"/>
+<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('Magento_Theme::prototype/magento.css')) ?>"/>
+<link rel="stylesheet" type="text/css" href="<?= $block->escapeUrl($block->getViewFileUrl('mage/translate-inline.css')) ?>"/>
 
 <script id="translate-inline-icon" type="text/x-magento-template">
     <img src="<%- data.img %>" height="16" width="16" class="translate-edit-icon">
@@ -56,12 +56,12 @@
 </script>
 
 <div data-role="translate-dialog"
-     data-mage-init='{"translateInline":{"ajaxUrl":"<?php echo $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
+     data-mage-init='{"translateInline":{"ajaxUrl":"<?= $block->escapeJs($block->escapeUrl($block->getAjaxUrl())) ?>"},"loader":{}}'></div>
 <script type="text/x-magento-init">
     {
         "body": {
             "editTrigger": {
-                "img": "<?php echo $block->escapeJs($block->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>",
+                "img": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl('Magento_Theme::fam_book_open.png'))) ?>",
                 "alwaysShown":true,
                 "singleElement":false
             },
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
index f420d55db7d58..0307af4f749d4 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/default.phtml
@@ -12,8 +12,8 @@
  * @var $block \Magento\Ui\Component\Control\Button
  */
 ?>
-<?php echo $block->getBeforeHtml(); ?>
-<button <?php /* @escapeNotVerified */ echo $block->getAttributesHtml(), $block->getUiId(); ?>>
-    <span><?php /* @escapeNotVerified */ echo $block->getLabel(); ?></span>
+<?= $block->getBeforeHtml() ?>
+<button <?= /* @escapeNotVerified */ $block->getAttributesHtml(), $block->getUiId() ?>>
+    <span><?= /* @escapeNotVerified */ $block->getLabel() ?></span>
 </button>
-<?php echo $block->getAfterHtml(); ?>
+<?= $block->getAfterHtml() ?>
diff --git a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
index 537589595144d..1ff1722f944fb 100644
--- a/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
+++ b/app/code/Magento/Ui/view/base/templates/control/button/split.phtml
@@ -11,26 +11,26 @@
 /** @var $block \Magento\Ui\Component\Control\SplitButton */
 ?>
 
-<div <?php echo $block->getAttributesHtml(); ?>>
-    <button <?php echo $block->getButtonAttributesHtml(); ?>>
-        <span><?php echo $block->escapeHtml($block->getLabel()); ?></span>
+<div <?= $block->getAttributesHtml() ?>>
+    <button <?= $block->getButtonAttributesHtml() ?>>
+        <span><?= $block->escapeHtml($block->getLabel()) ?></span>
     </button>
     <?php if ($block->hasSplit()): ?>
-        <button <?php echo $block->getToggleAttributesHtml() ?>>
+        <button <?= $block->getToggleAttributesHtml() ?>>
             <span>Select</span>
         </button>
 
         <?php if (!$block->getDisabled()): ?>
-            <ul class="dropdown-menu" <?php /* @escapeNotVerified */ echo $block->getUiId("dropdown-menu"); ?>>
+            <ul class="dropdown-menu" <?= /* @escapeNotVerified */ $block->getUiId("dropdown-menu") ?>>
                 <?php foreach ($block->getOptions() as $key => $option): ?>
                 <li>
-                    <span <?php echo $block->getOptionAttributesHtml($key, $option); ?>>
-                        <?php echo $block->escapeHtml($option['label']); ?>
+                    <span <?= $block->getOptionAttributesHtml($key, $option) ?>>
+                        <?= $block->escapeHtml($option['label']) ?>
                     </span>
                     <?php if (isset($option['hint'])): ?>
-                    <div class="tooltip" <?php /* @escapeNotVerified */ echo $block->getUiId('item', $key, 'tooltip'); ?>>
-                        <a href="<?php echo $block->escapeHtml($option['hint']['href']) ?>" class="help">
-                            <?php echo $block->escapeHtml($option['hint']['label']) ?>
+                    <div class="tooltip" <?= /* @escapeNotVerified */ $block->getUiId('item', $key, 'tooltip') ?>>
+                        <a href="<?= $block->escapeHtml($option['hint']['href']) ?>" class="help">
+                            <?= $block->escapeHtml($option['hint']['label']) ?>
                         </a>
                     </div>
                     <?php endif; ?>
diff --git a/app/code/Magento/Ui/view/base/templates/form/default.phtml b/app/code/Magento/Ui/view/base/templates/form/default.phtml
index 058a952e40905..97f8ec52ca0d0 100644
--- a/app/code/Magento/Ui/view/base/templates/form/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/form/default.phtml
@@ -10,10 +10,10 @@
  */
 /* @escapeNotVerified */ echo $block->renderChildComponent('before_form');
 ?>
-<div data-role="spinner" data-component="<?php /* @escapeNotVerified */ echo $block->getName(); ?>.areas" class="admin__data-grid-loading-mask">
+<div data-role="spinner" data-component="<?= /* @escapeNotVerified */ $block->getName() ?>.areas" class="admin__data-grid-loading-mask">
     <div class="grid-loader"></div>
 </div>
-<div data-bind="scope: '<?php /* @escapeNotVerified */ echo $block->getName(); ?>.areas'" class="entry-edit form-inline">
+<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getName() ?>.areas'" class="entry-edit form-inline">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
 <?php
diff --git a/app/code/Magento/Ui/view/base/templates/label/default.phtml b/app/code/Magento/Ui/view/base/templates/label/default.phtml
index 5b733d96593c0..db434adf92ee9 100644
--- a/app/code/Magento/Ui/view/base/templates/label/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/label/default.phtml
@@ -5,5 +5,5 @@
  */
 ?>
 <span>
-    <?php /* @escapeNotVerified */ echo $block->getData('label'); ?>
+    <?= /* @escapeNotVerified */ $block->getData('label') ?>
 </span>
diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
index f02aff60d9ff6..58e9ed5d0508f 100644
--- a/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/layout/tabs/default.phtml
@@ -7,6 +7,6 @@
  * @var \Magento\Ui\Component\Layout\Tabs $block
  */
 ?>
-<div data-bind="scope: '<?php /* @escapeNotVerified */ echo $block->getDataScope(); ?>.sections' " class="ui-tabs">
+<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getDataScope() ?>.sections' " class="ui-tabs">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
index 6735c2c0d997f..b81e0bcc8f2a4 100644
--- a/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/layout/tabs/nav/default.phtml
@@ -7,6 +7,6 @@
  * @var \Magento\Ui\Component\Layout\Tabs\Nav $block
  */
 ?>
-<div data-bind="scope: '<?php /* @escapeNotVerified */ echo $block->getDataScope(); ?>.sections' " class="ui-tabs">
+<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getDataScope() ?>.sections' " class="ui-tabs">
     <!-- ko template: getTemplate() --><!-- /ko -->
 </div>
diff --git a/app/code/Magento/Ui/view/base/templates/logger.phtml b/app/code/Magento/Ui/view/base/templates/logger.phtml
index 1237d38a42e77..d064704ab6aed 100644
--- a/app/code/Magento/Ui/view/base/templates/logger.phtml
+++ b/app/code/Magento/Ui/view/base/templates/logger.phtml
@@ -9,7 +9,7 @@
 <?php if ($block->isLoggingEnabled()): ?>
     <script>
         window.onerror = function(msg, url, line) {
-            var key = "<?php /* @escapeNotVerified */ echo $block->getSessionStorageKey(); ?>";
+            var key = "<?= /* @escapeNotVerified */ $block->getSessionStorageKey() ?>";
             var errors = {};
             if (sessionStorage.getItem(key)) {
                 errors = JSON.parse(sessionStorage.getItem(key));
diff --git a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
index 83276cab6702a..05a537b9a6559 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -8,7 +8,7 @@
 
 /** @var $block \Magento\Ui\Block\Component\StepsWizard */
 ?>
-<div data-role="steps-wizard-main" class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope')?>" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
+<div data-role="steps-wizard-main" class="steps-wizard <?= /* @noEscape */ $block->getData('config/dataScope') ?>" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName() ?>'">
     <div data-role="messages" class="messages"></div>
 
     <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
@@ -60,11 +60,11 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                        "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
+                        "<?= /* @escapeNotVerified */  $block->getComponentName() ?>": {
                             "component": "Magento_Ui/js/lib/step-wizard",
                             "initData": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData()) ?>,
                             "stepsNames": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents()) ?>,
-                            "modalClass": "<?= /* @noEscape */ $block->getData('config/dataScope')?>"
+                            "modalClass": "<?= /* @noEscape */ $block->getData('config/dataScope') ?>"
                         }
                     }
                 }
diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
index b8041d3be417f..388727f1e0d65 100644
--- a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
+++ b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -84,13 +84,13 @@ require(["prototype"], function(){
                 'carriers_ups_mode_xml'];
             this.onlyUpsElements = ['carriers_ups_gateway_url'];
 
-            this.storedOriginShipment = '<?php /* @noEscape */ echo $storedOriginShipment ?>';
-            this.storedFreeShipment = '<?php /* @noEscape */ echo $storedFreeShipment ?>';
-            this.storedUpsType = '<?php /* @noEscape */ echo $storedUpsType ?>';
+            this.storedOriginShipment = '<?= /* @noEscape */ $storedOriginShipment ?>';
+            this.storedFreeShipment = '<?= /* @noEscape */ $storedFreeShipment ?>';
+            this.storedUpsType = '<?= /* @noEscape */ $storedUpsType ?>';
             <?php /** @var $jsonHelper \Magento\Framework\Json\Helper\Data */ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data'); ?>
-            this.storedAllowedMethods = <?php /* @noEscape */ echo $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
-            this.originShipmentObj = <?php /* @noEscape */ echo $jsonHelper->jsonEncode($orShipArr) ?>;
-            this.originShipmentObj['default'] = <?php /* @noEscape */ echo $jsonHelper->jsonEncode($defShipArr) ?>;
+            this.storedAllowedMethods = <?= /* @noEscape */ $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
+            this.originShipmentObj = <?= /* @noEscape */ $jsonHelper->jsonEncode($orShipArr) ?>;
+            this.originShipmentObj['default'] = <?= /* @noEscape */ $jsonHelper->jsonEncode($defShipArr) ?>;
 
             this.setFormValues();
             Event.observe($(this.carriersUpsTypeId), 'change', this.setFormValues.bind(this));
@@ -108,7 +108,7 @@ require(["prototype"], function(){
             while (freeMethod.length > 0) {
                 freeMethod.remove(0);
             }
-            freeMethod.insert(new Element('option', {value:''}).update('<?php echo $block->escapeHtml(__('None')); ?>'));
+            freeMethod.insert(new Element('option', {value:''}).update('<?= $block->escapeHtml(__('None')) ?>'));
 
             var code, option;
             for (code in originShipment) {
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
index eb26fcd7d8a9d..0aa8a98dd1df8 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
@@ -9,7 +9,7 @@
 /** @var \Magento\UrlRewrite\Block\Catalog\Category\Tree $block */
 ?>
 <fieldset class="admin__fieldset" data-ui-id="category-selector">
-    <legend class="admin__legend"><span><?php echo $block->escapeHtml(__('Select Category')) ?></span></legend>
+    <legend class="admin__legend"><span><?= $block->escapeHtml(__('Select Category')) ?></span></legend>
     <div class="content content-category-tree">
         <input type="hidden" name="categories" id="product_categories" value="" />
         <?php if ($block->getRoot()): ?>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
index c56278d2910f4..09ac4a5990f6b 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
@@ -8,7 +8,7 @@
 
 /** @var \Magento\UrlRewrite\Block\Edit $block */
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
 <?php if ($block->getChildBlock('form')): ?>
 <script>
 require([
@@ -17,7 +17,7 @@ require([
     'mage/backend/validation'
 ], function($){
     $('#edit_form').form()
-        .validation({validationUrl: '<?php echo $block->escapeUrl($block->getValidationUrl()) ?>'});
+        .validation({validationUrl: '<?= $block->escapeUrl($block->getValidationUrl()) ?>'});
 });
 </script>
 <?php endif; ?>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
index 13fa80077a039..1cc0203d8fbfe 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
@@ -12,12 +12,12 @@
     <fieldset class="admin__fieldset fieldset" data-container-for="entity-type-selector">
         <div class="admin__field field field-entity-type-selector">
             <label for="entity-type-selector" class="admin__field-label label">
-                <span><?php echo $block->escapeHtml($block->getSelectorLabel()) ?></span>
+                <span><?= $block->escapeHtml($block->getSelectorLabel()) ?></span>
             </label>
             <div class="admin__field-control control">
                 <select data-role="entity-type-selector" class="admin__control-select select" onchange="window.location = this.value;" id="entity-type-selector">
                 <?php foreach ($block->getModes() as $mode => $label): ?>
-                    <option <?php /* noEscape */ echo $block->isMode($mode) ? 'selected="selected" ' : '' ?>value="<?php echo $block->escapeUrl($block->getModeUrl($mode)) ?>"><?php echo $block->escapeHtml($label) ?></option>
+                    <option <?php /* noEscape */ echo $block->isMode($mode) ? 'selected="selected" ' : '' ?>value="<?= $block->escapeUrl($block->getModeUrl($mode)) ?>"><?= $block->escapeHtml($label) ?></option>
                 <?php endforeach; ?>
                 </select>
             </div>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
index efb70200bca0b..bc37eb57a12ab 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
@@ -9,23 +9,23 @@
 ?>
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}'>
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Password Help'); ?></span></legend><br/>
-        <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey(); ?>" />
-        <p class="admin__field-info"><?php /* @escapeNotVerified */ echo __('Enter your email address.  You will receive an email with a link to reset your password.'); ?></p>
+        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Password Help') ?></span></legend><br/>
+        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
+        <p class="admin__field-info"><?= /* @escapeNotVerified */ __('Enter your email address.  You will receive an email with a link to reset your password.') ?></p>
         <div class="admin__field _required field-email">
-            <label for="email" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Email address'); ?></span></label>
+            <label for="email" class="admin__field-label"><span><?= /* @escapeNotVerified */ __('Email address') ?></span></label>
             <div class="admin__field-control">
                 <input type="text" id="email" name="email" value="" data-validate="{required:true, 'validate-email':true}" class="admin__control-text" />
             </div>
         </div>
-        <?php echo $block->getChildHtml('form.additional.info'); ?>
+        <?= $block->getChildHtml('form.additional.info') ?>
         <div class="form-actions">
             <div class="actions">
-                <button class="action-retrieve action-primary" type="submit"><span><?php /* @escapeNotVerified */ echo __('Retrieve Password'); ?></span></button>
+                <button class="action-retrieve action-primary" type="submit"><span><?= /* @escapeNotVerified */ __('Retrieve Password') ?></span></button>
             </div>
             <div class="links">
-                <a class="action-back" href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml', ['_nosecret' => true]); ?>">
-                    <?php /* @escapeNotVerified */ echo __('Back to Sign in'); ?>
+                <a class="action-back" href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml', ['_nosecret' => true]) ?>">
+                    <?= /* @escapeNotVerified */ __('Back to Sign in') ?>
                 </a>
             </div>
         </div>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
index 26aeec69ce817..9015ccc75d5a5 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword_url.phtml
@@ -8,5 +8,5 @@
 
 ?>
 <div class="links">
-<a class="action-forgotpassword" href="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])?>"><?php /* @escapeNotVerified */ echo __('Forgot your password?') ?></a>
+<a class="action-forgotpassword" href="<?= /* @escapeNotVerified */ $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true]) ?>"><?= /* @escapeNotVerified */ __('Forgot your password?') ?></a>
 </div>
diff --git a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
index 8be26a5fe5556..cd5abcbc1fecf 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/resetforgottenpassword.phtml
@@ -8,28 +8,28 @@
 
 ?>
 
-<form method="post" data-mage-init='{"form": {}, "validation": {}}' action="<?php /* @escapeNotVerified */ echo $block->getUrl('*/auth/resetpasswordpost', ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]]); ?>" id="reset-password-form" autocomplete="off">
+<form method="post" data-mage-init='{"form": {}, "validation": {}}' action="<?= /* @escapeNotVerified */ $block->getUrl('*/auth/resetpasswordpost', ['_query' => ['id' => $block->getUserId(), 'token' => $block->getResetPasswordLinkToken()]]) ?>" id="reset-password-form" autocomplete="off">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Reset a Password'); ?></span></legend><br />
-        <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey(); ?>" />
+        <legend class="admin__legend"><span><?= /* @escapeNotVerified */ __('Reset a Password') ?></span></legend><br />
+        <input name="form_key" type="hidden" value="<?= /* @escapeNotVerified */ $block->getFormKey() ?>" />
         <div class="admin__field _required field-password">
-            <label class="admin__field-label" for="password"><span><?php /* @escapeNotVerified */ echo __('New Password'); ?></span></label>
+            <label class="admin__field-label" for="password"><span><?= /* @escapeNotVerified */ __('New Password') ?></span></label>
             <div class="admin__field-control">
                 <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-admin-password':true}" name="password" id="password" placeholder="new password" autocomplete="off" />
             </div>
         </div>
         <div class="admin__field _required field-confirmation">
-            <label class="admin__field-label" for="confirmation"><span><?php /* @escapeNotVerified */ echo __('Confirm New Password'); ?></span></label>
+            <label class="admin__field-label" for="confirmation"><span><?= /* @escapeNotVerified */ __('Confirm New Password') ?></span></label>
             <div class="admin__field-control">
                 <input type="password" class="admin__control-text" data-validate="{required:true, 'validate-cpassword':true}" name="confirmation" id="confirmation" placeholder="confirm new password" autocomplete="off" />
             </div>
         </div>
         <div class="form-actions">
             <div class="actions">
-                <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Reset Password'); ?>" class="action-reset action-primary"><span><?php /* @escapeNotVerified */ echo __('Reset Password'); ?></span></button>
+                <button type="submit" title="<?= /* @escapeNotVerified */ __('Reset Password') ?>" class="action-reset action-primary"><span><?= /* @escapeNotVerified */ __('Reset Password') ?></span></button>
             </div>
             <div class="links">
-                <a class="action-back" href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml', ['_nosecret' => true]) ?>"><?php /* @escapeNotVerified */ echo __('Back to Sign in'); ?></a>
+                <a class="action-back" href="<?= /* @escapeNotVerified */ $block->getUrl('adminhtml', ['_nosecret' => true]) ?>"><?= /* @escapeNotVerified */ __('Back to Sign in') ?></a>
             </div>
         </div>
     </fieldset>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
index 7c35eacc1594e..25d8e4331a30d 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -12,26 +12,26 @@
 /** @var $block \Magento\User\Block\Role\Tab\Edit */
 ?>
 
-<?php echo $block->getChildHtml(); ?>
+<?= $block->getChildHtml() ?>
 
 <fieldset class="fieldset form-inline entry-edit">
     <legend class="legend">
-        <span><?php /* @escapeNotVerified */ echo __('Roles Resources') ?></span>
+        <span><?= /* @escapeNotVerified */ __('Roles Resources') ?></span>
     </legend><br />
 
     <div class="field">
-        <label class="label" for="all"><span><?php /* @escapeNotVerified */ echo __('Resource Access') ?></span></label>
+        <label class="label" for="all"><span><?= /* @escapeNotVerified */ __('Resource Access') ?></span></label>
 
         <div class="control">
             <select id="all" name="all" onchange="jQuery('[data-role=tree-resources-container]').toggle()" class="select">
-                <option value="0" <?php echo($block->isEverythingAllowed() ? '' : 'selected="selected"'); ?>><?php /* @escapeNotVerified */ echo __('Custom') ?></option>
-                <option value="1" <?php echo($block->isEverythingAllowed() ? 'selected="selected"' : ''); ?>><?php /* @escapeNotVerified */ echo __('All') ?></option>
+                <option value="0" <?= ($block->isEverythingAllowed() ? '' : 'selected="selected"') ?>><?= /* @escapeNotVerified */ __('Custom') ?></option>
+                <option value="1" <?= ($block->isEverythingAllowed() ? 'selected="selected"' : '') ?>><?= /* @escapeNotVerified */ __('All') ?></option>
             </select>
         </div>
     </div>
 
     <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
-        <label class="label"><span><?php /* @escapeNotVerified */ echo __('Resources') ?></span></label>
+        <label class="label"><span><?= /* @escapeNotVerified */ __('Resources') ?></span></label>
 
         <div class="control">
             <div class="tree x-tree" data-role="resource-tree" data-mage-init='<?php
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
index e726cea0111f3..689b8c82ceeba 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/saverole') ?>" method="post" id="role-edit-form">
-    <?php echo $block->getBlockHtml('formkey')?>
+<form action="<?= /* @escapeNotVerified */ $block->getUrl('*/*/saverole') ?>" method="post" id="role-edit-form">
+    <?= $block->getBlockHtml('formkey') ?>
 </form>
 <script>
 require([
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
index 85291ddd65f3e..d30e658512fc8 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Role Users') ?></span></legend>
+    <legend class="legend"><span><?= /* @escapeNotVerified */ __('Role Users') ?></span></legend>
     <br />
-    <?php echo $block->getGridHtml() ?>
+    <?= $block->getGridHtml() ?>
 </fieldset>
diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
index ca8747ef8501b..964d925a5f2fd 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml
@@ -17,7 +17,7 @@ require([
 <!--
 <?php $myBlock = $block->getLayout()->getBlock('roleUsersGrid'); ?>
 <?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
-    var checkBoxes = $H(<?php /* @escapeNotVerified */ echo $myBlock->getUsers(true) ?>);
+    var checkBoxes = $H(<?= /* @escapeNotVerified */ $myBlock->getUsers(true) ?>);
     var warning = false;
     if (checkBoxes.size() > 0) {
         warning = true;
@@ -46,7 +46,7 @@ require([
 
                 if (checked) {
                     confirm({
-                        content: "<?php /* @escapeNotVerified */ echo __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>",
+                        content: "<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>",
                         actions: {
                             confirm: function () {
                                 checkbox[0].checked = false;
@@ -95,7 +95,7 @@ require([
         if (!allCheckbox.checked && _.size(checkBoxes._object) > 0) {
             allCheckbox.checked = true;
             confirm({
-                content: "<?php /* @escapeNotVerified */ echo __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>",
+                content: "<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>",
                 actions: {
                     confirm: function () {
                         allCheckbox.checked = false;
@@ -108,25 +108,25 @@ require([
         }
     }
     function markCheckboxes(value) {
-        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.rows.each(function(row)
+        <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rows.each(function(row)
         {
             $(row).getElementsByClassName('checkbox')[0].checked = value;
-            roleUsersRowInit(<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>, row);
+            roleUsersRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row);
         });
     }
     function onLoad() {
-        if (typeof <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?> !== 'undefined') {
-            <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.
+        if (typeof <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?> !== 'undefined') {
+            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
             rowClickCallback = roleUsersRowClick;
-            <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.
+            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
             initRowCallback = roleUsersRowInit;
-            <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.
+            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
             checkboxCheckCallback = registerUserRole;
-            <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.
+            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
             checkCheckboxes = massSelectUsers;
-            <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.
+            <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.
             rows.each(function (row) {
-                roleUsersRowInit(<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>, row)
+                roleUsersRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row)
             });
             $('in_role_user_old').value = $('in_role_user').value;
         } else {
diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
index 661139869acff..11ac72e6e382c 100644
--- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml
@@ -17,7 +17,7 @@ require([
 <?php if (is_object($myBlock) && $myBlock->getJsObjectName()): ?>
     var radioBoxes = $H({});
     var warning = false;
-    var userRoles = $H(<?php /* @escapeNotVerified */ echo $myBlock->getSelectedRoles(true) ?>);
+    var userRoles = $H(<?= /* @escapeNotVerified */ $myBlock->getSelectedRoles(true) ?>);
     if (userRoles.size() > 0) warning = true;
     $('user_user_roles').value = userRoles.toQueryString();
 
@@ -40,7 +40,7 @@ require([
             if(checkbox[0] && !checkbox[0].checked){
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
                 if (checked && warning && radioBoxes.size() > 0) {
-                    if ( !confirm("<?php /* @escapeNotVerified */ echo __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
+                    if ( !confirm("<?= /* @escapeNotVerified */ __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
                         checkbox[0].checked = false;
                         for(i in radioBoxes) {
                             if( radioBoxes[i].status == 1) {
@@ -51,7 +51,7 @@ require([
                     }
                     warning = false;
                 }
-                <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.setCheckboxChecked(checkbox[0], checked);
+                <?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.setCheckboxChecked(checkbox[0], checked);
             }
         }
     }
@@ -63,10 +63,10 @@ require([
         }
     }
 
-<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.rowClickCallback = roleRowClick;
-<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.initRowCallback = rolesRowInit;
-<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
-<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.rows.each(function(row){rolesRowInit(<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>, row)});
+<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rowClickCallback = roleRowClick;
+<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.initRowCallback = rolesRowInit;
+<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
+<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>.rows.each(function(row){rolesRowInit(<?= /* @escapeNotVerified */ $myBlock->getJsObjectName() ?>, row)});
 <?php endif; ?>
 
 });
@@ -78,9 +78,9 @@ require([
         {
             "[data-role=delete-user]" : {
                 "deleteUserAccount" : {
-                    "message": "<?php echo $editBlock->escapeHtml($editBlock->getDeleteMessage()) ?>",
-                    "url": "<?php /* @noEscape */ echo $editBlock->getDeleteUrl(); ?>",
-                    "objId": "<?php echo $editBlock->escapeHtml($editBlock->getObjectId()) ?>"
+                    "message": "<?= $editBlock->escapeHtml($editBlock->getDeleteMessage()) ?>",
+                    "url": "<?= /* @noEscape */ $editBlock->getDeleteUrl() ?>",
+                    "objId": "<?= $editBlock->escapeHtml($editBlock->getObjectId()) ?>"
                 }
             }
         }
diff --git a/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
index fa84b1fe2895d..ddaf678c57691 100644
--- a/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
+++ b/app/code/Magento/Vault/view/adminhtml/templates/form/vault.phtml
@@ -11,13 +11,13 @@ $code = $block->escapeHtml($block->getMethodCode());
 ?>
 <fieldset data-mage-init='{
         "Magento_Vault/js/vault": {
-            "code": "<?php /* @noEscape */ echo $code; ?>",
-            "fieldset": "payment_form_<?php /* @noEscape */ echo $code; ?>"
+            "code": "<?= /* @noEscape */ $code ?>",
+            "fieldset": "payment_form_<?= /* @noEscape */ $code ?>"
         }
     }' class="admin__fieldset payment-method"
-          id="payment_form_<?php /* @noEscape */ echo $code; ?>"
+          id="payment_form_<?= /* @noEscape */ $code ?>"
           style="display:none"
               >
-    <input type="hidden" name="payment[public_hash]" id="<?php /* @noEscape */ echo $code; ?>_public_hash" value="" />
-    <?php echo $block->getChildHtml(); ?>
+    <input type="hidden" name="payment[public_hash]" id="<?= /* @noEscape */ $code ?>_public_hash" value="" />
+    <?= $block->getChildHtml() ?>
 </fieldset>
diff --git a/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml b/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
index 80de44a11b0bb..9fd9e304523c4 100644
--- a/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
+++ b/app/code/Magento/Vault/view/frontend/templates/cards_list.phtml
@@ -11,12 +11,12 @@ $tokens = $block->getPaymentTokens();
 <?php if (count($tokens) !== 0): ?>
     <div class="table-wrapper my-credit-cards">
         <table class="data table table-credit-cards" id="my-orders-table">
-            <caption class="table-caption"><?php /* @noEscape */ echo __('Stored Payment Methods') ?></caption>
+            <caption class="table-caption"><?= /* @noEscape */ __('Stored Payment Methods') ?></caption>
             <thead>
             <tr>
-                <th scope="col" class="col card-number"><?php /* @noEscape */ echo __('Card Number') ?></th>
-                <th scope="col" class="col expire"><?php /* @noEscape */ echo __('Expiration Date') ?></th>
-                <th scope="col" class="col card-type"><?php /* @noEscape */ echo __('Type') ?></th>
+                <th scope="col" class="col card-number"><?= /* @noEscape */ __('Card Number') ?></th>
+                <th scope="col" class="col expire"><?= /* @noEscape */ __('Expiration Date') ?></th>
+                <th scope="col" class="col card-type"><?= /* @noEscape */ __('Type') ?></th>
                 <th scope="col" class="col actions">&nbsp;</th>
             </tr>
             </thead>
@@ -31,5 +31,5 @@ $tokens = $block->getPaymentTokens();
     </div>
 
 <?php elseif (!$block->isExistsCustomerTokens()): ?>
-    <div class="message info empty"><span><?php /* @noEscape */ echo __('You have no stored payment methods.'); ?></span></div>
+    <div class="message info empty"><span><?= /* @noEscape */ __('You have no stored payment methods.') ?></span></div>
 <?php endif ?>
diff --git a/app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml b/app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml
index 5ea3eee11797d..7be7946fff1bf 100644
--- a/app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml
+++ b/app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml
@@ -12,28 +12,28 @@ use Magento\Vault\Block\CardRendererInterface;
 $ccNumberView = $block->escapeHtml($block->getNumberLast4Digits());
 ?>
 <tr>
-    <td data-th="<?php echo $block->escapeHtml(__('Card Number')) ?>" class="col card-number">
-        <span><?php echo $block->escapeHtml(__('ending')); ?></span> <?php /* @noEscape */ echo $ccNumberView ?>
+    <td data-th="<?= $block->escapeHtml(__('Card Number')) ?>" class="col card-number">
+        <span><?= $block->escapeHtml(__('ending')) ?></span> <?= /* @noEscape */ $ccNumberView ?>
     </td>
-    <td data-th="<?php echo $block->escapeHtml(__('Expiration Date')) ?>" class="col card-expire">
-        <?php echo $block->escapeHtml($block->getExpDate()); ?>
+    <td data-th="<?= $block->escapeHtml(__('Expiration Date')) ?>" class="col card-expire">
+        <?= $block->escapeHtml($block->getExpDate()) ?>
     </td>
-    <td data-th="<?php echo $block->escapeHtml(__('Type')) ?>" class="col card-type">
-        <img src="<?php /* @noEscape */ echo $block->getIconUrl(); ?>"
-             width="<?php /* @noEscape */ echo $block->getIconWidth(); ?>"
-             height="<?php /* @noEscape */ echo $block->getIconHeight(); ?>"
+    <td data-th="<?= $block->escapeHtml(__('Type')) ?>" class="col card-type">
+        <img src="<?= /* @noEscape */ $block->getIconUrl() ?>"
+             width="<?= /* @noEscape */ $block->getIconWidth() ?>"
+             height="<?= /* @noEscape */ $block->getIconHeight() ?>"
         >
     </td>
-    <td data-th="<?php echo $block->escapeHtml(__('Actions')) ?>" class="col actions">
+    <td data-th="<?= $block->escapeHtml(__('Actions')) ?>" class="col actions">
         <form
             class="form"
-            action="<?php echo $block->escapeUrl($block->getUrl('vault/cards/deleteaction')); ?>"
+            action="<?= $block->escapeUrl($block->getUrl('vault/cards/deleteaction')) ?>"
             method="post"
             >
-            <?php echo $block->getBlockHtml('formkey')?>
+            <?= $block->getBlockHtml('formkey') ?>
             <input
-                name="<?php /* @noEscape */ echo PaymentTokenInterface::PUBLIC_HASH?>"
-                value="<?php /* @noEscape */ echo $block->getToken()->getPublicHash()?>"
+                name="<?= /* @noEscape */ PaymentTokenInterface::PUBLIC_HASH ?>"
+                value="<?= /* @noEscape */ $block->getToken()->getPublicHash() ?>"
                 type="hidden"/>
             <button type="submit"
                     class="action delete"
@@ -42,13 +42,13 @@ $ccNumberView = $block->escapeHtml($block->getNumberLast4Digits());
                                         "type": "popup",
                                         "modalClass": "my-credit-cards-popup",
                                         "toggleEvent": "click",
-                                        "title": "<?php echo $block->escapeHtml(__('Delete')) ?>",
-                                        "content": "Are you sure you want to delete this card: <?php
-                                            /* @noEscape */ echo $ccNumberView
+                                        "title": "<?= $block->escapeHtml(__('Delete')) ?>",
+                                        "content": "Are you sure you want to delete this card: <?=
+                                            /* @noEscape */ $ccNumberView
                                         ?>?"
                                     }
                                 }'>
-                <span><?php echo $block->escapeHtml(__('Delete')) ?></span>
+                <span><?= $block->escapeHtml(__('Delete')) ?></span>
             </button>
         </form>
     </td>
diff --git a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
index 8cfcd4b734a41..17d648ebaf25c 100644
--- a/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
+++ b/app/code/Magento/Vault/view/frontend/templates/token_list.phtml
@@ -13,13 +13,13 @@ $tokens = $block->getPaymentTokens();
         <table class="data table table-credit-cards" id="token-list-table">
             <thead>
             <tr>
-                <th scope="col" class="col"><?php echo $block->escapeHtml(__('PayPal Account')); ?></th>
+                <th scope="col" class="col"><?= $block->escapeHtml(__('PayPal Account')) ?></th>
                 <th scope="col" class="col actions">&nbsp;</th>
             </tr>
             </thead>
             <tbody>
             <?php foreach($tokens as $token): ?>
-                <?php /* @noEscape */ echo $block->renderTokenHtml($token); ?>
+                <?= /* @noEscape */ $block->renderTokenHtml($token) ?>
             <?php endforeach; ?>
             </tbody>
         </table>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
index 0bdc7b5edd900..ea35eff438c0d 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/row.phtml
@@ -19,24 +19,24 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
         <?php endif; ?>
 
-        <?php echo $block->getRowPriceExclTaxHtml() ?>
+        <?= $block->getRowPriceExclTaxHtml() ?>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
+                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount'], $tax['row_amount']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                    <?php echo $block->getFinalRowPriceExclTaxHtml(); ?>
+                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                    <?= $block->getFinalRowPriceExclTaxHtml() ?>
                 </span>
             <?php endif; ?>
         <?php endif; ?>
@@ -45,24 +45,24 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
         <?php endif; ?>
-        <?php echo $block->getRowPriceInclTaxHtml(); ?>
+        <?= $block->getRowPriceInclTaxHtml() ?>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
             <br />
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
+                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                    <?php echo $block->getFinalRowPriceInclTaxHtml(); ?>
+                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                    <?= $block->getFinalRowPriceInclTaxHtml() ?>
                 </span>
             <?php endif; ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
index b4bfc9f059395..fa55009fb5b6f 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
@@ -13,4 +13,4 @@
 $_item = $block->getItem();
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?= /* @escapeNotVerified */ $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
index c7f9737785021..13eca4afd2e8e 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/items/price/unit.phtml
@@ -19,25 +19,25 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
         <?php endif; ?>
 
-        <?php echo $block->getUnitPriceExclTaxHtml() ?>
+        <?= $block->getUnitPriceExclTaxHtml() ?>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
             <br />
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
+                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount'], $tax['amount']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                    <?php echo $block->getFinalUnitPriceExclTaxHtml(); ?>
+                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                    <?= $block->getFinalUnitPriceExclTaxHtml() ?>
                 </span>
             <?php endif; ?>
         <?php endif; ?>
@@ -46,24 +46,24 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
         <?php endif; ?>
-        <?php echo $block->getUnitPriceInclTaxHtml(); ?>
+        <?= $block->getUnitPriceInclTaxHtml() ?>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
             <br />
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
+                        <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']) ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                    <?php echo $block->getFinalUnitPriceInclTaxHtml(); ?>
+                <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                    <?= $block->getFinalUnitPriceInclTaxHtml() ?>
                 </span>
             <?php endif; ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index 7066c1fc7b6ba..d9bd79e65a153 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
@@ -15,9 +15,9 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getRowDisplayPriceExclTax()); ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
@@ -25,15 +25,15 @@ $_item = $block->getItem();
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
+            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
@@ -41,22 +41,22 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getRowDisplayPriceInclTax()); ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>:<br />
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
+            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
index f30a422776fc2..bda7b807c6094 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/total.phtml
@@ -17,9 +17,9 @@ $_item = $block->getItem();
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php $_rowTotalWithoutDiscount = $block->getRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount(); ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
@@ -27,15 +27,15 @@ $_item = $block->getItem();
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()); ?>
+            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
@@ -44,23 +44,23 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice(max(0, $_incl)) ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice(max(0, $_incl)) ?>
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>:<br />
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()); ?>
+            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
index 481e1c6ffdb8b..d56e0fc3ebb3f 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/unit.phtml
@@ -15,24 +15,24 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */ __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+            <span class="nobr"><?= /* @escapeNotVerified */ __('Total') ?>:<br />
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
@@ -41,23 +41,23 @@ $_item = $block->getItem();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */ __('Incl. Tax') ?>:</span>
     <?php endif; ?>
-    <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+    <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
 
     <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
         <br />
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <small>
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */ $tax['title'] ?>: <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>:<br />
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+            <span class="nobr"><?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>:<br />
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
index a99af1cd2cdc8..01ecaca435d15 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -17,24 +17,24 @@ $data = ['fptAttribute' => [
     'bundlePriceType' => '#price_type',
 ]];
 ?>
-<div id="attribute-<?php echo $block->getElement()->getHtmlId(); ?>-container" class="field"
-     data-attribute-code="<?php echo $block->getElement()->getHtmlId(); ?>"
-     data-mage-init="<?=$block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data))?>">
-    <label class="label"><span><?php /* @escapeNotVerified */ echo $block->getElement()->getLabel() ?></span></label>
+<div id="attribute-<?= $block->getElement()->getHtmlId() ?>-container" class="field"
+     data-attribute-code="<?= $block->getElement()->getHtmlId() ?>"
+     data-mage-init="<?= $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data)) ?>">
+    <label class="label"><span><?= /* @escapeNotVerified */ $block->getElement()->getLabel() ?></span></label>
 
     <div class="control">
         <table class="data-table">
             <thead>
                 <tr>
-                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Website'); ?></th>
-                    <th class="col-country required"><?php /* @escapeNotVerified */ echo __('Country/State'); ?></th>
-                    <th class="col-tax required"><?php /* @escapeNotVerified */ echo __('Tax'); ?></th>
-                    <th class="col-action"><?php /* @escapeNotVerified */ echo __('Action'); ?></th>
+                    <th class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none;"<?php endif; ?>><?= /* @escapeNotVerified */ __('Website') ?></th>
+                    <th class="col-country required"><?= /* @escapeNotVerified */ __('Country/State') ?></th>
+                    <th class="col-tax required"><?= /* @escapeNotVerified */ __('Tax') ?></th>
+                    <th class="col-action"><?= /* @escapeNotVerified */ __('Action') ?></th>
                 </tr>
             </thead>
             <tfoot>
                 <tr>
-                    <td colspan="4" class="col-actions-add"><?php echo $block->getAddButtonHtml(); ?></td>
+                    <td colspan="4" class="col-actions-add"><?= $block->getAddButtonHtml() ?></td>
                 </tr>
             </tfoot>
             <tbody data-role="fpt-item-container" class="fpt-item-container">
@@ -44,42 +44,42 @@ $data = ['fptAttribute' => [
             Hidden field below with attribute code id is necessary for jQuery validation plugin.
             Validation message will be displayed after this field.
         -->
-        <input type="hidden" name="<?php echo $block->getElement()->getHtmlId(); ?>" id="<?php echo $block->getElement()->getHtmlId(); ?>" disabled="disabled">
+        <input type="hidden" name="<?= $block->getElement()->getHtmlId() ?>" id="<?= $block->getElement()->getHtmlId() ?>" disabled="disabled">
     </div>
 
     <script data-role="row-template" type="text/x-magento-template">
-        <tr id="<?php echo $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
+        <tr id="<?= $block->getElement()->getHtmlId() ?>_weee_tax_row_<%- data.index %>" data-role="fpt-item-row">
             <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
-                <select id="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_website"
-                        name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>[<%- data.index %>][website_id]"
-                        class="<?php /* @escapeNotVerified */ echo $block->getElement()->getClass() ?> website required-entry" data-role="select-website">
+                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_website"
+                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][website_id]"
+                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> website required-entry" data-role="select-website">
                     <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_websiteId ?>"><?php /* @escapeNotVerified */ echo $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?php /* @escapeNotVerified */ echo $_info['currency'] ?>]<?php endif; ?></option>
+                    <option value="<?= /* @escapeNotVerified */ $_websiteId ?>"><?= /* @escapeNotVerified */ $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?= /* @escapeNotVerified */ $_info['currency'] ?>]<?php endif; ?></option>
                     <?php endforeach ?>
                 </select>
             </td>
             <td class="col-country">
-                <select id="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_country"
-                        name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>[<%- data.index %>][country]"
-                        class="<?php /* @escapeNotVerified */ echo $block->getElement()->getClass() ?> country required-entry" data-role="select-country">
+                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_country"
+                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][country]"
+                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> country required-entry" data-role="select-country">
                     <?php foreach ($block->getCountries() as $_country): ?>
-                    <option value="<?php /* @escapeNotVerified */ echo $_country['value'] ?>"><?php /* @escapeNotVerified */ echo htmlspecialchars($_country['label']) ?></option>
+                    <option value="<?= /* @escapeNotVerified */ $_country['value'] ?>"><?= /* @escapeNotVerified */ htmlspecialchars($_country['label']) ?></option>
                     <?php endforeach ?>
                 </select>
-                <select id="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_state"
-                        name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>[<%- data.index %>][state]"
-                        class="<?php /* @escapeNotVerified */ echo $block->getElement()->getClass() ?> state" disabled="" data-role="select-state">
+                <select id="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_state"
+                        name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][state]"
+                        class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> state" disabled="" data-role="select-state">
                     <option value="0">*</option>
                 </select>
             </td>
             <td class="col-tax">
-                <input name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>[<%- data.index %>][price]"
-                       class="<?php /* @escapeNotVerified */ echo $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
+                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][price]"
+                       class="<?= /* @escapeNotVerified */ $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
                        type="text" value="<%- data.value %>"/>
             </td>
             <td class="col-action">
-                <input name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
-                <?php echo $block->getChildHtml('delete_button') ?>
+                <input name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
+                <?= $block->getChildHtml('delete_button') ?>
             </td>
         </tr>
     </script>
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index f31c0192aac71..c05d48cab6a43 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -23,22 +23,22 @@ $priceDisplay = $block->isPriceIncludesTax();
         <?php if ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_INCLUDING_TAX): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
-                            <?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute); ?></span>
+                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
+                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
         <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_EXCLUDING_TAX): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
-                            <?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute); ?></span>
+                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) ?>">
+                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php elseif ($taxDisplay == Magento\Tax\Model\Config::DISPLAY_TYPE_BOTH): ?>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Incl. Tax'  ?>">
-                            <?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute); ?></span>
+                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Incl. Tax' ?>">
+                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithTax($weeeTaxAttribute) ?></span>
             <span class="weee"
                   data-price-type="weee"
-                  data-label="<?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Excl. Tax' ?>">
-                            <?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute); ?></span>
+                  data-label="<?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeName($weeeTaxAttribute) . ' Excl. Tax' ?>">
+                            <?= /* @escapeNotVerified */ $block->renderWeeeTaxAttributeWithoutTax($weeeTaxAttribute) ?></span>
         <?php endif; ?>
     <?php endforeach; ?>
 <?php endif; ?>
@@ -46,6 +46,6 @@ $priceDisplay = $block->isPriceIncludesTax();
 <?php if ($block->showExclDescrIncl()): // excl. + weee + final ?>
     <span class="price-final price-final_price"
           data-price-type="weeePrice"
-          data-price-amount="<?php /* @escapeNotVerified */ echo $block->getRawFinalAmount(); ?>"
-          data-label="<?php /* @escapeNotVerified */ echo __('Final Price'); ?>"><?php /* @escapeNotVerified */ echo $block->getFinalAmount(); ?></span>
+          data-price-amount="<?= /* @escapeNotVerified */ $block->getRawFinalAmount() ?>"
+          data-label="<?= /* @escapeNotVerified */ __('Final Price') ?>"><?= /* @escapeNotVerified */ $block->getFinalAmount() ?></span>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
index 79140880aceaa..9c7a77c54a373 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/cart/item/price/sidebar.phtml
@@ -16,29 +16,29 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 ?>
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <span class="minicart-tax-total">
     <?php else: ?>
         <span class="minicart-price">
     <?php endif; ?>
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
         </span>
 
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info">
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
-                    <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?>
+                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
+                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
-                    <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total Incl. Tax')); ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -48,29 +48,29 @@ $block->setZone(\Magento\Framework\Pricing\Render::ZONE_CART);
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <span class="minicart-tax-total">
     <?php else: ?>
         <span class="minicart-price">
     <?php endif; ?>
-        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+        <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
         </span>
 
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info">
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
-                    <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?>
+                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
+                    <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
                 </span>
             <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
-                    <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
index e50b797b2bbd7..bc63a5eff642b 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_excl_tax.phtml
@@ -11,26 +11,26 @@
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
-<?php /* @escapeNotVerified */ echo $block->formatPrice($block->getRowDisplayPriceExclTax()); ?>
+<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>" style="display: none;">
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?></span>
+            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo __('Total'); ?>">
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
index 765d464ba0843..a85904e197bfb 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/row_incl_tax.phtml
@@ -14,26 +14,26 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
 ?>
 <?php $_incl = $_item->getRowTotalInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
-<?php /* @escapeNotVerified */ echo $block->formatPrice($block->getRowDisplayPriceInclTax()); ?>
+<?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>" style="display: none;">
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
+                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>">
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
index b0536de831462..dc1d22ff3b0dd 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_excl_tax.phtml
@@ -11,27 +11,27 @@
 $_item = $block->getItem();
 ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="eunit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>" style="display:none;">
+    <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display:none;">
     <?php if ($block->displayPriceWithWeeeDetails()): ?>
         <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?></span>
+            <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?></span>
         <?php endforeach; ?>
     <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo __('Total'); ?>">
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total') ?>">
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
index 6a06bfad49eda..3b7c2f530d3be 100644
--- a/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/checkout/onepage/review/item/price/unit_incl_tax.phtml
@@ -14,27 +14,27 @@ $_weeeHelper = $this->helper('Magento\Weee\Helper\Data');
 ?>
 <?php $_incl = $_item->getPriceInclTax(); ?>
 <?php if ($block->displayPriceWithWeeeDetails()): ?>
-    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+<?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
     </span>
 
 <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item)): ?>
-    <span class="cart-tax-info" id="unit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>" style="display: none;">
+    <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>" style="display: none;">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?></span>
+                <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>"><?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?></span>
             <?php endforeach; ?>
         <?php endif; ?>
     </span>
 
     <?php if ($block->displayFinalPrice()): ?>
-        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>">
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+        <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $_item->getId() ?>"}}'>
+            <span class="weee" data-label="<?= /* @escapeNotVerified */ __('Total Incl. Tax') ?>">
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
             </span>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index a01bfc8b5a691..dc128902ef4d2 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
@@ -11,30 +11,30 @@
 $item = $block->getItem();
 ?>
 <?php if (($block->displayPriceInclTax() || $block->displayBothPrices()) && !$item->getNoSubtotal()): ?>
-    <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getRowDisplayPriceInclTax()); ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceInclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <div class="cart-tax-info" id="subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>" style="display: none;">
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?>
+                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </div>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
-                    <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total Incl. Tax')); ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -43,31 +43,31 @@ $item = $block->getItem();
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getRowDisplayPriceExclTax()); ?>
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getRowDisplayPriceExclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?>
+                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['row_amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
-                    <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
index 4bfd2dd7832df..03c050e0a0b04 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/total_after_discount.phtml
@@ -10,4 +10,4 @@
 $_item = $block->getItem();
 ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<?php /* @escapeNotVerified */ echo $_order->formatPrice($block->getTotalAmount($_item))?>
+<?= /* @escapeNotVerified */ $_order->formatPrice($block->getTotalAmount($_item)) ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
index 05e23bbfaed0e..575a0dd6c9aa8 100644
--- a/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/item/price/unit.phtml
@@ -11,30 +11,30 @@
 $item = $block->getItem();
 ?>
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
-    <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
+    <span class="price-including-tax" data-label="<?= $block->escapeHtml(__('Incl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+            <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceInclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="unit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>" style="display: none;">
+            <span class="cart-tax-info" id="unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?>
+                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount_incl_tax'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
-                    <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total Incl. Tax')); ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+                    data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total Incl. Tax')) ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -43,31 +43,31 @@ $item = $block->getItem();
 <?php endif; ?>
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
-    <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
+    <span class="price-excluding-tax" data-label="<?= $block->escapeHtml(__('Excl. Tax')) ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+                <?= /* @escapeNotVerified */ $block->formatPrice($block->getUnitDisplayPriceExclTax()) ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
-            <span class="cart-tax-info" id="eunit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"
+            <span class="cart-tax-info" id="eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?>
+                    <span class="weee" data-label="<?= /* @escapeNotVerified */ $tax['title'] ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($tax['amount'], true, true) ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
-                    <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
-                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+                      data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?= /* @escapeNotVerified */ $item->getId() ?>"}}'>
+                    <span class="weee" data-label="<?= $block->escapeHtml(__('Total')) ?>">
+                        <?= /* @escapeNotVerified */ $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()) ?>
                     </span>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
index 0a6a0073a315d..b6c19f2906508 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/catalog/category/widget/tree.phtml
@@ -10,16 +10,16 @@
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
-<div id="<?php echo $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
+<div id="<?= $block->escapeHtmlAttr($_divId) ?>" class="tree"></div>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <script>
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){
 
-var tree<?php echo $block->escapeJs($block->getId()) ?>;
+var tree<?= $block->escapeJs($block->getId()) ?>;
 
-var useMassaction = <?php /* @noEscape */ echo $block->getUseMassaction() ? 1 : 0; ?>;
+var useMassaction = <?= /* @noEscape */ $block->getUseMassaction() ? 1 : 0 ?>;
 
-var isAnchorOnly = <?php /* @noEscape */ echo $block->getIsAnchorOnly() ? 1 : 0; ?>;
+var isAnchorOnly = <?= /* @noEscape */ $block->getIsAnchorOnly() ? 1 : 0 ?>;
 
 Ext.tree.TreePanel.Enhanced = function(el, config)
 {
@@ -44,7 +44,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
         if (firstLoad) {
             <?php if ($block->getNodeClickListener()): ?>
-                this.addListener('click', <?php /* @noEscape */ echo $block->getNodeClickListener() ?>.createDelegate(this));
+                this.addListener('click', <?= /* @noEscape */ $block->getNodeClickListener() ?>.createDelegate(this));
             <?php endif; ?>
         }
 
@@ -57,10 +57,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?php /* @noEscape */ echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+    var emptyNodeAdded = <?= /* @noEscape */ ($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 
     var categoryLoader = new Ext.tree.TreeLoader({
-        dataUrl: '<?php echo $block->escapeUrl($block->getLoadTreeUrl()) ?>'
+        dataUrl: '<?= $block->escapeUrl($block->getLoadTreeUrl()) ?>'
     });
 
     categoryLoader.buildCategoryTree = function(parent, config)
@@ -79,7 +79,7 @@ jQuery(function()
                 // Add empty node to reset category filter
                 if(!emptyNodeAdded) {
                     var empty = Object.clone(_node);
-                    empty.text = '<?php echo $block->escapeJs($block->escapeHtml(__('None'))); ?>';
+                    empty.text = '<?= $block->escapeJs($block->escapeHtml(__('None'))) ?>';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -150,37 +150,37 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?php echo $block->escapeJs($_divId); ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('<?= $block->escapeJs($_divId) ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?php echo $block->escapeJs($block->getId()) ?> = new Ext.tree.TreePanel.Enhanced('<?php echo $block->escapeJs($_divId) ?>', {
+    tree<?= $block->escapeJs($block->getId()) ?> = new Ext.tree.TreePanel.Enhanced('<?= $block->escapeJs($_divId) ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
-        rootVisible:      '<?php echo (bool) $block->getRoot()->getIsVisible() ?>',
+        rootVisible:      '<?= (bool) $block->getRoot()->getIsVisible() ?>',
         useAjax:          true,
-        currentNodeId:    <?php echo (int) $block->getCategoryId() ?>,
+        currentNodeId:    <?= (int) $block->getCategoryId() ?>,
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?php echo $block->escapeJs($block->getId()) ?>.on('check', function(node) {
-            $('<?php echo $block->escapeJs($_divId); ?>').fire('node:changed', {node:node});
-        }, tree<?php echo $block->escapeJs($block->getId()) ?>);
+        tree<?= $block->escapeJs($block->getId()) ?>.on('check', function(node) {
+            $('<?= $block->escapeJs($_divId) ?>').fire('node:changed', {node:node});
+        }, tree<?= $block->escapeJs($block->getId()) ?>);
     }
 
     // set the root node
     var parameters = {
         text:        'Psw',
         draggable:   false,
-        id:          <?php echo (int) $block->getRoot()->getId() ?>,
-        expanded:    <?php echo (int) $block->getIsWasExpanded() ?>,
-        category_id: <?php echo (int) $block->getCategoryId() ?>
+        id:          <?= (int) $block->getRoot()->getId() ?>,
+        expanded:    <?= (int) $block->getIsWasExpanded() ?>,
+        category_id: <?= (int) $block->getCategoryId() ?>
     };
 
-    tree<?php echo $block->escapeJs($block->getId()) ?>.loadTree({parameters:parameters, data:<?php /* @noEscape */ echo $block->getTreeJson() ?>},true);
+    tree<?= $block->escapeJs($block->getId()) ?>.loadTree({parameters:parameters, data:<?= /* @noEscape */ $block->getTreeJson() ?>},true);
 
 });
 
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index c2c6600129421..a0a0fc040a262 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -10,11 +10,11 @@
 
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php echo $block->escapeHtml(__('Layout Updates')); ?></span></legend>
+    <legend class="legend"><span><?= $block->escapeHtml(__('Layout Updates')) ?></span></legend>
     <br />
     <div class="widget-layout-updates">
         <div id="page_group_container"></div>
-        <div class="actions"><?php echo $block->getAddLayoutButtonHtml() ?></div>
+        <div class="actions"><?= $block->getAddLayoutButtonHtml() ?></div>
     </div>
 </fieldset>
 <script id="ie-deferred-loader" defer="defer" src="//:"></script>
@@ -32,33 +32,33 @@ require([
 var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="page_group_container_<%- data.id %>">'+
     '<div class="fieldset-wrapper-title">'+
         '<label for="widget_instance[<%- data.id %>][page_group]">Display on <span class="required">*</span></label>'+
-        '<?php echo $block->getDisplayOnSelectHtml(); ?>'+
+        '<?= $block->getDisplayOnSelectHtml() ?>'+
         '<div class="actions">'+
-        <?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> +
+        <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> +
         '</div>'+
     '</div>'+
     '<div class="fieldset-wrapper-content">'+
 <?php foreach ($block->getDisplayOnContainers() as $container): ?>
-    '<div class="no-display <?php echo $block->escapeJs($container['code']) ?> group_container" id="<?php echo $block->escapeJs($container['name']) ?>_<%- data.id %>">'+
-        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>]" />'+
-        '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][page_id]" value="<%- data.page_id %>" />'+
-        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][layout_handle]" value="<?php echo $block->escapeJs($container['layout_handle']) ?>" />'+
+    '<div class="no-display <?= $block->escapeJs($container['code']) ?> group_container" id="<?= $block->escapeJs($container['name']) ?>_<%- data.id %>">'+
+        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>]" />'+
+        '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][page_id]" value="<%- data.page_id %>" />'+
+        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][layout_handle]" value="<?= $block->escapeJs($container['layout_handle']) ?>" />'+
         '<table class="data-table">'+
             '<col width="200" />'+
             '<thead>'+
                 '<tr>'+
-                    '<th><label><?php echo $block->escapeJs(__('%1', $container['label'])) ?></label></th>'+
-                    '<th><label><?php echo $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                    '<th><label><?php echo $block->escapeJs(__('Template')) ?></label></th>'+
+                    '<th><label><?= $block->escapeJs(__('%1', $container['label'])) ?></label></th>'+
+                    '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
+                    '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
                 '</tr>'+
             '</thead>'+
             '<tbody>'+
                 '<tr>'+
                     '<td>'+
-                        '<input disabled="disabled" type="radio" class="radio for_all" id="all_<?php echo $block->escapeJs($container['name']) ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
-                        '<label for="all_<?php echo $block->escapeJs($container['name']) ?>_<%- data.id %>"><?php echo $block->escapeJs(__('All')) ?></label><br />'+
-                        '<input disabled="disabled" type="radio" class="radio for_specific" id="specific_<?php echo $block->escapeJs($container['name']) ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
-                        '<label for="specific_<?php echo $block->escapeJs($container['name']) ?>_<%- data.id %>"><?php echo $block->escapeJs(__('Specific %1', $container['label'])) ?></label>'+
+                        '<input disabled="disabled" type="radio" class="radio for_all" id="all_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
+                        '<label for="all_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>"><?= $block->escapeJs(__('All')) ?></label><br />'+
+                        '<input disabled="disabled" type="radio" class="radio for_specific" id="specific_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
+                        '<label for="specific_<?= $block->escapeJs($container['name']) ?>_<%- data.id %>"><?= $block->escapeJs(__('Specific %1', $container['label'])) ?></label>'+
                     '</td>'+
                     '<td>'+
                         '<div class="block_reference_container">'+
@@ -73,16 +73,16 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
                 '</tr>'+
             '</tbody>'+
         '</table>'+
-        '<div class="no-display chooser_container" id="<?php echo $block->escapeJs($container['name']) ?>_ids_<%- data.id %>">'+
-            '<input disabled="disabled" type="hidden" class="is_anchor_only" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][is_anchor_only]" value="<?php echo $block->escapeJs($container['is_anchor_only']) ?>" />'+
-            '<input disabled="disabled" type="hidden" class="product_type_id" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][product_type_id]" value="<?php echo $block->escapeJs($container['product_type_id']) ?>" />'+
+        '<div class="no-display chooser_container" id="<?= $block->escapeJs($container['name']) ?>_ids_<%- data.id %>">'+
+            '<input disabled="disabled" type="hidden" class="is_anchor_only" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][is_anchor_only]" value="<?= $block->escapeJs($container['is_anchor_only']) ?>" />'+
+            '<input disabled="disabled" type="hidden" class="product_type_id" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][product_type_id]" value="<?= $block->escapeJs($container['product_type_id']) ?>" />'+
             '<p>' +
-                '<input disabled="disabled" type="text" class="input-text entities" name="widget_instance[<%- data.id %>][<?php echo $block->escapeJs($container['name']) ?>][entities]" value="<%- data.<?php echo $block->escapeJs($container['name']) ?>_entities %>" readonly="readonly" />&nbsp;' +
-                '<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?php echo $block->escapeJs($container['code']) ?>\', \'<?php echo $block->escapeJs($container['name']) ?>_ids_<%- data.id %>\')"  title="<?php echo $block->escapeJs(__('Open Chooser')) ?>">' +
-                    '<img src="<?php echo $block->escapeUrl($block->getViewFileUrl('images/rule_chooser_trigger.gif')) ?>" alt="<?php echo $block->escapeJs(__('Open Chooser')); ?>" />' +
+                '<input disabled="disabled" type="text" class="input-text entities" name="widget_instance[<%- data.id %>][<?= $block->escapeJs($container['name']) ?>][entities]" value="<%- data.<?= $block->escapeJs($container['name']) ?>_entities %>" readonly="readonly" />&nbsp;' +
+                '<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?= $block->escapeJs($container['code']) ?>\', \'<?= $block->escapeJs($container['name']) ?>_ids_<%- data.id %>\')"  title="<?= $block->escapeJs(__('Open Chooser')) ?>">' +
+                    '<img src="<?= $block->escapeUrl($block->getViewFileUrl('images/rule_chooser_trigger.gif')) ?>" alt="<?= $block->escapeJs(__('Open Chooser')) ?>" />' +
                 '</a>&nbsp;' +
-                '<a href="javascript:void(0)" onclick="WidgetInstance.hideEntityChooser(\'<?php echo $block->escapeJs($container['name']) ?>_ids_<%- data.id %>\')" title="<?php echo $block->escapeJs(__('Apply')); ?>">' +
-                    '<img src="<?php echo $block->escapeUrl($block->getViewFileUrl('images/rule_component_apply.gif')) ?>" alt="<?php echo $block->escapeJs(__('Apply')); ?>" />' +
+                '<a href="javascript:void(0)" onclick="WidgetInstance.hideEntityChooser(\'<?= $block->escapeJs($container['name']) ?>_ids_<%- data.id %>\')" title="<?= $block->escapeJs(__('Apply')) ?>">' +
+                    '<img src="<?= $block->escapeUrl($block->getViewFileUrl('images/rule_component_apply.gif')) ?>" alt="<?= $block->escapeJs(__('Apply')) ?>" />' +
                 '</a>' +
             '</p>'+
             '<div class="chooser"></div>'+
@@ -98,8 +98,8 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?php echo $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJs(__('Template')) ?></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
                 '<th>&nbsp;</th>'+
             '</tr>'+
         '</thead>'+
@@ -128,14 +128,14 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?php echo $block->escapeJs(__('Page')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJs(__('Template')) ?></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Page')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
             '</tr>'+
         '</thead>'+
         '<tbody>'+
             '<tr>'+
-                '<td><?php /* @noEscape */ echo $block->getLayoutsChooser() ?></td>'+
+                '<td><?= /* @noEscape */ $block->getLayoutsChooser() ?></td>'+
                 '<td>'+
                     '<div class="block_reference_container">'+
                         '<div class="block_reference"></div>'+
@@ -159,14 +159,14 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?php echo $block->escapeJs(__('Page')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJs(__('Template')) ?></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Page')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Container')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?= $block->escapeJs(__('Template')) ?></label></th>'+
             '</tr>'+
         '</thead>'+
         '<tbody>'+
             '<tr>'+
-                '<td><?php /* @noEscape */ echo $block->getPageLayoutsPageChooser() ?></td>'+
+                '<td><?= /* @noEscape */ $block->getPageLayoutsPageChooser() ?></td>'+
                 '<td>'+
                     '<div class="block_reference_container">'+
                         '<div class="block_reference"></div>'+
@@ -334,10 +334,10 @@ var WidgetInstance = {
             additional = {};
         }
         if (type == 'categories') {
-            additional.url = '<?php echo $block->escapeUrl($block->getCategoriesChooserUrl()) ?>';
+            additional.url = '<?= $block->escapeUrl($block->getCategoriesChooserUrl()) ?>';
             additional.post_parameters = $H({'is_anchor_only':$(chooser).down('input.is_anchor_only').value});
         } else if (type == 'products') {
-            additional.url = '<?php echo $block->escapeUrl($block->getProductsChooserUrl()) ?>';
+            additional.url = '<?= $block->escapeUrl($block->getProductsChooserUrl()) ?>';
             additional.post_parameters = $H({'product_type_id':$(chooser).down('input.product_type_id').value});
         }
         if (chooser && additional) {
@@ -443,13 +443,13 @@ var WidgetInstance = {
             selected = '';
             parameters = {};
             if (type == 'block_reference') {
-                url = '<?php echo $block->escapeUrl($block->getBlockChooserUrl()) ?>';
+                url = '<?= $block->escapeUrl($block->getBlockChooserUrl()) ?>';
                 if (additional.selectedBlock) {
                     selected = additional.selectedBlock;
                 }
                 parameters.layout = value;
             } else if (type == 'block_template') {
-                url = '<?php echo $block->escapeUrl($block->getTemplateChooserUrl()) ?>';
+                url = '<?= $block->escapeUrl($block->getTemplateChooserUrl()) ?>';
                 if (additional.selectedTemplate) {
                     selected = additional.selectedTemplate;
                 }
@@ -487,7 +487,7 @@ window.WidgetInstance = WidgetInstance;
 
 jQuery(function(){
     <?php foreach ($block->getPageGroups() as $pageGroup): ?>
-        WidgetInstance.addPageGroup(<?php /* @noEscape */ echo $pageGroup ?>);
+        WidgetInstance.addPageGroup(<?= /* @noEscape */ $pageGroup ?>);
     <?php endforeach; ?>
     Event.observe(document, 'product:changed', function(event){
         WidgetInstance.checkProduct(event);
diff --git a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
index 55ac3dc81ec29..a2c27193f98da 100644
--- a/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/adminhtml/templates/customer/edit/tab/wishlist.phtml
@@ -21,13 +21,13 @@
                     if (!urlParams) {
                         urlParams = '';
                     }
-                    var url = <?php echo $block->escapeJs($block->escapeUrl($block->getJsObjectName())) ?>.url + '?ajax=true' + urlParams;
+                    var url = <?= $block->escapeJs($block->escapeUrl($block->getJsObjectName())) ?>.url + '?ajax=true' + urlParams;
                     new Ajax.Updater(
-                        <?php echo $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.containerId,
+                        <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.containerId,
                         url,
                         {
                             parameters: {form_key: FORM_KEY},
-                            onComplete: <?php echo $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.initGrid.bind(<?php echo $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>),
+                            onComplete: <?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>.initGrid.bind(<?= $block->escapeJs($block->escapeHtml($block->getJsObjectName())) ?>),
                         evalScripts:true
                 }
             );
@@ -50,7 +50,7 @@
         var self = this;
 
         confirm({
-            content: '<?php echo $block->escapeJs($block->escapeHtml(__('Are you sure you want to remove this item?'))) ?>',
+            content: '<?= $block->escapeJs($block->escapeHtml(__('Are you sure you want to remove this item?'))) ?>',
             actions: {
                 confirm: function () {
                     self.reload('&delete=' + itemId);
@@ -63,8 +63,8 @@
     productConfigure.addListType(
         'wishlist',
         {
-            urlFetch: '<?php echo $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>',
-            urlConfirm: '<?php echo $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/update'))) ?>'
+            urlFetch: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/configure'))) ?>',
+            urlConfirm: '<?= $block->escapeJs($block->escapeUrl($block->getUrl('customer/wishlist_product_composite_wishlist/update'))) ?>'
         }
     );
     //-->
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml
index b43aa2a6217d0..b4d1e0164741e 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/addto.phtml
@@ -9,7 +9,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php /* @noEscape */ echo $this->helper(\Magento\Framework\Json\Helper\Data::class)
+            "addToWishlist": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)
                 ->jsonEncode($block->getWishlistOptions());
             ?>
         }
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
index 48f0f481719e1..fc54a90758780 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/share.phtml
@@ -9,7 +9,7 @@
 /** @var \Magento\Wishlist\Block\Customer\Wishlist\Button $block */
 ?>
 <?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->getShared() < $block->getConfig()->getSharingEmailLimit()): ?>
-    <button type="submit" name="save_and_share" title="<?php echo $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action share">
-        <span><?php echo $block->escapeHtml(__('Share Wish List')) ?></span>
+    <button type="submit" name="save_and_share" title="<?= $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action share">
+        <span><?= $block->escapeHtml(__('Share Wish List')) ?></span>
     </button>
 <?php endif;?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
index 04902b27c14db..6f901cac1a633 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
@@ -10,7 +10,7 @@
 ?>
 
 <?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->isSalable()): ?>
-    <button type="button" data-role="all-tocart" title="<?php echo $block->escapeHtmlAttr(__('Add All to Cart')) ?>" class="action tocart">
-        <span><?php echo $block->escapeHtml(__('Add All to Cart')) ?></span>
+    <button type="button" data-role="all-tocart" title="<?= $block->escapeHtmlAttr(__('Add All to Cart')) ?>" class="action tocart">
+        <span><?= $block->escapeHtml(__('Add All to Cart')) ?></span>
     </button>
 <?php endif;?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
index d8ac809cd27f4..d19a5c2968ff4 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
@@ -10,7 +10,7 @@
 ?>
 
 <?php if ($block->getWishlist()->getItemsCount()): ?>
-    <button type="submit" name="do" title="<?php echo $block->escapeHtmlAttr(__('Update Wish List')) ?>" class="action update">
-        <span><?php echo $block->escapeHtml(__('Update Wish List')) ?></span>
+    <button type="submit" name="do" title="<?= $block->escapeHtmlAttr(__('Update Wish List')) ?>" class="action update">
+        <span><?= $block->escapeHtml(__('Update Wish List')) ?></span>
     </button>
 <?php endif;?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
index c452c9aa05cd8..1977b876e9d7a 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/cart/item/renderer/actions/move_to_wishlist.phtml
@@ -10,8 +10,8 @@
 ?>
 <?php if ($block->isAllowInCart() && $block->isProductVisibleInSiteVisibility()): ?>
     <a href="#"
-       data-post='<?php /* @noEscape */ echo $block->getMoveFromCartParams(); ?>'
+       data-post='<?= /* @noEscape */ $block->getMoveFromCartParams() ?>'
        class="use-ajax action action-towishlist">
-        <span><?php echo $block->escapeHtml(__('Move to Wishlist')); ?></span>
+        <span><?= $block->escapeHtml(__('Move to Wishlist')) ?></span>
     </a>
 <?php endif ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml
index c1dbf923106f7..b09118e0483af 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/list/addto/wishlist.phtml
@@ -11,11 +11,11 @@
 <?php if ($block->getWishlistHelper()->isAllow()): ?>
     <a href="#"
        class="action towishlist"
-       title="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')); ?>"
-       aria-label="<?php echo $block->escapeHtmlAttr(__('Add to Wish List')); ?>"
-       data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($block->getProduct()); ?>'
+       title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
+       aria-label="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>"
+       data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($block->getProduct()) ?>'
        data-action="add-to-wishlist"
        role="button">
-        <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
+        <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
     </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml
index b8fa5395ce848..1959694776ebc 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/catalog/product/view/addto/wishlist.phtml
@@ -11,13 +11,13 @@
 <?php if ($block->isWishListAllowed()) : ?>
     <a href="#"
        class="action towishlist"
-       data-post='<?php /* @noEscape */ echo $block->getWishlistParams(); ?>'
-       data-action="add-to-wishlist"><span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span></a>
+       data-post='<?= /* @noEscape */ $block->getWishlistParams() ?>'
+       data-action="add-to-wishlist"><span><?= $block->escapeHtml(__('Add to Wish List')) ?></span></a>
 <?php endif; ?>
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php /* @noEscape */ echo $block->getWishlistOptionsJson() ?>
+            "addToWishlist": <?= /* @noEscape */ $block->getWishlistOptionsJson() ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
index 2c21673952bac..0bc333ad6f561 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
@@ -20,7 +20,7 @@
             <td class="col product">
                 <p>
                     <a href="<?= $block->escapeUrl($block->getProductUrl($_product)) ?>">
-                        <?php /* @noEscape */ echo $block->getImage($_product, 'product_small_image')->toHtml(); ?>
+                        <?= /* @noEscape */ $block->getImage($_product, 'product_small_image')->toHtml() ?>
                     </a>
                 </p>
 
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
index ac641d67d332d..0b50df8c59fbb 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/actions.phtml
@@ -10,9 +10,9 @@
 ?>
 <?php $children = $block->getChildNames(); ?>
 <?php if ($children): ?>
-    <div class="<?php echo $block->escapeHtmlAttr($block->getCssClass()) ?>">
+    <div class="<?= $block->escapeHtmlAttr($block->getCssClass()) ?>">
         <?php foreach ($children as $childName):?>
-            <?php /* @noEscape */ echo $block->getLayout()->renderElement($childName, false);?>
+            <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
         <?php endforeach;?>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
index 5bb8c597c2ea3..9ea0d1a823235 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/cart.phtml
@@ -13,35 +13,35 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <?php foreach ($block->getChildNames() as $childName): ?>
-    <?php /* @noEscape */ echo $block->getLayout()->renderElement($childName, false); ?>
+    <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
 <?php endforeach;?>
 <div class="box-tocart">
     <fieldset class="fieldset">
     <?php if ($item->canHaveQty() && $product->isVisibleInSiteVisibility()): ?>
         <div class="field qty">
-            <label class="label" for="qty[<?php echo $block->escapeHtmlAttr($item->getId()) ?>]"><span><?php echo $block->escapeHtml(__('Qty')) ?></span></label>
+            <label class="label" for="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]"><span><?= $block->escapeHtml(__('Qty')) ?></span></label>
             <div class="control">
-                <input type="number" data-role="qty" id="qty[<?php echo $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
-               name="qty[<?php echo $block->escapeHtmlAttr($item->getId()) ?>]" value="<?php /* @noEscape */ echo (int)($block->getAddToCartQty($item) * 1) ?>">
+                <input type="number" data-role="qty" id="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
+               name="qty[<?= $block->escapeHtmlAttr($item->getId()) ?>]" value="<?= /* @noEscape */ (int)($block->getAddToCartQty($item) * 1) ?>">
             </div>
         </div>
     <?php endif; ?>
     <?php if ($product->isSaleable()): ?>
     <div class="product-item-actions">
         <div class="actions-primary">
-            <button type="button" data-role="tocart" data-post='<?php /* @noEscape */ echo $block->getItemAddToCartParams($item)?>' title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>" data-item-id="<?php echo $block->escapeHtmlAttr($item->getId())?>" class="action tocart primary">
-                <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+            <button type="button" data-role="tocart" data-post='<?= /* @noEscape */ $block->getItemAddToCartParams($item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>" data-item-id="<?= $block->escapeHtmlAttr($item->getId()) ?>" class="action tocart primary">
+                <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
             </button>
         </div>
     </div>
     <?php else: ?>
         <?php if ($product->getIsSalable()): ?>
-            <p class="available stock" title="<?php echo $block->escapeHtmlAttr(__('Availability')) ?>">
-                <span><?php echo $block->escapeHtml(__('In stock')) ?></span>
+            <p class="available stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                <span><?= $block->escapeHtml(__('In stock')) ?></span>
             </p>
         <?php else: ?>
-            <p class="unavailable stock" title="<?php echo $block->escapeHtmlAttr(__('Availability')) ?>">
-                <span><?php echo $block->escapeHtml(__('Out of stock')) ?></span>
+            <p class="unavailable stock" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
+                <span><?= $block->escapeHtml(__('Out of stock')) ?></span>
             </p>
         <?php endif; ?>
     <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
index 25ab004be04a9..17e2404ee23cf 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/comment.phtml
@@ -13,10 +13,10 @@ $item = $block->getItem();
 ?>
 
 <div class="field comment-box">
-    <label class="label" for="product-item-comment-<?php echo $block->escapeHtmlAttr($item->getWishlistItemId()) ?>">
-        <span><?php echo $block->escapeHtml(__('Comment')) ?></span>
+    <label class="label" for="product-item-comment-<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>">
+        <span><?= $block->escapeHtml(__('Comment')) ?></span>
     </label>
     <div class="control">
-        <textarea id="product-item-comment-<?php echo $block->escapeHtmlAttr($item->getWishlistItemId()) ?>" placeholder="<?php /* @noEscape */ echo $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?php echo $block->escapeHtmlAttr($item->getWishlistItemId()) ?>]" title="<?php echo $block->escapeHtmlAttr(__('Comment')) ?>" class="product-item-comment"><?php echo($block->escapeHtml($item->getDescription())) ?></textarea>
+        <textarea id="product-item-comment-<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>" placeholder="<?= /* @noEscape */ $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?= $block->escapeHtmlAttr($item->getWishlistItemId()) ?>]" title="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="product-item-comment"><?= ($block->escapeHtml($item->getDescription())) ?></textarea>
     </div>
 </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
index cd3e633fc5ab9..1898ef6fc0d66 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/edit.phtml
@@ -14,7 +14,7 @@ $product = $item->getProduct();
 ?>
 
 <?php if ($product->isVisibleInSiteVisibility()): ?>
-    <a class="action edit" href="<?php echo $block->escapeUrl($block->getItemConfigureUrl($item)) ?>">
-        <span><?php echo $block->escapeHtml(__('Edit')) ?></span>
+    <a class="action edit" href="<?= $block->escapeUrl($block->getItemConfigureUrl($item)) ?>">
+        <span><?= $block->escapeHtml(__('Edit')) ?></span>
     </a>
 <?php endif ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
index 6f4cd6841e8e9..1008f5f377df5 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/image.phtml
@@ -12,6 +12,6 @@
 $item = $block->getItem();
 $product = $item->getProduct();
 ?>
-<a class="product-item-photo" tabindex="-1" href="<?php echo $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?php echo $block->escapeHtmlAttr($product->getName()) ?>">
-    <?php echo $block->getImage($product, 'wishlist_thumbnail')->toHtml(); ?>
+<a class="product-item-photo" tabindex="-1" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
+    <?= $block->getImage($product, 'wishlist_thumbnail')->toHtml() ?>
 </a>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
index 119e0e98cdcc4..265f4635a6be3 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/name.phtml
@@ -13,7 +13,7 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <strong class="product-item-name">
-    <a href="<?php echo $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?php echo $block->escapeHtmlAttr($product->getName()) ?>" class="product-item-link">
-        <?php echo $block->escapeHtml($product->getName()) ?>
+    <a href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>" class="product-item-link">
+        <?= $block->escapeHtml($product->getName()) ?>
     </a>
 </strong>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
index e1a0fa47fca41..34770f8fe12de 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/price.phtml
@@ -10,5 +10,5 @@
 ?>
 
 <?php foreach ($block->getChildNames() as $childName): ?>
-    <?php /* @noEscape */ echo $block->getLayout()->renderElement($childName, false); ?>
+    <?= /* @noEscape */ $block->getLayout()->renderElement($childName, false) ?>
 <?php endforeach;?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
index 459059b7e2bda..57ae439d9995b 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/column/remove.phtml
@@ -9,6 +9,6 @@
 /* @var \Magento\Wishlist\Block\Customer\Wishlist\Item\Column\Remove $block */
 ?>
 
-<a href="#" data-role="remove" data-post-remove='<?php /* @noEscape */ echo $block->getItemRemoveParams($block->getItem()); ?>' title="<?php echo $block->escapeHtmlAttr(__('Remove Item')) ?>" class="btn-remove action delete">
-    <span><?php echo $block->escapeHtml(__('Remove item'));?></span>
+<a href="#" data-role="remove" data-post-remove='<?= /* @noEscape */ $block->getItemRemoveParams($block->getItem()) ?>' title="<?= $block->escapeHtmlAttr(__('Remove Item')) ?>" class="btn-remove action delete">
+    <span><?= $block->escapeHtml(__('Remove item')) ?></span>
 </a>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
index 3e92b4db0a6a6..a60a68e99f34e 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto.phtml
@@ -11,22 +11,22 @@
 
 <div class="product-addto-links" data-role="add-to-links">
     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-        <a href="#" data-post='<?php /* @noEscape */ echo $block->getUpdateParams(); ?>' class="action towishlist updated" data-action="add-to-wishlist">
-            <span><?php echo $block->escapeHtml(__('Update Wish List')) ?></span>
+        <a href="#" data-post='<?= /* @noEscape */ $block->getUpdateParams() ?>' class="action towishlist updated" data-action="add-to-wishlist">
+            <span><?= $block->escapeHtml(__('Update Wish List')) ?></span>
         </a>
     <?php endif; ?>
     <?php $_product = $block->getProduct(); ?>
     <?php $_compareUrl = $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddUrl($_product); ?>
     <?php if ($_compareUrl) : ?>
-        <a href="<?php echo $block->escapeUrl($_compareUrl) ?>" class="action tocompare">
-            <span><?php echo $block->escapeHtml(__('Add to Compare')) ?></span>
+        <a href="<?= $block->escapeUrl($_compareUrl) ?>" class="action tocompare">
+            <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
         </a>
     <?php endif; ?>
 </div>
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
+            "addToWishlist": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions()) ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml
index 4529ab08117be..5b1d39681d948 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/configure/addto/wishlist.phtml
@@ -9,14 +9,14 @@
 /** @var \Magento\Wishlist\Block\Item\Configure $block */
 ?>
 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <a href="#" data-post='<?php /* @noEscape */ echo $block->getUpdateParams(); ?>' class="action towishlist updated" data-action="add-to-wishlist">
-        <span><?php echo $block->escapeHtml(__('Update Wish List')) ?></span>
+    <a href="#" data-post='<?= /* @noEscape */ $block->getUpdateParams() ?>' class="action towishlist updated" data-action="add-to-wishlist">
+        <span><?= $block->escapeHtml(__('Update Wish List')) ?></span>
     </a>
 <?php endif; ?>
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php /* @noEscape */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
+            "addToWishlist": <?= /* @noEscape */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions()) ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
index 0effe68e114a1..eb3d9e58ecfc9 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -17,22 +17,22 @@ $columns = $block->getColumns();
     <?php if (count($block->getItems())): ?>
     <ol class="product-items">
         <?php foreach ($block->getItems() as $item): ?>
-        <?php /* @noEscape */ echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' : '</li><li class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' ?>
+        <?= /* @noEscape */ ($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' : '</li><li class="product-item" id="item_' . $block->escapeHtmlAttr($item->getId()) . '">' ?>
             <div class="product-item-info" data-container="product-grid">
                 <?php foreach ($columns as $column): ?>
                     <?php $column->setItem($item); echo $column->toHtml($item);?>
                 <?php endforeach; ?>
             </div>
-        <?php echo($iterator == count($block->getItems())+1) ? '</li>' : '' ?>
+        <?= ($iterator == count($block->getItems())+1) ? '</li>' : '' ?>
         <?php endforeach; ?>
     </ol>
     <?php else: ?>
         <div class="message info empty">
-            <span><?php echo $block->escapeHtml(__('This Wish List has no Items'));?></span>
+            <span><?= $block->escapeHtml(__('This Wish List has no Items')) ?></span>
         </div>
     <?php endif; ?>
 </div>
 
 <?php foreach ($columns as $column): ?>
-    <?php echo $column->getAdditionalHtml();?>
+    <?= $column->getAdditionalHtml() ?>
 <?php endforeach; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
index e71938935b8f3..bad5acc209b5f 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/js/components.phtml
@@ -7,4 +7,4 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getChildHtml() ?>
+<?= $block->getChildHtml() ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
index 72833e16cc34b..7f77dd0195a3b 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
@@ -9,7 +9,7 @@
 /* @var \Magento\Wishlist\Block\Link $block */
 ?>
 <li class="link wishlist" data-bind="scope: 'wishlist'">
-    <a <?php /* @noEscape */ echo $block->getLinkAttributes() ?>><?php echo $block->escapeHtml($block->getLabel()) ?>
+    <a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $block->escapeHtml($block->getLabel()) ?>
         <!-- ko if: wishlist().counter -->
         <span data-bind="text: wishlist().counter" class="counter qty"></span>
         <!-- /ko -->
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
index 42f85914ebbe7..5abb0dd8e0144 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/messages/addProductSuccessMessage.phtml
@@ -7,5 +7,4 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 
-<?php
-echo $block->escapeHtml(__('%1 has been added to your Wish List.', $block->getData('product_name'))) ?> <?php echo $block->escapeHtml(__('Click <a href="%1">here</a> to continue shopping.', $block->getData('referer')), ['a']);
+<?= $block->escapeHtml(__('%1 has been added to your Wish List.', $block->getData('product_name'))) ?> <?= $block->escapeHtml(__('Click <a href="%1">here</a> to continue shopping.', $block->getData('referer')), ['a']);
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
index cd68ef956de62..9f7670e34f800 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
@@ -12,17 +12,17 @@
 <?php $options = $block->getOptionList(); ?>
 <?php if ($options): ?>
 <div class="tooltip wrapper product-item-tooltip">
-  <span class="action details tooltip toggle"><?php echo $block->escapeHtml(__('See Details')) ?></span>
+  <span class="action details tooltip toggle"><?= $block->escapeHtml(__('See Details')) ?></span>
   <div class="tooltip content">
-      <strong class="subtitle"><?php echo $block->escapeHtml(__('Options Details')); ?></strong>
+      <strong class="subtitle"><?= $block->escapeHtml(__('Options Details')) ?></strong>
       <dl>
           <?php foreach ($options as $option): ?>
-          <dt class="label"><?php echo $block->escapeHtml($option['label']) ?></dt>
+          <dt class="label"><?= $block->escapeHtml($option['label']) ?></dt>
           <dd class="values">
               <?php if (is_array($option['value'])): ?>
-              <?php /* @noEscape */ echo nl2br(implode("\n", $option['value'])) ?>
+              <?= /* @noEscape */ nl2br(implode("\n", $option['value'])) ?>
               <?php else: ?>
-              <?php /* @noEscape */ echo $option['value'] ?>
+              <?= /* @noEscape */ $option['value'] ?>
               <?php endif; ?>
           </dd>
           <?php endforeach; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
index 23e28ee4180bd..7794b9027e952 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
@@ -10,8 +10,8 @@
 ?>
 <?php if ($block->getLink()): ?>
 <p style="font-size:12px; line-height:16px; margin:0 0 16px;">
-    <?php echo $block->escapeHtml(__("RSS link to %1's wishlist", $this->helper('Magento\Wishlist\Helper\Data')->getCustomerName())) ?>
+    <?= $block->escapeHtml(__("RSS link to %1's wishlist", $this->helper('Magento\Wishlist\Helper\Data')->getCustomerName())) ?>
     <br />
-    <a href="<?php echo $block->escapeUrl($block->getLink()); ?>"><?php echo $block->escapeUrl($block->getLink()); ?></a>
+    <a href="<?= $block->escapeUrl($block->getLink()) ?>"><?= $block->escapeUrl($block->getLink()) ?></a>
 </p>
 <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml b/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
index ecae98d0864c8..04e7903b53bbf 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/wishlist.phtml
@@ -9,7 +9,7 @@
 /** @var \Magento\Wishlist\Block\Rss\Link $block */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink() && $this->helper('Magento\Wishlist\Helper\Data')->getWishlist()->getItemsCount()): ?>
-    <a href="<?php echo $block->escapeUrl($block->getLink()); ?>" class="action rss wishlist">
-        <span><?php echo $block->escapeHtml(__('RSS Feed')) ?></span>
+    <a href="<?= $block->escapeUrl($block->getLink()) ?>" class="action rss wishlist">
+        <span><?= $block->escapeHtml(__('RSS Feed')) ?></span>
     </a>
 <?php endif; ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
index 4a8cd246b8e32..e34c431d00475 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/shared.phtml
@@ -10,15 +10,15 @@
 ?>
 
 <?php if ($block->hasWishlistItems()): ?>
-    <form class="form shared wishlist" action="<?php echo $block->escapeUrl($block->getUrl('wishlist/index/update')) ?>" method="post">
+    <form class="form shared wishlist" action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update')) ?>" method="post">
         <div class="wishlist table-wrapper">
             <table class="table data wishlist" id="wishlist-table">
-                <caption class="table-caption"><?php echo $block->escapeHtml(__('Wish List')); ?></caption>
+                <caption class="table-caption"><?= $block->escapeHtml(__('Wish List')) ?></caption>
                 <thead>
                 <tr>
-                    <th class="col product" scope="col"><?php echo $block->escapeHtml(__('Product')) ?></th>
-                    <th class="col comment" scope="col"><?php echo $block->escapeHtml(__('Comment')) ?></th>
-                    <th class="col actions" scope="col"><?php echo $block->escapeHtml(__('Add to Cart')) ?></th>
+                    <th class="col product" scope="col"><?= $block->escapeHtml(__('Product')) ?></th>
+                    <th class="col comment" scope="col"><?= $block->escapeHtml(__('Comment')) ?></th>
+                    <th class="col actions" scope="col"><?= $block->escapeHtml(__('Add to Cart')) ?></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -28,13 +28,13 @@
                     $isVisibleProduct = $product->isVisibleInSiteVisibility();
                     ?>
                     <tr>
-                        <td data-th="<?php echo $block->escapeHtmlAttr(__('Product')) ?>" class="col product">
-                            <a class="product photo" href="<?php echo $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?php echo $block->escapeHtmlAttr($product->getName()) ?>">
-                                <?php echo $block->getImage($product, 'customer_shared_wishlist')->toHtml(); ?>
+                        <td data-th="<?= $block->escapeHtmlAttr(__('Product')) ?>" class="col product">
+                            <a class="product photo" href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>" title="<?= $block->escapeHtmlAttr($product->getName()) ?>">
+                                <?= $block->getImage($product, 'customer_shared_wishlist')->toHtml() ?>
                             </a>
                             <strong class="product name">
-                                <a href="<?php echo $block->escapeUrl($block->getProductUrl($item)) ?>">
-                                    <?php echo $block->escapeHtml($product->getName()) ?>
+                                <a href="<?= $block->escapeUrl($block->getProductUrl($item)) ?>">
+                                    <?= $block->escapeHtml($product->getName()) ?>
                                 </a>
                             </strong>
                             <?php
@@ -45,22 +45,22 @@
                                     ['item' => $item]
                                 );
                             ?>
-                            <?php echo $block->getDetailsHtml($item) ?>
+                            <?= $block->getDetailsHtml($item) ?>
                         </td>
-                        <td data-th="<?php echo $block->escapeHtmlAttr(__('Comment')) ?>" class="col comment"><?php /* @noEscape */ echo $block->getEscapedDescription($item) ?></td>
-                        <td data-th="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>" class="col actions" data-role="add-to-links">
+                        <td data-th="<?= $block->escapeHtmlAttr(__('Comment')) ?>" class="col comment"><?= /* @noEscape */ $block->getEscapedDescription($item) ?></td>
+                        <td data-th="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>" class="col actions" data-role="add-to-links">
                             <?php if ($product->isSaleable()): ?>
                                 <?php if ($isVisibleProduct): ?>
                                     <button type="button"
-                                            title="<?php echo $block->escapeHtmlAttr(__('Add to Cart')) ?>"
-                                            data-post='<?php /* @noEscape */ echo $block->getSharedItemAddToCartUrl($item); ?>'
+                                            title="<?= $block->escapeHtmlAttr(__('Add to Cart')) ?>"
+                                            data-post='<?= /* @noEscape */ $block->getSharedItemAddToCartUrl($item) ?>'
                                             class="action tocart">
-                                        <span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span>
+                                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
                                     </button>
                                 <?php endif ?>
                             <?php endif; ?>
-                            <a href="#" data-post='<?php /* @noEscape */ echo $block->getAddToWishlistParams($item); ?>'  onclick="location.assign(this.href); return false;" class="action towishlist" data-action="add-to-wishlist">
-                                <span><?php echo $block->escapeHtml(__('Add to Wish List')) ?></span>
+                            <a href="#" data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($item) ?>'  onclick="location.assign(this.href); return false;" class="action towishlist" data-action="add-to-wishlist">
+                                <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
                             </a>
                         </td>
                     </tr>
@@ -73,20 +73,20 @@
             <?php if ($block->isSaleable()):?>
                 <div class="primary">
                     <button type="button"
-                            title="<?php echo $block->escapeHtmlAttr(__('Add All to Cart')) ?>"
-                            data-post='<?php echo $block->escapeUrl($block->getSharedAddAllToCartUrl()); ?>'
+                            title="<?= $block->escapeHtmlAttr(__('Add All to Cart')) ?>"
+                            data-post='<?= $block->escapeUrl($block->getSharedAddAllToCartUrl()) ?>'
                             class="action tocart primary">
-                        <span><?php echo $block->escapeHtml(__('Add All to Cart')) ?></span>
+                        <span><?= $block->escapeHtml(__('Add All to Cart')) ?></span>
                     </button>
                 </div>
             <?php endif;?>
             <div class="secondary">
-                <a href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-                    <span><?php echo $block->escapeHtml(__('Back')) ?></span>
+                <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                    <span><?= $block->escapeHtml(__('Back')) ?></span>
                 </a>
             </div>
         </div>
     </form>
 <?php else: ?>
-    <div class="message info empty"><div><?php echo $block->escapeHtml(__('Wish List is empty now.')) ?></div></div>
+    <div class="message info empty"><div><?= $block->escapeHtml(__('Wish List is empty now.')) ?></div></div>
 <?php endif ?>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
index 81d174bfbcc80..430ebd384c82b 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sharing.phtml
@@ -9,32 +9,32 @@
 /** @var \Magento\Wishlist\Block\Customer\Sharing $block */
 ?>
 <form class="form wishlist share"
-      action="<?php echo $block->escapeUrl($block->getSendUrl()) ?>"
+      action="<?= $block->escapeUrl($block->getSendUrl()) ?>"
       id="form-validate"
       method="post"
-      data-hasrequired="<?php echo $block->escapeHtmlAttr(__('* Required Fields')) ?>"
+      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"
       data-mage-init='{"validation":{}}'>
     <fieldset class="fieldset">
-        <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo $block->escapeHtml(__('Sharing Information')) ?></span></legend><br />
+        <?= $block->getBlockHtml('formkey') ?>
+        <legend class="legend"><span><?= $block->escapeHtml(__('Sharing Information')) ?></span></legend><br />
         <div class="field emails required">
-            <label class="label" for="email_address"><span><?php echo $block->escapeHtml(__('Email addresses, separated by commas')) ?></span></label>
+            <label class="label" for="email_address"><span><?= $block->escapeHtml(__('Email addresses, separated by commas')) ?></span></label>
             <div class="control">
-                <textarea name="emails" cols="60" rows="5" id="email_address" data-validate="{required:true,'validate-emails':true}"><?php /* @noEscape */ echo $block->getEnteredData('emails') ?></textarea>
+                <textarea name="emails" cols="60" rows="5" id="email_address" data-validate="{required:true,'validate-emails':true}"><?= /* @noEscape */ $block->getEnteredData('emails') ?></textarea>
             </div>
         </div>
         <div class="field text">
-            <label class="label" for="message"><span><?php echo $block->escapeHtml(__('Message')) ?></span></label>
+            <label class="label" for="message"><span><?= $block->escapeHtml(__('Message')) ?></span></label>
             <div class="control">
-                <textarea id="message" name="message" cols="60" rows="5"><?php /* @noEscape */ echo $block->getEnteredData('message') ?></textarea>
+                <textarea id="message" name="message" cols="60" rows="5"><?= /* @noEscape */ $block->getEnteredData('message') ?></textarea>
             </div>
         </div>
         <?php if ($this->helper('Magento\Wishlist\Helper\Rss')->isRssAllow()): ?>
             <div class="field choice rss">
-                <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?php echo $block->escapeHtmlAttr(__('Check here to link an RSS feed to your Wish List.')) ?>" class="checkbox">
+                <input type="checkbox" name="rss_url" id="rss_url" value="1" title="<?= $block->escapeHtmlAttr(__('Check here to link an RSS feed to your Wish List.')) ?>" class="checkbox">
                 <label class="label" for="rss_url">
                     <span>
-                        <?php echo $block->escapeHtml(__('Check here to link an RSS feed to your Wish List.')) ?>
+                        <?= $block->escapeHtml(__('Check here to link an RSS feed to your Wish List.')) ?>
                     </span>
                 </label>
             </div>
@@ -42,12 +42,12 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" title="<?php echo $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action submit primary">
-                <span><?php echo $block->escapeHtml(__('Share Wish List')) ?></span>
+            <button type="submit" title="<?= $block->escapeHtmlAttr(__('Share Wish List')) ?>" class="action submit primary">
+                <span><?= $block->escapeHtml(__('Share Wish List')) ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()); ?>"><span><?php echo $block->escapeHtml(__('Back'))?></span></a>
+            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Back')) ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
index fe40b1b26d3b3..00fb87b411fe0 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/sidebar.phtml
@@ -14,13 +14,13 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
 <?php if ($wishlistHelper->isAllow()) : ?>
     <div class="block block-wishlist" data-bind="scope: 'wishlist'">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $block->escapeHtml($block->getTitle()); ?></strong>
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml($block->getTitle()) ?></strong>
             <!-- ko if: wishlist().counter -->
             <span data-bind="text: wishlist().counter" class="counter"></span>
             <!-- /ko -->
         </div>
         <div class="block-content">
-            <strong class="subtitle"><?php echo $block->escapeHtml(__('Last Added Items')) ?></strong>
+            <strong class="subtitle"><?= $block->escapeHtml(__('Last Added Items')) ?></strong>
             <!-- ko if: wishlist().counter -->
                 <ol class="product-items no-display" id="wishlist-sidebar" data-bind="foreach: wishlist().items, css: {'no-display': null}">
                     <li class="product-item">
@@ -39,18 +39,18 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
                                     <!-- ko if: product_is_saleable_and_visible -->
                                     <div class="actions-primary">
                                         <!-- ko if: product_has_required_options -->
-                                        <a href="#" data-bind="attr: {'data-post': add_to_cart_params}" class="action tocart primary"><span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span></a>
+                                        <a href="#" data-bind="attr: {'data-post': add_to_cart_params}" class="action tocart primary"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span></a>
                                         <!-- /ko -->
                                         <!-- ko ifnot: product_has_required_options -->
-                                            <button type="button" class="action tocart primary" data-bind="attr: {'data-post': add_to_cart_params}"><span><?php echo $block->escapeHtml(__('Add to Cart')) ?></span></button>
+                                            <button type="button" class="action tocart primary" data-bind="attr: {'data-post': add_to_cart_params}"><span><?= $block->escapeHtml(__('Add to Cart')) ?></span></button>
                                         <!-- /ko -->
                                     </div>
                                     <!-- /ko -->
                                     <div class="actions-secondary">
                                         <a href="#"  data-bind="attr: {'data-post': delete_item_params}"
-                                           title="<?php echo $block->escapeHtmlAttr(__('Remove This Item')) ?>"
+                                           title="<?= $block->escapeHtmlAttr(__('Remove This Item')) ?>"
                                            class="btn-remove action delete">
-                                            <span><?php echo $block->escapeHtml(__('Remove This Item')) ?></span>
+                                            <span><?= $block->escapeHtml(__('Remove This Item')) ?></span>
                                         </a>
                                     </div>
                                 </div>
@@ -61,13 +61,13 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
                 <div class="actions-toolbar no-display" data-bind="css: {'no-display': null}">
                     <div class="primary">
                         <a class="action details"
-                           href="<?php echo $block->escapeUrl($this->helper('Magento\Wishlist\Helper\Data')->getListUrl()) ?>"
-                           title="<?php echo $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?php echo $block->escapeHtml(__('Go to Wish List')) ?></span></a>
+                           href="<?= $block->escapeUrl($this->helper('Magento\Wishlist\Helper\Data')->getListUrl()) ?>"
+                           title="<?= $block->escapeHtmlAttr(__('Go to Wish List')) ?>"><span><?= $block->escapeHtml(__('Go to Wish List')) ?></span></a>
                     </div>
                 </div>
             <!-- /ko -->
             <!-- ko ifnot: wishlist().counter -->
-                <div class="empty"><?php echo $block->escapeHtml(__('You have no items in your wish list.')) ?></div>
+                <div class="empty"><?= $block->escapeHtml(__('You have no items in your wish list.')) ?></div>
             <!-- /ko -->
         </div>
     </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
index 9d4e061ec97ff..8b2e1b1c9d808 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -10,29 +10,29 @@
 ?>
 
 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
-    <?php echo($block->getChildHtml('wishlist.rss.link'));?>
+    <?= ($block->getChildHtml('wishlist.rss.link')) ?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
-          "addToCartUrl":<?php /* @noEscape */ echo $block->getItemAddToCartParams("%item%");?>,
-          "addAllToCartUrl":<?php /* @noEscape */ echo $block->getAddAllToCartParams(); ?>,
+          "addToCartUrl":<?= /* @noEscape */ $block->getItemAddToCartParams("%item%") ?>,
+          "addAllToCartUrl":<?= /* @noEscape */ $block->getAddAllToCartParams() ?>,
           "commentString":""},
-          "validation": {}}' action="<?php echo $block->escapeUrl($block->getUrl('wishlist/index/update', ['wishlist_id' => $block->getWishlistInstance()->getId()])) ?>" method="post">
-        <?php echo $block->getChildHtml('top'); ?>
+          "validation": {}}' action="<?= $block->escapeUrl($block->getUrl('wishlist/index/update', ['wishlist_id' => $block->getWishlistInstance()->getId()])) ?>" method="post">
+        <?= $block->getChildHtml('top') ?>
         <?php if ($block->hasWishlistItems()): ?>
-            <?php echo $block->getBlockHtml('formkey');?>
+            <?= $block->getBlockHtml('formkey') ?>
             <?php $block->getChildBlock('items')->setItems($block->getWishlistItems()); ?>
-            <?php echo $block->getChildHtml('items');?>
+            <?= $block->getChildHtml('items') ?>
         <?php else: ?>
-            <div class="message info empty"><span><?php echo $block->escapeHtml(__('You have no items in your wish list.')) ?></span></div>
+            <div class="message info empty"><span><?= $block->escapeHtml(__('You have no items in your wish list.')) ?></span></div>
         <?php endif ?>
-        <?php echo $block->getChildHtml('bottom'); ?>
+        <?= $block->getChildHtml('bottom') ?>
         <div class="actions-toolbar">
             <div class="primary">
-                <?php echo $block->getChildHtml('control_buttons');?>
+                <?= $block->getChildHtml('control_buttons') ?>
             </div>
             <div class="secondary">
-                <a href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-                    <span><?php echo $block->escapeHtml(__('Back')) ?></span>
+                <a href="<?= $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
+                    <span><?= $block->escapeHtml(__('Back')) ?></span>
                 </a>
             </div>
         </div>
diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
index a399ba1d9e651..6e73b6706f193 100644
--- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -20,30 +20,30 @@
             role="heading"
             aria-level="2"
             data-role="title"
-            data-count="<?php echo count($_filters); ?>"><?php /* @escapeNotVerified */ echo __('Now Shopping by') ?></strong>
+            data-count="<?= count($_filters) ?>"><?= /* @escapeNotVerified */ __('Now Shopping by') ?></strong>
     <ol class="items">
         <?php foreach ($_filters as $_filter): ?>
             <li class="item">
-                <span class="filter-label"><?php echo $block->escapeHtml(__($_filter->getName())); ?></span>
-                <span class="filter-value"><?php /* @escapeNotVerified */ echo $block->stripTags($_filter->getLabel()) ?></span>
+                <span class="filter-label"><?= $block->escapeHtml(__($_filter->getName())) ?></span>
+                <span class="filter-value"><?= /* @escapeNotVerified */ $block->stripTags($_filter->getLabel()) ?></span>
                 <?php
                 $clearLinkUrl = $_filter->getClearLinkUrl();
                 $currentFilterName = $block->escapeHtml(__($_filter->getName())) . " " . $block->stripTags($_filter->getLabel());
                 if ($clearLinkUrl):
                     ?>
-                    <a class="action previous" href="<?php /* @escapeNotVerified */ echo $_filter->getRemoveUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo __('Previous') ?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Previous') ?></span>
+                    <a class="action previous" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
+                       title="<?= /* @escapeNotVerified */ __('Previous') ?>">
+                        <span><?= /* @escapeNotVerified */ __('Previous') ?></span>
                     </a>
                     <a class="action remove"
-                       title="<?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
-                       href="<?php /* @escapeNotVerified */ echo $clearLinkUrl ?>">
-                        <span><?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
+                       title="<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
+                       href="<?= /* @escapeNotVerified */ $clearLinkUrl ?>">
+                        <span><?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
                     </a>
                 <?php else: ?>
-                    <a class="action remove" href="<?php /* @escapeNotVerified */ echo $_filter->getRemoveUrl() ?>"
-                       title="<?php /* @escapeNotVerified */ echo $block->escapeHtml(__('Remove')) . " " . $currentFilterName;?>">
-                        <span><?php /* @escapeNotVerified */ echo __('Remove This Item') ?></span>
+                    <a class="action remove" href="<?= /* @escapeNotVerified */ $_filter->getRemoveUrl() ?>"
+                       title="<?= /* @escapeNotVerified */ $block->escapeHtml(__('Remove')) . " " . $currentFilterName ?>">
+                        <span><?= /* @escapeNotVerified */ __('Remove This Item') ?></span>
                     </a>
                 <?php endif; ?>
             </li>
diff --git a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
index 7f6465c9fd1bf..1f09aa7510e06 100644
--- a/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/app/design/frontend/Magento/luma/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -17,27 +17,27 @@
 <?php if ($block->canShowBlock()): ?>
     <div class="block filter" id="layered-filter-block" data-mage-init='{"collapsible":{"openedState": "active", "collapsible": true, "active": false, "collateral": { "openedState": "filter-active", "element": "body" } }}'>
         <?php $filtered = count($block->getLayer()->getState()->getFilters()) ?>
-        <div class="block-title filter-title" data-count="<?php /* @escapeNotVerified */ echo $filtered; ?>">
-            <strong data-role="title"><?php /* @escapeNotVerified */ echo __('Shop By') ?></strong>
+        <div class="block-title filter-title" data-count="<?= /* @escapeNotVerified */ $filtered ?>">
+            <strong data-role="title"><?= /* @escapeNotVerified */ __('Shop By') ?></strong>
         </div>
         <div class="block-content filter-content">
-            <?php echo $block->getChildHtml('state') ?>
+            <?= $block->getChildHtml('state') ?>
 
             <?php if ($block->getLayer()->getState()->getFilters()): ?>
                 <div class="block-actions filter-actions">
-                    <a href="<?php /* @escapeNotVerified */ echo $block->getClearUrl() ?>" class="action clear filter-clear"><span><?php /* @escapeNotVerified */ echo __('Clear All') ?></span></a>
+                    <a href="<?= /* @escapeNotVerified */ $block->getClearUrl() ?>" class="action clear filter-clear"><span><?= /* @escapeNotVerified */ __('Clear All') ?></span></a>
                 </div>
             <?php endif; ?>
             <?php $wrapOptions = false; ?>
             <?php foreach ($block->getFilters() as $filter): ?>
                 <?php if ($filter->getItemsCount()): ?>
                     <?php if (!$wrapOptions): ?>
-                        <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?php /* @escapeNotVerified */ echo __('Shopping Options') ?></strong>
+                        <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?= /* @escapeNotVerified */ __('Shopping Options') ?></strong>
                         <div class="filter-options" id="narrow-by-list" data-role="content" data-mage-init='{"accordion":{"openedState": "active", "collapsible": true, "active": false, "multipleCollapsible": false}}'>
                     <?php  $wrapOptions = true; endif; ?>
                     <div data-role="collapsible" class="filter-options-item">
-                        <div data-role="title" class="filter-options-title"><?php /* @escapeNotVerified */ echo __($filter->getName()) ?></div>
-                        <div data-role="content" class="filter-options-content"><?php /* @escapeNotVerified */ echo $block->getChildBlock('renderer')->render($filter); ?></div>
+                        <div data-role="title" class="filter-options-title"><?= /* @escapeNotVerified */ __($filter->getName()) ?></div>
+                        <div data-role="content" class="filter-options-content"><?= /* @escapeNotVerified */ $block->getChildBlock('renderer')->render($filter) ?></div>
                     </div>
                 <?php endif; ?>
             <?php endforeach; ?>
diff --git a/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
new file mode 100644
index 0000000000000..de869982d54cf
--- /dev/null
+++ b/dev/tests/static/framework/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniff.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\EchoTags;
+
+use PHP_CodeSniffer_File;
+use PHP_CodeSniffer_Sniff;
+use PHP_CodeSniffer_Tokens;
+
+class ShortEchoSyntaxSniff implements PHP_CodeSniffer_Sniff
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function register()
+    {
+        return [T_OPEN_TAG];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+    {
+        $tokens  = $phpcsFile->getTokens();
+        $openTag = $tokens[$stackPtr];
+
+        // HHVM Will classify <?= as a T_OPEN_TAG
+        if ($openTag['content'] === '<?=') {
+            return;
+        }
+
+        $nextToken = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($stackPtr + 1), null, true);
+        if ($tokens[$nextToken]['code'] == T_ECHO) {
+            $phpcsFile->addError(
+                'Short echo tag syntax must be used; expected "<?=" but found "<?php echo"',
+                $stackPtr
+            );
+        }
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
new file mode 100644
index 0000000000000..310bff9bf9779
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/ShortEchoSyntaxSniffTest.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Sniffs\EchoTags;
+
+class ShortEchoSyntaxSniffTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHP_CodeSniffer_File|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileMock;
+
+    /**
+     * @var ShortEchoSyntaxSniff
+     */
+    private $shortEchoUsageSniff;
+
+    protected function setUp()
+    {
+        $this->fileMock = $this->getMock(\PHP_CodeSniffer_File::class, [], [], '', false);
+        $this->shortEchoUsageSniff = new ShortEchoSyntaxSniff();
+    }
+
+    /**
+     * @param string $file
+     * @param int $incorrectUsages
+     * @dataProvider processDataProvider
+     */
+    public function testEchoTagSniff($file, $stackPtr, $incorrectUsages)
+    {
+        $fileContent = file_get_contents(__DIR__ . '/_files/' . $file);
+        $tokens = $this->tokenizeString($fileContent);
+
+        $this->fileMock->expects($this->any())
+            ->method('findNext')
+            ->with([T_WHITESPACE, T_COMMENT, T_DOC_COMMENT], $stackPtr + 1, null, true)
+            ->willReturn($stackPtr + 1);
+
+        $this->fileMock->expects($this->once())
+            ->method('getTokens')
+            ->willReturn($tokens);
+
+        $this->fileMock->expects($this->exactly($incorrectUsages))
+            ->method('addError')
+            ->with('Short echo tag syntax must be used; expected "<?=" but found "<?php echo"');
+
+        $this->shortEchoUsageSniff->process($this->fileMock, $stackPtr);
+    }
+
+    /**
+     * Get tokens for a string
+     *
+     * @param string $fileContent
+     * @return array
+     */
+    private function tokenizeString($fileContent)
+    {
+        $tokens = token_get_all($fileContent);
+        $snifferTokens = [];
+        for ($i = 0; $i < count($tokens); $i++) {
+            $code = is_array($tokens[$i]) ? $tokens[$i][0] : $tokens[$i];
+            $content = is_array($tokens[$i]) ? $tokens[$i][1] : $tokens[$i];
+            $snifferTokens[$i]['code'] = $code;
+            $snifferTokens[$i]['content'] = $content;
+        }
+        return $snifferTokens;
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            ['incorrect_echotag.txt', 1, 1],
+            ['correct_noecho.txt', 1, 0],
+            ['correct_echotag.txt', 1, 0]
+        ];
+    }
+}
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
new file mode 100644
index 0000000000000..fd8027e1e23e6
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_echotag.txt
@@ -0,0 +1,6 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+<?= "foo" ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
new file mode 100644
index 0000000000000..5b003e1e5cfba
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/correct_noecho.txt
@@ -0,0 +1,6 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+<?php $foo = bar; ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
new file mode 100644
index 0000000000000..84d72334bf850
--- /dev/null
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/EchoTags/_files/incorrect_echotag.txt
@@ -0,0 +1,6 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+<?php echo "foo" ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php
index 58083c57d9bf7..e828ab6c531fb 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/buffy.php
@@ -3,4 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'At the young age of 15, Buffy Summers was chosen to hunt vampires, demons, and the forces of darkness.';
+?>
+<?= 'At the young age of 15, Buffy Summers was chosen to hunt vampires, demons, and the forces of darkness.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php
index 6eaa942f5a393..0042a7380a1bc 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/interview_with_the_vampire.php
@@ -3,4 +3,5 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'A man tells his epic life story: love, betrayal, loneliness, and hunger.';
+?>
+<?= 'A man tells his epic life story: love, betrayal, loneliness, and hunger.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php
index 6de0b8ecb7fef..1303df7570e0c 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/eclipse.php
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'As a string of mysterious killings grips Seattle, Bella, whose high school graduation is fast approaching,
+?>
+<?= 'As a string of mysterious killings grips Seattle, Bella, whose high school graduation is fast approaching,
     is forced to choose between her love for vampire Edward and her friendship with demon Jacob.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php
index 5a5b194b76261..77c3a4f00d104 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Inspection/_files/words_finder/twilight/newmoon.php
@@ -3,5 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-echo 'Vampire Edward leaves Bella after an attack that nearly claimed her life, and in her depression she falls into
+?>
+<?= 'Vampire Edward leaves Bella after an attack that nearly claimed her life, and in her depression she falls into
     yet another paranormal relationship - this time with demon Jacob Black.';
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
index 94d939dcb94b8..50d2503514d12 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_safe.phtml
@@ -7,31 +7,31 @@
 // @codingStandardsIgnoreFile
 ?>
 
-<?php /* @escapeNotVerified */ echo $block->getSomeData();?>
-<?php /* @noEscape */ echo $block->getSomeData();?>
-<input name="form_key" type="hidden" value="<?php echo $block->escapeUrl($var) ?>" />
-<input name="form_key" type="hidden" value="<?php echo $block->escapeHtmlAttr('value') ?>" />
-<input name="form_key" type="hidden" value="<?php echo $block->escapeJs('value') ?>" />
-<?php echo $block->escapeCss('value') ?>
+<?= /* @escapeNotVerified */ $block->getSomeData() ?>
+<?= /* @noEscape */ $block->getSomeData() ?>
+<input name="form_key" type="hidden" value="<?= $block->escapeUrl($var) ?>" />
+<input name="form_key" type="hidden" value="<?= $block->escapeHtmlAttr('value') ?>" />
+<input name="form_key" type="hidden" value="<?= $block->escapeJs('value') ?>" />
+<?= $block->escapeCss('value') ?>
 echo $var;
-<?php echo $block->getHtmlId("some value") ?>
-<?php echo $block->getIdHtml("some value") ?>
-<?= $block->getIdHtml("some value"); ?>
-<?php echo "\$var1"; ?>
-<?php echo '$var'; ?>
-<?php echo "value"; ?>
-<?php echo 'value'; ?>
-<?php echo (int)$var; ?>
-<?php echo (bool)$var; ?>
-<?php echo count($var); ?>
-<?php echo $object->methodHtml(); ?>
+<?= $block->getHtmlId("some value") ?>
+<?= $block->getIdHtml("some value") ?>
+<?= $block->getIdHtml("some value") ?>
+<?= "\$var1" ?>
+<?= '$var' ?>
+<?= "value" ?>
+<?= 'value' ?>
+<?= (int)$var ?>
+<?= (bool)$var ?>
+<?= count($var) ?>
+<?= $object->methodHtml() ?>
 <?php pecho($var);?>
-<?php echo $object->methodHtml() .
+<?= $object->methodHtml() .
     (bool)$var .
     $block->escapeUrl("some value");
 ?>
-<?php /* @noEscape */ echo '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\''; ?>
-<?= $block->getExtendedElement($switchAttributeCode)->toHtml(); ?>
+<?= /* @noEscape */ '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\'' ?>
+<?= $block->getExtendedElement($switchAttributeCode)->toHtml() ?>
 <?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>
 <?php
 /**
@@ -42,7 +42,7 @@ echo $var;
 <?php
 /* This part is commented to remove all <col> tags from the code. */
 /* foreach ($block->getColumns() as $_column): ?>
-    <col <?php echo $_column->getProperty() ?> />
+    <col <?= $_column->getProperty() ?> />
 <?php endforeach; */ ?>
 
-<?php echo $block->escapeHtmlAttr($block->getParamValue('title_' . $store['value'])); ?>
+<?= $block->escapeHtmlAttr($block->getParamValue('title_' . $store['value'])) ?>
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
index c83d7821ac401..bf3aec540b815 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/TestFramework/Utility/_files/xss_unsafe.phtml
@@ -6,24 +6,24 @@
 
 // @codingStandardsIgnoreFile
 ?>
-<?php echo $block->getSomeData();?>
-<?=  $block->getTitle();?>
-<?php echo $object->getSomeMethod($block->getHtmlId());?>
-<?php echo "Title: $title";?>
-<?php echo $block->escapeUrl($var) . $var . 'value';?>
-<?php echo $var;?>
-<?= $someVar?>
-<?php echo __("value");?>
+<?= $block->getSomeData() ?>
+<?= $block->getTitle() ?>
+<?= $object->getSomeMethod($block->getHtmlId()) ?>
+<?= "Title: $title" ?>
+<?= $block->escapeUrl($var) . $var . 'value' ?>
+<?= $var ?>
+<?= $someVar ?>
+<?= __("value") ?>
 
-<?php echo $object->methodHtml() .
+<?= $object->methodHtml() .
     $var .
     $block->getSomeData();
 ?>
-<?php echo '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\''; ?>
-<?php echo "\"" . $code . "\",\"" . $block->escapeHtml($data['parentSymbol']) . "\""; ?>
+<?= '\'' . $code . '\',\'' . $block->escapeHtml($data['parentSymbol']) . '\'' ?>
+<?= "\"" . $code . "\",\"" . $block->escapeHtml($data['parentSymbol']) . "\"" ?>
 
 <?php
 /* This part is commented to remove all <col> tags from the code. */
 /* foreach ($block->getColumns() as $_column): ?>
-    <col <?php echo $_column->getProperty() ?> />
+    <col <?= $_column->getProperty() ?> />
 <?php endforeach; */ ?>
diff --git a/pub/errors/default/page.phtml b/pub/errors/default/page.phtml
index d734940b57dbd..98ca8276b0d2c 100644
--- a/pub/errors/default/page.phtml
+++ b/pub/errors/default/page.phtml
@@ -7,8 +7,8 @@
 <!doctype html>
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head>
-    <title><?php echo $this->pageTitle?></title>
-    <base href="<?php echo $this->getViewFileUrl()?>" />
+    <title><?= $this->pageTitle ?></title>
+    <base href="<?= $this->getViewFileUrl() ?>" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="robots" content="*"/>
     <link rel="stylesheet" href="css/styles.css" type="text/css" />
diff --git a/pub/errors/default/report.phtml b/pub/errors/default/report.phtml
index ef16bbf88486a..f907e73149d41 100644
--- a/pub/errors/default/report.phtml
+++ b/pub/errors/default/report.phtml
@@ -25,37 +25,37 @@
     </div>
 </div>
     <?php endif; ?>
-<form action="<?php echo "{$this->getBaseUrl(true)}errors/report.php?id={$this->reportId}" ?>" method="post" id="form-validate" class="form">
+<form action="<?= "{$this->getBaseUrl(true)}errors/report.php?id={$this->reportId}" ?>" method="post" id="form-validate" class="form">
     <fieldset class="fieldset" data-hasrequired="* Required Fields">
         <legend class="legend"><span>Personal Information</span></legend><br />
         <div class="field firstname required">
             <label for="firstname" class="label">First Name</label>
             <div class="control">
-                <input type="text" name="firstname" id="firstname" value="<?php echo $this->postData['firstName'] ?>" title="First Name" class="required-entry input-text" />
+                <input type="text" name="firstname" id="firstname" value="<?= $this->postData['firstName'] ?>" title="First Name" class="required-entry input-text" />
             </div>
         </div>
         <div class="field lastname required">
             <label for="lastname" class="label">Last Name</label>
             <div class=control">
-                <input type="text" name="lastname" id="lastname" value="<?php echo $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
+                <input type="text" name="lastname" id="lastname" value="<?= $this->postData['lastName'] ?>" title="Last Name" class="required-entry input-text" />
             </div>
         </div>
         <div class="field email required">
             <label for="email_address" class="label">Email Address</label>
             <div class=control">
-                <input type="text" name="email" id="email_address" value="<?php echo $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
+                <input type="text" name="email" id="email_address" value="<?= $this->postData['email'] ?>" title="Email Address" class="validate-email required-entry input-text" />
             </div>
         </div>
         <div class="field telephone">
             <label for="telephone" class="label">Telephone</label>
             <div class=control">
-                <input type="text" name="telephone" id="telephone" value="<?php echo $this->postData['telephone'] ?>" title="Telephone" class="input-text" />
+                <input type="text" name="telephone" id="telephone" value="<?= $this->postData['telephone'] ?>" title="Telephone" class="input-text" />
             </div>
         </div>
         <div class="field comment">
             <label for="comment" class="label">Comment</label>
             <div class=control">
-                <textarea name="comment" cols="5" rows="3" class="textarea"><?php echo $this->postData['comment'] ?></textarea>
+                <textarea name="comment" cols="5" rows="3" class="textarea"><?= $this->postData['comment'] ?></textarea>
             </div>
         </div>
     </fieldset>
@@ -70,10 +70,10 @@
 <?php if ($this->reportAction == 'print'): ?>
 <div class="trace-container">
     <div class="trace">
-        <pre><?php echo htmlspecialchars($this->reportData[0]) ?></pre>
+        <pre><?= htmlspecialchars($this->reportData[0]) ?></pre>
     </div>
 </div>
 <?php endif; ?>
 <?php if ($this->reportId): ?>
-    <p>Error log record number: <?php echo $this->reportId ?></p>
+    <p>Error log record number: <?= $this->reportId ?></p>
 <?php endif; ?>
diff --git a/setup/view/error/401.phtml b/setup/view/error/401.phtml
index f07e80304751c..6fa12384d3b6a 100644
--- a/setup/view/error/401.phtml
+++ b/setup/view/error/401.phtml
@@ -11,7 +11,7 @@
     document.title = 'Magento Setup - 401 Unauthorized Access';
 </script>
 <section class="page-landing">
-    <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-logo.svg" alt="Magento"/>
+    <img class="logo" src="<?= $this->basePath() ?>/pub/images/magento-logo.svg" alt="Magento"/>
     <p class="text-welcome">
         Welcome to Magento Admin, your online store headquarters.
         <br>
diff --git a/setup/view/error/404.phtml b/setup/view/error/404.phtml
index c2d00115d126e..dd4a7d79a82bd 100644
--- a/setup/view/error/404.phtml
+++ b/setup/view/error/404.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <header class="header">
-    <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
+    <img class="logo" src="<?= $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
     <h1 class="header-title">A 404 error occurred</h1>
 </header>
 
@@ -37,7 +37,7 @@
     }
     ?>
 
-    <p><?php echo $reasonMessage ?></p>
+    <p><?= $reasonMessage ?></p>
 
 <?php endif ?>
 
@@ -45,7 +45,7 @@
 
     <dl>
         <dt>Controller:</dt>
-        <dd><?php echo $this->escapeHtml( $this->controller ) ?>
+        <dd><?= $this->escapeHtml( $this->controller ) ?>
             <?php
             if ( isset( $this->controller_class )
                  && $this->controller_class
@@ -64,21 +64,21 @@
     <?php if ( isset( $this->exception ) && $this->exception instanceof Exception ): ?>
         <hr/>
         <h2>Additional information:</h2>
-        <h3><?php echo get_class( $this->exception ); ?></h3>
+        <h3><?= get_class( $this->exception ) ?></h3>
         <dl>
             <dt>File:</dt>
             <dd>
-                <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
+                <pre class="prettyprint linenums"><?= $this->exception->getFile() ?>:<?= $this->exception->getLine() ?></pre>
             </dd>
 
             <dt>Message:</dt>
             <dd>
-                <pre class="prettyprint linenums"><?php echo $this->exception->getMessage() ?></pre>
+                <pre class="prettyprint linenums"><?= $this->exception->getMessage() ?></pre>
             </dd>
 
             <dt>Stack trace:</dt>
             <dd>
-                <pre class="prettyprint linenums"><?php echo $this->exception->getTraceAsString() ?></pre>
+                <pre class="prettyprint linenums"><?= $this->exception->getTraceAsString() ?></pre>
             </dd>
         </dl>
         <?php
@@ -90,21 +90,21 @@
             <ul class="unstyled">
                 <?php while ( $e ) : ?>
                     <li>
-                        <h3><?php echo get_class( $e ); ?></h3>
+                        <h3><?= get_class( $e ) ?></h3>
                         <dl>
                             <dt>File:</dt>
                             <dd>
-                                <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+                                <pre class="prettyprint linenums"><?= $e->getFile() ?>:<?= $e->getLine() ?></pre>
                             </dd>
 
                             <dt>Message:</dt>
                             <dd>
-                                <pre class="prettyprint linenums"><?php echo $e->getMessage() ?></pre>
+                                <pre class="prettyprint linenums"><?= $e->getMessage() ?></pre>
                             </dd>
 
                             <dt>Stack trace:</dt>
                             <dd>
-                                <pre class="prettyprint linenums"><?php echo $e->getTraceAsString() ?></pre>
+                                <pre class="prettyprint linenums"><?= $e->getTraceAsString() ?></pre>
                             </dd>
                         </dl>
                     </li>
diff --git a/setup/view/error/index.phtml b/setup/view/error/index.phtml
index a2e7129e3e2e3..40f8bd4968b4e 100644
--- a/setup/view/error/index.phtml
+++ b/setup/view/error/index.phtml
@@ -8,32 +8,32 @@
 
 ?>
 <header class="header">
-    <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
+    <img class="logo" src="<?= $this->basePath() ?>/pub/images/magento-icon.svg" alt="Magento"/>
     <h1 class="header-title">An error occurred</h1>
 </header>
 
-<h2><?php echo $this->message ?></h2>
+<h2><?= $this->message ?></h2>
 
 <?php if ( isset( $this->display_exceptions ) && $this->display_exceptions ): ?>
 
     <?php if ( isset( $this->exception ) && $this->exception instanceof Exception ): ?>
         <hr/>
         <h2>Additional information:</h2>
-        <h3><?php echo get_class( $this->exception ); ?></h3>
+        <h3><?= get_class( $this->exception ) ?></h3>
         <dl>
             <dt>File:</dt>
             <dd>
-                <pre class="prettyprint linenums"><?php echo $this->exception->getFile() ?>:<?php echo $this->exception->getLine() ?></pre>
+                <pre class="prettyprint linenums"><?= $this->exception->getFile() ?>:<?= $this->exception->getLine() ?></pre>
             </dd>
 
             <dt>Message:</dt>
             <dd>
-                <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $this->exception->getMessage() ) ?></pre>
+                <pre class="prettyprint linenums"><?= $this->escapeHtml( $this->exception->getMessage() ) ?></pre>
             </dd>
 
             <dt>Stack trace:</dt>
             <dd>
-                <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $this->exception->getTraceAsString() ) ?></pre>
+                <pre class="prettyprint linenums"><?= $this->escapeHtml( $this->exception->getTraceAsString() ) ?></pre>
             </dd>
         </dl>
         <?php
@@ -45,21 +45,21 @@
             <ul class="unstyled">
                 <?php while ( $e ) : ?>
                     <li>
-                        <h3><?php echo get_class( $e ); ?></h3>
+                        <h3><?= get_class( $e ) ?></h3>
                         <dl>
                             <dt>File:</dt>
                             <dd>
-                                <pre class="prettyprint linenums"><?php echo $e->getFile() ?>:<?php echo $e->getLine() ?></pre>
+                                <pre class="prettyprint linenums"><?= $e->getFile() ?>:<?= $e->getLine() ?></pre>
                             </dd>
 
                             <dt>Message:</dt>
                             <dd>
-                                <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $e->getMessage() ) ?></pre>
+                                <pre class="prettyprint linenums"><?= $this->escapeHtml( $e->getMessage() ) ?></pre>
                             </dd>
 
                             <dt>Stack trace:</dt>
                             <dd>
-                                <pre class="prettyprint linenums"><?php echo $this->escapeHtml( $e->getTraceAsString() ) ?></pre>
+                                <pre class="prettyprint linenums"><?= $this->escapeHtml( $e->getTraceAsString() ) ?></pre>
                             </dd>
                         </dl>
                     </li>
diff --git a/setup/view/layout/layout.phtml b/setup/view/layout/layout.phtml
index 7ea76c3de4efb..613ff391a8fff 100644
--- a/setup/view/layout/layout.phtml
+++ b/setup/view/layout/layout.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php echo $this->doctype(); ?>
+<?= $this->doctype() ?>
 <!--[if IE 9]>
 <html class="ie9" lang="en" ng-app="magentoSetup"><![endif]-->
 <!--[if !IE]><!-->
@@ -14,10 +14,10 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{$state.current.title}}</title>
-    <?php echo $this->headLink()
+    <?= $this->headLink()
         ->appendStylesheet($this->basePath() . '/pub/styles/setup.css');
     ?>
-    <?php echo $this->headScript()
+    <?= $this->headScript()
         ->appendFile($this->basePath() . '/pub/angular/angular.min.js')
         ->appendFile($this->basePath() . '/pub/angular-ng-storage/angular-ng-storage.min.js')
         ->appendFile($this->basePath() . '/pub/angular-ng-dialog/angular-ng-dialog.min.js')
@@ -54,24 +54,24 @@
     <link
         rel="icon"
         type="image/x-icon"
-        href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon.ico"
+        href="<?= $this->basePath() ?>/pub/images/favicon/favicon.ico"
         sizes="16x16">
     <link
         rel="icon"
         type="image/png"
-        href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-96x96.png"
+        href="<?= $this->basePath() ?>/pub/images/favicon/favicon-96x96.png"
         sizes="96x96">
     <link
         rel="icon"
         type="image/png"
-        href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-32x32.png"
+        href="<?= $this->basePath() ?>/pub/images/favicon/favicon-32x32.png"
         sizes="32x32">
     <link
         rel="icon"
         type="image/png"
-        href="<?php echo $this->basePath() ?>/pub/images/favicon/favicon-16x16.png"
+        href="<?= $this->basePath() ?>/pub/images/favicon/favicon-16x16.png"
         sizes="16x16">
-    <?php echo $this->inlineScript() ?>
+    <?= $this->inlineScript() ?>
     <style>
         a.white-space-pre-line {
             white-space: pre-line;
@@ -79,6 +79,6 @@
     </style>
 </head>
 <body>
-<?php echo $this->content; ?>
+<?= $this->content ?>
 </body>
 </html>
diff --git a/setup/view/magento/setup/create-admin-account.phtml b/setup/view/magento/setup/create-admin-account.phtml
index 6c1942f71d025..5c55bd729d770 100644
--- a/setup/view/magento/setup/create-admin-account.phtml
+++ b/setup/view/magento/setup/create-admin-account.phtml
@@ -153,7 +153,7 @@ $passwordWizard = sprintf(
                 class="form-el-input"
                 ng-change="passwordStatusChange()"
                 tooltip-placement="right"
-                tooltip-html-unsafe="<?php echo $passwordWizard; ?>"
+                tooltip-html-unsafe="<?= $passwordWizard ?>"
                 tooltip-trigger="focus"
                 tooltip-append-to-body="true"
                 type="password"
diff --git a/setup/view/magento/setup/customize-your-store.phtml b/setup/view/magento/setup/customize-your-store.phtml
index 3efcdc4d05050..15cd53ca26cfd 100644
--- a/setup/view/magento/setup/customize-your-store.phtml
+++ b/setup/view/magento/setup/customize-your-store.phtml
@@ -69,7 +69,7 @@
                         tooltip-trigger="focus"
                         tooltip-append-to-body="true">
                         <?php foreach ( $this->timezone as $value => $label ): ?>
-                            <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
+                            <?= "<option value=\"" . $value . "\">" . $label . "</option>" ?>
                         <?php endforeach; ?>
                     </select>
                 </label>
@@ -93,7 +93,7 @@
                         tooltip-trigger="focus"
                         tooltip-append-to-body="true">
                         <?php foreach ( $this->currency as $value => $label ): ?>
-                            <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
+                            <?= "<option value=\"" . $value . "\">" . $label . "</option>" ?>
                         <?php endforeach; ?>
                     </select>
                 </label>
@@ -117,7 +117,7 @@
                         tooltip-trigger="focus"
                         tooltip-append-to-body="true">
                         <?php foreach ( $this->language as $value => $label ): ?>
-                            <?php echo "<option value=\"" . $value . "\">" . $label . "</option>"; ?>
+                            <?= "<option value=\"" . $value . "\">" . $label . "</option>" ?>
                         <?php endforeach; ?>
                     </select>
                 </label>
diff --git a/setup/view/magento/setup/extension-grid.phtml b/setup/view/magento/setup/extension-grid.phtml
index be9930bff3276..47e5f7eec309b 100644
--- a/setup/view/magento/setup/extension-grid.phtml
+++ b/setup/view/magento/setup/extension-grid.phtml
@@ -81,7 +81,7 @@
                 <span class="module-summary-count">{{total}} extensions</span>
             </div>
             <div class="col-xs-9 admin__data-grid-pager-wrap"
-                 ng-include="'<?php echo $this->basePath();?>/pub/magento/setup/view/pagination.html'">
+                 ng-include="'<?= $this->basePath() ?>/pub/magento/setup/view/pagination.html'">
             </div>
         </div>
     </div>
@@ -170,7 +170,7 @@
 (!$root.extensionsProcessed)" class="loading-mask ng-scope" data-role="loader">
     <div class="popup popup-loading">
         <div class="popup-inner">
-            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            <img alt="Loading..." src="<?= $this->basePath() ?>/pub/images/loader-1.gif">
             Please wait...
         </div>
     </div>
diff --git a/setup/view/magento/setup/index.phtml b/setup/view/magento/setup/index.phtml
index fa95356ae0a89..648345beec7f7 100644
--- a/setup/view/magento/setup/index.phtml
+++ b/setup/view/magento/setup/index.phtml
@@ -8,7 +8,7 @@
 <div class="{{$state.current.type == 'install' && !$state.current.wrapper ?  'container' : 'page-wrapper'}}">
     <div ng-include="'index.php/navigation/header-bar'"></div>
     <main id="anchor-content" class="page-content">
-        <?php echo $this->render('navigation/menu.phtml');?>
+        <?= $this->render('navigation/menu.phtml') ?>
         <div
             id="main"
             class="{{class}}"
diff --git a/setup/view/magento/setup/install-extension-grid.phtml b/setup/view/magento/setup/install-extension-grid.phtml
index 55cff4d80f958..8e2ecd8ec2558 100644
--- a/setup/view/magento/setup/install-extension-grid.phtml
+++ b/setup/view/magento/setup/install-extension-grid.phtml
@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="col-xs-9 admin__data-grid-pager-wrap"
-                 ng-include="'<?php echo $this->basePath();?>/pub/magento/setup/view/pagination.html'">
+                 ng-include="'<?= $this->basePath() ?>/pub/magento/setup/view/pagination.html'">
             </div>
         </div>
     </div>
@@ -138,7 +138,7 @@
 <div ng-show="!isHiddenSpinner" class="loading-mask ng-scope" data-role="loader">
     <div class="popup popup-loading">
         <div class="popup-inner">
-            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            <img alt="Loading..." src="<?= $this->basePath() ?>/pub/images/loader-1.gif">
             Please wait...
         </div>
     </div>
diff --git a/setup/view/magento/setup/landing.phtml b/setup/view/magento/setup/landing.phtml
index 03014df505234..581be20df937b 100644
--- a/setup/view/magento/setup/landing.phtml
+++ b/setup/view/magento/setup/landing.phtml
@@ -8,9 +8,9 @@
 
 ?>
 <section class="page-landing">
-    <img class="logo" src="<?php echo $this->basePath() ?>/pub/images/magento-logo.svg" alt="Magento"/>
+    <img class="logo" src="<?= $this->basePath() ?>/pub/images/magento-logo.svg" alt="Magento"/>
     <p class="text-version">
-        <?php echo 'Version' . ' ' . $this->version; ?>
+        <?= 'Version' . ' ' . $this->version ?>
     </p>
     <p class="text-welcome">
         Welcome to Magento Admin, your online store headquarters.
diff --git a/setup/view/magento/setup/license.phtml b/setup/view/magento/setup/license.phtml
index e7fbe27140838..6adaa49001a5c 100644
--- a/setup/view/magento/setup/license.phtml
+++ b/setup/view/magento/setup/license.phtml
@@ -8,7 +8,7 @@
 <div class="row page-license">
     <div class="col-m-offset-2 col-m-8 col-xs-12">
         <div class="license-text">
-            <?php echo nl2br(htmlspecialchars($this->license, ENT_COMPAT, 'UTF-8')); ?>
+            <?= nl2br(htmlspecialchars($this->license, ENT_COMPAT, 'UTF-8')) ?>
         </div>
         <div class="page-license-footer">
             <div class="btn-wrap-triangle-left">
diff --git a/setup/view/magento/setup/marketplace-credentials.phtml b/setup/view/magento/setup/marketplace-credentials.phtml
index c13517f2200ee..32ae512313610 100644
--- a/setup/view/magento/setup/marketplace-credentials.phtml
+++ b/setup/view/magento/setup/marketplace-credentials.phtml
@@ -7,7 +7,7 @@
     <div class="sync-login-wrap">
         <div class="login-header" ng-show="showCredsForm || upgradeProcessError">
             <img class="logo-img"
-                 src="<?php echo $this->basePath();?>/pub/images//magento-logo.svg" alt="Magento"/>
+                 src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
             <span>Marketplace</span>
         </div>
         <div class="messages">
@@ -106,7 +106,7 @@
 <div ng-show="!isHiddenSpinner" class="loading-mask ng-scope" data-role="loader">
     <div class="popup popup-loading">
         <div class="popup-inner">
-            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            <img alt="Loading..." src="<?= $this->basePath() ?>/pub/images/loader-1.gif">
             Please wait...
         </div>
     </div>
diff --git a/setup/view/magento/setup/module-grid.phtml b/setup/view/magento/setup/module-grid.phtml
index 567cdaf03f452..5fe0447b7c791 100644
--- a/setup/view/magento/setup/module-grid.phtml
+++ b/setup/view/magento/setup/module-grid.phtml
@@ -21,7 +21,7 @@
                 </div>
             </div>
             <div class="col-xs-9 admin__data-grid-pager-wrap"
-                 ng-include="'<?php echo $this->basePath();?>/pub/magento/setup/view/pagination.html'">
+                 ng-include="'<?= $this->basePath() ?>/pub/magento/setup/view/pagination.html'">
             </div>
         </div>
     </div>
diff --git a/setup/view/magento/setup/navigation/header-bar.phtml b/setup/view/magento/setup/navigation/header-bar.phtml
index bd23e4ada6cf7..03fb55d46cc4e 100644
--- a/setup/view/magento/setup/navigation/header-bar.phtml
+++ b/setup/view/magento/setup/navigation/header-bar.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <header ng-controller="headerController" class="page-header row"
-        data-ng-init="redirectTo('<?php echo $this->redirect?>')"
+        data-ng-init="redirectTo('<?= $this->redirect ?>')"
         ng-hide="$state.current.main">
     <div class="page-header-hgroup col-l-8 col-m-6">
         <div class="page-title-wrapper">
diff --git a/setup/view/magento/setup/navigation/side-menu.phtml b/setup/view/magento/setup/navigation/side-menu.phtml
index 49206ced5ab71..d41b306a75fca 100644
--- a/setup/view/magento/setup/navigation/side-menu.phtml
+++ b/setup/view/magento/setup/navigation/side-menu.phtml
@@ -17,7 +17,7 @@
 ?>
 
 <div class="menu-wrapper"
-    ng-show="<?php echo implode( '&&', $expressions); ?>"
+    ng-show="<?= implode( '&&', $expressions) ?>"
     >
 <nav class="admin__menu" ng-controller="mainController">
     <span
diff --git a/setup/view/magento/setup/popupauth.phtml b/setup/view/magento/setup/popupauth.phtml
index bce55a7c336dc..8b074abaa5f12 100644
--- a/setup/view/magento/setup/popupauth.phtml
+++ b/setup/view/magento/setup/popupauth.phtml
@@ -17,7 +17,7 @@
                 <div class="sync-login-wrap">
                     <div class="login-header">
                         <img class="logo-img"
-                             src="<?php echo $this->basePath();?>/pub/images//magento-logo.svg" alt="Magento"/>
+                             src="<?= $this->basePath() ?>/pub/images//magento-logo.svg" alt="Magento"/>
                         <span>Marketplace</span>
                     </div>
                     <div class="messages">
diff --git a/setup/view/magento/setup/readiness-check.phtml b/setup/view/magento/setup/readiness-check.phtml
index e5fc10227024a..6c6c2fbc39fc7 100644
--- a/setup/view/magento/setup/readiness-check.phtml
+++ b/setup/view/magento/setup/readiness-check.phtml
@@ -35,7 +35,7 @@
 
 <h2 class="page-sub-title">{{$state.current.header}}</h2>
 <div ng-show="$state.is('root.readiness-check-' + $state.current.type)"
-     ng-init="actionFrom='<?php echo $this->actionFrom ?>'" class="accent-box">
+     ng-init="actionFrom='<?= $this->actionFrom ?>'" class="accent-box">
     <p>Let's check your environment for the correct PHP version, PHP extensions, file permissions and compatibility.</p>
     <button
         class="btn btn-large btn-prime"
diff --git a/setup/view/magento/setup/system-config.phtml b/setup/view/magento/setup/system-config.phtml
index 55087c5a99491..9f7f051436f83 100644
--- a/setup/view/magento/setup/system-config.phtml
+++ b/setup/view/magento/setup/system-config.phtml
@@ -123,7 +123,7 @@
 <div ng-show="!isHiddenSpinner" class="loading-mask ng-scope" data-role="loader">
     <div class="popup popup-loading">
         <div class="popup-inner">
-            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            <img alt="Loading..." src="<?= $this->basePath() ?>/pub/images/loader-1.gif">
             Please wait...
         </div>
     </div>
diff --git a/setup/view/magento/setup/update-extension-grid.phtml b/setup/view/magento/setup/update-extension-grid.phtml
index 4b43e74924c40..b02fbf1a4aae5 100644
--- a/setup/view/magento/setup/update-extension-grid.phtml
+++ b/setup/view/magento/setup/update-extension-grid.phtml
@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="col-xs-9 admin__data-grid-pager-wrap"
-                 ng-include="'<?php echo $this->basePath();?>/pub/magento/setup/view/pagination.html'">
+                 ng-include="'<?= $this->basePath() ?>/pub/magento/setup/view/pagination.html'">
             </div>
         </div>
     </div>
@@ -146,7 +146,7 @@
 <div ng-show="!isHiddenSpinner" class="loading-mask ng-scope" data-role="loader">
     <div class="popup popup-loading">
         <div class="popup-inner">
-            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            <img alt="Loading..." src="<?= $this->basePath() ?>/pub/images/loader-1.gif">
             Please wait...
         </div>
     </div>
diff --git a/setup/view/magento/setup/updater-success.phtml b/setup/view/magento/setup/updater-success.phtml
index 05eb41cb55879..0e4c108d8495c 100644
--- a/setup/view/magento/setup/updater-success.phtml
+++ b/setup/view/magento/setup/updater-success.phtml
@@ -30,7 +30,7 @@
 <div ng-show="!isHiddenSpinner" class="loading-mask ng-scope" data-role="loader">
     <div class="popup popup-loading">
         <div class="popup-inner">
-            <img alt="Loading..." src="<?php echo $this->basePath() ?>/pub/images/loader-1.gif">
+            <img alt="Loading..." src="<?= $this->basePath() ?>/pub/images/loader-1.gif">
             Please wait...
         </div>
     </div>
diff --git a/setup/view/magento/setup/web-configuration.phtml b/setup/view/magento/setup/web-configuration.phtml
index 589431bc2dc0c..d0307a71e4a37 100644
--- a/setup/view/magento/setup/web-configuration.phtml
+++ b/setup/view/magento/setup/web-configuration.phtml
@@ -72,12 +72,12 @@ $hints = [
                 name="base_url"
                 ng-model="config.address.base_url"
                 ng-class="{'invalid': webconfig.base_url.$invalid && webconfig.submitted}"
-                ng-init="config.address.auto_base_url = '<?php echo $this->autoBaseUrl ?>'; fillBaseURL();"
+                ng-init="config.address.auto_base_url = '<?= $this->autoBaseUrl ?>'; fillBaseURL();"
                 ng-blur="addSlash()"
                 ng-change="populateHttps()"
                 ng-pattern="/^(https?:\/\/).*$/"
                 tooltip-placement="right"
-                tooltip-html-unsafe="<?php echo $hints['base_url']; ?>"
+                tooltip-html-unsafe="<?= $hints['base_url'] ?>"
                 tooltip-trigger="focus"
                 tooltip-append-to-body="true"
                 >
@@ -115,10 +115,10 @@ $hints = [
                         ng-pattern="/^[a-zA-Z0-9_]+$/"
                         ng-model="config.address.admin"
                         ng-class="{'invalid' : webconfig.admin.$invalid && webconfig.submitted }"
-                        ng-init="config.address.admin = '<?php echo $this->autoAdminPath ?>';"
+                        ng-init="config.address.admin = '<?= $this->autoAdminPath ?>';"
                         required
                         tooltip-placement="right"
-                        tooltip-html-unsafe="<?php echo $hints['admin']; ?>"
+                        tooltip-html-unsafe="<?= $hints['admin'] ?>"
                         tooltip-trigger="focus"
                         tooltip-append-to-body="true"
                         >
@@ -279,7 +279,7 @@ $hints = [
                         ng-model="config.encrypt.key"
                         ng-class="{'invalid': webconfig.key.$invalid && webconfig.submitted}"
                         tooltip-placement="right"
-                        tooltip-html-unsafe="<?php echo $hints['encrypt_key']; ?>"
+                        tooltip-html-unsafe="<?= $hints['encrypt_key'] ?>"
                         tooltip-trigger="focus"
                         tooltip-append-to-body="true"
                         ng-minlength="4"
@@ -316,7 +316,7 @@ $hints = [
                     tooltip-append-to-body="true"
                     >
                     <?php foreach ($this->sessionSave as $value):?>
-                        <?php echo "<option value=\"" . $value . "\">" . ucfirst($value) . "</option>"; ?>
+                        <?= "<option value=\"" . $value . "\">" . ucfirst($value) . "</option>" ?>
                     <?php endforeach; ?>
                 </select>
             </div>