From 1e8ba207b626bfdbff611cbc7a047b6cc74b5cf2 Mon Sep 17 00:00:00 2001
From: Viktor Tymchynskyi <vtymchynskyi@ebay.com>
Date: Fri, 11 Sep 2015 14:08:38 +0300
Subject: [PATCH] MAGETWO-41781: Create static test

-  Xss potentially unsafe outputs  in *.phtml templates are marked by /* @escapeNotVerified */ annotation
---
 .../templates/notification/window.phtml       |  12 +-
 .../adminhtml/templates/system/messages.phtml |   8 +-
 .../templates/system/messages/popup.phtml     |   4 +-
 .../adminhtml/templates/toolbar_entry.phtml   |  30 ++--
 .../templates/directpost/iframe.phtml         |   4 +-
 .../adminhtml/templates/directpost/info.phtml |  58 +++----
 .../order/view/info/fraud_details.phtml       |  14 +-
 .../templates/admin/access_denied.phtml       |   8 +-
 .../adminhtml/templates/admin/formkey.phtml   |   2 +-
 .../adminhtml/templates/admin/login.phtml     |  12 +-
 .../templates/admin/login_buttons.phtml       |   2 +-
 .../templates/admin/overlay_popup.phtml       |   2 +-
 .../view/adminhtml/templates/admin/page.phtml |   4 +-
 .../adminhtml/templates/dashboard/graph.phtml |  10 +-
 .../templates/dashboard/graph/disabled.phtml  |   4 +-
 .../adminhtml/templates/dashboard/grid.phtml  |  24 +--
 .../adminhtml/templates/dashboard/index.phtml |  10 +-
 .../templates/dashboard/salebar.phtml         |   6 +-
 .../templates/dashboard/searches.phtml        |   4 +-
 .../templates/dashboard/store/switcher.phtml  |  14 +-
 .../templates/dashboard/totalbar.phtml        |   6 +-
 .../totalbar/refreshstatistics.phtml          |   6 +-
 .../adminhtml/templates/media/uploader.phtml  |  14 +-
 .../view/adminhtml/templates/menu.phtml       |   2 +-
 .../adminhtml/templates/page/copyright.phtml  |   4 +-
 .../adminhtml/templates/page/footer.phtml     |   4 +-
 .../adminhtml/templates/page/header.phtml     |  22 +--
 .../templates/page/js/calendar.phtml          |  36 ++---
 .../templates/page/js/require_js.phtml        |   4 +-
 .../adminhtml/templates/page/locale.phtml     |   6 +-
 .../adminhtml/templates/page/notices.phtml    |   6 +-
 .../adminhtml/templates/page/report.phtml     |   2 +-
 .../adminhtml/templates/pageactions.phtml     |   2 +-
 .../adminhtml/templates/store/switcher.phtml  |  28 ++--
 .../switcher/form/renderer/fieldset.phtml     |   8 +-
 .../form/renderer/fieldset/element.phtml      |  10 +-
 .../templates/system/autocomplete.phtml       |   6 +-
 .../templates/system/cache/additional.phtml   |  22 +--
 .../templates/system/cache/edit.phtml         |  16 +-
 .../templates/system/design/edit.phtml        |   2 +-
 .../adminhtml/templates/system/search.phtml   |   4 +-
 .../templates/widget/accordion.phtml          |   2 +-
 .../templates/widget/breadcrumbs.phtml        |   2 +-
 .../adminhtml/templates/widget/button.phtml   |   4 +-
 .../templates/widget/button/split.phtml       |   4 +-
 .../templates/widget/form/container.phtml     |   8 +-
 .../templates/widget/form/element.phtml       |  38 ++---
 .../widget/form/element/gallery.phtml         |  34 ++--
 .../widget/form/renderer/fieldset.phtml       |  32 ++--
 .../form/renderer/fieldset/element.phtml      |  10 +-
 .../adminhtml/templates/widget/grid.phtml     |  64 ++++----
 .../templates/widget/grid/column_set.phtml    |  52 +++---
 .../templates/widget/grid/export.phtml        |   8 +-
 .../templates/widget/grid/extended.phtml      |  98 +++++------
 .../templates/widget/grid/massaction.phtml    |  30 ++--
 .../widget/grid/massaction_extended.phtml     |  26 +--
 .../templates/widget/grid/serializer.phtml    |  12 +-
 .../adminhtml/templates/widget/tabs.phtml     |  36 ++---
 .../templates/widget/tabshoriz.phtml          |  24 +--
 .../adminhtml/templates/widget/tabsleft.phtml |  14 +-
 .../adminhtml/templates/backup/dialogs.phtml  |  68 ++++----
 .../adminhtml/templates/backup/left.phtml     |   2 +-
 .../view/adminhtml/templates/data_js.phtml    |   2 +-
 .../view/adminhtml/templates/form.phtml       |  54 +++----
 .../frontend/templates/PayPal/shortcut.phtml  |  16 +-
 .../templates/creditcard/delete.phtml         |  26 +--
 .../frontend/templates/creditcard/edit.phtml  |  96 +++++------
 .../frontend/templates/creditcard/index.phtml |  20 +--
 .../view/frontend/templates/data_js.phtml     |   2 +-
 .../view/frontend/templates/form.phtml        |  60 +++----
 .../product/edit/tab/attributes/extend.phtml  |  14 +-
 .../composite/fieldset/options/bundle.phtml   |   4 +-
 .../fieldset/options/type/checkbox.phtml      |  26 +--
 .../fieldset/options/type/multi.phtml         |  18 +--
 .../fieldset/options/type/radio.phtml         |  36 ++---
 .../fieldset/options/type/select.phtml        |  28 ++--
 .../templates/product/edit/bundle.phtml       |  10 +-
 .../product/edit/bundle/option.phtml          |  56 +++----
 .../edit/bundle/option/selection.phtml        |  52 +++---
 .../creditmemo/create/items/renderer.phtml    |  56 +++----
 .../creditmemo/view/items/renderer.phtml      |  22 +--
 .../sales/invoice/create/items/renderer.phtml |  54 +++----
 .../sales/invoice/view/items/renderer.phtml   |  22 +--
 .../sales/order/view/items/renderer.phtml     |  56 +++----
 .../shipment/create/items/renderer.phtml      |  20 +--
 .../sales/shipment/view/items/renderer.phtml  |  20 +--
 .../templates/product/price/final_price.phtml |  16 +-
 .../product/price/selection/amount.phtml      |   2 +-
 .../templates/product/price/tier_prices.phtml |   4 +-
 .../catalog/product/view/backbutton.phtml     |   2 +-
 .../catalog/product/view/customize.phtml      |   2 +-
 .../catalog/product/view/options/notice.phtml |   2 +-
 .../catalog/product/view/summary.phtml        |  14 +-
 .../catalog/product/view/type/bundle.phtml    |   8 +-
 .../view/type/bundle/option/checkbox.phtml    |  22 +--
 .../view/type/bundle/option/multi.phtml       |  20 +--
 .../view/type/bundle/option/radio.phtml       |  38 ++---
 .../view/type/bundle/option/select.phtml      |  32 ++--
 .../product/view/type/bundle/options.phtml    |   6 +-
 .../order/items/creditmemo/default.phtml      |  12 +-
 .../email/order/items/invoice/default.phtml   |  12 +-
 .../email/order/items/order/default.phtml     |  20 +--
 .../email/order/items/shipment/default.phtml  |  12 +-
 .../order/creditmemo/items/renderer.phtml     |  12 +-
 .../sales/order/invoice/items/renderer.phtml  |  10 +-
 .../sales/order/items/renderer.phtml          |  30 ++--
 .../sales/order/shipment/items/renderer.phtml |  12 +-
 .../view/adminhtml/templates/default.phtml    |  20 +--
 .../view/frontend/templates/default.phtml     |  22 +--
 .../catalog/category/checkboxes/tree.phtml    |  18 +--
 .../templates/catalog/category/edit.phtml     |   2 +-
 .../catalog/category/edit/form.phtml          |  34 ++--
 .../templates/catalog/category/tree.phtml     |  32 ++--
 .../catalog/category/widget/tree.phtml        |  30 ++--
 .../form/renderer/fieldset/element.phtml      |  16 +-
 .../catalog/product/attribute/form.phtml      |   8 +-
 .../catalog/product/attribute/js.phtml        |   4 +-
 .../catalog/product/attribute/labels.phtml    |   6 +-
 .../catalog/product/attribute/options.phtml   |  22 +--
 .../catalog/product/attribute/set/main.phtml  |  34 ++--
 .../product/attribute/set/toolbar/add.phtml   |   2 +-
 .../catalog/product/composite/configure.phtml |   2 +-
 .../product/composite/fieldset/options.phtml  |   2 +-
 .../fieldset/options/type/date.phtml          |  20 +--
 .../fieldset/options/type/file.phtml          |  30 ++--
 .../fieldset/options/type/select.phtml        |   2 +-
 .../fieldset/options/type/text.phtml          |   8 +-
 .../product/composite/fieldset/qty.phtml      |   4 +-
 .../templates/catalog/product/edit.phtml      |  24 +--
 .../product/edit/action/attribute.phtml       |   4 +-
 .../product/edit/action/inventory.phtml       | 152 +++++++++---------
 .../product/edit/action/websites.phtml        |  18 +--
 .../catalog/product/edit/attribute_set.phtml  |   2 +-
 .../product/edit/category/new/form.phtml      |   2 +-
 .../catalog/product/edit/options.phtml        |   4 +-
 .../catalog/product/edit/options/option.phtml |  42 ++---
 .../product/edit/options/type/date.phtml      |   6 +-
 .../product/edit/options/type/file.phtml      |  14 +-
 .../product/edit/options/type/select.phtml    |  12 +-
 .../product/edit/options/type/text.phtml      |   8 +-
 .../catalog/product/edit/price/group.phtml    |  46 +++---
 .../catalog/product/edit/price/tier.phtml     |  50 +++---
 .../catalog/product/edit/serializer.phtml     |   2 +-
 .../catalog/product/edit/websites.phtml       |  12 +-
 .../catalog/product/helper/gallery.phtml      |  42 ++---
 .../templates/catalog/product/js.phtml        |   8 +-
 .../templates/catalog/product/tab/alert.phtml |   2 +-
 .../catalog/product/tab/inventory.phtml       | 134 +++++++--------
 .../templates/catalog/wysiwyg/js.phtml        |   2 +-
 .../product/edit/attribute/search.phtml       |  10 +-
 .../templates/product/edit/tabs.phtml         |  54 +++----
 .../product/grid/massaction_extended.phtml    |  26 +--
 .../adminhtml/templates/rss/grid/link.phtml   |   2 +-
 .../product/price/amount/default.phtml        |  16 +-
 .../product/price/configured_price.phtml      |   2 +-
 .../templates/product/price/default.phtml     |   2 +-
 .../templates/product/price/final_price.phtml |  12 +-
 .../templates/product/price/tier_prices.phtml |  10 +-
 .../templates/category/description.phtml      |   2 +-
 .../frontend/templates/category/image.phtml   |   2 +-
 .../frontend/templates/category/rss.phtml     |   2 +-
 .../category/widget/link/link_block.phtml     |   4 +-
 .../category/widget/link/link_inline.phtml    |   4 +-
 .../frontend/templates/navigation/left.phtml  |  10 +-
 .../templates/product/compare/link.phtml      |   6 +-
 .../templates/product/compare/list.phtml      |  42 ++---
 .../templates/product/compare/sidebar.phtml   |  14 +-
 .../frontend/templates/product/gallery.phtml  |  18 +--
 .../frontend/templates/product/image.phtml    |  10 +-
 .../product/image_with_borders.phtml          |  14 +-
 .../frontend/templates/product/list.phtml     |  40 ++---
 .../templates/product/list/items.phtml        |  58 +++----
 .../templates/product/list/toolbar.phtml      |   2 +-
 .../product/list/toolbar/amount.phtml         |   6 +-
 .../product/list/toolbar/limiter.phtml        |   8 +-
 .../product/list/toolbar/sorter.phtml         |  12 +-
 .../product/list/toolbar/viewmode.phtml       |  22 +--
 .../frontend/templates/product/listing.phtml  |  12 +-
 .../templates/product/view/additional.phtml   |   2 +-
 .../templates/product/view/addto.phtml        |  14 +-
 .../templates/product/view/addtocart.phtml    |  10 +-
 .../templates/product/view/attribute.phtml    |   6 +-
 .../templates/product/view/attributes.phtml   |   4 +-
 .../templates/product/view/description.phtml  |   2 +-
 .../templates/product/view/details.phtml      |  14 +-
 .../templates/product/view/form.phtml         |   6 +-
 .../templates/product/view/gallery.phtml      |  34 ++--
 .../templates/product/view/mailto.phtml       |   6 +-
 .../product/view/opengraph/currency.phtml     |   4 +-
 .../product/view/opengraph/general.phtml      |  10 +-
 .../templates/product/view/options.phtml      |   2 +-
 .../product/view/options/type/date.phtml      |  18 +--
 .../product/view/options/type/file.phtml      |  40 ++---
 .../product/view/options/type/select.phtml    |   6 +-
 .../product/view/options/type/text.phtml      |  18 +--
 .../product/view/options/wrapper.phtml        |   2 +-
 .../templates/product/view/type/default.phtml |   8 +-
 .../product/widget/link/link_block.phtml      |   4 +-
 .../product/widget/link/link_inline.phtml     |   4 +-
 .../widget/new/column/new_default_list.phtml  |  38 ++---
 .../widget/new/column/new_images_list.phtml   |   8 +-
 .../widget/new/column/new_names_list.phtml    |  10 +-
 .../product/widget/new/content/new_grid.phtml |  44 ++---
 .../product/widget/new/content/new_list.phtml |  50 +++---
 .../frontend/templates/qtyincrements.phtml    |   2 +-
 .../templates/stockqty/composite.phtml        |  20 +--
 .../frontend/templates/stockqty/default.phtml |   4 +-
 .../adminhtml/templates/promo/fieldset.phtml  |   6 +-
 .../frontend/templates/advanced/form.phtml    |  62 +++----
 .../frontend/templates/advanced/link.phtml    |   4 +-
 .../frontend/templates/advanced/result.phtml  |  10 +-
 .../view/frontend/templates/result.phtml      |   6 +-
 .../templates/product/widget/conditions.phtml |   4 +-
 .../product/widget/content/grid.phtml         |  44 ++---
 .../view/frontend/templates/button.phtml      |   2 +-
 .../view/frontend/templates/cart/coupon.phtml |  12 +-
 .../view/frontend/templates/cart/form.phtml   |  18 +--
 .../cart/item/configure/updatecart.phtml      |   8 +-
 .../templates/cart/item/default.phtml         |  32 ++--
 .../templates/cart/item/price/sidebar.phtml   |   4 +-
 .../cart/item/renderer/actions/edit.phtml     |   4 +-
 .../cart/item/renderer/actions/remove.phtml   |   4 +-
 .../frontend/templates/cart/methods.phtml     |   2 +-
 .../frontend/templates/cart/minicart.phtml    |  10 +-
 .../frontend/templates/cart/noItems.phtml     |   4 +-
 .../frontend/templates/cart/shipping.phtml    |  10 +-
 .../view/frontend/templates/cart/totals.phtml |   2 +-
 .../frontend/templates/item/price/row.phtml   |   2 +-
 .../frontend/templates/item/price/unit.phtml  |   2 +-
 .../view/frontend/templates/onepage.phtml     |  10 +-
 .../frontend/templates/onepage/billing.phtml  |  82 +++++-----
 .../frontend/templates/onepage/failure.phtml  |   6 +-
 .../frontend/templates/onepage/link.phtml     |   6 +-
 .../frontend/templates/onepage/payment.phtml  |   6 +-
 .../templates/onepage/payment/methods.phtml   |  14 +-
 .../templates/onepage/review/button.phtml     |   6 +-
 .../templates/onepage/review/info.phtml       |  16 +-
 .../templates/onepage/review/item.phtml       |   6 +-
 .../review/item/price/row_excl_tax.phtml      |   2 +-
 .../review/item/price/row_incl_tax.phtml      |   2 +-
 .../review/item/price/unit_excl_tax.phtml     |   2 +-
 .../review/item/price/unit_incl_tax.phtml     |   2 +-
 .../templates/onepage/review/totals.phtml     |  10 +-
 .../frontend/templates/onepage/shipping.phtml |  68 ++++----
 .../templates/onepage/shipping_method.phtml   |   4 +-
 .../onepage/shipping_method/additional.phtml  |   2 +-
 .../onepage/shipping_method/available.phtml   |  14 +-
 .../frontend/templates/registration.phtml     |   6 +-
 .../frontend/templates/shipping/price.phtml   |   2 +-
 .../view/frontend/templates/success.phtml     |   4 +-
 .../frontend/templates/total/default.phtml    |   6 +-
 .../templates/additional_agreements.phtml     |  12 +-
 .../view/frontend/templates/agreements.phtml  |  12 +-
 .../templates/multishipping_agreements.phtml  |  12 +-
 .../adminhtml/templates/browser/content.phtml |   2 +-
 .../templates/browser/content/files.phtml     |  12 +-
 .../templates/browser/content/uploader.phtml  |  12 +-
 .../adminhtml/templates/browser/tree.phtml    |   4 +-
 .../Cms/view/frontend/templates/content.phtml |   2 +-
 .../Cms/view/frontend/templates/meta.phtml    |   4 +-
 .../templates/widget/link/link_block.phtml    |   2 +-
 .../templates/widget/link/link_inline.phtml   |   2 +-
 .../widget/static_block/default.phtml         |   2 +-
 .../page/system/config/robots/reset.phtml     |   2 +-
 .../templates/system/config/edit.phtml        |   2 +-
 .../system/config/form/field/array.phtml      |  32 ++--
 .../templates/system/config/js.phtml          |   2 +-
 .../templates/system/config/switcher.phtml    |   8 +-
 .../templates/system/config/tabs.phtml        |  14 +-
 .../product/attribute/new/created.phtml       |   2 +-
 .../catalog/product/attribute/set/js.phtml    |   6 +-
 .../composite/fieldset/configurable.phtml     |  12 +-
 .../attribute/steps/attributes_values.phtml   |  28 ++--
 .../product/edit/attribute/steps/bulk.phtml   | 112 ++++++-------
 .../attribute/steps/select_attributes.phtml   |  12 +-
 .../edit/attribute/steps/summary.phtml        |   8 +-
 .../edit/super/associated-product-grid.phtml  |   4 +-
 .../edit/super/attribute-template.phtml       |  20 +--
 .../catalog/product/edit/super/config.phtml   |  24 +--
 .../edit/super/manual-product-grid.phtml      |   4 +-
 .../catalog/product/edit/super/matrix.phtml   |  36 ++---
 .../form.phtml                                |  10 +-
 .../affected-attribute-set-selector/js.phtml  |  16 +-
 .../configurable/attribute-selector/js.phtml  |   4 +-
 .../view/type/options/configurable.phtml      |  10 +-
 .../view/frontend/templates/form.phtml        |  28 ++--
 .../frontend/templates/html/notices.phtml     |  16 +-
 .../frontend/templates/require_cookie.phtml   |   2 +-
 .../view/adminhtml/templates/grid.phtml       |  20 +--
 .../system/currency/rate/matrix.phtml         |  14 +-
 .../system/currency/rate/services.phtml       |   2 +-
 .../templates/system/currency/rates.phtml     |   2 +-
 .../create/address/form/renderer/vat.phtml    |   6 +-
 .../templates/system/config/validatevat.phtml |  10 +-
 .../view/adminhtml/templates/tab/cart.phtml   |  24 +--
 .../templates/tab/view/personal_info.phtml    |  32 ++--
 .../adminhtml/templates/tab/view/sales.phtml  |  32 ++--
 .../account/authentication-popup.phtml        |   8 +-
 .../frontend/templates/account/customer.phtml |   2 +-
 .../templates/account/dashboard/address.phtml |  12 +-
 .../templates/account/dashboard/info.phtml    |  20 +--
 .../account/link/authorization.phtml          |   4 +-
 .../templates/account/link/back.phtml         |   2 +-
 .../templates/account/navigation.phtml        |   2 +-
 .../frontend/templates/address/book.phtml     |  38 ++---
 .../frontend/templates/address/edit.phtml     |  76 ++++-----
 .../templates/form/confirmation.phtml         |  10 +-
 .../view/frontend/templates/form/edit.phtml   |  28 ++--
 .../templates/form/forgotpassword.phtml       |  12 +-
 .../view/frontend/templates/form/login.phtml  |  20 +--
 .../frontend/templates/form/newsletter.phtml  |  12 +-
 .../frontend/templates/form/register.phtml    |  80 ++++-----
 .../form/resetforgottenpassword.phtml         |  10 +-
 .../frontend/templates/js/customer-data.phtml |   2 +-
 .../templates/js/section-config.phtml         |   2 +-
 .../view/frontend/templates/logout.phtml      |   4 +-
 .../view/frontend/templates/newcustomer.phtml |   6 +-
 .../view/frontend/templates/widget/dob.phtml  |   6 +-
 .../frontend/templates/widget/gender.phtml    |   6 +-
 .../view/frontend/templates/widget/name.phtml |  90 +++++------
 .../frontend/templates/widget/taxvat.phtml    |   4 +-
 .../adminhtml/templates/unitofmeasure.phtml   |  16 +-
 .../templates/js/optional_zip_countries.phtml |   4 +-
 .../view/frontend/templates/currency.phtml    |  14 +-
 .../frontend/templates/currency/switch.phtml  |   4 +-
 .../composite/fieldset/downloadable.phtml     |  22 +--
 .../templates/product/edit/downloadable.phtml |   2 +-
 .../product/edit/downloadable/links.phtml     |  50 +++---
 .../product/edit/downloadable/samples.phtml   |  22 +--
 .../column/downloadable/creditmemo/name.phtml |  18 +--
 .../column/downloadable/invoice/name.phtml    |  20 +--
 .../items/column/downloadable/name.phtml      |  20 +--
 .../templates/catalog/product/links.phtml     |  24 +--
 .../templates/catalog/product/samples.phtml   |   4 +-
 .../templates/catalog/product/type.phtml      |   8 +-
 .../frontend/templates/checkout/success.phtml |   2 +-
 .../templates/customer/products/list.phtml    |  28 ++--
 .../order/items/creditmemo/downloadable.phtml |  12 +-
 .../order/items/invoice/downloadable.phtml    |  14 +-
 .../order/items/order/downloadable.phtml      |  22 +--
 .../items/renderer/downloadable.phtml         |  14 +-
 .../invoice/items/renderer/downloadable.phtml |  12 +-
 .../order/items/renderer/downloadable.phtml   |  26 +--
 .../adminhtml/templates/template/edit.phtml   |  30 ++--
 .../templates/template/preview.phtml          |   2 +-
 .../adminhtml/templates/giftoptionsform.phtml |   6 +-
 .../view/adminhtml/templates/popup.phtml      |   4 +-
 .../sales/order/create/giftoptions.phtml      |   8 +-
 .../templates/sales/order/create/items.phtml  |   6 +-
 .../sales/order/view/giftoptions.phtml        |   8 +-
 .../templates/sales/order/view/items.phtml    |  16 +-
 .../templates/cart/gift_options.phtml         |   4 +-
 .../item/renderer/actions/gift_options.phtml  |   8 +-
 .../view/frontend/templates/inline.phtml      | 142 ++++++++--------
 .../view/frontend/templates/code.phtml        |  18 ++-
 .../view/frontend/templates/ga.phtml          |   4 +-
 .../product/composite/fieldset/grouped.phtml  |  34 ++--
 .../templates/product/grouped/container.phtml |  12 +-
 .../templates/product/grouped/grouped.phtml   |   4 +-
 .../templates/product/grouped/list.phtml      |   8 +-
 .../templates/product/price/final_price.phtml |   2 +-
 .../templates/product/view/type/default.phtml |   8 +-
 .../templates/product/view/type/grouped.phtml |  20 +--
 .../view/adminhtml/templates/busy.phtml       |   4 +-
 .../templates/export/form/after.phtml         |  10 +-
 .../templates/export/form/before.phtml        |   2 +-
 .../templates/import/form/after.phtml         |   4 +-
 .../templates/import/form/before.phtml        |  10 +-
 .../templates/import/frame/result.phtml       |   2 +-
 .../integration/activate/permissions.phtml    |   4 +-
 .../activate/permissions/tab/webapi.phtml     |   6 +-
 .../integration/popup_container.phtml         |  16 +-
 .../integration/tokens_exchange.phtml         |   2 +-
 .../adminhtml/templates/resourcetree.phtml    |  10 +-
 .../frontend/templates/layer/filter.phtml     |  12 +-
 .../view/frontend/templates/layer/state.phtml |  18 +--
 .../view/frontend/templates/layer/view.phtml  |   8 +-
 .../system/storage/media/synchronize.phtml    |  14 +-
 .../base/templates/product/price/msrp.phtml   |  18 +--
 .../frontend/templates/cart/subtotal.phtml    |   2 +-
 .../view/frontend/templates/cart/totals.phtml |   4 +-
 .../Msrp/view/frontend/templates/popup.phtml  |  10 +-
 .../render/item/price_msrp_item.phtml         |  22 +--
 .../render/item/price_msrp_rss.phtml          |   2 +-
 .../templates/checkout/address/select.phtml   |  14 +-
 .../templates/checkout/addresses.phtml        |  36 ++---
 .../frontend/templates/checkout/billing.phtml |  22 +--
 .../templates/checkout/billing/items.phtml    |  14 +-
 .../templates/checkout/item/default.phtml     |   6 +-
 .../frontend/templates/checkout/link.phtml    |   2 +-
 .../templates/checkout/overview.phtml         |  80 ++++-----
 .../templates/checkout/overview/item.phtml    |   2 +-
 .../templates/checkout/shipping.phtml         |  46 +++---
 .../frontend/templates/checkout/state.phtml   |   2 +-
 .../frontend/templates/checkout/success.phtml |  10 +-
 .../multishipping/item/default.phtml          |   6 +-
 .../templates/preview/iframeswitcher.phtml    |   2 +-
 .../adminhtml/templates/preview/store.phtml   |   8 +-
 .../view/adminhtml/templates/queue/edit.phtml |   6 +-
 .../adminhtml/templates/queue/preview.phtml   |   2 +-
 .../adminhtml/templates/subscriber/list.phtml |   4 +-
 .../adminhtml/templates/template/edit.phtml   |  24 +--
 .../templates/template/preview.phtml          |   2 +-
 .../view/frontend/templates/subscribe.phtml   |  10 +-
 .../templates/form/banktransfer.phtml         |   6 +-
 .../templates/form/cashondelivery.phtml       |   6 +-
 .../adminhtml/templates/form/checkmo.phtml    |   4 +-
 .../templates/form/purchaseorder.phtml        |   8 +-
 .../adminhtml/templates/info/checkmo.phtml    |   2 +-
 .../templates/info/pdf/checkmo.phtml          |   2 +-
 .../templates/form/banktransfer.phtml         |   4 +-
 .../templates/form/cashondelivery.phtml       |   4 +-
 .../frontend/templates/form/checkmo.phtml     |   6 +-
 .../templates/form/purchaseorder.phtml        |   6 +-
 .../frontend/templates/info/checkmo.phtml     |   4 +-
 .../templates/info/purchaseorder.phtml        |   2 +-
 .../view/frontend/templates/javascript.phtml  |   2 +-
 .../view/adminhtml/templates/form/cc.phtml    |  70 ++++----
 .../adminhtml/templates/info/default.phtml    |   2 +-
 .../templates/info/instructions.phtml         |   2 +-
 .../templates/info/pdf/default.phtml          |   4 +-
 .../templates/transparent/form.phtml          |  84 +++++-----
 .../templates/transparent/iframe.phtml        |   4 +-
 .../templates/transparent/info.phtml          |   6 +-
 .../view/frontend/templates/form/cc.phtml     |  56 +++----
 .../frontend/templates/info/default.phtml     |   2 +-
 .../templates/info/instructions.phtml         |   2 +-
 .../frontend/templates/transparent/form.phtml |  52 +++---
 .../templates/transparent/iframe.phtml        |   4 +-
 .../frontend/templates/transparent/info.phtml |   6 +-
 .../templates/billing/agreement/form.phtml    |  14 +-
 .../billing/agreement/view/tab/info.phtml     |  22 +--
 .../payment/form/billing/agreement.phtml      |  12 +-
 .../templates/system/config/api_wizard.phtml  |   4 +-
 .../system/config/bml_api_wizard.phtml        |   2 +-
 .../system/config/fieldset/hint.phtml         |   2 +-
 .../system/config/payflowlink/advanced.phtml  |   6 +-
 .../system/config/payflowlink/info.phtml      |   6 +-
 .../templates/system/config/rules.phtml       |   2 +-
 .../templates/billing/agreement/view.phtml    |  50 +++---
 .../templates/billing/agreements.phtml        |  42 ++---
 .../frontend/templates/express/review.phtml   |  52 +++---
 .../templates/express/review/details.phtml    |  10 +-
 .../express/review/shipping/method.phtml      |  12 +-
 .../frontend/templates/express/shortcut.phtml |  22 +--
 .../view/frontend/templates/hss/form.phtml    |  10 +-
 .../view/frontend/templates/hss/iframe.phtml  |   4 +-
 .../view/frontend/templates/hss/info.phtml    |   6 +-
 .../frontend/templates/hss/redirect.phtml     |   8 +-
 .../templates/hss/review/button.phtml         |   4 +-
 .../frontend/templates/partner/logo.phtml     |   4 +-
 .../templates/payflowadvanced/form.phtml      |  10 +-
 .../templates/payflowadvanced/info.phtml      |   4 +-
 .../frontend/templates/payflowlink/form.phtml |  10 +-
 .../frontend/templates/payflowlink/info.phtml |   6 +-
 .../templates/payflowlink/redirect.phtml      |   8 +-
 .../payment/form/billing/agreement.phtml      |  10 +-
 .../frontend/templates/payment/mark.phtml     |  10 +-
 .../frontend/templates/payment/redirect.phtml |  10 +-
 .../view/frontend/templates/remember_me.phtml |   8 +-
 .../view/frontend/templates/email/price.phtml |  12 +-
 .../view/frontend/templates/email/stock.phtml |  12 +-
 .../frontend/templates/product/view.phtml     |   2 +-
 .../view/adminhtml/templates/grid.phtml       |  62 +++----
 .../templates/report/grid/container.phtml     |   2 +-
 .../adminhtml/templates/report/wishlist.phtml |  14 +-
 .../adminhtml/templates/store/switcher.phtml  |  14 +-
 .../templates/store/switcher/enhanced.phtml   |  12 +-
 .../templates/product/widget/viewed.phtml     |   6 +-
 .../product/widget/viewed/item.phtml          |  34 ++--
 .../column/compared_default_list.phtml        |  36 ++---
 .../column/compared_images_list.phtml         |   8 +-
 .../compared/column/compared_names_list.phtml |   8 +-
 .../compared/content/compared_grid.phtml      |  46 +++---
 .../compared/content/compared_list.phtml      |  52 +++---
 .../viewed/column/viewed_default_list.phtml   |  34 ++--
 .../viewed/column/viewed_images_list.phtml    |   8 +-
 .../viewed/column/viewed_names_list.phtml     |   8 +-
 .../widget/viewed/content/viewed_grid.phtml   |  46 +++---
 .../widget/viewed/content/viewed_list.phtml   |  52 +++---
 .../adminhtml/templates/rating/detailed.phtml |   6 +-
 .../adminhtml/templates/rating/form.phtml     |   2 +-
 .../adminhtml/templates/rating/options.phtml  |  10 +-
 .../templates/rating/stars/detailed.phtml     |   4 +-
 .../templates/rating/stars/summary.phtml      |   4 +-
 .../adminhtml/templates/rss/grid/link.phtml   |   2 +-
 .../frontend/templates/customer/list.phtml    |  28 ++--
 .../frontend/templates/customer/recent.phtml  |  12 +-
 .../frontend/templates/customer/view.phtml    |  16 +-
 .../view/frontend/templates/detailed.phtml    |   4 +-
 .../view/frontend/templates/empty.phtml       |   4 +-
 .../Review/view/frontend/templates/form.phtml |  38 ++---
 .../frontend/templates/helper/summary.phtml   |  14 +-
 .../templates/helper/summary_short.phtml      |  12 +-
 .../templates/product/view/count.phtml        |   2 +-
 .../templates/product/view/list.phtml         |  14 +-
 .../templates/product/view/other.phtml        |   2 +-
 .../view/frontend/templates/review.phtml      |   2 +-
 .../Review/view/frontend/templates/view.phtml |  18 +--
 .../Rss/view/frontend/templates/feeds.phtml   |  14 +-
 .../templates/items/column/name.phtml         |  20 +--
 .../templates/items/column/qty.phtml          |  20 +--
 .../adminhtml/templates/items/price/row.phtml |   2 +-
 .../templates/items/price/total.phtml         |   2 +-
 .../templates/items/price/unit.phtml          |   2 +-
 .../templates/items/renderer/default.phtml    |   6 +-
 .../templates/order/address/form.phtml        |   4 +-
 .../templates/order/comments/view.phtml       |  18 +--
 .../templates/order/create/abstract.phtml     |   2 +-
 .../order/create/billing/method/form.phtml    |  14 +-
 .../templates/order/create/comment.phtml      |   4 +-
 .../templates/order/create/coupons/form.phtml |   6 +-
 .../templates/order/create/data.phtml         |  16 +-
 .../templates/order/create/form.phtml         |   8 +-
 .../templates/order/create/form/account.phtml |   4 +-
 .../templates/order/create/form/address.phtml |  38 ++---
 .../templates/order/create/giftmessage.phtml  |   4 +-
 .../templates/order/create/items.phtml        |   2 +-
 .../templates/order/create/items/grid.phtml   |  96 +++++------
 .../order/create/items/price/row.phtml        |   2 +-
 .../order/create/items/price/total.phtml      |   2 +-
 .../order/create/items/price/unit.phtml       |   2 +-
 .../adminhtml/templates/order/create/js.phtml |   6 +-
 .../order/create/newsletter/form.phtml        |   2 +-
 .../order/create/shipping/method/form.phtml   |  22 +--
 .../templates/order/create/sidebar.phtml      |  12 +-
 .../order/create/sidebar/items.phtml          |  42 ++---
 .../templates/order/create/store/select.phtml |   4 +-
 .../templates/order/create/totals.phtml       |  10 +-
 .../order/create/totals/default.phtml         |   8 +-
 .../order/create/totals/grandtotal.phtml      |  26 +--
 .../order/create/totals/shipping.phtml        |  30 ++--
 .../order/create/totals/subtotal.phtml        |  24 +--
 .../templates/order/create/totals/tax.phtml   |  18 +--
 .../order/creditmemo/create/form.phtml        |  16 +-
 .../order/creditmemo/create/items.phtml       |  40 ++---
 .../create/items/renderer/default.phtml       |  12 +-
 .../create/totals/adjustments.phtml           |  14 +-
 .../order/creditmemo/view/form.phtml          |  24 +--
 .../order/creditmemo/view/items.phtml         |  18 +--
 .../view/items/renderer/default.phtml         |   6 +-
 .../adminhtml/templates/order/details.phtml   |  40 ++---
 .../templates/order/giftoptions.phtml         |   2 +-
 .../templates/order/invoice/create/form.phtml |  22 +--
 .../order/invoice/create/items.phtml          |  46 +++---
 .../create/items/renderer/default.phtml       |  10 +-
 .../templates/order/invoice/view/form.phtml   |  22 +--
 .../templates/order/invoice/view/items.phtml  |  16 +-
 .../invoice/view/items/renderer/default.phtml |   6 +-
 .../adminhtml/templates/order/totalbar.phtml  |   4 +-
 .../adminhtml/templates/order/totals.phtml    |  20 +--
 .../templates/order/totals/discount.phtml     |   6 +-
 .../templates/order/totals/due.phtml          |   4 +-
 .../templates/order/totals/grand.phtml        |   6 +-
 .../templates/order/totals/item.phtml         |   4 +-
 .../templates/order/totals/paid.phtml         |   4 +-
 .../templates/order/totals/refunded.phtml     |   4 +-
 .../templates/order/totals/shipping.phtml     |   4 +-
 .../templates/order/totals/tax.phtml          |  14 +-
 .../templates/order/view/giftmessage.phtml    |  26 +--
 .../templates/order/view/history.phtml        |  26 +--
 .../adminhtml/templates/order/view/info.phtml |  82 +++++-----
 .../templates/order/view/items.phtml          |  22 +--
 .../order/view/items/renderer/default.phtml   |  10 +-
 .../templates/order/view/tab/history.phtml    |  24 +--
 .../templates/order/view/tab/info.phtml       |  16 +-
 .../templates/rss/order/grid/link.phtml       |   2 +-
 .../templates/transactions/detail.phtml       |  20 +--
 .../templates/email/creditmemo/items.phtml    |   6 +-
 .../templates/email/invoice/items.phtml       |   6 +-
 .../view/frontend/templates/email/items.phtml |  14 +-
 .../email/items/creditmemo/default.phtml      |  10 +-
 .../email/items/invoice/default.phtml         |  10 +-
 .../templates/email/items/order/default.phtml |  18 +--
 .../templates/email/items/price/row.phtml     |   2 +-
 .../email/items/shipment/default.phtml        |   8 +-
 .../templates/email/shipment/items.phtml      |   4 +-
 .../templates/email/shipment/track.phtml      |   4 +-
 .../view/frontend/templates/guest/form.phtml  |  22 +--
 .../frontend/templates/items/price/row.phtml  |   2 +-
 .../items/price/total_after_discount.phtml    |   2 +-
 .../frontend/templates/items/price/unit.phtml |   2 +-
 .../frontend/templates/order/comments.phtml   |   4 +-
 .../frontend/templates/order/creditmemo.phtml |   4 +-
 .../templates/order/creditmemo/items.phtml    |  28 ++--
 .../creditmemo/items/renderer/default.phtml   |  14 +-
 .../frontend/templates/order/history.phtml    |  30 ++--
 .../view/frontend/templates/order/info.phtml  |  16 +-
 .../templates/order/info/buttons.phtml        |   8 +-
 .../templates/order/info/buttons/rss.phtml    |   4 +-
 .../frontend/templates/order/invoice.phtml    |   4 +-
 .../templates/order/invoice/items.phtml       |  24 +--
 .../invoice/items/renderer/default.phtml      |  10 +-
 .../view/frontend/templates/order/items.phtml |  38 ++---
 .../order/items/renderer/default.phtml        |  24 +--
 .../templates/order/order_comments.phtml      |   4 +-
 .../frontend/templates/order/order_date.phtml |   2 +-
 .../templates/order/order_status.phtml        |   2 +-
 .../templates/order/print/creditmemo.phtml    |  34 ++--
 .../templates/order/print/invoice.phtml       |  32 ++--
 .../templates/order/print/shipment.phtml      |  22 +--
 .../frontend/templates/order/recent.phtml     |  36 ++---
 .../shipment/items/renderer/default.phtml     |  10 +-
 .../frontend/templates/order/totals.phtml     |  10 +-
 .../view/frontend/templates/order/view.phtml  |  14 +-
 .../frontend/templates/reorder/sidebar.phtml  |  18 +--
 .../templates/widget/guest/form.phtml         |  20 +--
 .../templates/promo/salesrulejs.phtml         |   2 +-
 .../view/frontend/templates/form.mini.phtml   |  20 +--
 .../Search/view/frontend/templates/term.phtml |   6 +-
 .../view/frontend/templates/send.phtml        |  40 ++---
 .../adminhtml/templates/create/form.phtml     |  16 +-
 .../adminhtml/templates/create/items.phtml    |  30 ++--
 .../create/items/renderer/default.phtml       |  10 +-
 .../templates/order/Tracking/view.phtml       |  20 +--
 .../templates/order/packaging/grid.phtml      |  32 ++--
 .../templates/order/packaging/packed.phtml    |  76 ++++-----
 .../templates/order/packaging/popup.phtml     |  88 +++++-----
 .../adminhtml/templates/order/tracking.phtml  |  12 +-
 .../adminhtml/templates/order/view/info.phtml |  10 +-
 .../view/adminhtml/templates/view/form.phtml  |  30 ++--
 .../view/adminhtml/templates/view/items.phtml |   6 +-
 .../view/items/renderer/default.phtml         |   2 +-
 .../view/frontend/templates/items.phtml       |  32 ++--
 .../frontend/templates/order/shipment.phtml   |   4 +-
 .../frontend/templates/tracking/link.phtml    |   6 +-
 .../frontend/templates/tracking/popup.phtml   |  72 ++++-----
 .../frontend/templates/switch/flags.phtml     |   6 +-
 .../frontend/templates/switch/languages.phtml |  12 +-
 .../frontend/templates/switch/stores.phtml    |   4 +-
 .../frontend/templates/swagger-ui/index.phtml |   2 +-
 .../catalog/product/attribute/js.phtml        |   4 +-
 .../catalog/product/attribute/text.phtml      |  26 +--
 .../catalog/product/attribute/visual.phtml    |  28 ++--
 .../templates/product/layered/renderer.phtml  |  42 ++---
 .../templates/product/listing/renderer.phtml  |  12 +-
 .../templates/product/view/renderer.phtml     |   6 +-
 .../adminhtml/templates/class/page/edit.phtml |   2 +-
 .../adminhtml/templates/items/price/row.phtml |   8 +-
 .../templates/items/price/total.phtml         |   2 +-
 .../templates/items/price/unit.phtml          |   8 +-
 .../order/create/items/price/row.phtml        |   8 +-
 .../order/create/items/price/total.phtml      |   8 +-
 .../order/create/items/price/unit.phtml       |   8 +-
 .../view/adminhtml/templates/rate/js.phtml    |   2 +-
 .../view/adminhtml/templates/rate/title.phtml |   6 +-
 .../view/adminhtml/templates/rule/edit.phtml  |  38 ++---
 .../adminhtml/templates/rule/rate/form.phtml  |   2 +-
 .../templates/toolbar/class/add.phtml         |   4 +-
 .../templates/toolbar/class/save.phtml        |   2 +-
 .../templates/toolbar/rate/save.phtml         |   2 +-
 .../templates/toolbar/rule/add.phtml          |   4 +-
 .../templates/toolbar/rule/save.phtml         |   2 +-
 .../base/templates/pricing/adjustment.phtml   |   6 +-
 .../templates/pricing/adjustment/bundle.phtml |   8 +-
 .../checkout/cart/item/price/sidebar.phtml    |   8 +-
 .../templates/checkout/grandtotal.phtml       |  26 +--
 .../templates/checkout/shipping.phtml         |  30 ++--
 .../templates/checkout/shipping/price.phtml   |   8 +-
 .../templates/checkout/subtotal.phtml         |  24 +--
 .../frontend/templates/checkout/tax.phtml     |  20 +--
 .../templates/email/items/price/row.phtml     |   8 +-
 .../frontend/templates/item/price/row.phtml   |   4 +-
 .../item/price/total_after_discount.phtml     |   2 +-
 .../frontend/templates/item/price/unit.phtml  |   4 +-
 .../view/frontend/templates/order/tax.phtml   |  18 +--
 .../adminhtml/templates/importExport.phtml    |   8 +-
 .../adminhtml/templates/browser/content.phtml |   2 +-
 .../templates/browser/content/files.phtml     |   8 +-
 .../templates/browser/content/uploader.phtml  |  10 +-
 .../view/adminhtml/templates/tabs/css.phtml   |   2 +-
 .../templates/tabs/fieldset/js.phtml          |   6 +-
 .../view/adminhtml/templates/tabs/js.phtml    |   2 +-
 .../view/adminhtml/templates/title.phtml      |   6 +-
 .../Theme/view/base/templates/root.phtml      |  14 +-
 .../templates/callouts/left_col.phtml         |   6 +-
 .../templates/callouts/right_col.phtml        |   6 +-
 .../view/frontend/templates/html/block.phtml  |   6 +-
 .../frontend/templates/html/breadcrumbs.phtml |   4 +-
 .../frontend/templates/html/bugreport.phtml   |   4 +-
 .../frontend/templates/html/collapsible.phtml |   8 +-
 .../frontend/templates/html/copyright.phtml   |   2 +-
 .../view/frontend/templates/html/footer.phtml |   6 +-
 .../frontend/templates/html/header/logo.phtml |   8 +-
 .../frontend/templates/html/notices.phtml     |  10 +-
 .../view/frontend/templates/html/pager.phtml  |  52 +++---
 .../frontend/templates/html/sections.phtml    |  10 +-
 .../view/frontend/templates/html/skip.phtml   |   4 +-
 .../frontend/templates/html/skiptarget.phtml  |   2 +-
 .../view/frontend/templates/html/title.phtml  |   8 +-
 .../frontend/templates/html/topmenu.phtml     |   2 +-
 .../view/frontend/templates/js/calendar.phtml |  30 ++--
 .../view/frontend/templates/js/cookie.phtml   |   6 +-
 .../templates/translate_inline.phtml          |   8 +-
 .../view/base/templates/translate.phtml       |   2 +-
 .../frontend/templates/translate_inline.phtml |  10 +-
 .../templates/control/button/default.phtml    |   4 +-
 .../Ui/view/base/templates/form/default.phtml |   8 +-
 .../view/base/templates/label/default.phtml   |   2 +-
 .../base/templates/layout/tabs/default.phtml  |   2 +-
 .../templates/layout/tabs/nav/default.phtml   |   2 +-
 .../Ui/view/base/templates/logger.phtml       |   2 +-
 .../Ui/view/base/templates/stepswizard.phtml  |  24 +--
 .../system/shipping/carrier_config.phtml      |  12 +-
 .../view/adminhtml/templates/categories.phtml |   2 +-
 .../view/adminhtml/templates/edit.phtml       |   2 +-
 .../view/adminhtml/templates/selector.phtml   |   4 +-
 .../templates/admin/forgotpassword.phtml      |  14 +-
 .../templates/admin/forgotpassword_url.phtml  |   2 +-
 .../admin/resetforgottenpassword.phtml        |  14 +-
 .../view/adminhtml/templates/role/edit.phtml  |  10 +-
 .../view/adminhtml/templates/role/info.phtml  |   2 +-
 .../view/adminhtml/templates/role/users.phtml |   2 +-
 .../templates/role/users_grid_js.phtml        |  20 +--
 .../templates/user/roles_grid_js.phtml        |  14 +-
 .../adminhtml/templates/items/price/row.phtml |  12 +-
 .../templates/items/price/total.phtml         |   2 +-
 .../templates/items/price/unit.phtml          |  12 +-
 .../order/create/items/price/row.phtml        |  20 +--
 .../order/create/items/price/total.phtml      |  20 +--
 .../order/create/items/price/unit.phtml       |  20 +--
 .../adminhtml/templates/renderer/tax.phtml    |  36 ++---
 .../base/templates/pricing/adjustment.phtml   |   8 +-
 .../checkout/cart/item/price/sidebar.phtml    |  16 +-
 .../review/item/price/row_excl_tax.phtml      |  14 +-
 .../review/item/price/row_incl_tax.phtml      |  14 +-
 .../review/item/price/unit_excl_tax.phtml     |  14 +-
 .../review/item/price/unit_incl_tax.phtml     |  14 +-
 .../templates/email/items/price/row.phtml     |  16 +-
 .../frontend/templates/item/price/row.phtml   |  28 ++--
 .../item/price/total_after_discount.phtml     |   2 +-
 .../frontend/templates/item/price/unit.phtml  |  28 ++--
 .../catalog/category/widget/tree.phtml        |  30 ++--
 .../templates/instance/edit/layout.phtml      |  72 ++++-----
 .../customer/edit/tab/wishlist.phtml          |  12 +-
 .../frontend/templates/button/share.phtml     |   4 +-
 .../frontend/templates/button/tocart.phtml    |   4 +-
 .../frontend/templates/button/update.phtml    |   4 +-
 .../renderer/actions/move_to_wishlist.phtml   |   4 +-
 .../view/frontend/templates/email/items.phtml |  12 +-
 .../templates/item/column/actions.phtml       |   4 +-
 .../frontend/templates/item/column/cart.phtml |  20 +--
 .../templates/item/column/comment.phtml       |   6 +-
 .../frontend/templates/item/column/edit.phtml |   4 +-
 .../templates/item/column/image.phtml         |   2 +-
 .../frontend/templates/item/column/name.phtml |   2 +-
 .../templates/item/column/price.phtml         |   2 +-
 .../templates/item/column/remove.phtml        |   4 +-
 .../templates/item/configure/addto.phtml      |  10 +-
 .../view/frontend/templates/item/list.phtml   |   4 +-
 .../view/frontend/templates/link.phtml        |   2 +-
 .../frontend/templates/options_list.phtml     |   8 +-
 .../view/frontend/templates/rss/email.phtml   |   2 +-
 .../frontend/templates/rss/wishlist.phtml     |   4 +-
 .../view/frontend/templates/shared.phtml      |  36 ++---
 .../view/frontend/templates/sharing.phtml     |  24 +--
 .../view/frontend/templates/sidebar.phtml     |  18 +--
 .../view/frontend/templates/view.phtml        |  12 +-
 .../templates/layer/state.phtml               |  20 +--
 .../templates/layer/view.phtml                |  14 +-
 .../Utility/XssOutputValidator.php            |  38 ++++-
 .../Utility/_files/xss_safe.phtml             |   1 +
 762 files changed, 5838 insertions(+), 5709 deletions(-)

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 cfe907830dbc3..51fa6d1a05ebd 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml
@@ -13,19 +13,19 @@
  */
 ?>
 <div data-mage-init='{"modalPopup": {}}' class="fade critical-notification">
-    <div class="popup popup-<?php echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
+    <div class="popup popup-<?php /* @escapeNotVerified */ echo preg_replace('#[^a-z0-9]+#', '-', strtolower($block->getSeverityText())) ?>">
         <div class="popup-inner">
             <div class="popup-header">
-                <div class="popup-title"><?php echo $block->getHeaderText(); ?></div>
+                <div class="popup-title"><?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?></div>
             </div>
             <div class="popup-content">
-                <span><?php echo $block->getSeverityText();?></span>
+                <span><?php /* @escapeNotVerified */ echo $block->getSeverityText();?></span>
 
-                <p class="message-text"><?php echo $block->getNoticeMessageText(); ?></p>
+                <p class="message-text"><?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?></p>
 
-                <a href="<?php echo $block->getNoticeMessageUrl(); ?>"><?php echo $block->getReadDetailsText(); ?></a>
+                <a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
             </div>
-            <span class="action close" data-dismiss="popup" title="<?php echo $block->escapeHtml(__('Close popup'));?>"><?php echo __('Close'); ?></span>
+            <span class="action close" data-dismiss="popup" title="<?php echo $block->escapeHtml(__('Close popup'));?>"><?php /* @escapeNotVerified */ echo __('Close'); ?></span>
         </div>
     </div>
 </div>
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 784e229f9a57f..fcfa262be72d9 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -15,19 +15,19 @@
         <?php if ($lastCritical): ?>
             <ul class="message-system-list">
                 <li class="message message-warning error">
-                    <?php echo $lastCritical->getText();?>
+                    <?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
                 </li>
             </ul>
         <?php endif; ?>
         <div class="message-system-short">
             <span class="message-system-short-label">
-                <?php echo __('System Messages:')?>
+                <?php /* @escapeNotVerified */ echo __('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 echo $block->getCriticalCount();?>
+                        <?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
                     </a>
                 </div>
             <?php endif;?>
@@ -35,7 +35,7 @@
             <?php if ($block->getMajorCount()): ?>
                <div class="message message-warning warning">
                    <a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
-                       <?php echo $block->getMajorCount();?>
+                       <?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
                    </a>
                </div>
             <?php endif;?>
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 3652e763a1c9b..589c26fa8c373 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
@@ -12,8 +12,8 @@
 <div id="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
     <ul class="message-system-list">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
-            <li class="message message-warning <?php echo $block->getItemClass($message);?>">
-                <?php echo $message->getText();?>
+            <li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
+                <?php /* @escapeNotVerified */ echo $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 e020a661d4d91..b86a2f2246a2a 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -15,25 +15,25 @@
 <div
     data-mage-init='{"toolbarEntry": {}}'
     class="notifications-wrapper admin__action-dropdown-wrap"
-    data-notification-count="<?php echo $notificationCount; ?>">
+    data-notification-count="<?php /* @escapeNotVerified */ echo $notificationCount; ?>">
     <?php if ($notificationCount > 0) : ?>
         <a
-            href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
+            href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
             class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
-            title="<?php echo __('Notifications'); ?>"
+            title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>"
             data-toggle="dropdown">
             <span class="notifications-counter">
-                <?php echo ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount; ?>
+                <?php /* @escapeNotVerified */ echo ($notificationCount > $notificationCounterMax) ? $notificationCounterMax . '+' : $notificationCount; ?>
             </span>
         </a>
         <ul
             class="admin__action-dropdown-menu"
-            data-mark-as-read-url="<?php echo $block->getUrl('adminhtml/notification/ajaxMarkAsRead'); ?>">
+            data-mark-as-read-url="<?php /* @escapeNotVerified */ echo $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 echo $notification->getId(); ?>"
+                data-notification-id="<?php /* @escapeNotVerified */ echo $notification->getId(); ?>"
                 data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
                 <?php
                     $notificationDescription = $block->escapeHtml($notification->getDescription());
@@ -45,40 +45,40 @@
                 <?php if (strlen($notificationDescription) > $notificationDescriptionLength) : ?>
                     <p class="notifications-entry-description _cutted">
                         <span class="notifications-entry-description-start">
-                            <?php echo substr($notificationDescription, 0, $notificationDescriptionLength); ?>
+                            <?php /* @escapeNotVerified */ echo substr($notificationDescription, 0, $notificationDescriptionLength); ?>
                         </span>
                         <span class="notifications-entry-description-end">
-                            <?php echo substr($notificationDescription, $notificationDescriptionLength); ?>
+                            <?php /* @escapeNotVerified */ echo substr($notificationDescription, $notificationDescriptionLength); ?>
                         </span>
                     </p>
                 <?php else : ?>
                     <p class="notifications-entry-description">
-                        <?php echo $notificationDescription; ?>
+                        <?php /* @escapeNotVerified */ echo $notificationDescription; ?>
                     </p>
                 <?php endif; ?>
                 <time class="notifications-entry-time">
-                    <?php echo $block->formatNotificationDate($notification->getDateAdded()); ?>
+                    <?php /* @escapeNotVerified */ echo $block->formatNotificationDate($notification->getDateAdded()); ?>
                 </time>
                 <button
                     type="button"
                     class="notifications-close"
-                    title="<?php echo __('Close'); ?>"
+                    title="<?php /* @escapeNotVerified */ echo __('Close'); ?>"
                     ></button>
             </li>
             <?php endforeach; ?>
             <li class="notifications-entry notifications-entry-last">
                 <a
-                    href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
+                    href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
                     class="action-tertiary action-more">
-                    <?php echo __('See All (') ?><span class="notifications-counter"><?php echo $notificationCount ?></span><?php echo __(' unread)'); ?>
+                    <?php /* @escapeNotVerified */ echo __('See All (') ?><span class="notifications-counter"><?php /* @escapeNotVerified */ echo $notificationCount ?></span><?php /* @escapeNotVerified */ echo __(' unread)'); ?>
                 </a>
             </li>
         </ul>
     <?php else : ?>
         <a
             class="notifications-action admin__action-dropdown"
-            href="<?php echo $block->getUrl('adminhtml/notification/index'); ?>"
-            title="<?php echo __('Notifications'); ?>">
+            href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/notification/index'); ?>"
+            title="<?php /* @escapeNotVerified */ echo __('Notifications'); ?>">
         </a>
     <?php endif; ?>
 </div>
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 23c1438d777bc..2712012849971 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/iframe.phtml
@@ -22,9 +22,9 @@ $helper = $block->getHelper('adminhtml');
             window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']) ?>";
         <?php endif; ?>
         <?php if (isset($params['error_msg'])): ?>
-            window.top.directPostModel.showError(<?php echo json_encode((array)$params['error_msg']) ?>);
+            window.top.directPostModel.showError(<?php /* @escapeNotVerified */ echo json_encode((array)$params['error_msg']) ?>);
             <?php if (isset($params['x_invoice_num'])): ?>
-                window.top.directPostModel.successUrl="<?php echo $helper->getSuccessOrderUrl($params) ?>";
+                window.top.directPostModel.successUrl="<?php /* @escapeNotVerified */ echo $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 586d6ff403ebc..adff03b5365c2 100644
--- a/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
+++ b/app/code/Magento/Authorizenet/view/adminhtml/templates/directpost/info.phtml
@@ -18,71 +18,71 @@ $_controller = $block->getRequest()->getControllerName();
 $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Backend\Data')->getPlaceOrderAdminUrl();
 ?>
 <!-- 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->getViewFileUrl('blank.html') ?>"></iframe>
+<iframe id="order-directpost-iframe" allowtransparency="true" frameborder="0" name="iframeSubmitOrder" style="display:none;width:100%;background-color:transparent" src="<?php /* @escapeNotVerified */ echo $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->getViewFileUrl('blank.html') ?>"></iframe>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $_code ?>" style="display:none;">
+<iframe id="directpost-iframe" allowtransparency="true" frameborder="0"  name="iframeDirectPost" style="display:none;width:100%;background-color:transparent" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('blank.html') ?>"></iframe>
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display:none;">
     <div class="admin__field _required">
-        <label for="<?php echo $_code ?>_cc_type"
-               class="admin__field-label"><span><?php echo __('Credit Card Type') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"
+               class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span></label>
         <div class="admin__field-control">
-            <select id="<?php echo $_code ?>_cc_type"
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"
                     name="payment[cc_type]"
                     class="required-entry validate-cc-type-select admin__control-select">
                 <?php $_ccType = $_form->getInfoData('cc_type') ?>
                 <option value=""></option>
                 <?php foreach ($_form->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                    <option value="<?php echo $_typeCode ?>"
-                            <?php if ($_typeCode == $_ccType): ?>selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"
+                            <?php if ($_typeCode == $_ccType): ?>selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <div class="admin__field _required">
-        <label for="<?php echo $_code ?>_cc_number"
-               class="admin__field-label"><span><?php echo __('Credit Card Number') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number"
+               class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span></label>
 
         <div class="admin__field-control">
-            <input type="text" id="<?php echo $_code ?>_cc_number"
+            <input type="text" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number"
                    name="payment[cc_number]"
                    class="input-text required-entry validate-cc-number admin__control-text"
-                   value="<?php echo $block->getInfoData('cc_number') ?>"/>
+                   value="<?php /* @escapeNotVerified */ echo $block->getInfoData('cc_number') ?>"/>
         </div>
     </div>
     <div class="admin__field _required">
-        <label for="<?php echo $_code ?>_expiration"
-               class="admin__field-label"><span><?php echo __('Expiration Date') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_expiration"
+               class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Expiration Date') ?></span></label>
 
         <div class="admin__field-control">
-            <select id="<?php echo $_code ?>_expiration"
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration"
                     name="payment[cc_exp_month]"
                     class="validate-cc-exp required-entry admin__control-select admin__control-select-month">
                 <?php $_ccExpMonth = $_form->getInfoData('cc_exp_month') ?>
                 <?php foreach ($_form->getCcMonths() as $k => $v): ?>
-                    <option value="<?php echo $k ?>"
-                            <?php if ($k == $_ccExpMonth): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $k ?>"
+                            <?php if ($k == $_ccExpMonth): ?>selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                 <?php endforeach ?>
             </select>
             <?php $_ccExpYear = $_form->getInfoData('cc_exp_year') ?>
-            <select id="<?php echo $_code ?>_expiration_yr"
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration_yr"
                     name="payment[cc_exp_year]"
                     class="required-entry admin__control-select admin__control-select-year">
                 <?php foreach ($_form->getCcYears() as $k => $v): ?>
-                    <option value="<?php echo $k ? $k : '' ?>"
-                            <?php if ($k == $_ccExpYear): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $k ? $k : '' ?>"
+                            <?php if ($k == $_ccExpYear): ?>selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <?php if ($_form->hasVerification()): ?>
     <div class="admin__field _required">
-        <label for="<?php echo $_code ?>_cc_cid"><span><?php echo __('Card Verification Number') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid"><span><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?></span></label>
 
         <div class="admin__field-control">
             <input type="text"
                    class="required-entry input-text validate-cc-cvn admin__control-text"
-                   id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]"
-                   value="<?php echo $block->getInfoData('cc_cid') ?>"/>
+                   id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" name="payment[cc_cid]"
+                   value="<?php /* @escapeNotVerified */ echo $block->getInfoData('cc_cid') ?>"/>
         </div>
     </div>
     <?php endif; ?>
@@ -98,19 +98,19 @@ $_orderUrl = $this->helper('Magento\Authorizenet\Helper\Backend\Data')->getPlace
         /**
          * Disable card server validation in admin
          */
-        order.addExcludedPaymentMethod('<?php echo $_code ?>');
+        order.addExcludedPaymentMethod('<?php /* @escapeNotVerified */ echo $_code ?>');
 
         <?php if (!$block->isAjaxRequest()): ?>
             document.observe('dom:loaded', function(){
         <?php endif; ?>
 
         directPostModel = new directPost(
-            '<?php echo $_code ?>',
+            '<?php /* @escapeNotVerified */ echo $_code ?>',
             'directpost-iframe',
-            '<?php echo $_controller ?>',
-            '<?php echo $_orderUrl ?>',
-            '<?php echo $_method->getCgiUrl() ?>',
-            '<?php echo $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]) ?>');
+            '<?php /* @escapeNotVerified */ echo $_controller ?>',
+            '<?php /* @escapeNotVerified */ echo $_orderUrl ?>',
+            '<?php /* @escapeNotVerified */ echo $_method->getCgiUrl() ?>',
+            '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]) ?>');
 
         <?php if (!$block->isAjaxRequest()): ?>
             });
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 90a39448fa2ea..b26a258c77f3c 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
@@ -12,31 +12,31 @@
 
 <?php if (!empty($fraudDetails)): ?>
     <div class="admin__page-section-item-title">
-        <span class="title"><?php echo __('Fraud Detection ') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 __('FDS Filter Action') ?>: <?php echo $fraudDetails['fds_filter_action'] ?></br>
+                <?php /* @escapeNotVerified */ echo __('FDS Filter Action') ?>: <?php /* @escapeNotVerified */ echo $fraudDetails['fds_filter_action'] ?></br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['avs_response'])): ?>
-                <?php echo __('AVS Response') ?>: <?php echo $fraudDetails['avs_response'] ?></br>
+                <?php /* @escapeNotVerified */ echo __('AVS Response') ?>: <?php /* @escapeNotVerified */ echo $fraudDetails['avs_response'] ?></br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['card_code_response'])): ?>
-                <?php echo __('Card Code Response') ?>: <?php echo $fraudDetails['card_code_response'] ?></br>
+                <?php /* @escapeNotVerified */ echo __('Card Code Response') ?>: <?php /* @escapeNotVerified */ echo $fraudDetails['card_code_response'] ?></br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['cavv_response']) || ($fraudDetails['cavv_response'] === 0)): ?>
-                <?php echo __('CAVV Response') ?>: <?php echo $fraudDetails['cavv_response'] ?></br>
+                <?php /* @escapeNotVerified */ echo __('CAVV Response') ?>: <?php /* @escapeNotVerified */ echo $fraudDetails['cavv_response'] ?></br>
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['fraud_filters'])): ?>
-                <b><?php echo __('Fraud Filters') ?>:</b></br>
+                <b><?php /* @escapeNotVerified */ echo __('Fraud Filters') ?>:</b></br>
                 <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
-                    <?php echo $filter['name'] ?>: <?php echo $filter['action'] ?></br>
+                    <?php /* @escapeNotVerified */ echo $filter['name'] ?>: <?php /* @escapeNotVerified */ echo $filter['action'] ?></br>
                 <?php endforeach; ?>
             <?php endif; ?>
         </div>
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 4ae9c810ef01a..19f7fbb8535b1 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 echo __('Access denied') ?></h1>
+<h1 class="page-heading"><?php /* @escapeNotVerified */ echo __('Access denied') ?></h1>
 <?php if (!$block->hasAvailableResources()): ?>
 <p>
-<?php echo __('Please try to sign out and sign in again.') ?><br/>
-<?php echo __('If you continue to receive this message, please contact the store owner.') ?>
+<?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.') ?>
 </p>
 <?php else: ?>
-<p><?php echo __('You need more permissions to access this.') ?></p>
+<p><?php /* @escapeNotVerified */ echo __('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 cd3ac37adf388..76ba6a35bc6b2 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 echo $block->getFormKey() ?>" /></div>
+<div><input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $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 12d8f0b32e94d..f1c516f0e7a59 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/login.phtml
@@ -10,10 +10,10 @@
 
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}' autocomplete="off">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php echo __('Welcome, please sign in') ?></span></legend><br/>
-        <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
+        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Welcome, please sign in') ?></span></legend><br/>
+        <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>" />
         <div class="admin__field _required field-username">
-            <label for="username" class="admin__field-label"><span><?php echo __('Username') ?></span></label>
+            <label for="username" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Username') ?></span></label>
             <div class="admin__field-control">
                 <input
                     id="username"
@@ -23,11 +23,11 @@
                     autofocus
                     value=""
                     data-validate="{required:true}"
-                    placeholder="<?php echo __('user name') ?>"/>
+                    placeholder="<?php /* @escapeNotVerified */ echo __('user name') ?>"/>
             </div>
         </div>
         <div class="admin__field _required field-password">
-            <label for="login" class="admin__field-label"><span><?php echo __('Password') ?></span></label>
+            <label for="login" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
             <div class="admin__field-control">
                 <!-- This is a dummy hidden field to trick firefox from auto filling the password -->
                 <input
@@ -41,7 +41,7 @@
                     type="password"
                     name="login[password]"
                     data-validate="{required:true}"
-                    value="" placeholder="<?php echo __('password') ?>" />
+                    value="" placeholder="<?php /* @escapeNotVerified */ echo __('password') ?>" />
             </div>
         </div>
         <?php echo $block->getChildHtml('form.additional.info'); ?>
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 c9916a41e983d..6fcbe18951d4d 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 echo __('Sign in')?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 fdbae02504f6e..735592b837660 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,7 +11,7 @@
     <div class="middle" id="anchor-content">
         <div id="page:main-container">
         <?php if ($block->getChildHtml('left')): ?>
-            <div class="columns <?php echo $block->getContainerCssClass() ?>" id="page:container">
+            <div class="columns <?php /* @escapeNotVerified */ echo $block->getContainerCssClass() ?>" id="page:container">
                 <div id="page:left" class="side-col">
                     <?php echo $block->getChildHtml('left') ?>
                 </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 6ace15eb6afff..b7d458c0ef282 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/admin/page.phtml
@@ -9,7 +9,7 @@
 ?>
 <?php /** @var $block \Magento\Backend\Block\Page */ ?>
 <!doctype html>
-<html lang="<?php echo $block->getLang() ?>" class="no-js">
+<html lang="<?php /* @escapeNotVerified */ echo $block->getLang() ?>" class="no-js">
 
 <head>
     <?php echo $block->getChildHtml('head') ?>
@@ -32,7 +32,7 @@
             </div>
             <?php echo $block->getChildHtml('page_main_actions'); ?>
             <?php if ($block->getChildHtml('left')): ?>
-                <div id="page:main-container" class="<?php echo $block->getContainerCssClass() ?> col-2-left-layout">
+                <div id="page:main-container" class="<?php /* @escapeNotVerified */ echo $block->getContainerCssClass() ?> col-2-left-layout">
                     <div class="main-col" id="content">
                         <?php echo $block->getChildHtml('content') ?>
                     </div>
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 9d7ae05f61fca..c369ba2348fb5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/graph.phtml
@@ -10,26 +10,26 @@
 <div class="dashboard-diagram">
     <div class="dashboard-diagram-switcher">
         <label for="order_<?php echo $block->getHtmlId() ?>_period"
-               class="label"><?php echo __('Select Range:') ?></label>
+               class="label"><?php /* @escapeNotVerified */ echo __('Select Range:') ?></label>
         <select name="period" id="order_<?php echo $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 echo $value ?>"
+                <option value="<?php /* @escapeNotVerified */ echo $value ?>"
                     <?php if ($block->getRequest()->getParam('period') == $value): ?> selected="selected"<?php endif; ?>
-                    ><?php echo $label ?></option>
+                    ><?php /* @escapeNotVerified */ echo $label ?></option>
             <?php endforeach; ?>
         </select>
     </div>
     <?php if ($block->getCount()): ?>
     <div class="dashboard-diagram-image">
-        <img src="<?php echo $block->getChartUrl(false) ?>" class="dashboard-diagram-chart" alt="Chart" title="Chart" />
+        <img src="<?php /* @escapeNotVerified */ echo $block->getChartUrl(false) ?>" class="dashboard-diagram-chart" alt="Chart" title="Chart" />
     </div>
     <?php else: ?>
     <div class="dashboard-diagram-nodata">
-        <span><?php echo __('No Data Found') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 9cb41edab8598..51c18b2c84386 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
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div class="dashboard-diagram-disabled">
-    <?php echo __('Chart is disabled. To enable the chart, click <a href="%1">here</a>.', $block->getConfigUrl())?>
+    <?php /* @escapeNotVerified */ echo __('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 2f2a467f62c7e..8941d495420d0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/grid.phtml
@@ -14,7 +14,7 @@ $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 echo $block->getId() ?>_table">
+        <table class="admin__table-primary dashboard-data" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
             <?php
             /* This part is commented to remove all <col> tags from the code. */
             /* foreach ($block->getColumns() as $_column): ?>
@@ -34,9 +34,9 @@ $numColumns = sizeof($block->getColumns());
             <?php if (!$block->getIsCollapsed()): ?>
                 <tbody>
                 <?php foreach ($block->getCollection() as $_index => $_item): ?>
-                    <tr title="<?php echo $block->getRowUrl($_item) ?>">
+                    <tr title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>">
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
-                        <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"><?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?></td>
+                        <td class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"><?php echo(($_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 echo $block->getEmptyTextClass() ?>"><?php echo $block->getEmptyText() ?></div>
+        <div class="<?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?>"><?php /* @escapeNotVerified */ echo $block->getEmptyText() ?></div>
     <?php endif; ?>
 </div>
 <?php if ($block->canDisplayContainer()): ?>
@@ -65,23 +65,23 @@ require(deps, function(<?php echo ($block->getDependencyJsObject() ? 'registry'
     <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
     <?php if ($block->getDependencyJsObject()): ?>
-        registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+        registry.get('<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>', function (<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>) {
     <?php endif; ?>
 
-    <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
-    <?php echo $block->getJsObjectName() ?>.useAjax = '<?php echo $block->getUseAjax() ?>';
+    <?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() ?>';
     <?php if ($block->getRowClickCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.rowClickCallback = <?php echo $block->getRowClickCallback() ?>;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rowClickCallback = <?php /* @escapeNotVerified */ echo $block->getRowClickCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getCheckboxCheckCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php echo $block->getCheckboxCheckCallback() ?>;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php /* @escapeNotVerified */ echo $block->getCheckboxCheckCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getRowInitCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.initRowCallback = <?php echo $block->getRowInitCallback() ?>;
-        <?php echo $block->getJsObjectName() ?>.rows.each(function(row){<?php echo $block->getRowInitCallback() ?>(<?php echo $block->getJsObjectName() ?>, row)});
+        <?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)});
     <?php endif; ?>
     <?php if ($block->getMassactionBlock()->isAvailable()): ?>
-    <?php echo $block->getMassactionBlock()->getJavaScript() ?>
+    <?php /* @escapeNotVerified */ echo $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 e95c1ac8696bb..5c9cf626e37f1 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -15,12 +15,12 @@ require(['prototype'], function(){
 window.changeDiagramsPeriod = function(periodObj) {
     periodParam = periodObj.value ? 'period/' + periodObj.value + '/' : '';
 <?php foreach ($block->getChildBlock('diagrams')->getTabsIds() as $tabId): ?>
-    ajaxBlockParam = 'block/tab_<?php echo $tabId ?>/';
+    ajaxBlockParam = 'block/tab_<?php /* @escapeNotVerified */ echo $tabId ?>/';
     ajaxBlockUrl = '<?php echo $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 echo $block->getChildBlock('diagrams')->getId() ?>_<?php echo $tabId ?>_content';
+            tabContentElementId = '<?php /* @escapeNotVerified */ echo $block->getChildBlock('diagrams')->getId() ?>_<?php /* @escapeNotVerified */ echo $tabId ?>_content';
             try {
                 if (transport.responseText.isJSON()) {
                     var response = transport.responseText.evalJSON()
@@ -86,15 +86,15 @@ window.changeDiagramsPeriod = function(periodObj) {
     <div class="dashboard-secondary col-m-4 col-m-pull-8">
         <?php echo $block->getChildHtml('sales') ?>
         <div class="dashboard-item">
-            <div class="dashboard-item-title"><?php echo __('Last Orders') ?></div>
+            <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo __('Last Orders') ?></div>
             <?php echo $block->getChildHtml('lastOrders'); ?>
         </div>
         <div class="dashboard-item">
-            <div class="dashboard-item-title"><?php echo __('Last Search Terms') ?></div>
+            <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo __('Last Search Terms') ?></div>
             <?php echo $block->getChildHtml('lastSearches'); ?>
         </div>
         <div class="dashboard-item">
-            <div class="dashboard-item-title"><?php echo __('Top Search Terms') ?></div>
+            <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo __('Top Search Terms') ?></div>
             <?php echo $block->getChildHtml('topSearches'); ?>
         </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 fe5772aa4b364..0f29bb724caab 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 echo $_total['label'] ?></div>
+        <div class="dashboard-item-title"><?php /* @escapeNotVerified */ echo $_total['label'] ?></div>
         <div class="dashboard-item-content">
             <strong class="dashboard-sales-value">
-                <?php echo $_total['value'] ?>
-                <span class="dashboard-sales-decimals"><?php echo $_total['decimals'] ?></span>
+                <?php /* @escapeNotVerified */ echo $_total['value'] ?>
+                <span class="dashboard-sales-decimals"><?php /* @escapeNotVerified */ echo $_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 e549eb962b841..89c369177ddb9 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 echo $item->getQueryText() ?></span><br />
+        <span><?php /* @escapeNotVerified */ echo $item->getQueryText() ?></span><br />
         <?php endforeach; ?>
     </div>
 <?php else: ?>
-    <div class="empty-text"><?php echo __('There are no search keywords.') ?></div>
+    <div class="empty-text"><?php /* @escapeNotVerified */ echo __('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 8d0af5ac5a628..70ffeebf204c3 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 echo __('View Statistics For:') ?></label>
+<p class="switcher"><label for="store_switcher"><?php /* @escapeNotVerified */ echo __('View Statistics For:') ?></label>
 <?php echo $block->getHintHtml() ?>
 <select name="store_switcher" id="store_switcher" class="left-col-block" onchange="return switchStore(this);">
-    <option value=""><?php echo __('All Websites') ?></option>
+    <option value=""><?php /* @escapeNotVerified */ echo __('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 echo $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected="selected"<?php endif; ?>><?php echo $_website->getName() ?></option>
+                    <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>
                 <?php endif; ?>
                 <?php if ($showGroup == false): ?>
                     <?php $showGroup = true; ?>
-                    <!--optgroup label="&nbsp;&nbsp;&nbsp;<?php echo $_group->getName() ?>"-->
-                    <option group="true" value="<?php echo $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?php echo $_group->getName() ?></option>
+                    <!--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>
                 <?php endif; ?>
-                <option value="<?php echo $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $_store->getName() ?></option>
+                <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>
             <?php endforeach; ?>
             <?php if ($showGroup): ?>
                 <!--</optgroup>-->
@@ -57,7 +57,7 @@
                 var select = $('order_amounts_period');
             }
             var periodParam = select.value ? 'period/' + select.value + '/' : '';
-            setLocation('<?php echo $block->getSwitchUrl() ?>' + storeParam + periodParam);
+            setLocation('<?php /* @escapeNotVerified */ echo $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 01b32b165356c..0b93ae0d12481 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 echo $_total['label'] ?></span>
+                <span class="dashboard-totals-label"><?php /* @escapeNotVerified */ echo $_total['label'] ?></span>
                 <strong class="dashboard-totals-value">
-                    <?php echo $_total['value'] ?>
-                    <span class="dashboard-totals-decimals"><?php echo $_total['decimals'] ?></span>
+                    <?php /* @escapeNotVerified */ echo $_total['value'] ?>
+                    <span class="dashboard-totals-decimals"><?php /* @escapeNotVerified */ echo $_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 82c404c077f38..fa70cd5ed9778 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
@@ -8,17 +8,17 @@
     <div class="page-actions-inner">
         <div class="page-actions-buttons">
             <form
-                action="<?php echo $block->getUrl('*/*/refreshStatistics'); ?>"
+                action="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/refreshStatistics'); ?>"
                 method="post">
                 <input
                     name="form_key"
                     type="hidden"
-                    value="<?php echo $block->getFormKey(); ?>"/>
+                    value="<?php /* @escapeNotVerified */ echo $block->getFormKey(); ?>"/>
                 <button
                     class="action-primary"
                     type="submit"
                     title="Refresh Data">
-                    <?php echo __('Reload Data') ?>
+                    <?php /* @escapeNotVerified */ echo __('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 bad6017eb58f2..d6bd7de2f1c0c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/media/uploader.phtml
@@ -4,14 +4,16 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /** @var $block \Magento\Backend\Block\Media\Uploader */
 ?>
 
 <div id="<?php echo $block->getHtmlId() ?>" class="uploader">
     <div class="fileinput-button form-buttons button">
-        <span><?php echo __('Browse Files...') ?></span>
-        <input id="fileupload" type="file" name="<?php echo $block->getConfig()->getFileField() ?>"
-            data-url="<?php echo $block->getConfig()->getUrl() ?>" multiple="multiple" />
+        <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" />
     </div>
     <div class="clear"></div>
     <script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template">
@@ -38,7 +40,7 @@ require([
         dropZone: '[data-tab-panel=image-management]',
         sequentialUploads: true,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-        maxFileSize: <?php echo $block->getFileSizeService()->getMaxFileSize() ?> ,
+        maxFileSize: <?php /* @escapeNotVerified */ echo $block->getFileSizeService()->getMaxFileSize() ?> ,
         add: function (e, data) {
             var progressTmpl = mageTemplate('#<?php echo $block->getHtmlId(); ?>-template'),
                 fileSize,
@@ -96,8 +98,8 @@ require([
             fileTypes: /^image\/(gif|jpeg|png)$/
         }, {
             action: 'resize',
-            maxWidth: <?php echo \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
-            maxHeight: <?php echo \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
+            maxWidth: <?php /* @escapeNotVerified */ echo \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
+            maxHeight: <?php /* @escapeNotVerified */ echo \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
         }, {
             action: 'save'
         }]
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml b/app/code/Magento/Backend/view/adminhtml/templates/menu.phtml
index 68e537bd55566..4b0433cbfaae9 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" role="navigation">
-    <?php echo $block->renderNavigation($block->getMenuModel(), 0, 12); ?>
+    <?php /* @escapeNotVerified */ echo $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 840252f3658d0..5612ab2066179 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml
@@ -8,6 +8,6 @@
 
 ?>
 <p class="copyright">
-    <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php echo __('Magento') ?>"></a>
-    <?php echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
+    <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
+    <?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
 </p>
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 065826fa1c02b..364c9b7a03d46 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 echo __('Magento'); ?></strong>
-    <?php echo __('ver. %1', \Magento\Framework\AppInterface::VERSION) ?>
+    <strong><?php /* @escapeNotVerified */ echo __('Magento'); ?></strong>
+    <?php /* @escapeNotVerified */ echo __('ver. %1', \Magento\Framework\AppInterface::VERSION) ?>
 </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 8b60043de0f8d..fbe41e2a58b48 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -13,17 +13,17 @@
         <?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 echo $block->getHomeLink() ?>"
-            <?php echo $edition; ?>
+            href="<?php /* @escapeNotVerified */ echo $block->getHomeLink() ?>"
+            <?php /* @escapeNotVerified */ echo $edition; ?>
             class="logo">
-            <img class="logo-img" src="<?php echo $block->getViewFileUrl($logoSrc) ?>"
+            <img class="logo-img" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl($logoSrc) ?>"
             alt="<?php echo $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
         </a>
     <?php break; ?>
     <?php case 'user': ?>
         <div class="admin-user admin__action-dropdown-wrap">
             <a
-                href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>"
+                href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml/system_account/index') ?>"
                 class="admin__action-dropdown"
                 title="<?php echo $block->escapeHtml(__('My Account')) ?>"
                 data-mage-init='{"dropdown":{}}'
@@ -36,27 +36,27 @@
                 <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
                 <li>
                     <a
-                        href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>"
-                        <?php echo $block->getUiId('user', 'account', 'settings')?>
+                        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 echo __('Account Setting') ?> (<span class="admin-user-name"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>)
+                        <?php /* @escapeNotVerified */ echo __('Account Setting') ?> (<span class="admin-user-name"><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span>)
                     </a>
                 </li>
                 <?php endif; ?>
                 <li>
                     <a
-                        href="<?php echo $block->getBaseUrl(); ?>"
+                        href="<?php /* @escapeNotVerified */ echo $block->getBaseUrl(); ?>"
                         title="<?php echo $block->escapeHtml(__('Customer View')); ?>"
                         target="_blank" class="store-front">
-                        <?php echo __('Customer View'); ?>
+                        <?php /* @escapeNotVerified */ echo __('Customer View'); ?>
                     </a>
                 </li>
                 <li>
                     <a
-                        href="<?php echo $block->getLogoutLink() ?>"
+                        href="<?php /* @escapeNotVerified */ echo $block->getLogoutLink() ?>"
                         class="account-signout"
                         title="<?php echo $block->escapeHtml(__('Sign Out')) ?>">
-                        <?php echo __('Sign Out') ?>
+                        <?php /* @escapeNotVerified */ echo __('Sign Out') ?>
                     </a>
                 </li>
             </ul>
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 8de8c93ee6391..d76f33b2b874a 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 echo $days['wide']?>,
-            dayNamesMin: <?php echo $days['abbreviated']?>,
-            monthNames: <?php echo $months['wide']?>,
-            monthNamesShort: <?php echo $months['abbreviated']?>,
-            infoTitle: "<?php echo __('About the calendar');?>",
-            firstDay: <?php echo $firstDay?>,
-            closeText: "<?php echo __('Close');?>",
-            currentText: "<?php echo __('Go Today'); ?>",
-            prevText: "<?php echo __('Previous');?>",
-            nextText: "<?php echo __('Next');?>",
-            weekHeader: "<?php echo __('WK'); ?>",
-            timeText: "<?php echo __('Time');?>",
-            hourText: "<?php echo __('Hour');?>",
-            minuteText: "<?php echo __('Minute');?>",
+            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');?>",
             dateFormat: $.datepicker.RFC_2822,
             showOn: "button",
             showAnim: "",
@@ -50,13 +50,13 @@ require([
             showTime: false,
             showHour: false,
             showMinute: false,
-            localTimezone: <?php echo $block->getTimezoneOffsetSeconds() ?>,
-            serverTimezoneSeconds:<?php echo $block->getStoreTimestamp() ?>,
-            yearRange: '<?php echo $block->getYearRange() ?>'
+            localTimezone: <?php /* @escapeNotVerified */ echo $block->getTimezoneOffsetSeconds() ?>,
+            serverTimezoneSeconds:<?php /* @escapeNotVerified */ echo $block->getStoreTimestamp() ?>,
+            yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
         }
     });
 
-enUS = <?php echo $enUS?>; // en_US locale reference
+enUS = <?php /* @escapeNotVerified */ echo $enUS?>; // en_US locale reference
 
 });
 </script>
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 5238cfb8cb91f..4997592a10c5b 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,6 +5,6 @@
  */
 ?>
 <script>
-    var BASE_URL = '<?php echo $block->getUrl('*') ?>';
-    var FORM_KEY = '<?php echo $block->getFormKey() ?>';
+    var BASE_URL = '<?php /* @escapeNotVerified */ echo $block->getUrl('*') ?>';
+    var FORM_KEY = '<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>';
 </script>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml
index e6d67eddf7f05..fd4ac471185b8 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/locale.phtml
@@ -8,8 +8,8 @@
 
 ?>
 <div class="locale-switcher col-m-5">
-    <label class="label" for="footer_interface_locale"><span><?php echo __('Interface Locale'); ?></span></label>
-    <?php echo $block->getLocaleSelect(); ?>
+    <label class="label" for="footer_interface_locale"><span><?php /* @escapeNotVerified */ echo __('Interface Locale'); ?></span></label>
+    <?php /* @escapeNotVerified */ echo $block->getLocaleSelect(); ?>
     <script>
         (function () {
             'use strict';
@@ -17,7 +17,7 @@
             var elem = document.getElementById('footer_interface_locale');
 
             function onChange() {
-                window.location.href = '<?php echo $block->getChangeLocaleUrl() ?>locale/' + elem.value + '/<?php echo $block->getUrlForReferer() ?>';
+                window.location.href = '<?php /* @escapeNotVerified */ echo $block->getChangeLocaleUrl() ?>locale/' + elem.value + '/<?php /* @escapeNotVerified */ echo $block->getUrlForReferer() ?>';
             }
 
             elem.addEventListener('change', onChange);
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 26853cbd3fe25..7a18bedcba484 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 echo __('JavaScript may be disabled in your browser.'); ?></strong>
-                <?php echo __('To use this website you must first enable JavaScript in your browser.'); ?>
+                <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.'); ?>
             </div>
         </div>
     </noscript>
@@ -25,7 +25,7 @@
 <?php if ($block->displayDemoNotice()): ?>
     <div class="messages">
         <div class="message message-warning message-demo-mode">
-            <?php echo __('This is only a demo store. You can browse and place orders, but nothing will be processed.') ?>
+            <?php /* @escapeNotVerified */ echo __('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 e247a370d1408..acafad06855eb 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 echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php echo __('Report Bugs') ?></a>
+    <a class="link-report" href="<?php /* @escapeNotVerified */ echo $block->getBugreportUrl(); ?>" id="footer_bug_tracking"><?php /* @escapeNotVerified */ echo __('Report Bugs') ?></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 4f6f3f9a93c63..64624e31f5c67 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 echo $block->getUiId('content-header') ?>>
+    <div data-mage-init='{"floatingHeader": {}}' class="page-actions" <?php /* @escapeNotVerified */ echo $block->getUiId('content-header') ?>>
         <?php echo $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 ef97688024295..f43b8f6bf691d 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 echo __('Store View:') ?></span>
+    <span class="store-switcher-label"><?php /* @escapeNotVerified */ echo __('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 echo $block->getStoreVarName() ?>"
+               data-role="store-view-id" data-param="<?php /* @escapeNotVerified */ echo $block->getStoreVarName() ?>"
                value="<?php echo $block->escapeHtml($block->getStoreId()) ?>"
-               onchange="switchScope(this);"<?php echo $block->getUiId()?> />
+               onchange="switchScope(this);"<?php /* @escapeNotVerified */ echo $block->getUiId()?> />
         <input type="hidden" name="store_group_switcher" id="store_group_switcher"
-               data-role="store-group-id" data-param="<?php echo $block->getStoreGroupVarName() ?>"
+               data-role="store-group-id" data-param="<?php /* @escapeNotVerified */ echo $block->getStoreGroupVarName() ?>"
                value="<?php echo $block->escapeHtml($block->getStoreGroupId()) ?>"
-               onchange="switchScope(this);"<?php echo $block->getUiId()?> />
+               onchange="switchScope(this);"<?php /* @escapeNotVerified */ echo $block->getUiId()?> />
         <input type="hidden" name="website_switcher" id="website_switcher"
-               data-role="website-id" data-param="<?php echo $block->getWebsiteVarName() ?>"
+               data-role="website-id" data-param="<?php /* @escapeNotVerified */ echo $block->getWebsiteVarName() ?>"
                value="<?php echo $block->escapeHtml($block->getWebsiteId()) ?>"
-               onchange="switchScope(this);"<?php echo $block->getUiId()?> />
+               onchange="switchScope(this);"<?php /* @escapeNotVerified */ echo $block->getUiId()?> />
         <button
             type="button"
             class="admin__action-dropdown"
@@ -32,7 +32,7 @@
             data-toggle="dropdown"
             aria-haspopup="true"
             id="store-change-button">
-            <?php echo $block->getCurrentSelectionName() ?>
+            <?php /* @escapeNotVerified */ echo $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 echo $block->getDefaultSelectionName() ?>
+                            <?php /* @escapeNotVerified */ echo $block->getDefaultSelectionName() ?>
                         </a>
                     <?php
                     } else {
                         ?>
-                        <span><?php echo $block->getDefaultSelectionName() ?></span>
+                        <span><?php /* @escapeNotVerified */ echo $block->getDefaultSelectionName() ?></span>
                     <?php
                     } ?>
                 </li>
@@ -121,7 +121,7 @@
             <?php endforeach; ?>
             <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
                 <li class="dropdown-toolbar">
-                    <a href="<?php echo $block->getUrl('*/system_store') ?>"><?php echo __('Stores Configuration') ?></a>
+                    <a href="<?php /* @escapeNotVerified */ echo $block->getUrl('*/system_store') ?>"><?php /* @escapeNotVerified */ echo __('Stores Configuration') ?></a>
                 </li>
             <?php endif; ?>
         </ul>
@@ -171,10 +171,10 @@ require(['jquery'], function(jQuery){
         } else {
 
             <?php if ($block->getUseConfirm()): ?>
-            if (confirm("<?php echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>")) {
+            if (confirm("<?php /* @escapeNotVerified */ echo __('Please confirm scope switching. All data that hasn\'t been saved will be lost.') ?>")) {
                 reload();
             } else {
-                obj.value = '<?php echo $block->getStoreId() ?>';
+                obj.value = '<?php /* @escapeNotVerified */ echo $block->getStoreId() ?>';
             }
             <?php else: ?>
                 reload();
@@ -183,7 +183,7 @@ require(['jquery'], function(jQuery){
 
         function reload() {
             <?php if (!$block->isUsingIframe()): ?>
-            var url = '<?php echo $block->getSwitchUrl() ?>' + scopeParams;
+            var url = '<?php /* @escapeNotVerified */ echo $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 6cb7cfa2c5d1f..64d4ca68e905c 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,18 +9,18 @@
 ?>
 <?php $_element = $block->getElement() ?>
 <?php if ($_element->getFieldsetContainerId()): ?>
-    <div id="<?php echo $_element->getFieldsetContainerId(); ?>">789
+    <div id="<?php /* @escapeNotVerified */ echo $_element->getFieldsetContainerId(); ?>">789
 <?php endif; ?>
 
 <?php if (!$_element->getNoContainer()): ?>
-    <fieldset class="fieldset <?php echo $_element->getClass() ?>" id="<?php echo $_element->getHtmlId() ?>">
+    <fieldset class="fieldset <?php /* @escapeNotVerified */ echo $_element->getClass() ?>" id="<?php echo $_element->getHtmlId() ?>">
 <?php endif; ?>
 
     <?php if ($_element->getLegend()): ?>
         <legend class="legend">
-            <span><?php echo $_element->getLegend() ?></span>
+            <span><?php /* @escapeNotVerified */ echo $_element->getLegend() ?></span>
         </legend>
-        <?php echo $_element->getHeaderBar() ?>
+        <?php /* @escapeNotVerified */ echo $_element->getHeaderBar() ?>
     <?php endif; ?>
         <?php echo $block->getHintHtml() ?>
         <div class="tree-store-scope">
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 4f597407e1f07..24369768eb088 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
@@ -28,20 +28,20 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     <?php if ($element->getType() == 'hidden'): ?>
         <?php echo $element->getElementHtml() ?>
     <?php else: ?>
-    <div<?php echo $fieldAttributes ?>>
+    <div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
         <?php if ($elementBeforeLabel): ?>
             <?php echo $element->getElementHtml() ?>
             <?php echo $element->getLabelHtml() ?>
-            <?php echo $note ?>
+            <?php /* @escapeNotVerified */ echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
             <div class="control">
-                <?php echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
-                <?php echo $note ?>
+                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="addon">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
+                <?php /* @escapeNotVerified */ echo $note ?>
             </div>
         <?php endif; ?>
         <?php if ($element->getScopeLabel()): ?>
-            <div class="field-service" value-scope="<?php echo $element->getScopeLabel()?>">
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo $element->getScopeLabel()?>">
             </div>
         <?php endif;?>
         <?php echo $block->getHintHtml() ?>
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 3772361d50cbd..a8108a5f5541c 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/autocomplete.phtml
@@ -9,9 +9,9 @@
 ?>
 <ul class="dropdown-menu">
     <?php foreach ($items as $item): ?>
-    <li id="<?php echo $item['id'] ?>" class="item">
-        <a href="<?php echo $item['url'] ?>" class="title"><?php echo $block->escapeHtml($item['name']) ?></a>
-        <div class="type"><?php echo $item['type'] ?></div>
+    <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>
     <?php endforeach ?>
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 06eeedd275a76..6afd71fb3c03c 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
@@ -3,31 +3,33 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div class="fieldset additional-cache-management">
     <div class="legend">
-        <span><?php echo __('Additional Cache Management') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Additional Cache Management') ?></span>
     </div>
     <div class="field">
-        <button onclick="setLocation('<?php echo $block->getCleanImagesUrl() ?>')" type="button">
-            <?php echo __('Flush Catalog Images Cache') ?>
+        <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanImagesUrl() ?>')" type="button">
+            <?php /* @escapeNotVerified */ echo __('Flush Catalog Images Cache') ?>
         </button>
-        <label class="label"><?php echo __('Pregenerated product images files') ?></label>
+        <label class="label"><?php /* @escapeNotVerified */ echo __('Pregenerated product images files') ?></label>
     </div>
     <div class="field">
-        <button onclick="setLocation('<?php echo $block->getCleanMediaUrl() ?>')" type="button">
-            <?php echo __('Flush JavaScript/CSS Cache') ?>
+        <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanMediaUrl() ?>')" type="button">
+            <?php /* @escapeNotVerified */ echo __('Flush JavaScript/CSS Cache') ?>
         </button>
-        <label class="label"><?php echo __('Themes JavaScript and CSS files combined to one file.') ?></label>
+        <label class="label"><?php /* @escapeNotVerified */ echo __('Themes JavaScript and CSS files combined to one file.') ?></label>
     </div>
     <?php
     if (!$block->isInProductionMode()):
         ?>
         <div class="field">
-            <button onclick="setLocation('<?php echo $block->getCleanStaticFilesUrl() ?>')" type="button">
-                <?php echo __('Flush Static Files Cache') ?>
+            <button onclick="setLocation('<?php /* @escapeNotVerified */ echo $block->getCleanStaticFilesUrl() ?>')" type="button">
+                <?php /* @escapeNotVerified */ echo __('Flush Static Files Cache') ?>
             </button>
-            <label class="label"><?php echo __('Preprocessed view files and static files') ?></label>
+            <label class="label"><?php /* @escapeNotVerified */ echo __('Preprocessed view files and static files') ?></label>
         </div>
     <?php
     endif;
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 976fa606ed42d..21c2183a10cca 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
@@ -17,7 +17,7 @@
  */
 ?>
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getSaveButtonHtml() ?></div>
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
+<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
     <?php echo $block->getBlockHtml('formkey')?>
 
     <script>
@@ -34,7 +34,7 @@
     <?php echo $block->getChildHtml('form') ?>
     <div class="entry-edit">
         <div class="entry-edit-head">
-            <h4 class="icon-head head-edit-form fieldset-legend"><?php echo __('Catalog') ?></h4>
+            <h4 class="icon-head head-edit-form fieldset-legend"><?php /* @escapeNotVerified */ echo __('Catalog') ?></h4>
         </div>
         <fieldset id="catalog">
             <table class="form-list">
@@ -45,15 +45,15 @@
     continue;
 }?>
                     <tr>
-                        <td class="label"><label><?php echo $_item['label'] ?></label></td>
+                        <td class="label"><label><?php /* @escapeNotVerified */ echo $_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 echo $clickAction; ?>"<?php endif; ?> id="<?php echo $_button['name'] ?>" type="button" class="scalable <?php if (isset($_button['disabled']) && $_button['disabled']):?>disabled<?php endif; ?>" style=""><span><span><span><?php echo $_button['action'] ?></span></span></span></button>
-                                <?php if (isset($_button['comment'])): ?> <br /> <small><?php echo $_button['comment']; ?></small> <?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; ?>
                             <?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 echo __('JavaScript/CSS') ?></h4>
+            <h4 class="icon-head head-edit-form fieldset-legend"><?php /* @escapeNotVerified */ echo __('JavaScript/CSS') ?></h4>
         </div>
 
         <fieldset id="jscss">
             <table class="form-list">
                 <tbody>
                     <tr>
-                        <td class="label"><label><?php echo __('JavaScript/CSS Cache') ?></label></td>
+                        <td class="label"><label><?php /* @escapeNotVerified */ echo __('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 echo __('Clear') ?></span></span></span></button>
+                            <button onclick="setCacheAction('jscss_action', this)" id='jscss_action' type="button" class="scalable"><span><span><span><?php /* @escapeNotVerified */ echo __('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 c1d4e8cd8af12..6a78cbc7b96e6 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,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" id="design-edit-form">
+<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="design-edit-form">
     <?php echo $block->getBlockHtml('formkey')?>
 </form>
 <script>
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 15b00d7a88c59..534b7e8819201 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml
@@ -21,7 +21,7 @@
             <button
                 type="submit"
                 class="search-global-action"
-                title="<?php echo __('Search') ?>"
+                title="<?php /* @escapeNotVerified */ echo __('Search') ?>"
                 ></button>
         </div>
     </form>
@@ -40,7 +40,7 @@
         <% } else { %>
             <li>
                 <span class="mage-suggest-no-records">
-                    <?php echo __('No records found.') ?>
+                    <?php /* @escapeNotVerified */ echo __('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 95b8908c5ec60..4f28917c8ff91 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/accordion.phtml
@@ -23,7 +23,7 @@ $items = $block->getItems();
         require([
             'mage/adminhtml/accordion'
         ], function(){
-        	tab_content_<?php echo $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?php echo $block->getHtmlId() ?>', '<?php echo $block->getShowOnlyOne() ?>');
+        	tab_content_<?php echo $block->getHtmlId() ?>AccordionJs = new varienAccordion('tab_content_<?php echo $block->getHtmlId() ?>', '<?php /* @escapeNotVerified */ echo $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 932d443b748bd..e117dd360e8ef 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/breadcrumbs.phtml
@@ -19,7 +19,7 @@
                 <strong><?php echo $block->escapeHtml($_link['label']) ?></strong>
             <?php endif; ?>
         <?php else: ?>
-            <a href="<?php echo $_link['url'] ?>" title="<?php echo $block->escapeHtml($_link['title']) ?>"><?php echo $block->escapeHtml($_link['label']) ?></a>
+            <a href="<?php /* @escapeNotVerified */ echo $_link['url'] ?>" title="<?php echo $block->escapeHtml($_link['title']) ?>"><?php echo $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 7b64ceb119484..326941e913a43 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/button.phtml
@@ -13,7 +13,7 @@
  */
 ?>
 <?php echo $block->getBeforeHtml(); ?>
-<button <?php echo $block->getAttributesHtml(), $block->getUiId(); ?>>
-    <span><?php echo $block->getLabel(); ?></span>
+<button <?php /* @escapeNotVerified */ echo $block->getAttributesHtml(), $block->getUiId(); ?>>
+    <span><?php /* @escapeNotVerified */ echo $block->getLabel(); ?></span>
 </button>
 <?php echo $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 f966335b0de91..f78c819e2a57b 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
@@ -21,14 +21,14 @@
         </button>
 
         <?php if (!$block->getDisabled()): ?>
-            <ul class="dropdown-menu" <?php echo $block->getUiId("dropdown-menu"); ?>>
+            <ul class="dropdown-menu" <?php /* @escapeNotVerified */ echo $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>
                     <?php if (isset($option['hint'])): ?>
-                    <div class="tooltip" <?php echo $block->getUiId('item', $key, 'tooltip'); ?>>
+                    <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']) ?>
                         </a>
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 d0c6ee352f93b..841e33cdd0dd0 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,9 +8,9 @@
 
 /** @var $block \Magento\Backend\Block\Widget\Form\Container */
  ?>
-<?php echo $block->getFormInitScripts() ?>
+<?php /* @escapeNotVerified */ echo $block->getFormInitScripts() ?>
 <?php if ($block->getButtonsHtml('header')): ?>
-    <div class="page-form-actions" <?php echo $block->getUiId('content-header') ?>><?php echo $block->getButtonsHtml('header') ?></div>
+    <div class="page-form-actions" <?php /* @escapeNotVerified */ echo $block->getUiId('content-header') ?>><?php echo $block->getButtonsHtml('header') ?></div>
 <?php endif; ?>
 <?php echo $block->getFormHtml() ?>
 <?php if ($block->hasFooterButtons()): ?>
@@ -27,7 +27,7 @@ require([
 
     $('#edit_form').form()
         .validation({
-            validationUrl: '<?php echo $block->getValidationUrl() ?>',
+            validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>',
             highlight: function(element) {
                 var detailsElement = $(element).closest('details');
                 if (detailsElement.length && detailsElement.is('.details')) {
@@ -42,4 +42,4 @@ require([
 
 });
 </script>
-<?php echo $block->getFormScripts() ?>
+<?php /* @escapeNotVerified */ echo $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 0356d2aea4e3e..9dfdcca41d1b9 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 echo $element->getLegend() ?></legend><br />
+        <legend><?php /* @escapeNotVerified */ echo $element->getLegend() ?></legend><br />
         <?php foreach ($element->getElements() as $_element): ?>
-            <?php echo $formBlock->drawElement($_element) ?>
+            <?php /* @escapeNotVerified */ echo $formBlock->drawElement($_element) ?>
         <?php endforeach; ?>
     </fieldset>
       <?php break;
     case 'column': ?>
       <?php break;
     case 'hidden': ?>
-    <input type="<?php echo $element->getType() ?>" name="<?php echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php echo $element->getValue() ?>">
+    <input type="<?php /* @escapeNotVerified */ echo $element->getType() ?>" name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $element->getValue() ?>">
       <?php break;
     case 'select': ?>
     <span class="form_row">
-        <?php if ($element->getLabel()): ?><label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label><?php endif; ?>
-        <select name="<?php echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" class="select<?php echo $element->getClass() ?>" title="<?php echo $element->getTitle() ?>">
+        <?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 foreach ($element->getValues() as $_value): ?>
-            <option <?php echo $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()): ?> selected="selected"<?php endif; ?>><?php echo $_value->getLabel() ?></option>
+            <option <?php /* @escapeNotVerified */ echo $_value->serialize() ?><?php if ($_value->getValue() == $element->getValue()): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo $_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 echo $block->getUiId('label') ?>><?php echo $element->getLabel() ?>:</label><?php endif; ?>
-        <input type="<?php echo $element->getType() ?>" name="<?php echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php echo $element->getValue() ?>" class="input-text <?php echo $element->getClass() ?>" title="<?php echo $element->getTitle() ?>" <?php echo($element->getOnClick() ? 'onClick="' . $element->getOnClick() . '"' : '') ?>/>
+        <?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() . '"' : '') ?>/>
     </span>
       <?php break;
     case 'radio': ?>
     <span class="form_row">
-        <?php if ($element->getLabel()): ?><label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label><?php endif; ?>
-        <input type="<?php echo $element->getType() ?>" name="<?php echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php echo $element->getValue() ?>" class="input-text <?php echo $element->getClass() ?>" title="<?php echo $element->getTitle() ?>"/>
+        <?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() ?>"/>
     </span>
       <?php break;
     case 'hidden': ?>
-        <input type="<?php echo $element->getType() ?>" name="<?php echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php echo $element->getValue() ?>">
+        <input type="<?php /* @escapeNotVerified */ echo $element->getType() ?>" name="<?php /* @escapeNotVerified */ echo $element->getName() ?>" id="<?php echo $element->getHtmlId() ?>" value="<?php /* @escapeNotVerified */ echo $element->getValue() ?>">
       <?php break;
     case 'radios': ?>
     <span class="form_row">
-        <label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
+        <label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label>
     <?php foreach ($element->getRadios() as $_radio): ?>
-    <input type="radio" name="<?php echo $_radio->getName() ?>" id="<?php echo $_radio->getHtmlId() ?>" value="<?php echo $_radio->getValue() ?>" class="input-radio <?php echo $_radio->getClass() ?>" title="<?php echo $_radio->getTitle() ?>" <?php echo($_radio->getValue() == $element->getChecked()) ? 'checked="true"' : '' ?> >&nbsp;<?php echo $_radio->getLabel() ?>
+    <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() ?>
     <?php endforeach; ?>
     </span>
       <?php break;
     case 'wysiwyg': ?>
     <span class="form_row">
-      <label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
+      <label for="<?php echo $element->getHtmlId() ?>"><?php /* @escapeNotVerified */ echo $element->getLabel() ?>:</label>
         <script>
         require([
             'tinymce'
@@ -67,7 +67,7 @@
             tinyMCE.init({
                 mode : "exact",
                 theme : "advanced",
-                elements : "<?php echo $element->getName(); ?>",
+                elements : "<?php /* @escapeNotVerified */ echo $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 echo $element->getName() ?>" title="<?php echo $element->getTitle() ?>" id="<?php echo $element->getHtmlId() ?>" class="textarea <?php echo $element->getClass() ?>" cols="80" rows="20"><?php echo $element->getValue(); ?></textarea>
+      <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>
     </span>
       <?php break;
         case 'textarea': ?>
             <span class="form_row">
-                    <label for="<?php echo $element->getHtmlId() ?>"><?php echo $element->getLabel() ?>:</label>
-                    <textarea name="<?php echo $element->getName() ?>" title="<?php echo $element->getTitle() ?>" id="<?php echo $element->getHtmlId() ?>" class="textarea <?php echo $element->getClass() ?>" cols="15" rows="2"><?php echo $element->getValue(); ?></textarea>
+                    <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>
             </span>
       <?php break;
     case 'editor': ?>
@@ -104,6 +104,6 @@
 } ?>
 <?php if ($element->getScript()): ?>
 <script>
-    <?php echo $element->getScript() ?>
+    <?php /* @escapeNotVerified */ echo $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 910fd5ae93922..a5d995b16a0a5 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,14 +9,14 @@
 ?>
 <tr>
 <td colspan="2">
-<label for="gallery"><?php echo __('Images') ?></label>
+<label for="gallery"><?php /* @escapeNotVerified */ echo __('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 echo __('Big Image') ?></td>
-        <td class="gallery" valign="middle" align="center"><?php echo __('Thumbnail') ?></td>
-        <td class="gallery" valign="middle" align="center"><?php echo __('Sort Order') ?></td>
-        <td class="gallery" valign="middle" align="center"><?php echo __('Delete') ?></td>
+        <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>
     </tr>
 </thead>
 
@@ -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 echo $image->getValueId() ?>" class="gallery">
+        <tr id="<?php echo $block->getElement()->getHtmlId() ?>_tr_<?php /* @escapeNotVerified */ echo $image->getValueId() ?>" class="gallery">
         <?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
             <td class="gallery" align="center" style="vertical-align:bottom;">
-            <a href="<?php echo $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?php echo $block->getElement()->getHtmlId() ?>_image_<?php echo $type ?>_<?php echo $image->getValueId() ?>');return false;">
-            <img id="<?php echo $block->getElement()->getHtmlId() ?>_image_<?php echo $type ?>_<?php echo $image->getValueId() ?>" src="<?php echo $image->setType($type)->getSourceUrl() ?>?<?php echo time() ?>" alt="<?php echo $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
-            <input type="file" name="<?php echo $block->getElement()->getName() ?>_<?php echo $type ?>[<?php echo $image->getValueId() ?>]" size="1"></td>
+            <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>
         <?php endforeach; ?>
-        <td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?php echo $block->getElement()->getParentName() ?>[position][<?php echo $image->getValueId() ?>]" value="<?php echo $image->getPosition() ?>" id="<?php echo $block->getElement()->getHtmlId() ?>_position_<?php 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 echo $block->getElement()->getParentName() ?>[delete][<?php echo $image->getValueId() ?>]" id="<?php echo $block->getElement()->getHtmlId() ?>_delete_<?php echo $image->getValueId() ?>"/></td>
+        <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>
         </tr>
     <?php endforeach; ?>
 <?php endif; ?>
@@ -56,7 +56,7 @@ require([
     'prototype'
 ], function () {
 id = 0;
-num_of_images = <?php echo $i ?>;
+num_of_images = <?php /* @escapeNotVerified */ echo $i ?>;
 
 window.addNewImage = function()
 {
@@ -65,17 +65,17 @@ window.addNewImage = function()
 
     id--;
     num_of_images++;
-    new_file_input = '<input type="file" name="<?php echo $block->getElement()->getName() ?>_%j%[%id%]" size="1">';
+    new_file_input = '<input type="file" name="<?php /* @escapeNotVerified */ echo $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 echo $block->getElement()->getParentName() ?>[position]['+id+']';
+    new_row_input.name = '<?php /* @escapeNotVerified */ echo $block->getElement()->getParentName() ?>[position]['+id+']';
     new_row_input.size = '3';
     new_row_input.value = '0';
 
     // Delete button
-    new_row_button = <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
+    new_row_button = <?php /* @escapeNotVerified */ echo $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 echo $block->getElement()->getName() ?>_delete_'+image).value=image;
-        document.getElementById('<?php echo $block->getElement()->getName() ?>_tr_'+image).style.display='none';
+        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';
     } else {
         image.parentNode.parentNode.parentNode.removeChild( image.parentNode.parentNode );
     }
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 ed79720277308..620c8195006da 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
@@ -39,26 +39,26 @@ if ($isField) {
 
 <?php if ($isWrapped): ?>
     <div class="fieldset-wrapper <?php echo($isCollapsable) ? 'admin__collapsible-block-wrapper ' : ''; ?>"
-        id="<?php echo $containerId ? $containerId : $id . '-wrapper';?>"
-        data-role="<?php echo $id ?>-wrapper">
+        id="<?php /* @escapeNotVerified */ echo $containerId ? $containerId : $id . '-wrapper';?>"
+        data-role="<?php /* @escapeNotVerified */ echo $id ?>-wrapper">
         <div class="fieldset-wrapper-title admin__fieldset-wrapper-title">
-            <strong <?php echo($isCollapsable) ?
+            <strong <?php /* @escapeNotVerified */ echo($isCollapsable) ?
                 'class="admin__collapsible-title" data-toggle="collapse" data-target="#' . $id . '-content"' :
                 'class="title"'; ?>>
-                <span><?php echo $element->getLegend() ?></span>
+                <span><?php /* @escapeNotVerified */ echo $element->getLegend() ?></span>
             </strong>
-            <?php echo $titleActions; ?>
+            <?php /* @escapeNotVerified */ echo $titleActions; ?>
         </div>
         <div class="fieldset-wrapper-content admin__fieldset-wrapper-content<?php echo($isCollapsable) ? ' collapse' : ''; ?>"
-            id="<?php echo $id ?>-content"
-            data-role="<?php echo $id ?>-content">
+            id="<?php /* @escapeNotVerified */ echo $id ?>-content"
+            data-role="<?php /* @escapeNotVerified */ echo $id ?>-content">
 <?php endif; ?>
 
     <?php if (!$element->getNoContainer()): ?>
-        <fieldset class="<?php echo $cssClass ?>" id="<?php echo $id ?>">
+        <fieldset class="<?php /* @escapeNotVerified */ echo $cssClass ?>" id="<?php /* @escapeNotVerified */ echo $id ?>">
         <?php if ($element->getLegend() && !$isWrapped): ?>
-            <legend class="<?php echo $isField ? 'label' : 'legend'?>">
-                <span><?php echo $element->getLegend() ?></span>
+            <legend class="<?php /* @escapeNotVerified */ echo $isField ? 'label' : 'legend'?>">
+                <span><?php /* @escapeNotVerified */ echo $element->getLegend() ?></span>
             </legend><br />
         <?php endif; ?>
     <?php endif; ?>
@@ -78,7 +78,7 @@ if ($isField) {
     <?php else: ?>
 
         <?php if ($isField && $count > 1):?>
-            <div class="fields-group-<?php echo $count?>">
+            <div class="fields-group-<?php /* @escapeNotVerified */ echo $count?>">
         <?php endif; ?>
 
         <?php echo $element->getBasicChildrenHtml(); ?>
@@ -91,16 +91,16 @@ if ($isField) {
 
         <?php if ($element->hasAdvanced() && !$isField): ?>
             <?php echo(!$element->getNoContainer() && $advancedAfter)  ? '</fieldset>' : ''?>
-            <details data-mage-init='{"details": {}}' class="details" id="details<?php echo $id ?>">
-                <summary class="details-summary" id="details-summary<?php echo $id ?>">
-                    <span><?php echo $advancedLabel ?></span>
+            <details data-mage-init='{"details": {}}' class="details" id="details<?php /* @escapeNotVerified */ echo $id ?>">
+                <summary class="details-summary" id="details-summary<?php /* @escapeNotVerified */ echo $id ?>">
+                    <span><?php /* @escapeNotVerified */ echo $advancedLabel ?></span>
                 </summary>
-                <div class="details-content" id="details-content<?php echo $id ?>">
+                <div class="details-content" id="details-content<?php /* @escapeNotVerified */ echo $id ?>">
                     <?php echo $element->getAdvancedChildrenHtml(); ?>
                 </div>
             </details>
         <?php elseif ($element->hasAdvanced() && $isField): ?>
-            <div class="nested" id="nested<?php echo $id ?>">
+            <div class="nested" id="nested<?php /* @escapeNotVerified */ echo $id ?>">
                 <?php echo $element->getAdvancedChildrenHtml(); ?>
             </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 a9600c1aae00a..824c0e92d6cf8 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
@@ -29,20 +29,20 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     <?php if ($element->getType() == 'hidden'): ?>
         <?php echo $element->getElementHtml() ?>
     <?php else: ?>
-    <div<?php echo $fieldAttributes ?>>
+    <div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
         <?php if ($elementBeforeLabel): ?>
             <?php echo $element->getElementHtml() ?>
             <?php echo $element->getLabelHtml() ?>
-            <?php echo $note ?>
+            <?php /* @escapeNotVerified */ echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
             <div class="admin__field-control control">
-                <?php echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
-                <?php echo $note ?>
+                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="admin__field admin__field-option">' . $element->getElementHtml() . '</div>' : $element->getElementHtml(); ?>
+                <?php /* @escapeNotVerified */ echo $note ?>
             </div>
         <?php endif; ?>
         <?php if ($element->getScopeLabel()): ?>
-            <div class="field-service" value-scope="<?php echo $element->getScopeLabel()?>">
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo $element->getScopeLabel()?>">
             </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 8bae9ea53a1c4..12dcacd1a0356 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -24,7 +24,7 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
 
 <?php if ($block->canDisplayContainer()): ?>
-<div id="<?php echo $block->getId() ?>" data-grid-id="<?php echo $block->getId() ?>">
+<div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>" data-grid-id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
 <?php else: ?>
 <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
 <?php endif; ?>
@@ -50,18 +50,18 @@ $numColumns = sizeof($block->getColumns());
                 <?php endif; ?>
                     <?php $countRecords = $block->getCollection()->getSize(); ?>
                     <div class="admin__control-support-text">
-                        <span id="<?php echo $block->getHtmlId() ?>-total-count" <?php echo $block->getUiId('total-count') ?>>
-                            <?php echo $countRecords ?>
+                        <span id="<?php echo $block->getHtmlId() ?>-total-count" <?php /* @escapeNotVerified */ echo $block->getUiId('total-count') ?>>
+                            <?php /* @escapeNotVerified */ echo $countRecords ?>
                         </span>
-                        <?php echo __('records found') ?>
+                        <?php /* @escapeNotVerified */ echo __('records found') ?>
                         <span id="<?php echo $block->getHtmlId() ?>_massaction-count"
-                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php echo __('selected') ?></span></span>
+                              class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php /* @escapeNotVerified */ echo __('selected') ?></span></span>
                     </div>
                 <?php if ($block->getPagerVisibility()): ?>
                     <div class="admin__data-grid-pager-wrap">
-                        <select name="<?php echo $block->getVarNameLimit() ?>"
+                        <select name="<?php /* @escapeNotVerified */ echo $block->getVarNameLimit() ?>"
                                 id="<?php echo $block->getHtmlId()?>_page-limit"
-                                onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)" <?php echo $block->getUiId('per-page') ?>
+                                onchange="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.loadByElement(this)" <?php /* @escapeNotVerified */ echo $block->getUiId('per-page') ?>
                                 class="admin__control-select">
                             <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                                 selected="selected"<?php endif; ?>>20
@@ -80,7 +80,7 @@ $numColumns = sizeof($block->getColumns());
                             </option>
                         </select>
                         <label for="<?php echo $block->getHtmlId()?>_page-limit"
-                            class="admin__control-support-text"><?php echo __('per page') ?></label>
+                            class="admin__control-support-text"><?php /* @escapeNotVerified */ echo __('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 echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;">
-                                            <span><?php echo __('Previous page') ?></span>
+                                        onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage - 1) ?>');return false;">
+                                            <span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span>
                                 </button>
                             <?php else: ?>
-                                <button type="button" class="action-previous disabled"><span><?php echo __('Previous page') ?></span></button>
+                                <button type="button" class="action-previous disabled"><span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span></button>
                             <?php endif; ?>
 
                             <input type="text"
                                    id="<?php echo $block->getHtmlId()?>_page-current"
-                                   name="<?php echo $block->getVarNamePage() ?>"
-                                   value="<?php echo $_curPage ?>"
+                                   name="<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>"
+                                   value="<?php /* @escapeNotVerified */ echo $_curPage ?>"
                                    class="admin__control-text"
-                                   onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')" <?php echo $block->getUiId('current-page') ?> />
+                                   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->getHtmlId()
                             ?>_page-current">
-                                <?php echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                                <?php /* @escapeNotVerified */ echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                             </label>
                             <?php if ($_curPage < $_lastPage): ?>
-                                <button title="<?php echo __('Next page') ?>"
+                                <button title="<?php /* @escapeNotVerified */ echo __('Next page') ?>"
                                         class="action-next"
-                                        onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;">
-                                    <span><?php echo __('Next page') ?></span>
+                                        onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage + 1) ?>');return false;">
+                                    <span><?php /* @escapeNotVerified */ echo __('Next page') ?></span>
                                 </button>
                             <?php else: ?>
-                                <button type="button" class="action-next disabled"><span><?php echo __('Next page') ?></span></button>
+                                <button type="button" class="action-next disabled"><span><?php /* @escapeNotVerified */ echo __('Next page') ?></span></button>
                             <?php endif; ?>
                         </div>
                     </div>
@@ -122,13 +122,13 @@ $numColumns = sizeof($block->getColumns());
         </div>
         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
         <?php if ($block->getGridCssClass()): ?>
-            <table class="<?php echo $block->getGridCssClass() ?> data-grid" id="<?php echo $block->getId() ?>_table">
+            <table class="<?php /* @escapeNotVerified */ echo $block->getGridCssClass() ?> data-grid" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
                 <!-- Rendering column set -->
                 <?php echo $block->getChildHtml('grid.columnSet'); ?>
             </table>
         <?php else: ?>
 
-            <table class="data-grid" id="<?php echo $block->getId() ?>_table">
+            <table class="data-grid" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
                 <!-- Rendering column set -->
                 <?php echo $block->getChildHtml('grid.columnSet'); ?>
             </table>
@@ -158,29 +158,29 @@ $numColumns = sizeof($block->getColumns());
         <?php //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed ?>
 
         <?php if ($block->getDependencyJsObject()): ?>
-            registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+            registry.get('<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>', function (<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>) {
         <?php endif; ?>
 
-        <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
-        <?php echo $block->getJsObjectName() ?>.useAjax = <?php echo $block->getUseAjax() ? 'true' : 'false' ?>;
+        <?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() ? 'true' : 'false' ?>;
         <?php if ($block->getRowClickCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.rowClickCallback = <?php echo $block->getRowClickCallback() ?>;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rowClickCallback = <?php /* @escapeNotVerified */ echo $block->getRowClickCallback() ?>;
         <?php endif; ?>
         <?php if ($block->getCheckboxCheckCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php echo $block->getCheckboxCheckCallback() ?>;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php /* @escapeNotVerified */ echo $block->getCheckboxCheckCallback() ?>;
         <?php endif; ?>
         <?php if ($block->getSortableUpdateCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.sortableUpdateCallback = <?php echo $block->getSortableUpdateCallback()?>;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.sortableUpdateCallback = <?php /* @escapeNotVerified */ echo $block->getSortableUpdateCallback()?>;
         <?php endif; ?>
-        <?php echo $block->getJsObjectName() ?>.bindSortable();
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.bindSortable();
         <?php if ($block->getRowInitCallback()): ?>
-        <?php echo $block->getJsObjectName() ?>.initRowCallback = <?php echo $block->getRowInitCallback() ?>;
-        <?php echo $block->getJsObjectName() ?>.initGridRows();
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initRowCallback = <?php /* @escapeNotVerified */ echo $block->getRowInitCallback() ?>;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initGridRows();
         <?php endif; ?>
         <?php if ($block->getChildBlock('grid.massaction') && $block->getChildBlock('grid.massaction')->isAvailable()): ?>
-        <?php echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
+        <?php /* @escapeNotVerified */ echo $block->getChildBlock('grid.massaction')->getJavaScript() ?>
         <?php endif ?>
-        <?php echo $block->getAdditionalJavaScript(); ?>
+        <?php /* @escapeNotVerified */ echo $block->getAdditionalJavaScript(); ?>
 
         <?php if ($block->getDependencyJsObject()): ?>
             });
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 2ba8f456149f4..f4c13d812bb1b 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
@@ -27,7 +27,7 @@ $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 echo $_column->getId() ?>"
+                        <th class="data-grid-th" data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
                             <?php echo $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
                     <?php else: ?>
                         <?php echo $_column->getHeaderHtml()?>
@@ -38,7 +38,7 @@ $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 echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
+                        <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
                             <?php echo $_column->getFilterHtml() ?>
                         </td>
                     <?php endforeach; ?>
@@ -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 echo $block->getRowUrl($_item) ?>" data-role="row"
-                    <?php if ($_class = $block->getRowClass($_item)):?> class="<?php echo $_class; ?>"<?php endif;?>
+                <tr title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>" data-role="row"
+                    <?php if ($_class = $block->getRowClass($_item)):?> class="<?php /* @escapeNotVerified */ echo $_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 echo $_column->getId() ?>"
+                          ?><td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
                                 <?php echo($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>
-                                class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                                class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?> <?php /* @escapeNotVerified */ echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
                             >
                                 <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td><?php
                             if ($block->shouldRenderEmptyCell($_item, $_column)):?>
-                                <td colspan="<?php echo $block->getEmptyCellColspan($_item)?>" class="last">
-                                <?php echo $block->getEmptyCellLabel()?>
+                                <td colspan="<?php /* @escapeNotVerified */ echo $block->getEmptyCellColspan($_item)?>" class="last">
+                                <?php /* @escapeNotVerified */ echo $block->getEmptyCellLabel()?>
                                 </td><?php
                             endif;
                         endif;
@@ -79,8 +79,8 @@ $numColumns = sizeof($block->getColumns());
                     <?php endif; ?>
                     <tr data-role="row">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns($_i) as $_column):
-                            ?><td data-column="<?php echo $_column->getId() ?>"
-                            class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns-1 ? 'last' : '' ?>"
+                            ?><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' : '' ?>"
                         >
                             <?php echo(($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
                         </td><?php
@@ -91,10 +91,10 @@ $numColumns = sizeof($block->getColumns());
                 <?php if ($block->shouldRenderSubTotal($_item)): ?>
                     <tr class="subtotals">
                         <?php $i = 0; foreach ($block->getMultipleRowColumns() as $_column): ?>
-                            <td data-column="<?php echo $_column->getId() ?>"
-                                class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                            <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' : '' ?>"
                             >
-                                <?php echo $_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel()
+                                <?php /* @escapeNotVerified */ echo $_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel()
                                     : $_column->getRowField($block->getSubTotals($_item));
                                 ?>
                             </td>
@@ -102,22 +102,22 @@ $numColumns = sizeof($block->getColumns());
                     </tr>
                 <?php endif; ?>
             <?php else: ?>
-                <tr data-role="row" title="<?php echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)):?>
-                    class="<?php echo $_class; ?>"<?php endif;?>
+                <tr data-role="row" title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)):?>
+                    class="<?php /* @escapeNotVerified */ echo $_class; ?>"<?php endif;?>
                 >
                     <?php $i = 0; foreach ($block->getColumns() as $_column): ?>
                         <?php if ($block->shouldRenderCell($_item, $_column)):?>
-                            <td data-column="<?php echo $_column->getId() ?>"
-                                class="<?php echo $_column->getCssProperty() ?> <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?> <?php echo ++$i == $numColumns ? 'last' : '' ?>"
+                            <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' : '' ?>"
                             >
                                 <?php echo(($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
                             </td>
                             <?php if ($block->shouldRenderEmptyCell($_item, $_column)):?>
-                                <td data-column="<?php echo $_column->getId() ?>"
-                                    colspan="<?php echo $block->getEmptyCellColspan($_item)?>"
-                                    class="col-no-records <?php echo $block->getEmptyTextClass() ?> last"
+                                <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"
                                 >
-                                    <?php echo $block->getEmptyCellLabel()?>
+                                    <?php /* @escapeNotVerified */ echo $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 echo $block->getEmptyTextClass() ?>"
-                    colspan="<?php echo $numColumns ?>"><?php echo $block->getEmptyText() ?></td>
+                <td class="<?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?>"
+                    colspan="<?php /* @escapeNotVerified */ echo $numColumns ?>"><?php /* @escapeNotVerified */ echo $block->getEmptyText() ?></td>
             </tr>
         <?php endif; ?>
     </tbody>
@@ -137,10 +137,10 @@ $numColumns = sizeof($block->getColumns());
     <tfoot>
         <tr class="totals" data-role="row">
             <?php foreach ($block->getColumns() as $_column): ?>
-                <th data-column="<?php echo $_column->getId() ?>"
-                    class="<?php echo $_column->getCssProperty() ?>"
+                <th data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
+                    class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>"
                 >
-                    <?php echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel()
+                    <?php /* @escapeNotVerified */ echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel()
                         : $_column->getRowField($block->getTotals()) ?>
                 </th>
             <?php endforeach; ?>
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 05387761a7b59..c69e342167d6c 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,12 +8,12 @@
 
 ?>
 <div class="admin__data-grid-export">
-    <label for="<?php echo $block->getId() ?>_export" class="admin__control-support-text">
-        <?php echo __('Export to:') ?>
+    <label for="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" class="admin__control-support-text">
+        <?php /* @escapeNotVerified */ echo __('Export to:') ?>
     </label>
-    <select name="<?php echo $block->getId() ?>_export" id="<?php echo $block->getId() ?>_export" class="admin__control-select">
+    <select name="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" class="admin__control-select">
         <?php foreach ($block->getExportTypes() as $_type): ?>
-            <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
+            <option value="<?php /* @escapeNotVerified */ echo $_type->getUrl() ?>"><?php /* @escapeNotVerified */ echo $_type->getLabel() ?></option>
         <?php endforeach; ?>
     </select>
     <?php echo $block->getExportButtonHtml() ?>
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 bb86ac95b9efd..385a5a1393c16 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,7 +26,7 @@ $numColumns = sizeof($block->getColumns());
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
 
-    <div id="<?php echo $block->getId() ?>" data-grid-id="<?php echo $block->getId() ?>">
+    <div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>" data-grid-id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
     <?php else: ?>
         <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
     <?php endif; ?>
@@ -41,11 +41,11 @@ $numColumns = sizeof($block->getColumns());
                 <div class="admin__data-grid-export">
                     <label
                         class="admin__control-support-text"
-                        for="<?php echo $block->getId() ?>_export"><?php echo __('Export to:') ?></label>
-                    <select name="<?php echo $block->getId() ?>_export" id="<?php echo $block->getId() ?>_export"
+                        for="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export"><?php /* @escapeNotVerified */ echo __('Export to:') ?></label>
+                    <select name="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_export"
                             class="admin__control-select">
                         <?php foreach ($block->getExportTypes() as $_type): ?>
-                            <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
+                            <option value="<?php /* @escapeNotVerified */ echo $_type->getUrl() ?>"><?php /* @escapeNotVerified */ echo $_type->getLabel() ?></option>
                         <?php endforeach; ?>
                     </select>
                     <?php echo $block->getExportButtonHtml() ?>
@@ -61,19 +61,19 @@ $numColumns = sizeof($block->getColumns());
                 <?php endif; ?>
                 <?php $countRecords = $block->getCollection()->getSize(); ?>
                 <div class="admin__control-support-text">
-                        <span id="<?php echo $block->getHtmlId() ?>-total-count" <?php echo $block->getUiId('total-count') ?>>
-                            <?php echo $countRecords ?>
+                        <span id="<?php echo $block->getHtmlId() ?>-total-count" <?php /* @escapeNotVerified */ echo $block->getUiId('total-count') ?>>
+                            <?php /* @escapeNotVerified */ echo $countRecords ?>
                         </span>
-                    <?php echo __('records found') ?>
+                    <?php /* @escapeNotVerified */ echo __('records found') ?>
                     <span id="<?php echo $block->getHtmlId() ?>_massaction-count"
-                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php echo __('selected') ?></span></span>
+                          class="mass-select-info _empty"><strong data-role="counter">0</strong> <span><?php /* @escapeNotVerified */ echo __('selected') ?></span></span>
                 </div>
 
             <?php if ($block->getPagerVisibility()): ?>
                 <div class="admin__data-grid-pager-wrap">
-                    <select name="<?php echo $block->getVarNameLimit() ?>"
+                    <select name="<?php /* @escapeNotVerified */ echo $block->getVarNameLimit() ?>"
                             id="<?php echo $block->getHtmlId()?>_page-limit"
-                            onchange="<?php echo $block->getJsObjectName() ?>.loadByElement(this)"
+                            onchange="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.loadByElement(this)"
                             class="admin__control-select">
                         <option value="20"<?php if ($block->getCollection()->getPageSize() == 20): ?>
                             selected="selected"<?php endif; ?>>20
@@ -92,7 +92,7 @@ $numColumns = sizeof($block->getColumns());
                         </option>
                     </select>
                     <label for="<?php echo $block->getHtmlId()?><?php echo $block->getHtmlId()?>_page-limit"
-                        class="admin__control-support-text"><?php echo __('per page') ?></label>
+                        class="admin__control-support-text"><?php /* @escapeNotVerified */ echo __('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 echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage - 1) ?>');return false;">
-                                <span><?php echo __('Previous page') ?></span>
+                                    onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage - 1) ?>');return false;">
+                                <span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span>
                             </button>
                         <?php else: ?>
-                            <button type="button" class="action-previous disabled"><span><?php echo __('Previous page') ?></span></button>
+                            <button type="button" class="action-previous disabled"><span><?php /* @escapeNotVerified */ echo __('Previous page') ?></span></button>
                         <?php endif; ?>
                         <input type="text"
                                id="<?php echo $block->getHtmlId()?>_page-current"
-                               name="<?php echo $block->getVarNamePage() ?>"
-                               value="<?php echo $_curPage ?>"
+                               name="<?php /* @escapeNotVerified */ echo $block->getVarNamePage() ?>"
+                               value="<?php /* @escapeNotVerified */ echo $_curPage ?>"
                                class="admin__control-text"
-                               onkeypress="<?php echo $block->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')" <?php echo $block->getUiId('current-page') ?> />
+                               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->getHtmlId()?>_page-current">
-                            <?php echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
+                            <?php /* @escapeNotVerified */ echo __('of %1', '<span>' . $block->getCollection()->getLastPageNumber() . '</span>') ?>
                         </label>
                         <?php if ($_curPage < $_lastPage): ?>
                             <button type="button"
-                                    title="<?php echo __('Next page') ?>"
+                                    title="<?php /* @escapeNotVerified */ echo __('Next page') ?>"
                                     class="action-next"
-                                    onclick="<?php echo $block->getJsObjectName() ?>.setPage('<?php echo($_curPage + 1) ?>');return false;">
-                                <span><?php echo __('Next page') ?></span>
+                                    onclick="<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setPage('<?php /* @escapeNotVerified */ echo($_curPage + 1) ?>');return false;">
+                                <span><?php /* @escapeNotVerified */ echo __('Next page') ?></span>
                             </button>
                         <?php else: ?>
-                        <button type="button" class="action-next disabled"><span><?php echo __('Next page') ?></span></button>
+                        <button type="button" class="action-next disabled"><span><?php /* @escapeNotVerified */ echo __('Next page') ?></span></button>
                         <?php endif; ?>
                     </div>
                 </div>
@@ -133,7 +133,7 @@ $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->getId() ?>_table">
+        <table class="data-grid" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
             <?php
             /* This part is commented to remove all <col> tags from the code. */
             /* foreach ($block->getColumns() as $_column): ?>
@@ -146,7 +146,7 @@ $numColumns = sizeof($block->getColumns());
                     <tr>
                         <?php foreach ($block->getColumns() as $_column): ?>
                             <?php if ($_column->getHeaderHtml() == '&nbsp;'):?>
-                                <th class="data-grid-th" data-column="<?php echo $_column->getId() ?>"
+                                <th class="data-grid-th" data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>"
                                     <?php echo $_column->getHeaderHtmlProperty() ?>>&nbsp;</th>
                             <?php else: ?>
                                 <?php echo $_column->getHeaderHtml()?>
@@ -158,7 +158,7 @@ $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 echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
+                            <td data-column="<?php /* @escapeNotVerified */ echo $_column->getId() ?>" <?php echo $_column->getHeaderHtmlProperty() ?>>
                                 <?php echo $_column->getFilterHtml() ?>
                             </td>
                         <?php endforeach; ?>
@@ -170,8 +170,8 @@ $numColumns = sizeof($block->getColumns());
                 <tfoot>
                 <tr class="totals">
                     <?php foreach ($block->getColumns() as $_column): ?>
-                        <th class="<?php echo $_column->getCssProperty() ?>">
-                            <?php echo($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>
+                        <th class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>">
+                            <?php /* @escapeNotVerified */ echo($_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 echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
-                        class="<?php echo $_class; ?>"<?php endif; ?> ><?php
+                    <tr title="<?php /* @escapeNotVerified */ echo $block->getRowUrl($_item) ?>"<?php if ($_class = $block->getRowClass($_item)): ?>
+                        class="<?php /* @escapeNotVerified */ echo $_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 echo $_column->getCssProperty() ?>
-                                        <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
+                                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><?php
                                 if ($block->shouldRenderEmptyCell($_item, $_column)):
                                     ?>
-                                    <td colspan="<?php echo $block->getEmptyCellColspan($_item) ?>"
-                                        class="last"><?php echo $block->getEmptyCellLabel() ?></td><?php
+                                    <td colspan="<?php /* @escapeNotVerified */ echo $block->getEmptyCellColspan($_item) ?>"
+                                        class="last"><?php /* @escapeNotVerified */ echo $block->getEmptyCellLabel() ?></td><?php
                                 endif;
                             endif;
                         endforeach; ?>
@@ -206,8 +206,8 @@ $numColumns = sizeof($block->getColumns());
                             <tr>
                                 <?php $i = 0;
                                 foreach ($block->getMultipleRowColumns($_i) as $_column): ?>
-                                    <td class="<?php echo $_column->getCssProperty() ?>
-                                        <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
+                                    <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>
                                 <?php endforeach; ?>
@@ -219,9 +219,9 @@ $numColumns = sizeof($block->getColumns());
                         <tr class="subtotals">
                             <?php $i = 0;
                             foreach ($block->getSubTotalColumns() as $_column): ?>
-                                <td class="<?php echo $_column->getCssProperty() ?>
-                                           <?php echo $_column->getId() == 'massaction' ? 'data-grid-checkbox-cell': ''?>">
-                                    <?php echo($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
+                                <td class="<?php /* @escapeNotVerified */ echo $_column->getCssProperty() ?>
+                                           <?php /* @escapeNotVerified */ echo $_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 echo $block->getEmptyTextClass() ?>"
-                        colspan="<?php echo $numColumns ?>"><?php echo $block->getEmptyText() ?></td>
+                    <td class="<?php /* @escapeNotVerified */ echo $block->getEmptyTextClass() ?>"
+                        colspan="<?php /* @escapeNotVerified */ echo $numColumns ?>"><?php /* @escapeNotVerified */ echo $block->getEmptyText() ?></td>
                 </tr>
             <?php endif; ?>
             </tbody>
@@ -260,25 +260,25 @@ $numColumns = sizeof($block->getColumns());
 
         //<![CDATA[
     <?php if ($block->getDependencyJsObject()): ?>
-        registry.get('<?php echo $block->getDependencyJsObject() ?>', function (<?php echo $block->getDependencyJsObject() ?>) {
+        registry.get('<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>', function (<?php /* @escapeNotVerified */ echo $block->getDependencyJsObject() ?>) {
     <?php endif; ?>
 
-    <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
-    <?php echo $block->getJsObjectName() ?>.useAjax = '<?php echo $block->getUseAjax() ?>';
+    <?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() ?>';
     <?php if ($block->getRowClickCallback()): ?>
-    <?php echo $block->getJsObjectName() ?>.rowClickCallback = <?php echo $block->getRowClickCallback() ?>;
+    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.rowClickCallback = <?php /* @escapeNotVerified */ echo $block->getRowClickCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getCheckboxCheckCallback()): ?>
-    <?php echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php echo $block->getCheckboxCheckCallback() ?>;
+    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.checkboxCheckCallback = <?php /* @escapeNotVerified */ echo $block->getCheckboxCheckCallback() ?>;
     <?php endif; ?>
     <?php if ($block->getRowInitCallback()): ?>
-    <?php echo $block->getJsObjectName() ?>.initRowCallback = <?php echo $block->getRowInitCallback() ?>;
-    <?php echo $block->getJsObjectName() ?>.initGridRows();
+    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initRowCallback = <?php /* @escapeNotVerified */ echo $block->getRowInitCallback() ?>;
+    <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initGridRows();
     <?php endif; ?>
     <?php if ($block->getMassactionBlock() && $block->getMassactionBlock()->isAvailable()): ?>
-    <?php echo $block->getMassactionBlock()->getJavaScript() ?>
+    <?php /* @escapeNotVerified */ echo $block->getMassactionBlock()->getJavaScript() ?>
     <?php endif ?>
-    <?php echo $block->getAdditionalJavaScript(); ?>
+    <?php /* @escapeNotVerified */ echo $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 901d1f1e1f7db..efcb2a427993c 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,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<?php echo $block->getSomething(); ?>
+<?php /* @escapeNotVerified */ echo $block->getSomething(); ?>
 <div id="<?php echo $block->getHtmlId() ?>" class="admin__grid-massaction">
 
     <?php if ($block->getHideFormElement() !== true):?>
@@ -18,10 +18,10 @@
             <select
                 id="<?php echo $block->getHtmlId() ?>-select"
                 class="required-entry local-validation admin__control-select"
-                <?php echo $block->getUiId('select') ?>>
-                <option class="admin__control-select-placeholder" value="" selected><?php echo __('Actions') ?></option>
+                <?php /* @escapeNotVerified */ echo $block->getUiId('select') ?>>
+                <option class="admin__control-select-placeholder" value="" selected><?php /* @escapeNotVerified */ echo __('Actions') ?></option>
                 <?php foreach ($block->getItems() as $_item):?>
-                    <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php /* @escapeNotVerified */ echo $_item->getLabel() ?></option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
@@ -33,7 +33,7 @@
     <?php endif ?>
     <div class="no-display">
     <?php foreach ($block->getItems() as $_item): ?>
-        <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
+        <div id="<?php echo $block->getHtmlId() ?>-item-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-block">
             <?php if ('' != $_item->getBlockName()):?>
                 <?php echo $block->getChildHtml($_item->getBlockName());?>
             <?php endif;?>
@@ -46,21 +46,21 @@
             id="<?php echo $block->getHtmlId() ?>-mass-select"
             class="action-select-multiselect"
             data-menu="grid-mass-select">
-            <optgroup label="<?php echo __('Mass Actions')?>">
+            <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
                 <option disabled selected></option>
                 <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
-                        <?php echo __('Select All') ?>
+                        <?php /* @escapeNotVerified */ echo __('Select All') ?>
                     </option>
                     <option value="unselectAll">
-                        <?php echo __('Unselect All') ?>
+                        <?php /* @escapeNotVerified */ echo __('Unselect All') ?>
                     </option>
                 <?php endif; ?>
                 <option value="selectVisible">
-                    <?php echo __('Select Visible') ?>
+                    <?php /* @escapeNotVerified */ echo __('Select Visible') ?>
                 </option>
                 <option value="unselectVisible">
-                    <?php echo __('Unselect Visible') ?>
+                    <?php /* @escapeNotVerified */ echo __('Unselect Visible') ?>
                 </option>
             </optgroup>
         </select>
@@ -75,24 +75,24 @@
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
-                    return <?php echo $block->getJsObjectName() ?>.selectAll();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectAll();
                     break;
                 case 'unselectAll':
-                    return <?php echo $block->getJsObjectName() ?>.unselectAll();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectAll();
                     break;
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?php echo $block->getJsObjectName() ?>.selectVisible();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectVisible();
                     break;
                 case 'unselectVisible':
-                    return <?php echo $block->getJsObjectName() ?>.unselectVisible();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
             this.blur();
         });
     });
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?php echo $block->getJsObjectName() ?>.setGridIds('<?php echo $block->getGridIdsJson() ?>');
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setGridIds('<?php /* @escapeNotVerified */ echo $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 c30c3407ad649..11755f0891962 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
@@ -20,9 +20,9 @@
             <select
                 id="<?php echo $block->getHtmlId() ?>-select"
                 class="required-entry local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?php echo __('Actions') ?></option>
+                <option class="admin__control-select-placeholder" value="" selected><?php /* @escapeNotVerified */ echo __('Actions') ?></option>
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php /* @escapeNotVerified */ echo $_item->getLabel() ?></option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
@@ -34,7 +34,7 @@
     <?php endif ?>
     <div class="no-display">
         <?php foreach ($block->getItems() as $_item): ?>
-            <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
+            <div id="<?php echo $block->getHtmlId() ?>-item-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-block">
                 <?php echo $_item->getAdditionalActionBlockHtml() ?>
             </div>
         <?php endforeach; ?>
@@ -44,21 +44,21 @@
             id="<?php echo $block->getHtmlId() ?>-mass-select"
             class="action-select-multiselect"
             data-menu="grid-mass-select">
-            <optgroup label="<?php echo __('Mass Actions')?>">
+            <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
                 <option disabled selected></option>
             <?php if ($block->getUseSelectAll()):?>
                 <option value="selectAll">
-                    <?php echo __('Select All') ?>
+                    <?php /* @escapeNotVerified */ echo __('Select All') ?>
                 </option>
                 <option value="unselectAll">
-                    <?php echo __('Unselect All') ?>
+                    <?php /* @escapeNotVerified */ echo __('Unselect All') ?>
                 </option>
             <?php endif; ?>
                 <option value="selectVisible">
-                    <?php echo __('Select Visible') ?>
+                    <?php /* @escapeNotVerified */ echo __('Select Visible') ?>
                 </option>
                 <option value="unselectVisible">
-                    <?php echo __('Unselect Visible') ?>
+                    <?php /* @escapeNotVerified */ echo __('Unselect Visible') ?>
                 </option>
             </optgroup>
         </select>
@@ -72,17 +72,17 @@
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
-                    return <?php echo $block->getJsObjectName() ?>.selectAll();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectAll();
                     break;
                 case 'unselectAll':
-                    return <?php echo $block->getJsObjectName() ?>.unselectAll();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectAll();
                     break;
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?php echo $block->getJsObjectName() ?>.selectVisible();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectVisible();
                     break;
                 case 'unselectVisible':
-                    return <?php echo $block->getJsObjectName() ?>.unselectVisible();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
                     break;
             }
             this.blur();
@@ -90,7 +90,7 @@
     });
 
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?php echo $block->getJsObjectName() ?>.setGridIds('<?php echo $block->getGridIdsJson() ?>');
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setGridIds('<?php /* @escapeNotVerified */ echo $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 1371e5acb7831..4e68bd58c4ed7 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 echo $block->getInputElementName()?>';
-            serializeInput.id   = '<?php echo $_id?>';
+            serializeInput.name = '<?php /* @escapeNotVerified */ echo $block->getInputElementName()?>';
+            serializeInput.id   = '<?php /* @escapeNotVerified */ echo $_id?>';
             try {
-                document.getElementById('<?php echo $formId?>').appendChild(serializeInput);
-                new serializerController('<?php echo $_id?>', <?php echo $block->getDataAsJSON() ?>, <?php echo $block->getColumnInputNames(true) ?>, <?php echo $block->getGridBlock()->getJsObjectName() ?>, '<?php echo $block->getReloadParamName()?>');
+                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()?>');
             } catch(e) {
                 //Error add serializer
             }
@@ -35,12 +35,12 @@
     });
 </script>
 <?php else :?>
-<input type="hidden" name="<?php echo $block->getInputElementName()?>"  value="" id="<?php echo $_id?>" />
+<input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getInputElementName()?>"  value="" id="<?php /* @escapeNotVerified */ echo $_id?>" />
 <script>
     require([
         'mage/adminhtml/grid'
     ], function(){
-        new serializerController('<?php echo $_id?>', <?php echo $block->getDataAsJSON() ?>, <?php echo $block->getColumnInputNames(true) ?>, <?php echo $block->getGridBlock()->getJsObjectName() ?>, '<?php echo $block->getReloadParamName()?>');
+        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()?>');
     });
 </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 89f5dc34a428b..96cf01e3b2584 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 echo $block->getId() ?>">
+<div class="admin__page-nav" data-role="container" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
     <?php if ($block->getTitle()): ?>
-        <div class="admin__page-nav-title" data-role="title" <?php echo $block->getUiId('title') ?>>
-            <strong><?php echo $block->getTitle() ?></strong>
+        <div class="admin__page-nav-title" data-role="title" <?php /* @escapeNotVerified */ echo $block->getUiId('title') ?>>
+            <strong><?php /* @escapeNotVerified */ echo $block->getTitle() ?></strong>
             <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
         </div>
     <?php endif ?>
-    <ul <?php echo $block->getUiId('tab', $block->getId()) ?> class="<?php echo $block->getIsHoriz() ? 'tabs-horiz' : 'tabs admin__page-nav-items' ?>">
+    <ul <?php /* @escapeNotVerified */ echo $block->getUiId('tab', $block->getId()) ?> class="<?php /* @escapeNotVerified */ echo $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 echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
-                <a href="<?php echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>" name="<?php echo $block->getTabId($_tab, false) ?>" title="<?php echo $block->getTabTitle($_tab) ?>"
-                   class="admin__page-nav-link <?php echo $_tabClass;?>"
-                   data-tab-type="<?php echo $_tabType;?>"
-                   <?php echo $block->getUiId('tab', 'link', $_tab->getId()) ?>>
+            <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()) ?>>
 
-                   <span><?php echo $block->getTabLabel($_tab); ?></span>
+                   <span><?php /* @escapeNotVerified */ echo $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 echo __('Changes have been made to this section that have not been saved.'); ?>
+                               <?php /* @escapeNotVerified */ echo __('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 echo __('This tab contains invalid data. Please resolve this before saving.'); ?>
+                               <?php /* @escapeNotVerified */ echo __('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 echo $block->getTabId($_tab) ?>_content" style="display:none;"<?php echo $block->getUiId('tab', 'content', $_tab->getId()) ?>><?php echo $block->getTabContent($_tab) ?></div>
+                <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>
             </li>
         <?php endforeach; ?>
     </ul>
@@ -63,11 +63,11 @@
 <script>
 require(['jquery',"mage/backend/tabs"], function($){
     $(function() {
-        $('#<?php echo $block->getId() ?>').tabs({
-            active: '<?php echo $block->getActiveTabId() ?>',
-            destination: '#<?php echo $block->getDestElementId() ?>',
-            shadowTabs: <?php echo $block->getAllShadowTabs()?>,
-            tabsBlockPrefix: '<?php echo $block->getId() ?>_',
+        $('#<?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() ?>_',
             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 45e939d58d561..fb254be2f793c 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 echo $block->getTitle() ?></h3>
+    <h3><?php /* @escapeNotVerified */ echo $block->getTitle() ?></h3>
 <?php endif ?> -->
 <?php if (!empty($tabs)): ?>
-<div id="<?php echo $block->getId() ?>">
+<div id="<?php /* @escapeNotVerified */ echo $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 echo $_tabHref?>" id="<?php echo $block->getTabId($_tab) ?>" title="<?php echo $block->getTabTitle($_tab) ?>" class="<?php $_tabClass ?>" data-tab-type="<?php $_tabType ?>">
+        <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 ?>">
             <span>
-                <span class="changed" title="<?php echo __('The information in this tab has been changed.') ?>"></span>
-                <span class="error" title="<?php echo __('This tab contains invalid data. Please resolve this before saving.') ?>"></span>
-                <span class="loader" title="<?php echo __('Loading...') ?>"></span>
-                <?php echo $block->getTabLabel($_tab) ?>
+                <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>
         </a>
-        <div id="<?php echo $block->getTabId($_tab) ?>_content" style="display:none"><?php echo $block->getTabContent($_tab) ?></div>
+        <div id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>_content" style="display:none"><?php /* @escapeNotVerified */ echo $block->getTabContent($_tab) ?></div>
     </li>
 <?php endforeach; ?>
 </ul>
@@ -34,10 +34,10 @@
 <script>
 require(["jquery","mage/backend/tabs"], function($){
     $(function() {
-        $('#<?php echo $block->getId() ?>').tabs({
-            active: '<?php echo $block->getActiveTabId() ?>',
-            destination: '#<?php echo $block->getDestElementId() ?>',
-            shadowTabs: <?php echo $block->getAllShadowTabs()?>
+        $('#<?php /* @escapeNotVerified */ echo $block->getId() ?>').tabs({
+            active: '<?php /* @escapeNotVerified */ echo $block->getActiveTabId() ?>',
+            destination: '#<?php /* @escapeNotVerified */ echo $block->getDestElementId() ?>',
+            shadowTabs: <?php /* @escapeNotVerified */ echo $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 3ed92243ce35b..20c5be509050c 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 echo $id ?>" class="accordion">
+<dl id="dl-<?php /* @escapeNotVerified */ echo $id ?>" class="accordion">
 <?php foreach ($sections as $sectionId => $section): ?>
-    <dt id="dt-<?php echo $id ?>-<?php echo $sectionId ?>">
-        <strong><?php echo $section['title'] ?></strong>
+    <dt id="dt-<?php /* @escapeNotVerified */ echo $id ?>-<?php /* @escapeNotVerified */ echo $sectionId ?>">
+        <strong><?php /* @escapeNotVerified */ echo $section['title'] ?></strong>
     </dt>
-    <dd id="dd-<?php echo $id ?>-<?php echo $section['id'] ?>" class="section-menu <?php echo !empty($section['active']) ? 'open' : '' ?>">
+    <dd id="dd-<?php /* @escapeNotVerified */ echo $id ?>-<?php /* @escapeNotVerified */ echo $section['id'] ?>" class="section-menu <?php echo !empty($section['active']) ? 'open' : '' ?>">
         <ul>
         <?php foreach ($section['children'] as $menuId => $menuItem): ?>
-            <li id="li-<?php echo $id ?>-<?php echo $sectionId ?>-<?php echo $menuId ?>">
-                <a href="#" title="<?php echo $menuItem['title'] ?>">
-                    <span><?php echo $menuItem['label'] ?></span>
+            <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>
                 </a>
             </li>
         <?php endforeach ?>
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 b467a197c0c70..b8e7ba06b8b9e 100644
--- a/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
+++ b/app/code/Magento/Backup/view/adminhtml/templates/backup/dialogs.phtml
@@ -12,19 +12,19 @@
     <div class="popup">
         <div class="popup-inner">
             <div class="popup-header">
-                <div class="popup-title"><?php echo __('Warning') ?></div>
+                <div class="popup-title"><?php /* @escapeNotVerified */ echo __('Warning') ?></div>
             </div>
             <div class="popup-content">
                 <div class="messages">
                     <div class="message message-warning">
-                        <p><?php echo __('You will lose any data created since the backup was made, including admin users, customers and orders.')?></p>
-                        <p><?php echo __('Are you sure you want to continue?')?></p>
+                        <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>
                     </div>
                 </div>
 
                 <div class="actions">
-                    <button type="button" class="action primary" onclick="backup.requestPassword()"><?php echo __('OK')?></button>
-                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
+                    <button type="button" class="action primary" onclick="backup.requestPassword()"><?php /* @escapeNotVerified */ echo __('OK')?></button>
+                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
                 </div>
             </div>
         </div>
@@ -35,18 +35,18 @@
     <div class="popup">
         <div class="popup-inner">
             <div class="popup-header">
-                <div class="popup-title"><?php echo __('Warning') ?></div>
+                <div class="popup-title"><?php /* @escapeNotVerified */ echo __('Warning') ?></div>
             </div>
             <div class="popup-content">
                 <div class="messages">
                     <div class="message message-warning">
-                        <?php echo __("It will take time to create a backup. ")?><?php echo __('Please wait while we create your backup.')?><br>
-                        <?php echo __('Are you sure you want to continue?')?>
+                        <?php /* @escapeNotVerified */ echo __("It will take time to create a backup. ")?><?php /* @escapeNotVerified */ echo __('Please wait while we create your backup.')?><br>
+                        <?php /* @escapeNotVerified */ echo __('Are you sure you want to continue?')?>
                     </div>
                 </div>
                 <div class="actions">
-                    <button type="button" class="action primary" onclick="backup.requestBackupOptions()"><?php echo __('OK')?></button>
-                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
+                    <button type="button" class="action primary" onclick="backup.requestBackupOptions()"><?php /* @escapeNotVerified */ echo __('OK')?></button>
+                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
                 </div>
             </div>
         </div>
@@ -57,23 +57,23 @@
     <div class="popup">
         <div class="popup-inner">
             <div class="popup-header">
-                <div class="popup-title"><?php echo __('Backup options') ?></div>
+                <div class="popup-title"><?php /* @escapeNotVerified */ echo __('Backup options') ?></div>
             </div>
             <div class="popup-content">
                 <div class="backup-messages" style="display: none;"><div class="messages"></div></div>
                 <div class="messages">
-                    <div class="message message-warning"><?php echo __('Please specify backup creation option.')?></div>
+                    <div class="message message-warning"><?php /* @escapeNotVerified */ echo __('Please specify backup creation option.')?></div>
                 </div>
                 <form action="" method="post" id="backup-form" class="form-inline">
                     <fieldset class="fieldset form-list question">
                         <div class="field">
-                            <label for="backup_name" class="label"><span><?php echo __('Backup Name')?></span></label>
+                            <label for="backup_name" class="label"><span><?php /* @escapeNotVerified */ echo __('Backup Name')?></span></label>
                             <div class="control">
                                 <input type="text" name="backup_name" id="backup_name"
                                        class="required-entry validate-alphanum-with-spaces validate-length maximum-length-50"
                                        maxlength="50" />
                                 <div class="note">
-                                    <?php echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
+                                    <?php /* @escapeNotVerified */ echo __('Please use only letters (a-z or A-Z), numbers (0-9) or spaces in this field.'); ?>
                                 </div>
                             </div>
                         </div>
@@ -81,22 +81,22 @@
                         <div class="field maintenance-checkbox-container">
                             <div class="control">
                                 <input type="checkbox" name="maintenance_mode" value="1" id="backup_maintenance_mode"/>
-                                <label for="backup_maintenance_mode"><?php echo __('Please put your store into maintenance mode during backup.')?></label>
+                                <label for="backup_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during backup.')?></label>
                             </div>
                         </div>
 
                         <div class="field maintenance-checkbox-container" id="exclude-media-checkbox-container" style="display: none;">
                             <div class="control">
                                 <input type="checkbox" name="exclude_media" value="1" id="exclude_media"/>
-                                <label for="exclude_media"><?php echo __('Exclude media folder from backup') ?></label>
+                                <label for="exclude_media"><?php /* @escapeNotVerified */ echo __('Exclude media folder from backup') ?></label>
                             </div>
                         </div>
                     </fieldset>
                 </form>
 
                 <div class="actions">
-                    <button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#backup-form"}}'><?php echo __('OK')?></button>
-                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
+                    <button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#backup-form"}}'><?php /* @escapeNotVerified */ echo __('OK')?></button>
+                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
                 </div>
             </div>
         </div>
@@ -107,52 +107,52 @@
     <div class="popup popup-notice">
         <div class="popup-inner">
             <div class="popup-header">
-                <div class="popup-title"><?php echo __('Please enter a password.') ?></div>
+                <div class="popup-title"><?php /* @escapeNotVerified */ echo __('Please enter a password.') ?></div>
             </div>
             <div class="popup-content">
                 <div class="backup-messages" style="display: none;"><div class="messages"></div></div>
                 <div class="messages">
                     <div class="message message-warning">
-                        <?php echo __('Please enter the password to confirm rollback.')?><br>
-                        <?php echo __('This action cannot be undone.')?>
-                        <p><?php echo __('Are you sure you want to continue?')?></p>
+                        <?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>
                     </div>
                 </div>
                 <form action="" method="post" id="rollback-form" class="form-inline">
                     <div class="password-box-container">
 
                         <div class="field required">
-                            <label for="password" class="label"><span><?php echo __('User Password')?></span></label>
+                            <label for="password" class="label"><span><?php /* @escapeNotVerified */ echo __('User Password')?></span></label>
                             <div class="control"><input type="password" name="password" id="password" class="required-entry" autocomplete="off"></div>
                         </div>
 
                         <div class="field maintenance-checkbox-container">
                             <input type="checkbox" name="maintenance_mode" value="1" id="rollback_maintenance_mode"/>
-                            <label for="rollback_maintenance_mode"><?php echo __('Please put your store into maintenance mode during rollback processing.')?></label>
+                            <label for="rollback_maintenance_mode"><?php /* @escapeNotVerified */ echo __('Please put your store into maintenance mode during rollback processing.')?></label>
                         </div>
 
                         <div class="field maintenance-checkbox-container" id="use-ftp-checkbox-row" style="display: none;">
-                            <input type="checkbox" name="use_ftp" value="1" id="use_ftp" onClick="backup.toggleFtpCredentialsForm();"/> <label for="use_ftp"><?php echo __('Use FTP Connection')?></label>
+                            <input type="checkbox" name="use_ftp" value="1" id="use_ftp" onClick="backup.toggleFtpCredentialsForm();"/> <label for="use_ftp"><?php /* @escapeNotVerified */ echo __('Use FTP Connection')?></label>
                         </div>
                     </div>
                     <div class="entry-edit" id="ftp-credentials-container" style="display: none;">
                         <fieldset class="fieldset">
-                            <legend class="legend"><span><?php echo __('FTP credentials')?></span></legend><br />
+                            <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('FTP credentials')?></span></legend><br />
                             <div class="field required">
-                                <label for="ftp_host"><span><?php echo __('FTP Host') ?></span></label>
+                                <label for="ftp_host"><span><?php /* @escapeNotVerified */ echo __('FTP Host') ?></span></label>
                                 <div class="control"><input type="text" name="ftp_host" id="ftp_host"></div>
                             </div>
 
                             <div class="field required">
-                                <label for="ftp_user"><span><?php echo __('FTP Login') ?></span></label>
+                                <label for="ftp_user"><span><?php /* @escapeNotVerified */ echo __('FTP Login') ?></span></label>
                                 <div class="control"><input type="text" name="ftp_user" id="ftp_user"></div>
                             </div>
                             <div class="field required">
-                                <label for="ftp_pass"><span><?php echo __('FTP Password') ?></span></label>
+                                <label for="ftp_pass"><span><?php /* @escapeNotVerified */ echo __('FTP Password') ?></span></label>
                                 <div class="control"><input type="password" name="ftp_pass" id="ftp_pass" autocomplete="off"></div>
                             </div>
                             <div class="field">
-                                <label for="ftp_path"><span><?php echo __('Magento root directory') ?></span></label>
+                                <label for="ftp_path"><span><?php /* @escapeNotVerified */ echo __('Magento root directory') ?></span></label>
                                 <div class="control"><input type="text" name="ftp_path" id="ftp_path"></div>
                             </div>
                         </fieldset>
@@ -160,8 +160,8 @@
                 </form>
 
                 <div class="actions">
-                    <button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#rollback-form"}}'><?php echo __('OK')?></button>
-                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php echo __('Cancel')?></button>
+                    <button type="button" class="action primary" data-mage-init='{"button":{"event":"submit","target":"#rollback-form"}}'><?php /* @escapeNotVerified */ echo __('OK')?></button>
+                    <button type="button" class="action cancel" onclick="backup.hidePopups()"><?php /* @escapeNotVerified */ echo __('Cancel')?></button>
                 </div>
             </div>
         </div>
@@ -181,8 +181,8 @@ require([
 
 //<![CDATA[
     backup = new AdminBackup();
-    backup.rollbackUrl = '<?php echo $block->escapeJsQuote($rollbackUrl);?>';
-    backup.backupUrl = '<?php echo $block->escapeJsQuote($backupUrl);?>';
+    backup.rollbackUrl = '<?php /* @escapeNotVerified */ echo $block->escapeJsQuote($rollbackUrl);?>';
+    backup.backupUrl = '<?php /* @escapeNotVerified */ echo $block->escapeJsQuote($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 8b6dc14117bc1..2e18e0f5de4d3 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 echo __('Create Backup') ?></h3>
+<h3><?php /* @escapeNotVerified */ echo __('Create Backup') ?></h3>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/data_js.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/data_js.phtml
index 7530c47c347b6..cbfe3dcda5f9f 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/data_js.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/data_js.phtml
@@ -21,7 +21,7 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
 <script type="text/x-magento-init">
     {
         "body": {
-             "braintreeDataJs": <?php echo $serializedFormData ?>
+             "braintreeDataJs": <?php /* @escapeNotVerified */ echo $serializedFormData ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Braintree/view/adminhtml/templates/form.phtml b/app/code/Magento/Braintree/view/adminhtml/templates/form.phtml
index 6af3443736026..f13f2d77b1c08 100644
--- a/app/code/Magento/Braintree/view/adminhtml/templates/form.phtml
+++ b/app/code/Magento/Braintree/view/adminhtml/templates/form.phtml
@@ -25,9 +25,9 @@ $formData = [
 ];
 $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($formData);
 ?>
-<input id="<?php echo $_code ?>_payment_method" type="hidden" name="payment[method]" value="<?php echo $_code ?>" />
-<div id="payment_form_<?php echo $_code ?>" class="admin__page-section-item" style="display:none;"
-    data-mage-init='{"braintreeCcForm":<?php echo $serializedFormData ?>}'
+<input id="<?php /* @escapeNotVerified */ echo $_code ?>_payment_method" type="hidden" name="payment[method]" value="<?php /* @escapeNotVerified */ echo $_code ?>" />
+<div id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" class="admin__page-section-item" style="display:none;"
+    data-mage-init='{"braintreeCcForm":<?php /* @escapeNotVerified */ echo $serializedFormData ?>}'
     >
     <input type="hidden" name="payment[payment_method_nonce]" id="braintree_nonce" value="" />
     <input type="hidden" name="payment[cc_last4]" id="cc_last4" value="" />
@@ -36,16 +36,16 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
     <?php endif; ?>
     <?php if ($_storedCards): ?>
     <fieldset class="admin__fieldset">
-        <div class="admin__field" id="<?php echo $_code ?>_token_selector">
-            <label class="admin__field-label" for="<?php echo $_code ?>_cc_token"><?php echo __('Payment Information') ?></label>
+        <div class="admin__field" id="<?php /* @escapeNotVerified */ echo $_code ?>_token_selector">
+            <label class="admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_token"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></label>
             <div class="admin__field-control control">
-                <select id="<?php echo $_code ?>_cc_token" name="payment[cc_token]" class="select admin__control-select">
+                <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_token" name="payment[cc_token]" class="select admin__control-select">
                     <?php foreach ($_storedCards as $creditCard): ?>
-                        <option value="<?php echo $creditCard->token?>" <?php echo $creditCard->default ? 'selected="selected"' : '' ?>>
-                            <?php echo $creditCard->maskedNumber  . ' - ' . $creditCard->cardType ?>
+                        <option value="<?php /* @escapeNotVerified */ echo $creditCard->token?>" <?php echo $creditCard->default ? 'selected="selected"' : '' ?>>
+                            <?php /* @escapeNotVerified */ echo $creditCard->maskedNumber  . ' - ' . $creditCard->cardType ?>
                         </option>
                     <?php endforeach; ?>
-                        <option value=''><?php echo __('Add new card') ?></option>
+                        <option value=''><?php /* @escapeNotVerified */ echo __('Add new card') ?></option>
                 </select>
             </div>
         </div>
@@ -53,13 +53,13 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
     <?php endif; ?>
     <fieldset class="admin__fieldset hide_if_token_selected">
     <div class="admin__field">
-        <label class="label admin__field-label" for="<?php echo $_code ?>_cc_type" ><?php echo __('Credit Card Type') ?><span class="required">*</span></label>
+        <label class="label admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type" ><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?><span class="required">*</span></label>
         <div class="admin__field-control control">
-            <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry _required select admin__control-select validate-cc-type-select">
-                <option value="">--<?php echo __('Please Select')?>--</option>
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry _required select admin__control-select validate-cc-type-select">
+                <option value="">--<?php /* @escapeNotVerified */ echo __('Please Select')?>--</option>
             <?php $_ccType = $_form->getInfoData('cc_type') ?>
             <?php foreach ($_form->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                <option value="<?php echo $_typeCode ?>"<?php if($_typeCode==$_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"<?php if($_typeCode==$_ccType): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
             <?php endforeach ?>
             </select>
         </div>
@@ -67,26 +67,26 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
     </fieldset>
     <fieldset class="admin__fieldset hide_if_token_selected">
     <div class="admin__field">
-        <label class="label admin__field-label" for="<?php echo $_code ?>_cc_number"><?php echo __('Credit Card Number') ?><span class="required">*</span></label>
+        <label class="label admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number"><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?><span class="required">*</span></label>
         <div class="admin__field-control control">
-            <input type="text" id="<?php echo $_code ?>_cc_number" data-encrypted-name="payment[cc_number]"  title="<?php echo __('Credit Card Number') ?>" class="input-text admin__control-text validate-cc-number validate-cc-type" value="" />
+            <input type="text" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number" data-encrypted-name="payment[cc_number]"  title="<?php /* @escapeNotVerified */ echo __('Credit Card Number') ?>" class="input-text admin__control-text validate-cc-number validate-cc-type" value="" />
         </div>
     </div>
     </fieldset>
     <fieldset class="admin__fieldset hide_if_token_selected">
-    <div id="<?php echo $_code ?>_cc_type_exp_div" class="admin__field">
-        <label class="label admin__field-label" for="<?php echo $_code ?>_expiration" ><?php echo __('Expiration Date') ?><span class="required">*</span></label>
+    <div id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_exp_div" class="admin__field">
+        <label class="label admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" ><?php /* @escapeNotVerified */ echo __('Expiration Date') ?><span class="required">*</span></label>
         <div class="admin__field-control control">
-            <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month validate-cc-exp required-entry _required select admin__control-select">
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" name="payment[cc_exp_month]" class="month validate-cc-exp required-entry _required select admin__control-select">
             <?php $_ccExpMonth = $_form->getInfoData('cc_exp_month') ?>
             <?php foreach ($_form->getCcMonths() as $k=>$v): ?>
-                <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpMonth): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
             <?php endforeach ?>
             </select>
             <?php $_ccExpYear = $_form->getInfoData('cc_exp_year') ?>
-            <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year required-entry _required select admin__control-select">
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="year required-entry _required select admin__control-select">
             <?php foreach ($_form->getCcYears() as $k=>$v): ?>
-                <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                <option value="<?php echo $k?$k:'' ?>"<?php if($k==$_ccExpYear): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
             <?php endforeach ?>
             </select>
         </div>
@@ -95,11 +95,11 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
     <?php echo $_form->getChildHtml() ?>
     <?php if($_form->hasVerification()): ?>
     <fieldset class="admin__fieldset hide_if_token_selected">
-        <div id="<?php echo $_code ?>_cc_type_cvv_div" class="admin__field">
-            <label class="label admin__field-label" for="<?php echo $_code ?>_cc_cid" ><?php echo __('Card Verification Number') ?><span class="required">*</span></label>
+        <div id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_cvv_div" class="admin__field">
+            <label class="label admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" ><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?><span class="required">*</span></label>
             <div class="admin__field-control control">
                 <div class="v-fix">
-                    <input type="text" title="<?php echo __('Card Verification Number') ?>" class="input-text admin__control-text cvv required-entry validate-cc-cvn" id="<?php echo $_code ?>_cc_cid" data-encrypted-name="payment[cc_cid]" value="" />
+                    <input type="text" title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>" class="input-text admin__control-text cvv required-entry validate-cc-cvn" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" data-encrypted-name="payment[cc_cid]" value="" />
                 </div>
             </div>
         </div>
@@ -107,9 +107,9 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
     <?php endif; ?>
     <?php if($_useVault): ?>
     <fieldset class="admin__fieldset hide_if_token_selected">
-        <div id="<?php echo $_code ?>_store_in_vault_div" style="text-align:left;" class="">
-            <input type="checkbox" title="<?php echo __('Save this card for future use') ?>" class="input-checkbox" id="<?php echo $_code ?>_store_in_vault" name="payment[store_in_vault]" value="1" />
-            <label for="<?php echo $_code ?>_store_in_vault" style="float:none;"><?php echo __('Save this card for future use') ?></label>
+        <div id="<?php /* @escapeNotVerified */ echo $_code ?>_store_in_vault_div" style="text-align:left;" class="">
+            <input type="checkbox" title="<?php /* @escapeNotVerified */ echo __('Save this card for future use') ?>" class="input-checkbox" id="<?php /* @escapeNotVerified */ echo $_code ?>_store_in_vault" name="payment[store_in_vault]" value="1" />
+            <label for="<?php /* @escapeNotVerified */ echo $_code ?>_store_in_vault" style="float:none;"><?php /* @escapeNotVerified */ echo __('Save this card for future use') ?></label>
         </div>
     </fieldset>
     <?php endif; ?>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/PayPal/shortcut.phtml b/app/code/Magento/Braintree/view/frontend/templates/PayPal/shortcut.phtml
index 2dc3b0d7d85d0..a2e80be40522c 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/PayPal/shortcut.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/PayPal/shortcut.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /** @var \Magento\Braintree\Block\PayPal\Shortcut $block */
 $clientToken = $block->getClientToken();
 $amount = $block->getAmount();
@@ -19,13 +21,13 @@ $paymentDetailsId = $block->getPaymentDetailsId();
 $labelPosition = $block->getShowOrPosition();
 ?>
 <div data-label="<?php echo $block->escapeHtml(__('or')); ?>"
-     class="paypal checkout <?php echo $labelPosition ?> paypal-logo"
+     class="paypal checkout <?php /* @escapeNotVerified */ echo $labelPosition ?> paypal-logo"
     >
     <fieldset class="fieldset paypal items" id="braintree_paypal_shortcut">
-        <div id="<?php echo $containerId ?>"></div>
-        <form id="<?php echo $submitFormId ?>" action="<?php echo $url ?>" method="post" >
-            <input id="<?php echo $paymentMethodNonceId ?>" type="hidden" name="payment_method_nonce" />
-            <input id="<?php echo $paymentDetailsId ?>" type="hidden" name="details" />
+        <div id="<?php /* @escapeNotVerified */ echo $containerId ?>"></div>
+        <form id="<?php /* @escapeNotVerified */ echo $submitFormId ?>" action="<?php /* @escapeNotVerified */ echo $url ?>" method="post" >
+            <input id="<?php /* @escapeNotVerified */ echo $paymentMethodNonceId ?>" type="hidden" name="payment_method_nonce" />
+            <input id="<?php /* @escapeNotVerified */ echo $paymentDetailsId ?>" type="hidden" name="details" />
         </form>
     </fieldset>
 </div>
@@ -47,8 +49,8 @@ $labelPosition = $block->getShowOrPosition();
 ?>
 <script type="text/x-magento-init">
     {
-        "#<?php echo $containerId ?>": {
-            "braintreePayPalShortcut": <?php echo $serializedFormData ?>
+        "#<?php /* @escapeNotVerified */ echo $containerId ?>": {
+            "braintreePayPalShortcut": <?php /* @escapeNotVerified */ echo $serializedFormData ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/creditcard/delete.phtml b/app/code/Magento/Braintree/view/frontend/templates/creditcard/delete.phtml
index d21670f3b0bc5..b9011bdd4f54e 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/creditcard/delete.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/creditcard/delete.phtml
@@ -4,46 +4,48 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
     $creditCard = $block->creditCard();
     $token = $creditCard->token;
 ?>
 <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml();?>
-<form action="<?php echo $block->getDeleteConfirmUrl() ?>" method="post" id="delete-form"
+<form action="<?php /* @escapeNotVerified */ echo $block->getDeleteConfirmUrl() ?>" method="post" id="delete-form"
       xmlns="http://www.w3.org/1999/html">
     <fieldset class="fieldset info">
-        <legend class="legend"><?php echo __('Please confirm that you want to delete this credit card') ?></legend>
+        <legend class="legend"><?php /* @escapeNotVerified */ echo __('Please confirm that you want to delete this credit card') ?></legend>
         <div class="field">
             <ul>
                 <li>
-                    <b><?php echo __('Credit Card Number');?></b>
+                    <b><?php /* @escapeNotVerified */ echo __('Credit Card Number');?></b>
                 </li>
                 <li>
-                    <?php echo $creditCard->maskedNumber;?>
+                    <?php /* @escapeNotVerified */ echo $creditCard->maskedNumber;?>
                 </li>
                 <li>
-                    <b><?php echo __('Expiration Date');?></b>
+                    <b><?php /* @escapeNotVerified */ echo __('Expiration Date');?></b>
                 </li>
                 <li>
-                    <?php echo $creditCard->expirationDate; ?>
+                    <?php /* @escapeNotVerified */ echo $creditCard->expirationDate; ?>
                 </li>
                 <li>
-                    <b><?php echo __('Cardholder Name');?></b>
+                    <b><?php /* @escapeNotVerified */ echo __('Cardholder Name');?></b>
                 </li>
                 <li>
-                    <?php echo $creditCard->cardholderName;?>
+                    <?php /* @escapeNotVerified */ echo $creditCard->cardholderName;?>
                 </li>
             </ul>
         </div>
     </fieldset>
-    <input type="hidden" name="token" value="<?php echo $token ?>">
+    <input type="hidden" name="token" value="<?php /* @escapeNotVerified */ echo $token ?>">
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" id="opc-submit" data-role="opc-submit" class="action save primary"
-                    title="<?php echo __('Delete') ?>" ><?php echo __('Delete') ?></span></button>
+                    title="<?php /* @escapeNotVerified */ echo __('Delete') ?>" ><?php /* @escapeNotVerified */ echo __('Delete') ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->getBackUrl() ?>"><span><span><small>&laquo; </small>
-                        <?php echo __('Back') ?></span></a>
+            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>"><span><span><small>&laquo; </small>
+                        <?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
         </div>
     </div>
 
diff --git a/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml b/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml
index d357428ceb529..073009c4c6eb6 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/creditcard/edit.phtml
@@ -56,18 +56,18 @@ if ($block->isEditMode()) {
 ?>
 <form
     class="form form-edit-credit-card"
-    action='<?php echo $block->getFormAction() ?>'
+    action='<?php /* @escapeNotVerified */ echo $block->getFormAction() ?>'
     method="post" id="form-validate" data-mage-init='{"validation":{}}'>
     <?php echo $block->getBlockHtml('formkey'); ?>
-    <fieldset class="fieldset info" data-hasrequired="<?php echo __('* Required Fields') ?>">
+    <fieldset class="fieldset info" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
         <legend class="legend">
-            <span><?php echo __('Credit Card') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Credit Card') ?></span>
         </legend>
         <br>
 
         <div class="field name required">
             <label for="credit_card_cardholder_name" class="label">
-                <span><?php echo __('Cardholder Name') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Cardholder Name') ?></span>
             </label>
 
             <div class="control">
@@ -75,30 +75,30 @@ if ($block->isEditMode()) {
                     type="text"
                     class="input-text required-entry"
                     id="credit_card_cardholder_name"
-                    value="<?php echo $defaultCardholder ?>"
+                    value="<?php /* @escapeNotVerified */ echo $defaultCardholder ?>"
                     data-validate="{required:true}">
             </div>
         </div>
         <div class="field required type">
             <label for="credit_card_type" class="label">
-                <span><?php echo __('Credit Card Type') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span>
             </label>
 
             <div class="control">
                 <select name="credit_card_type" id="credit_card_type" data-container="credit_card_type"
                         data-validate='{required:true, "validate-cc-type-select":"#credit_card_number"}'>
-                    <option value=""><?php echo __('--Please Select--') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('--Please Select--') ?></option>
                     <?php
                     foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName) :
                         ?>
-                        <option value="<?php echo $_typeCode ?>"
+                        <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"
                             <?php
                             if (stripos($_typeName, $defaultCcType) !== false) :
                                 ?> selected="selected"
                             <?php
                             endif;
                             ?>>
-                            <?php echo $_typeName ?>
+                            <?php /* @escapeNotVerified */ echo $_typeName ?>
                         </option>
                     <?php
                     endforeach;
@@ -108,7 +108,7 @@ if ($block->isEditMode()) {
         </div>
         <div class="field name required">
             <label for="credit_card_number" class="label"><span>
-                        <?php echo __('Credit Card Number') ?></span>
+                        <?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span>
             </label>
 
             <div class="control">
@@ -121,7 +121,7 @@ if ($block->isEditMode()) {
                     <?php
                     if ($block->isEditMode()) :
                         ?>
-                        placeholder="<?php echo $maskedNumber ?>"
+                        placeholder="<?php /* @escapeNotVerified */ echo $maskedNumber ?>"
                     <?php
                     endif;
                     ?>
@@ -130,7 +130,7 @@ if ($block->isEditMode()) {
         </div>
         <div class="field sp-methods required">
             <label for="credit_card_expiration_date" class="label">
-                <span><?php echo __('Expiration Date') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Expiration Date') ?></span>
             </label>
 
             <div class="control">
@@ -147,7 +147,7 @@ if ($block->isEditMode()) {
                                 foreach ($block->getCcMonths() as $k => $v) :
                                     ?>
                                     <option
-                                        value="<?php echo $k ? $k : '' ?>"<?php if ($k == $defaultExpMonth) : ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                        value="<?php echo $k ? $k : '' ?>"<?php if ($k == $defaultExpMonth) : ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                                 <?php
                                 endforeach;
                                 ?>
@@ -174,7 +174,7 @@ if ($block->isEditMode()) {
                                         <?php
                                         endif;
                                         ?>>
-                                        <?php echo $v ?>
+                                        <?php /* @escapeNotVerified */ echo $v ?>
                                     </option>
                                 <?php
                                 endforeach;
@@ -189,13 +189,13 @@ if ($block->isEditMode()) {
         <?php if ($block->hasVerification()): ?>
         <div class="field sp-methods required">
             <label for="credit_card_cvv" class="label">
-                <span><?php echo __('CVV') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('CVV') ?></span>
             </label>
 
             <div class="control">
                 <input
                     type="text"
-                    title="<?php echo __('Card Verification Number') ?>"
+                    title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>"
                     class="input-text cvv required-entry validate-cc-cvn validate-cc-cvn-autodetect"
                     name="credit_card_cvv"
                     data-container="credit_card_cvv"
@@ -209,8 +209,8 @@ if ($block->isEditMode()) {
                 <div class="note">
                     <a href="#" id="credit_card-cvv-what-is-this" class="action cvv"
                        title="<?php echo $block->escapeHtml(__('What is this?')); ?>"
-                       data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'>
-                        <span><?php echo __('What is this?') ?></span>
+                       data-mage-init='{"tooltip": {"content": "<?php /* @escapeNotVerified */ echo $_content ?>"}}'>
+                        <span><?php /* @escapeNotVerified */ echo __('What is this?') ?></span>
                     </a>
                 </div>
             </div>
@@ -224,58 +224,58 @@ if ($block->isEditMode()) {
 
             <div class="control">
                 <input type="checkbox" name="credit_card[options][make_default]" id="credit_card_options_make_default"
-                       value="1" <?php echo $isCCDefault ? "checked" : "" ?>>
+                       value="1" <?php /* @escapeNotVerified */ echo $isCCDefault ? "checked" : "" ?>>
                 <label for="credit_card_options_make_default" class="label">
-                    <span><?php echo __('Make Default') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Make Default') ?></span>
                 </label>
             </div>
         </div>
     </fieldset>
     <fieldset class="fieldset info">
         <legend class="legend">
-            <span><?php echo __('Billing Address') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
         </legend>
         <div class="field name billing_address_first_name required">
             <label for="billing_address_first_name" class="label">
-                <span><?php echo __('First Name') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('First Name') ?></span>
             </label>
 
             <div class="control">
                 <input type="text" class="input-text required-entry " name="credit_card[billing_address][first_name]"
                        id="billing_address_first_name"
-                       value="<?php echo $defaultFirstName ?>"
+                       value="<?php /* @escapeNotVerified */ echo $defaultFirstName ?>"
                        data-validate="{required:true}">
             </div>
         </div>
         <div class="field name billing_address_last_name required">
-            <label for="billing_address_last_name" class="label"><span><?php echo __('Last Name') ?></span></label>
+            <label for="billing_address_last_name" class="label"><span><?php /* @escapeNotVerified */ echo __('Last Name') ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text required-entry " name="credit_card[billing_address][last_name]"
                        id="billing_address_last_name"
-                       value="<?php echo $defaultLastName ?>"
+                       value="<?php /* @escapeNotVerified */ echo $defaultLastName ?>"
                        data-validate="{required:true}">
             </div>
         </div>
         <div class="field name billing_address_company">
-            <label for="billing_address_company" class="label"><span><?php echo __('Company') ?></span></label>
+            <label for="billing_address_company" class="label"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
 
             <div class="control">
                 <input type="text" class="input-text " name="credit_card[billing_address][company]"
                        id="billing_address_company"
-                       value="<?php echo $defaultCompany ?>">
+                       value="<?php /* @escapeNotVerified */ echo $defaultCompany ?>">
             </div>
         </div>
         <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
         <div class="field name billing_address_street_address required">
             <label for="billing_address_street_address" class="label">
-                <span><?php echo __('Address') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Address') ?></span>
             </label>
 
             <div class="control">
                 <input type="text" class="input-text required-entry "
                        name="credit_card[billing_address][street_address]" id="billing_address_street_address"
-                       value="<?php echo $defaultStreetAddress ?>"
+                       value="<?php /* @escapeNotVerified */ echo $defaultStreetAddress ?>"
                        data-validate="{required:true}">
             </div>
         </div>
@@ -287,69 +287,69 @@ if ($block->isEditMode()) {
             <div class="control">
                 <input type="text" class="input-text " name="credit_card[billing_address][extended_address]"
                        id="billing_address_extended_address"
-                       value="<?php echo $defaultExtendedAddress ?>">
+                       value="<?php /* @escapeNotVerified */ echo $defaultExtendedAddress ?>">
             </div>
         </div>
         <div class="field name billing_address_locality required">
             <label for="billing_address_locality" class="label">
-                <span><?php echo __('City') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('City') ?></span>
             </label>
 
             <div class="control">
                 <input type="text" class="input-text required-entry " name="credit_card[billing_address][locality]"
                        id="billing_address_locality"
-                       value="<?php echo $defaultLocality ?>"
+                       value="<?php /* @escapeNotVerified */ echo $defaultLocality ?>"
                        data-validate="{required:true}">
             </div>
         </div>
         <div class="field region billing_address_region required">
             <label for="billing_address_region" class="label">
-                <span><?php echo __('State/Province') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span>
             </label>
 
             <div class="control">
                 <select id="billing_address_region_id" name="credit_card[billing_address][region_id]"
-                        title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;"
+                        title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" style="display:none;"
                         data-validate="{'validate-select':true}">
-                    <option value=""><?php echo __('Please select region, state or province') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Please select region, state or province') ?></option>
                 </select>
                 <input type="text" class="input-text " name="credit_card[billing_address][region]"
                        id="billing_address_region"
-                       value="<?php echo $block->getPostParam('customer.creditCard.billingAddress.region', $defaultRegion) ?>">
+                       value="<?php /* @escapeNotVerified */ echo $block->getPostParam('customer.creditCard.billingAddress.region', $defaultRegion) ?>">
             </div>
         </div>
         <div class="field zip billing_address_postal_code required">
             <label for="billing_address_postal_code" class="label">
-                <span><?php echo __('Zip/Postal Code') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span>
             </label>
             <div class="control">
                 <input type="text" class="input-text required-entry validate-zip-international "
                        name="credit_card[billing_address][postal_code]" id="billing_address_postal_code"
-                       value="<?php echo $defaultPostalCode ?>"
+                       value="<?php /* @escapeNotVerified */ echo $defaultPostalCode ?>"
                        data-validate="{required:true, 'validate-zip-international':true}">
             </div>
         </div>
         <div class="field name billing_address_country required">
             <label for="billing_address_country" class="label">
-                <span><?php echo __('Country') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Country') ?></span>
             </label>
 
             <div class="control">
                 <?php $default = $defaultCountryCodeAlpha2 ?>
-                <?php echo $block->countrySelect('credit_card' . '[billing_address][country_code_alpha2]', 'billing_address_country', $default) ?>
+                <?php /* @escapeNotVerified */ echo $block->countrySelect('credit_card' . '[billing_address][country_code_alpha2]', 'billing_address_country', $default) ?>
             </div>
         </div>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" id="opc-submit" data-role="opc-submit" class="action save primary"
-                    title="<?php echo __('Submit') ?>">
-                <span><?php echo __('Submit') ?></span>
+                    title="<?php /* @escapeNotVerified */ echo __('Submit') ?>">
+                <span><?php /* @escapeNotVerified */ echo __('Submit') ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->getBackUrl() ?>">
-                <span><span><small>&laquo; </small><?php echo __('Back') ?></span>
+            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>">
+                <span><span><small>&laquo; </small><?php /* @escapeNotVerified */ echo __('Back') ?></span>
             </a>
         </div>
     </div>
@@ -375,7 +375,7 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
     {
         "#form-validate": {
             "validation": {},
-             "braintreeEditForm": <?php echo $serializedFormData ?>
+             "braintreeEditForm": <?php /* @escapeNotVerified */ echo $serializedFormData ?>
         },
         "#billing_address_country": {
             "regionUpdater": {
@@ -384,10 +384,10 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
                 "regionInputId": "#billing_address_region",
                 "postcodeId": "#billing_address_region",
                 "form": "#form-validate",
-                "regionJson": <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php echo $defaultRegionId ?>",
+                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
+                "defaultRegion": "<?php /* @escapeNotVerified */ echo $defaultRegionId ?>",
                 "countriesWithOptionalZip":
-                <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
             }
         }
     }
diff --git a/app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml b/app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml
index 41dffe323f2ab..f4cef98141bd9 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/creditcard/index.phtml
@@ -11,7 +11,7 @@
 ?>
 <div class="page-title title-buttons">
     <?php if ($block->getUsesVault()): ?>
-        <button type="button" title="<?php echo __('Add Credit Card') ?>" class="action subscribe primary" onclick="window.location='<?php echo $block->getAddUrl() ?>';"><span><span><?php echo __('Add Credit Card') ?></span></span></button>
+        <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add Credit Card') ?>" class="action subscribe primary" onclick="window.location='<?php /* @escapeNotVerified */ echo $block->getAddUrl() ?>';"><span><span><?php /* @escapeNotVerified */ echo __('Add Credit Card') ?></span></span></button>
     <?php endif ?>
 </div>
 <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
@@ -24,23 +24,23 @@
         <col width="1" />
         <thead>
             <tr>
-                <th><?php echo __('Type') ?></th>
-                <th><?php echo __('Card Number') ?></th>
-                <th><?php echo __('Is Default') ?></th>
-                <th colspan="2"><?php echo __('Actions') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Type') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Card Number') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Is Default') ?></th>
+                <th colspan="2"><?php /* @escapeNotVerified */ echo __('Actions') ?></th>
             </tr>
         </thead>
         <tbody>
             <?php foreach ($_storedCards as $card):?>
                 <tr>
-                    <td><?php echo $card->cardType ?></td>
-                    <td><?php echo $card->maskedNumber ?></td>
-                    <td><?php echo ($card->default) ? __('Yes') : __('No') ?></td>
+                    <td><?php /* @escapeNotVerified */ echo $card->cardType ?></td>
+                    <td><?php /* @escapeNotVerified */ echo $card->maskedNumber ?></td>
+                    <td><?php /* @escapeNotVerified */ echo ($card->default) ? __('Yes') : __('No') ?></td>
                     <td>
-                        <a href="<?php echo $block->getEditUrl($card->token) ?>"><?php echo __('Edit')?></a>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getEditUrl($card->token) ?>"><?php /* @escapeNotVerified */ echo __('Edit')?></a>
                     </td>
                     <td>
-                        <a href="<?php echo $block->getDeleteUrl($card->token) ?>"><?php echo __('Delete')?></a>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getDeleteUrl($card->token) ?>"><?php /* @escapeNotVerified */ echo __('Delete')?></a>
                     </td>
                 </tr>
             <?php endforeach; ?>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/data_js.phtml b/app/code/Magento/Braintree/view/frontend/templates/data_js.phtml
index 7530c47c347b6..cbfe3dcda5f9f 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/data_js.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/data_js.phtml
@@ -21,7 +21,7 @@ $serializedFormData = $this->helper('Magento\Framework\Json\Helper\Data')->jsonE
 <script type="text/x-magento-init">
     {
         "body": {
-             "braintreeDataJs": <?php echo $serializedFormData ?>
+             "braintreeDataJs": <?php /* @escapeNotVerified */ echo $serializedFormData ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Braintree/view/frontend/templates/form.phtml b/app/code/Magento/Braintree/view/frontend/templates/form.phtml
index 84fc758ca4da3..f740ad803b188 100644
--- a/app/code/Magento/Braintree/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Braintree/view/frontend/templates/form.phtml
@@ -14,57 +14,57 @@ $_useVault = $_loggedIn && $block->useVault() && count($_storedCards);
 $_autoDetection = $block->isCcDetectionEnabled();
 $clientToken = $block->getClientToken();
 ?>
-<fieldset class="fieldset items braintree" id="payment_form_<?php echo $_code ?>" style="display:none;">
+<fieldset class="fieldset items braintree" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display:none;">
     <input type="hidden" name="payment[payment_method_nonce]" id="braintree_nonce" value="" />
-    <input type="hidden" name="payment[cc_last4]" id="<?php echo $_code ?>_cc_last4" value="" />
+    <input type="hidden" name="payment[cc_last4]" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_last4" value="" />
     <?php if ($_autoDetection) : ?>
         <input type="hidden" id="card_type_autoselect" value="" />
     <?php endif; ?>
     <?php if ($_useVault): ?>
-        <li id="<?php echo $_code ?>_token_selector">
-            <label for="<?php echo $_code ?>_cc_token"><?php echo __('Payment Information') ?></label>
+        <li id="<?php /* @escapeNotVerified */ echo $_code ?>_token_selector">
+            <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_token"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></label>
             <div class="input-box">
-                <select id="<?php echo $_code ?>_cc_token" name="payment[cc_token]">
+                <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_token" name="payment[cc_token]">
                     <?php foreach ($_storedCards as $creditCard): ?>
-                        <option value="<?php echo $creditCard->token?>" <?php echo $creditCard->default ? 'selected="selected"' : '' ?>>
-                            <?php echo $creditCard->maskedNumber . ' - ' . $creditCard->cardType; ?>
+                        <option value="<?php /* @escapeNotVerified */ echo $creditCard->token?>" <?php echo $creditCard->default ? 'selected="selected"' : '' ?>>
+                            <?php /* @escapeNotVerified */ echo $creditCard->maskedNumber . ' - ' . $creditCard->cardType; ?>
                         </option>
                     <?php endforeach; ?>
-                        <option value=''><?php echo __('Add new card') ?></option>
+                        <option value=''><?php /* @escapeNotVerified */ echo __('Add new card') ?></option>
                 </select>
             </div>
         </li>
     <?php endif; ?>
     <div class="field type required hide_if_token_selected">
-        <label for="<?php echo $_code ?>_cc_type" class="label"><span><?php echo __('Credit Card Type') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type" class="label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span></label>
         <div class="control">
-            <select id="<?php echo $_code ?>_cc_type"
-                    data-mage-init='{"creditCardType":{"creditCardTypeContainer":"#<?php echo $_code ?>_cc_type_ss_div"}}'
-                    name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}' class="select">
-                <option value=""><?php echo __('--Please Select--')?></option>
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"
+                    data-mage-init='{"creditCardType":{"creditCardTypeContainer":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_ss_div"}}'
+                    name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_number"}' class="select">
+                <option value=""><?php /* @escapeNotVerified */ echo __('--Please Select--')?></option>
                 <?php $_ccType = $block->getInfoData('cc_type') ?>
                 <?php foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                    <option value="<?php echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <div class="field number required hide_if_token_selected">
-        <label for="<?php echo $_code ?>_cc_number" class="label"><span><?php echo __('Credit Card Number') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number" class="label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span></label>
         <div class="control">
-            <input type="number" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{"required-number":true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
+            <input type="number" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php /* @escapeNotVerified */ echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{"required-number":true, "validate-cc-number":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type", "validate-cc-type":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"}'/>
         </div>
     </div>
-    <div class="field date required hide_if_token_selected" id="<?php echo $_code ?>_cc_type_exp_div">
-        <label for="<?php echo $_code ?>_expiration" class="label"><span><?php echo __('Expiration Date') ?></span></label>
+    <div class="field date required hide_if_token_selected" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_exp_div">
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo $_code ?>_expiration" name="payment[cc_exp_month]" class="select month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
+                        <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" name="payment[cc_exp_month]" class="select month" data-validate='{required:true, "validate-cc-exp":"#<?php /* @escapeNotVerified */ echo $_code ?>_expiration_yr"}'>
                             <?php $_ccExpMonth = $block->getInfoData('cc_exp_month') ?>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpMonth): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                             <?php endforeach ?>
                         </select>
                     </div>
@@ -72,9 +72,9 @@ $clientToken = $block->getClientToken();
                 <div class="field no-label year">
                     <div class="control">
                         <?php $_ccExpYear = $block->getInfoData('cc_exp_year') ?>
-                        <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="select year" data-validate='{required:true}'>
+                        <select id="<?php /* @escapeNotVerified */ echo $_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 echo $k ? $k : '' ?>"<?php if ($k == $_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpYear): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                             <?php endforeach ?>
                         </select>
                     </div>
@@ -83,22 +83,22 @@ $clientToken = $block->getClientToken();
         </div>
     </div>
     <?php if ($block->hasVerification()): ?>
-        <div class="field cvv required hide_if_token_selected" id="<?php echo $_code ?>_cc_type_cvv_div">
-            <label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
+        <div class="field cvv required hide_if_token_selected" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_cvv_div">
+            <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" class="label"><span><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?></span></label>
             <div class="control">
-                <input type="number" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{"required-number":true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
+                <input type="number" title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"}' />
                 <?php $_content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' . __('Card Verification Number Visual Reference') . '\" title=\"' . __('Card Verification Number Visual Reference') . '\" />'; ?>
                 <div class="note">
-                    <a href="#" class="action cvv" title="<?php echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
+                    <a href="#" class="action cvv" title="<?php /* @escapeNotVerified */ echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php /* @escapeNotVerified */ echo $_content ?>"}}'><span><?php /* @escapeNotVerified */ echo __('What is this?') ?></span></a>
                 </div>
             </div>
         </div>
     <?php endif; ?>
 
     <?php if($block->canSaveCard()): ?>
-        <li id="<?php echo $_code ?>_store_in_vault_div" style="text-align:left;" class="hide_if_token_selected">
-            <input type="checkbox" title="<?php echo __('Save this card for future use') ?>" class="input-checkbox" id="<?php echo $_code ?>_store_in_vault" checked="checked" name="payment[store_in_vault]" value="1" />
-            <label for="<?php echo $_code ?>_store_in_vault" class="required" style="float:none;"><?php echo __('Save this card for future use') ?></label>
+        <li id="<?php /* @escapeNotVerified */ echo $_code ?>_store_in_vault_div" style="text-align:left;" class="hide_if_token_selected">
+            <input type="checkbox" title="<?php /* @escapeNotVerified */ echo __('Save this card for future use') ?>" class="input-checkbox" id="<?php /* @escapeNotVerified */ echo $_code ?>_store_in_vault" checked="checked" name="payment[store_in_vault]" value="1" />
+            <label for="<?php /* @escapeNotVerified */ echo $_code ?>_store_in_vault" class="required" style="float:none;"><?php /* @escapeNotVerified */ echo __('Save this card for future use') ?></label>
         </li>
     <?php endif; ?>
 </fieldset>
@@ -115,7 +115,7 @@ $clientToken = $block->getClientToken();
 <script type="text/x-magento-init">
     {
         "#payment_form_braintree": {
-            "braintreeForm": <?php echo $serializedFormData ?>
+            "braintreeForm": <?php /* @escapeNotVerified */ echo $serializedFormData ?>
         }
     }
 </script>
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 166ae943859bd..2e38aae3d998d 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
@@ -21,7 +21,7 @@ $isElementReadonly = $block->getElement()
 ?>
 
 <?php if (!($attributeCode === 'price' && $block->getCanReadPrice() === false)) { ?>
-    <div class="<?= $attributeCode ?> "><?= $elementHtml ?></div>
+    <div class="<?= /* @escapeNotVerified */  $attributeCode ?> "><?= /* @escapeNotVerified */  $elementHtml ?></div>
 <?php } ?>
 
 <?=$block->getExtendedElement($switchAttributeCode)->toHtml(); ?>
@@ -29,9 +29,9 @@ $isElementReadonly = $block->getElement()
 <?php if (!$isElementReadonly && $block->getDisableChild()) { ?>
     <script>
         require(['prototype'], function () {
-            function <?=$switchAttributeCode?>_change() {
-                var $attribute = $('<?=$attributeCode?>');
-                if ($('<?=$switchAttributeCode?>').value == '<?=$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 = <?=$defaultProductPrice?>;
+                            $attribute.value = <?= /* @escapeNotVerified */ $defaultProductPrice?>;
                         <?php } else { ?>
                             $attribute.disabled = false;
                             $attribute.addClassName('required-entry');
@@ -59,9 +59,9 @@ $isElementReadonly = $block->getElement()
 
             <?php if (!($attributeCode === 'price' && !$block->getCanEditPrice()
                     && !$block->getProduct()->isObjectNew())) { ?>
-                $('<?=$switchAttributeCode?>').observe('change', <?=$switchAttributeCode?>_change);
+                $('<?= /* @escapeNotVerified */ $switchAttributeCode?>').observe('change', <?= /* @escapeNotVerified */ $switchAttributeCode?>_change);
             <?php } ?>
-            <?=$switchAttributeCode?>_change();
+            <?= /* @escapeNotVerified */ $switchAttributeCode?>_change();
         });
     </script>
 <?php } ?>
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 c1f89d31bf4b7..d3d7e3e3717b0 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
@@ -13,7 +13,7 @@
 <?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 echo __('Bundle Items') ?></span></legend><br />
+    <legend class="legend admin__legend"><span><?php /* @escapeNotVerified */ echo __('Bundle Items') ?></span></legend><br />
     <?php foreach ($options as $option) : ?>
         <?php if ($option->getSelections()) : ?>
             <?php echo $block->getOptionHtml($option); ?>
@@ -71,7 +71,7 @@ require([
             }
         }
     };
-    ProductConfigure.bundleControl = new BundleControl(<?php echo $block->getJsonConfig() ?>);
+    ProductConfigure.bundleControl = new BundleControl(<?php /* @escapeNotVerified */ echo $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 3d0db6d73a2ed..bcb6c9df485d9 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
@@ -21,42 +21,42 @@
         <div class="nested <?php if ($_option->getDecoratedIsLast()):?> last<?php endif;?>">
 
             <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-                <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                       name="bundle_option[<?php echo $_option->getId() ?>]"
-                       value="<?php echo $_selections[0]->getSelectionId() ?>"
-                       price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
+                       name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                       value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"
+                       price="<?php /* @escapeNotVerified */ echo $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 echo $_option->getId() ?> <?php if ($_option->getRequired()) echo 'validate-one-required-by-name' ?>"
-                            id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+                            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() ?>"
                             type="checkbox"
-                            name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection->getId() ?>]"
+                            name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][<?php /* @escapeNotVerified */ echo $_selection->getId() ?>]"
                             <?php if ($block->isSelected($_selection)):?>
                                 <?php echo ' checked="checked"'; ?>
                             <?php endif;?>
                             <?php if (!$_selection->isSaleable() && !$_skipSaleableCheck):?>
                                 <?php echo ' disabled="disabled"'; ?>
                             <?php endif;?>
-                            value="<?php echo $_selection->getSelectionId() ?>"
+                            value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
                             onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                            price="<?php echo $block->getSelectionPrice($_selection) ?>" />
+                            price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selection) ?>" />
 
                         <label class="admin__field-label"
-                               for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
-                            <span><?php echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>">
+                            <span><?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
                         </label>
 
                         <?php if ($_option->getRequired()): ?>
-                            <?php echo $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
+                            <?php /* @escapeNotVerified */ echo $block->setValidationContainer('bundle-option-' . $_option->getId() . '-' . $_selection->getSelectionId(), 'bundle-option-' . $_option->getId() . '-container') ?>
                         <?php endif;?>
                     </div>
                 <?php endforeach; ?>
 
-                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_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 777aecaf0a49a..da95ecaa780f7 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
@@ -15,20 +15,20 @@
     <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if (count($_selections) == 1 && $_option->getRequired()): ?>
-            <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]"
-                   value="<?php echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
+            <?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]) ?>" />
         <?php else: ?>
-            <select multiple="multiple" size="5" id="bundle-option-<?php echo $_option->getId() ?>"
-                    name="bundle_option[<?php echo $_option->getId() ?>][]"
-                    class="admin__control-multiselect bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> multiselect change-container-classname"
+            <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"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
             <?php if(!$_option->getRequired()): ?>
-                <option value=""><?php echo __('None') ?></option>
+                <option value=""><?php /* @escapeNotVerified */ echo __('None') ?></option>
             <?php endif; ?>
             <?php foreach ($_selections as $_selection): ?>
-                <option value="<?php echo $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?> price="<?php echo $block->getSelectionPrice($_selection) ?>"><?php echo $block->getSelectionQtyTitlePrice($_selection, false) ?></option>
+                <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>
             <?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 be5e42dbdbeb6..efd26aa3b0f00 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
@@ -19,22 +19,22 @@
     <div class="control admin__field-control">
         <div class="nested<?php if ($_option->getDecoratedIsLast()):?> last<?php endif; ?>">
         <?php if ($block->showSingle()): ?>
-            <?php echo $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   name="bundle_option[<?php echo $_option->getId() ?>]"
-                   value="<?php echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
+                   name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"
+                   price="<?php /* @escapeNotVerified */ echo $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 echo $_option->getId() ?>"
-                           name="bundle_option[<?php echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
+                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
+                           name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"<?php echo ($_default && $_default->isSalable()) ? '' : ' checked="checked" ' ?>
                            value=""
                            onclick="ProductConfigure.bundleControl.changeSelection(this)" />
                     <label class="admin__field-label"
-                           for="bundle-option-<?php echo $_option->getId() ?>"><span><?php echo __('None') ?></span></label>
+                           for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"><span><?php /* @escapeNotVerified */ echo __('None') ?></span></label>
                 </div>
             <?php endif; ?>
 
@@ -42,30 +42,30 @@
                 <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 echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
-                           name="bundle_option[<?php echo $_option->getId() ?>]"
+                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
+                           name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
                            <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
-                           value="<?php echo $_selection->getSelectionId() ?>"
+                           value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
                            onclick="ProductConfigure.bundleControl.changeSelection(this)"
-                           price="<?php echo $block->getSelectionPrice($_selection) ?>"
-                           qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input" />
+                           price="<?php /* @escapeNotVerified */ echo $block->getSelectionPrice($_selection) ?>"
+                           qtyId="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input" />
                     <label class="admin__field-label"
-                           for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"><span><?php echo $block->getSelectionTitlePrice($_selection) ?></span></label>
+                           for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"><span><?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selection) ?></span></label>
                 <?php if ($_option->getRequired()): ?>
-                    <?php echo $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
+                    <?php /* @escapeNotVerified */ echo $block->setValidationContainer('bundle-option-'.$_option->getId().'-'.$_selection->getSelectionId(), 'bundle-option-'.$_option->getId().'-container') ?>
                 <?php endif; ?>
                 </div>
             <?php endforeach; ?>
-            <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+            <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></div>
         <?php endif; ?>
             <div class="field admin__field qty">
                 <label class="label admin__field-label"
-                       for="bundle-option-<?php echo $_option->getId() ?>-qty-input"><span><?php echo __('Quantity:') ?></span></label>
+                       for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"><span><?php /* @escapeNotVerified */ echo __('Quantity:') ?></span></label>
                 <div class="control admin__field-control"><input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                        id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+                        id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
                         class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
                         type="text"
-                        name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
+                        name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $_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 23ccd1f708485..2363e58017c23 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
@@ -18,21 +18,21 @@
     <label class="label admin__field-label"><span><?php echo $block->escapeHtml($_option->getTitle()) ?></span></label>
     <div class="control admin__field-control">
         <?php if ($block->showSingle()): ?>
-            <?php echo $block->getSelectionTitlePrice($_selections[0]) ?>
-            <input type="hidden" name="bundle_option[<?php echo $_option->getId() ?>]"
-                   value="<?php echo $_selections[0]->getSelectionId() ?>"
-                   price="<?php echo $block->getSelectionPrice($_selections[0]) ?>" />
+            <?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]) ?>" />
         <?php else:?>
-            <select id="bundle-option-<?php echo $_option->getId() ?>"
-                    name="bundle_option[<?php echo $_option->getId() ?>]"
-                    class="bundle-option-<?php echo $_option->getId() ?><?php if ($_option->getRequired()) echo ' required-entry' ?> select admin__control-select change-container-classname"
+            <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"
                     onchange="ProductConfigure.bundleControl.changeSelection(this)">
-                <option value=""><?php echo __('Choose a selection...') ?></option>
+                <option value=""><?php /* @escapeNotVerified */ echo __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
                     <option
-                        value="<?php echo $_selection->getSelectionId() ?>"<?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?><?php if (!$_selection->isSaleable() && !$_skipSaleableCheck) echo ' disabled="disabled"' ?>
-                        price="<?php echo $block->getSelectionPrice($_selection) ?>"
-                        qtyId="bundle-option-<?php echo $_option->getId() ?>-qty-input"><?php echo $block->getSelectionTitlePrice($_selection, false) ?></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>
                 <?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 echo $_option->getId() ?>-qty-input"><span><?php echo __('Quantity:') ?></span></label>
+                       for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"><span><?php /* @escapeNotVerified */ echo __('Quantity:') ?></span></label>
                 <div class="control admin__field-control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                        id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+                        id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
                         class="input-text admin__control-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>" type="text"
-                        name="bundle_option_qty[<?php echo $_option->getId() ?>]" value="<?php echo $_defaultQty ?>" />
+                        name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $_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 e7f66de3d88fe..91aec2386ca0c 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
@@ -22,20 +22,20 @@ if(typeof Bundle=='undefined') {
     <div class="fieldset-wrapper admin__collapsible-block-wrapper collapsible-block-wrapper-last" id="bundle_product-wrapper">
         <div class="fieldset-wrapper-title">
             <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#bundle_product-content">
-                <span><?php echo $block->getTabLabel() ?></span>
+                <span><?php /* @escapeNotVerified */ echo $block->getTabLabel() ?></span>
             </strong>
         </div>
         <div class="fieldset-wrapper-content collapse" id="bundle_product-content">
             <fieldset class="fieldset">
                 <div class="field field-ship-bundle-items">
-                    <label for="shipment_type" class="label"><?php echo __('Ship Bundle Items') ?></label>
+                    <label for="shipment_type" class="label"><?php /* @escapeNotVerified */ echo __('Ship Bundle Items') ?></label>
                     <div class="control">
                         <select <?php if ($block->isReadonly()): ?>disabled="disabled" <?php endif;?>
                                 id="shipment_type"
-                                name="<?php echo $block->getFieldSuffix() ?>[shipment_type]"
+                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[shipment_type]"
                                 class="select">
-                            <option value="1"><?php echo __('Separately') ?></option>
-                            <option value="0"<?php if ($block->getProduct()->getShipmentType() == 0): ?> selected="selected"<?php endif; ?>><?php echo __('Together') ?></option>
+                            <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>
                         </select>
                     </div>
                 </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 930f02bfe5e77..ebb9ac5206896 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,10 +9,10 @@
 /** @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 echo $block->getFieldId() ?>_<%- data.index %>" class="option-box">
-        <div class="fieldset-wrapper admin__collapsible-block-wrapper opened" id="<?php echo $block->getFieldId() ?>_<%- data.index %>-wrapper">
+    <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 class="fieldset-wrapper-title">
-                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php echo $block->getFieldId() ?>_<%- data.index %>-content">
+                <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>-content">
                     <span><%- data.default_title %></span>
                 </strong>
                 <div class="actions">
@@ -20,55 +20,55 @@
                 </div>
                 <div data-role="draggable-handle" class="draggable-handle"></div>
             </div>
-            <div class="fieldset-wrapper-content in collapse" id="<?php echo $block->getFieldId() ?>_<%- data.index %>-content">
+            <div class="fieldset-wrapper-content in collapse" id="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldName() ?>_<%- data.index %>_title">
-                                <?php echo __('Option Title') ?>
+                            <label class="label" for="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_title">
+                                <?php /* @escapeNotVerified */ echo __('Option Title') ?>
                             </label>
                             <div class="control">
                                 <?php if ($block->isDefaultStore()): ?>
                                 <input class="input-text required-entry"
                                        type="text"
-                                       name="<?php echo $block->getFieldName() ?>[<%- data.index %>][title]"
-                                       id="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_title"
+                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][title]"
+                                       id="id_<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldName() ?>[<%- data.index %>][default_title]"
-                                       id="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_default_title"
+                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][default_title]"
+                                       id="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_default_title"
                                        value="<%- data.default_title %>"
                                        data-original-value="<%- data.default_title %>" />
                                 <?php endif; ?>
                                 <input type="hidden"
-                                       id="<?php echo $block->getFieldId() ?>_id_<%- data.index %>"
-                                       name="<?php echo $block->getFieldName() ?>[<%- data.index %>][option_id]"
+                                       id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_id_<%- data.index %>"
+                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][option_id]"
                                        value="<%- data.option_id %>" />
                                 <input type="hidden"
-                                       name="<?php echo $block->getFieldName() ?>[<%- data.index %>][delete]"
+                                       name="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldName() ?>_<%- data.index %>_title_store">
-                                <?php echo __('Store View Title') ?>
+                            <label class="label" for="id_<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>_<%- data.index %>_title_store">
+                                <?php /* @escapeNotVerified */ echo __('Store View Title') ?>
                             </label>
                             <div class="control">
                                 <input class="input-text required-entry" type="text"
-                                       name="<?php echo $block->getFieldName() ?>[<%- data.index %>][title]"
-                                       id="id_<?php echo $block->getFieldName() ?>_<%- data.index %>_title_store"
+                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][title]"
+                                       id="id_<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldId() . '_<%- data.index %>_type' ?>">
-                                <?php echo __('Input Type') ?>
+                            <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId() . '_<%- data.index %>_type' ?>">
+                                <?php /* @escapeNotVerified */ echo __('Input Type') ?>
                             </label>
                             <div class="control">
                                 <?php echo $block->getTypeSelectHtml() ?>
@@ -81,19 +81,19 @@
                                        checked="checked"
                                        id="field-option-req" />
                                 <label for="field-option-req">
-                                    <?php echo __('Required')?>
+                                    <?php /* @escapeNotVerified */ echo __('Required')?>
                                 </label>
                                 <span style="display:none"><?php echo $block->getRequireSelectHtml() ?></span>
                             </div>
                         </div>
                         <div class="field field-option-position no-display">
                             <label class="label" for="field-option-position">
-                                <?php echo __('Position') ?>
+                                <?php /* @escapeNotVerified */ echo __('Position') ?>
                             </label>
                             <div class="control">
                                 <input class="input-text validate-zero-or-greater"
                                        type="text"
-                                       name="<?php echo $block->getFieldName() ?>[<%- data.index %>][position]"
+                                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.index %>][position]"
                                        value="<%- data.position %>"
                                        id="field-option-position" />
                             </div>
@@ -101,13 +101,13 @@
                     </fieldset>
 
                     <div class="no-products-message">
-                        <?php echo __('There are no products in this option.')?>
+                        <?php /* @escapeNotVerified */ echo __('There are no products in this option.')?>
                     </div>
                     <?php echo $block->getAddSelectionButtonHtml() ?>
                 </fieldset>
             </div>
         </div>
-        <div id="<?php echo $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
+        <div id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_search_<%- data.index %>" class="selection-search"></div>
     </div>
 </script>
 
@@ -141,7 +141,7 @@ function changeInputType(oldObject, oType) {
 
 Bundle.Option = Class.create();
 Bundle.Option.prototype = {
-    idLabel : '<?php echo $block->getFieldId() ?>',
+    idLabel : '<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>',
     templateText : '',
     itemsCount : 0,
     initialize : function(template) {
@@ -150,7 +150,7 @@ Bundle.Option.prototype = {
 
     add : function(data) {
         if (!data) {
-            data = <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(['default_title' => __('New Option')])?>;
+            data = <?php /* @escapeNotVerified */ echo $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;");
@@ -282,12 +282,12 @@ bOption = new Bundle.Option(optionTemplate);
 <?php
     foreach ($block->getOptions() as $_option) {
         /** @var $_option \Magento\Bundle\Model\Option */
-        echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
+        /* @escapeNotVerified */ echo 'optionIndex = bOption.add(', $_option->toJson(), ');', PHP_EOL;
         if ($_option->getSelections()) {
             foreach ($_option->getSelections() as $_selection) {
                 /** @var $_selection \Magento\Catalog\Model\Product */
                 $_selection->setName($block->escapeHtml($_selection->getName()));
-                echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
+                /* @escapeNotVerified */ echo 'bSelection.addRow(optionIndex,', $_selection->toJson(), ');', PHP_EOL;
             }
         }
     }
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 ef2f2645a5197..11d43466c3942 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 echo __('Default') ?></th>
-                <th class="col-name"><?php echo __('Name') ?></th>
-                <th class="col-sku"><?php echo __('SKU') ?></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>
             <?php if ($block->getCanReadPrice() !== false): ?>
-                <th class="col-price price-type-box"><?php echo __('Price') ?></th>
-                <th class="col-price price-type-box"><?php echo __('Price Type') ?></th>
+                <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>
             <?php endif; ?>
-                <th class="col-qty"><?php echo __('Default Quantity') ?></th>
-                <th class="col-uqty qty-box"><?php echo __('User Defined') ?></th>
-                <th class="col-order type-order" style="display:none"><?php echo __('Position') ?></th>
+                <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-actions"></th>
             </tr>
         </thead>
@@ -33,29 +33,29 @@
 <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 echo $block->getFieldId() ?>_id<%- data.index %>"
-               name="<?php echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
+        <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_id<%- data.index %>"
+               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_id]"
                value="<%- data.selection_id %>"/>
-        <input type="hidden" name="<?php echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
+        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][option_id]"
                value="<%- data.option_id %>"/>
         <input type="hidden" class="product"
-               name="<?php echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
+               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][product_id]"
                value="<%- data.product_id %>"/>
-        <input type="hidden" name="<?php echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][delete]"
+        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][is_default]"
+               name="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldId() ?>_<%- data.index %>_price_value"
+        <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.index %>_price_value"
                class="input-text required-entry validate-zero-or-greater" type="text"
-               name="<?php echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
+               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]"
                value="<%- data.selection_price_value %>"
             <?php if ($block->getCanEditPrice() === false): ?>
                disabled="disabled"
@@ -66,18 +66,18 @@
         <div><?php echo $block->getCheckboxScopeHtml() ?></div>
     </td>
 <?php else: ?>
-    <input type="hidden" id="<?php echo $block->getFieldId(); ?>_<%- data.index %>_price_value"
-           name="<?php echo $block->getFieldName(); ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_value]" value="0" />
-    <input type="hidden" id="<?php echo $block->getFieldId(); ?>_<%- data.index %>_price_type"
-           name="<?php echo $block->getFieldName(); ?>[<%- data.parentIndex %>][<%- data.index %>][selection_price_type]" value="0" />
+    <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" />
     <?php if ($block->isUsedWebsitePrice()): ?>
-    <input type="hidden" id="<?php echo $block->getFieldId(); ?>_<%- data.index %>_price_scope"
-           name="<?php echo $block->getFieldName(); ?>[<%- data.parentIndex %>][<%- data.index %>][default_price_scope]" value="1" />
+    <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" />
     <?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 echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
+               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][selection_qty]"
                value="<%- data.selection_qty %>" />
     </td>
     <td class="col-uqty qty-box">
@@ -86,7 +86,7 @@
     </td>
     <td class="col-order type-order" style="display:none">
         <input class="input-text required-entry validate-zero-or-greater" type="text"
-               name="<?php echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
+               name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.parentIndex %>][<%- data.index %>][position]"
                value="<%- data.position %>" />
     </td>
     <td class="col-actions">
@@ -106,7 +106,7 @@ var bundleTemplateBox = jQuery('#bundle-option-selection-box-template').html(),
 
 Bundle.Selection = Class.create();
 Bundle.Selection.prototype = {
-    idLabel : '<?php echo $block->getFieldId() ?>',
+    idLabel : '<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>',
     scopePrice : <?php echo (int)$block->isUsedWebsitePrice() ?>,
     templateBox : '',
     templateRow : '',
@@ -115,7 +115,7 @@ Bundle.Selection.prototype = {
     gridSelection: new Hash(),
     gridRemoval: new Hash(),
     gridSelectedProductSkus: [],
-    selectionSearchUrl: '<?php echo $block->getSelectionSearchUrl() ?>',
+    selectionSearchUrl: '<?php /* @escapeNotVerified */ echo $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 dbbdb3d5861de..90fd586bf29b0 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 echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -51,7 +51,7 @@
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -69,44 +69,44 @@
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php echo __('Ordered') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <th><?php echo __('Invoiced') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <th><?php echo __('Shipped') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <th><?php echo __('Refunded') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <th><?php echo __('Canceled') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php echo __('Ordered') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <th><?php echo __('Shipped') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_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 echo $_item->getOrderItemId() ?>][back_to_stock]"
+                           name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_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 echo $_item->getOrderItemId() ?>][qty]"
-                           value="<?php echo $_item->getQty()*1 ?>" />
+                           name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][qty]"
+                           value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
                 <?php else: ?>
-                    <?php echo $_item->getQty()*1 ?>
+                    <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
                 <?php endif; ?>
             <?php else: ?>
                 &nbsp;
@@ -152,14 +152,14 @@
         </td>
         <td class="col-tax-amount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('tax_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('discount_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
             <?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 echo $option['label'] ?></dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
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 99572df301e36..8701e37c46155 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 echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -49,7 +49,7 @@
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -65,7 +65,7 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $_item->getQty()*1 ?>
+                <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -79,14 +79,14 @@
         </td>
         <td class="col-tax">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('tax_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('discount_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
             <?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 echo $option['label'] ?></dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
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 51de593040bde..1f0a69a5bff99 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 echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -50,7 +50,7 @@
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -70,44 +70,44 @@
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php echo __('Ordered') ?></th>
-                        <td><span><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+                        <td><span><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></span></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyInvoiced()): ?>
                     <tr>
-                        <th><?php echo __('Invoiced') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <th><?php echo __('Shipped') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyRefunded()): ?>
                     <tr>
-                        <th><?php echo __('Refunded') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getOrderItem()->getQtyCanceled()): ?>
                     <tr>
-                        <th><?php echo __('Canceled') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php echo __('Ordered') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getOrderItem()->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getOrderItem()->getQtyShipped()): ?>
                     <tr>
-                        <th><?php echo __('Shipped') ?></th>
-                        <td><?php echo $_item->getOrderItem()->getQtyShipped()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_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 echo $_item->getOrderItemId() ?>]"
-                           value="<?php echo $_item->getQty()*1 ?>" />
+                           name="invoice[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
+                           value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
                 <?php else : ?>
-                    <?php echo $_item->getQty()*1 ?>
+                    <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
                 <?php endif; ?>
             <?php else: ?>
                 &nbsp;
@@ -138,14 +138,14 @@
         </td>
         <td class="col-tax">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('tax_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('discount_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
             <?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 echo $option['label'] ?></dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
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 e36e011098332..fd6f324f27033 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 echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -49,7 +49,7 @@
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         <?php else: ?>
@@ -66,7 +66,7 @@
         </td>
         <td class="col-qty">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $_item->getQty()*1 ?>
+                <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -80,14 +80,14 @@
         </td>
         <td class="col-tax">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('tax_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('discount_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
             <?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 echo $option['label'] ?></dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['protoype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
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 f8797a30f8938..389c10df78e31 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 echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
             <td>&nbsp;</td>
@@ -50,11 +50,11 @@
     <tr<?php echo (++$_index==$_count && !$_showlastRow)?' class="border"':'' ?>>
         <?php if (!$_item->getParentItem()): ?>
         <td class="col-product">
-            <div class="product-title" id="order_item_<?php echo $_item->getId() ?>_title">
+            <div class="product-title" id="order_item_<?php /* @escapeNotVerified */ echo $_item->getId() ?>_title">
                 <?php echo $block->escapeHtml($_item->getName()) ?>
             </div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -65,14 +65,14 @@
         <?php endif; ?>
         <td class="col-status">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $_item->getStatus() ?>
+                <?php /* @escapeNotVerified */ echo $_item->getStatus() ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-price-original">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('original_price') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('original_price') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
@@ -88,44 +88,44 @@
             <?php if ($block->canShowPriceInfo($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php echo __('Ordered') ?></th>
-                        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyInvoiced()): ?>
                     <tr>
-                        <th><?php echo __('Invoiced') ?></th>
-                        <td><?php echo $_item->getQtyInvoiced()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyInvoiced()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyShipped() && $block->isShipmentSeparately($_item)): ?>
                     <tr>
-                        <th><?php echo __('Shipped') ?></th>
-                        <td><?php echo $_item->getQtyShipped()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyRefunded()): ?>
                     <tr>
-                        <th><?php echo __('Refunded') ?></th>
-                        <td><?php echo $_item->getQtyRefunded()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyRefunded()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                     <?php if ((float) $_item->getQtyCanceled()): ?>
                     <tr>
-                        <th><?php echo __('Canceled') ?></th>
-                        <td><?php echo $_item->getQtyCanceled()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyCanceled()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
             <?php elseif ($block->isShipmentSeparately($_item)): ?>
                 <table class="qty-table">
                     <tr>
-                        <th><?php echo __('Ordered') ?></th>
-                        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
                     </tr>
                     <?php if ((float) $_item->getQtyShipped()): ?>
                     <tr>
-                        <th><?php echo __('Shipped') ?></th>
-                        <td><?php echo $_item->getQtyShipped()*1 ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></td>
                     </tr>
                     <?php endif; ?>
                 </table>
@@ -142,21 +142,21 @@
         </td>
         <td class="col-tax-amount">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('tax_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-tax-percent">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayTaxPercent($_item) ?>
+                <?php /* @escapeNotVerified */ echo $block->displayTaxPercent($_item) ?>
             <?php else: ?>
                 &nbsp;
             <?php endif; ?>
         </td>
         <td class="col-discont">
             <?php if ($block->canShowPriceInfo($_item)): ?>
-                <?php echo $block->displayPriceAttribute('discount_amount') ?>
+                <?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?>
             <?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 echo $option['label'] ?>:</dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?>:</dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
                             
 });
 </script>
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 6a9e4b31871ce..6431212347ff9 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,7 +29,7 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td class="col-product">&nbsp;</td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
@@ -41,7 +41,7 @@
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -59,8 +59,8 @@
             <?php if ($block->isShipmentSeparately($_item)): ?>
                 <input type="text"
                        class="input-text admin__control-text"
-                       name="shipment[items][<?php echo $_item->getOrderItemId() ?>]"
-                       value="<?php echo $_item->getQty()*1 ?>" />
+                       name="shipment[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
+                       value="<?php /* @escapeNotVerified */ echo $_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 echo $option['label'] ?></dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-                            $('<?php echo $_id ?>').hide();
-                            $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-                            $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+                            $('<?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();});
 
 });
 </script>
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 4b6b77ee25644..ac103318785fb 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,7 +29,7 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
         <tr>
-            <td class="col-product"><div class="option-label"><?php echo $attributes['option_label'] ?></div></td>
+            <td class="col-product"><div class="option-label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             <td class="col-qty last">&nbsp;</td>
         </tr>
         <?php $_prevOptionId = $attributes['option_id'] ?>
@@ -40,7 +40,7 @@
         <td class="col-product">
             <div class="product-title"><?php echo $block->escapeHtml($_item->getName()) ?></div>
             <div class="product-sku-block">
-                <span><?php echo __('SKU') ?>:</span>
+                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
             </div>
         </td>
@@ -50,9 +50,9 @@
         <td class="col-qty last">
             <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
                 <?php if (isset($shipItems[$_item->getId()])): ?>
-                    <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
+                    <?php /* @escapeNotVerified */ echo $shipItems[$_item->getId()]->getQty()*1 ?>
                 <?php elseif ($_item->getIsVirtual()): ?>
-                    <?php echo __('N/A') ?>
+                    <?php /* @escapeNotVerified */ echo __('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 echo $option['label'] ?></dt>
+                    <dt><?php /* @escapeNotVerified */ echo $option['label'] ?></dt>
                     <dd>
                     <?php if (isset($option['custom_view']) && $option['custom_view']): ?>
-                        <?php echo $option['value'];?>
+                        <?php /* @escapeNotVerified */ echo $option['value'];?>
                     <?php else: ?>
                         <?php echo $block->truncateString($option['value'], 55, '', $_remainder);?>
                         <?php if ($_remainder):?>
-                            ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                            ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                             <script>
 require(['prototype'], function(){
 
-                            $('<?php echo $_id ?>').hide();
-                            $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-                            $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+                            $('<?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();});
 
 });
 </script>
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
index 641e3ca1a0d4c..406ca0cd37c52 100644
--- a/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
+++ b/app/code/Magento/Bundle/view/base/templates/product/price/final_price.phtml
@@ -23,14 +23,14 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
 ?>
 <?php if ($block->getSaleableItem()->getPriceView()): ?>
     <p class="minimal-price">
-        <?php echo $block->renderAmount($minimalPrice, [
+        <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
             'display_label'     => __('As low as'),
             'price_id'          => $block->getPriceId('from-'),
             'include_container' => true
         ]); ?>
         <?php if ($minimalPrice < $minimalRegularPrice): ?>
             <span class="old-price">
-                <?php echo $block->renderAmount($minimalRegularPrice, [
+                <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
                     'display_label'     => __('Regular Price'),
                     'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                     'include_container' => true,
@@ -42,7 +42,7 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
 <?php else: ?>
     <?php if ($block->showRangePrice()): ?>
         <p class="price-from">
-            <?php echo $block->renderAmount($minimalPrice, [
+            <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
                 'display_label'     => __('From'),
                 'price_id'          => $block->getPriceId('from-'),
                 'price_type'        => 'minPrice',
@@ -50,7 +50,7 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
             ]); ?>
             <?php if ($minimalPrice < $minimalRegularPrice): ?>
                 <span class="old-price">
-                    <?php echo $block->renderAmount($minimalRegularPrice, [
+                    <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
                         'display_label'     => __('Regular Price'),
                         'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                         'include_container' => true,
@@ -60,7 +60,7 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
             <?php endif ?>
         </p>
         <p class="price-to">
-            <?php echo $block->renderAmount($maximalPrice, [
+            <?php /* @escapeNotVerified */ echo $block->renderAmount($maximalPrice, [
                 'display_label'     => __('To'),
                 'price_id'          => $block->getPriceId('to-'),
                 'price_type'        => 'maxPrice',
@@ -68,7 +68,7 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
             ]); ?>
             <?php if ($maximalPrice < $maximalRegularPrice): ?>
                 <span class="old-price">
-                    <?php echo $block->renderAmount($maximalRegularPrice, [
+                    <?php /* @escapeNotVerified */ echo $block->renderAmount($maximalRegularPrice, [
                         'display_label'     => __('Regular Price'),
                         'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                         'include_container' => true,
@@ -78,13 +78,13 @@ $minimalRegularPrice = $regularPriceModel->getMinimalPrice();
             <?php endif ?>
         </p>
     <?php else: ?>
-        <?php echo $block->renderAmount($minimalPrice, [
+        <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalPrice, [
             'price_id'          => $block->getPriceId('product-price-'),
             'include_container' => true
         ]); ?>
         <?php if ($minimalPrice < $minimalRegularPrice): ?>
             <span class="old-price">
-                <?php echo $block->renderAmount($minimalRegularPrice, [
+                <?php /* @escapeNotVerified */ echo $block->renderAmount($minimalRegularPrice, [
                     'display_label'     => __('Regular Price'),
                     'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
                     'include_container' => true,
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 2d086144e4cd7..cc12d224423fc 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 echo $block->formatCurrency($block->getDisplayValue(), (bool) $block->getIncludeContainer()) ?>
+<?php /* @escapeNotVerified */ echo $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 d675f89cf4bd4..2c6f76ea1cdef 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,10 +16,10 @@ $tierPriceModel = $block->getPrice();
 $tierPrices = $tierPriceModel->getTierPriceList();
 ?>
 <?php if (count($tierPrices)) : ?>
-    <ul class="<?php echo($block->hasListClass() ? $block->getListClass() : 'prices tier items'); ?>">
+    <ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices tier items'); ?>">
         <?php foreach ($tierPrices as $index => $price) : ?>
             <li class="item">
-                <?php echo __(
+                <?php /* @escapeNotVerified */ echo __(
                     'Buy %1 with %2 discount each',
                     $price['price_qty'],
                     '<strong class="benefit">' . $tierPriceModel->getSavePercent($price['price']) . '%</strong>'
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 8d7c25a5cdd94..9fc6ebf07cedf 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 echo __('Go back to product details') ?></span>
+    <span><?php /* @escapeNotVerified */ echo __('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 9e48fea9f14c0..ea9e41ee74afa 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 echo __('Customize and Add to Cart'); ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('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 5b01fdbc5f75f..ede939664d56f 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 echo __('* Required Fields') ?></p>
+<p class="required"><?php /* @escapeNotVerified */ echo __('* 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 5936b82445cd3..10bcf37de60dd 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,7 +16,7 @@
      class="block-bundle-summary"
      data-mage-init='{"sticky":{"container": ".product-add-form"}}'>
     <div class="title">
-        <strong><?php echo __('Your Customization'); ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Your Customization'); ?></strong>
     </div>
     <div class="content">
         <div class="bundle-info">
@@ -24,19 +24,19 @@
             <div class="product-details">
                 <strong class="product name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
                 <?php if ($_product->getIsSalable()): ?>
-                    <p class="available stock" title="<?php echo __('Availability') ?>">
-                        <span><?php echo __('In stock') ?></span>
+                    <p class="available stock" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
                     </p>
                 <?php else: ?>
-                    <p class="unavailable stock" title="<?php echo __('Availability') ?>">
-                        <span><?php echo __('Out of stock') ?></span>
+                    <p class="unavailable stock" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
                     </p>
                 <?php endif; ?>
                 <?php echo $block->getChildHtml('', true);?>
             </div>
         </div>
         <div class="bundle-summary">
-            <strong class="subtitle"><?php echo __('Summary'); ?></strong>
+            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('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 echo __('%1 x %2', '<%- data._quantity_ %>', '<%- data._label_ %>') ?></div>
+                    <div><?php /* @escapeNotVerified */ echo __('%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 99de583042b28..3bf728ddf607b 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,12 +11,12 @@
 <?php $_product = $block->getProduct() ?>
 <?php if ($block->displayProductStockStatus()): ?>
     <?php if ($_product->isAvailable()): ?>
-        <p class="stock available" title="<?php echo __('Availability:') ?>">
-            <span><?php echo __('In stock') ?></span>
+        <p class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability:') ?>">
+            <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
         </p>
     <?php else: ?>
-        <p class="stock unavailable" title="<?php echo __('Availability:') ?>">
-            <span><?php echo __('Out of stock') ?></span>
+        <p class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability:') ?>">
+            <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
         </p>
     <?php endif; ?>
 <?php endif; ?>
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 505a554fe65a1..b1ad3903d1223 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
@@ -18,29 +18,29 @@
     <div class="control">
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
-                <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+                <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                       class="bundle-option-<?php echo $_option->getId() ?>  product bundle option"
-                       name="bundle_option[<?php echo $_option->getId() ?>]"
-                       value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+                       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() ?>"/>
             <?php else:?>
                 <?php foreach($_selections as $_selection): ?>
                     <div class="field choice">
-                        <input class="bundle-option-<?php echo $_option->getId() ?> checkbox product bundle option change-container-classname"
-                               id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+                        <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() ?>"
                                type="checkbox"
                                <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' . $_option->getId() . ']&quot;]:checked\'}"'?>
-                               name="bundle_option[<?php echo $_option->getId() ?>][<?php echo $_selection->getId() ?>]"
+                               name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][<?php /* @escapeNotVerified */ echo $_selection->getId() ?>]"
                                <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
                                <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
-                               value="<?php echo $_selection->getSelectionId() ?>"/>
+                               value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"/>
                         <label class="label"
-                               for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
-                            <span><?php echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>">
+                            <span><?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selection) ?></span>
                         </label>
                     </div>
                 <?php endforeach; ?>
-                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_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 81cb30bc6f7cf..793a8c4c9f302 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
@@ -11,30 +11,30 @@
 <?php $_option = $block->getOption() ?>
 <?php $_selections = $_option->getSelections() ?>
 <div class="field option <?php echo ($_option->getRequired()) ? ' required': ''; ?>">
-    <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
+    <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
         <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <?php if ($block->showSingle()): ?>
-            <?php echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
+            <?php /* @escapeNotVerified */ echo $block->getSelectionQtyTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   name="bundle_option[<?php echo $_option->getId() ?>]"
-                   value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+                   name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                   value="<?php /* @escapeNotVerified */ echo $_selections[0]->getSelectionId() ?>"/>
         <?php else: ?>
             <select multiple="multiple"
                     size="5"
-                    id="bundle-option-<?php echo $_option->getId() ?>"
-                    name="bundle_option[<?php echo $_option->getId() ?>][]"
-                    class="bundle-option-<?php echo $_option->getId() ?> multiselect product bundle option change-container-classname"
+                    id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
+                    name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>][]"
+                    class="bundle-option-<?php /* @escapeNotVerified */ echo $_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 echo __('None') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('None') ?></option>
                 <?php endif; ?>
                 <?php foreach ($_selections as $_selection): ?>
-                    <option value="<?php echo $_selection->getSelectionId() ?>"
+                    <option value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
                             <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
                             <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
-                        <?php echo $block->getSelectionQtyTitlePrice($_selection, false) ?>
+                        <?php /* @escapeNotVerified */ echo $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 5dc71ec3aaa92..68fe17b7c2281 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
@@ -20,22 +20,22 @@
     <div class="control">
         <div class="nested options-list">
             <?php if ($block->showSingle()): ?>
-                <?php echo $block->getSelectionTitlePrice($_selections[0]) ?>
+                <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
                 <input type="hidden"
-                       class="bundle-option-<?php echo $_option->getId() ?>  product bundle option"
-                       name="bundle_option[<?php echo $_option->getId() ?>]"
-                       value="<?php echo $_selections[0]->getSelectionId() ?>" />
+                       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() ?>" />
             <?php else:?>
                 <?php if (!$_option->getRequired()): ?>
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option"
-                               id="bundle-option-<?php echo $_option->getId() ?>"
-                               name="bundle_option[<?php echo $_option->getId() ?>]"
+                               id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
+                               name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
                                <?php echo ($_default && $_default->isSalable())?'':' checked="checked" ' ?>
                                value=""/>
-                        <label class="label" for="bundle-option-<?php echo $_option->getId() ?>">
-                            <span><?php echo __('None') ?></span>
+                        <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
+                            <span><?php /* @escapeNotVerified */ echo __('None') ?></span>
                         </label>
                     </div>
                 <?php endif; ?>
@@ -43,31 +43,31 @@
                     <div class="field choice">
                         <input type="radio"
                                class="radio product bundle option change-container-classname"
-                               id="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>"
+                               id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
                                <?php if ($_option->getRequired()) echo 'data-validate="{\'validate-one-required-by-name\':true}"'?>
-                               name="bundle_option[<?php echo $_option->getId() ?>]"
+                               name="bundle_option[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
                                <?php if ($block->isSelected($_selection)) echo ' checked="checked"' ?>
                                <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>
-                               value="<?php echo $_selection->getSelectionId() ?>"/>
+                               value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"/>
                         <label class="label"
-                               for="bundle-option-<?php echo $_option->getId() ?>-<?php echo $_selection->getSelectionId() ?>">
-                            <span><?php echo $block->getSelectionTitlePrice($_selection) ?></span>
+                               for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>">
+                            <span><?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selection) ?></span>
                         </label>
                     </div>
                 <?php endforeach; ?>
-                <div id="bundle-option-<?php echo $_option->getId() ?>-container"></div>
+                <div id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-container"></div>
             <?php endif; ?>
             <div class="field qty qty-holder">
-                <label class="label" for="bundle-option-<?php echo $_option->getId() ?>-qty-input">
-                    <span><?php echo __('Quantity') ?></span>
+                <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input">
+                    <span><?php /* @escapeNotVerified */ echo __('Quantity') ?></span>
                 </label>
                 <div class="control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                           id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
                            class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
                            type="number"
-                           name="bundle_option_qty[<?php echo $_option->getId() ?>]"
-                           value="<?php echo $_defaultQty ?>"/>
+                           name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                           value="<?php /* @escapeNotVerified */ echo $_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 b2737e90aa10f..2d4c2d6f41b4e 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
@@ -14,43 +14,43 @@
 <?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 echo $_option->getId() ?>">
+    <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>">
         <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
     </label>
     <div class="control">
         <?php if ($block->showSingle()): ?>
-            <?php echo $block->getSelectionTitlePrice($_selections[0]) ?>
+            <?php /* @escapeNotVerified */ echo $block->getSelectionTitlePrice($_selections[0]) ?>
             <input type="hidden"
-                   class="bundle-option-<?php echo $_option->getId() ?>  product bundle option"
-                   name="bundle_option[<?php echo $_option->getId() ?>]"
-                   value="<?php echo $_selections[0]->getSelectionId() ?>"/>
+                   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() ?>"/>
         <?php else:?>
-            <select id="bundle-option-<?php echo $_option->getId() ?>"
-                    name="bundle_option[<?php echo $_option->getId() ?>]"
-                    class="bundle-option-<?php echo $_option->getId() ?> product bundle option bundle-option-select change-container-classname"
+            <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() ?> product bundle option bundle-option-select change-container-classname"
                 <?php if ($_option->getRequired()) echo 'data-validate = {required:true}' ?>>
-                <option value=""><?php echo __('Choose a selection...') ?></option>
+                <option value=""><?php /* @escapeNotVerified */ echo __('Choose a selection...') ?></option>
                 <?php foreach ($_selections as $_selection): ?>
-                    <option value="<?php echo $_selection->getSelectionId() ?>"
+                    <option value="<?php /* @escapeNotVerified */ echo $_selection->getSelectionId() ?>"
                         <?php if ($block->isSelected($_selection)) echo ' selected="selected"' ?>
                         <?php if (!$_selection->isSaleable()) echo ' disabled="disabled"' ?>>
-                        <?php echo $block->getSelectionTitlePrice($_selection, false) ?>
+                        <?php /* @escapeNotVerified */ echo $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 echo $_option->getId() ?>-qty-input">
-                    <span><?php echo __('Quantity') ?></span>
+                <label class="label" for="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input">
+                    <span><?php /* @escapeNotVerified */ echo __('Quantity') ?></span>
                 </label>
                 <div class="control">
                     <input <?php if (!$_canChangeQty) echo ' disabled="disabled"' ?>
-                           id="bundle-option-<?php echo $_option->getId() ?>-qty-input"
+                           id="bundle-option-<?php /* @escapeNotVerified */ echo $_option->getId() ?>-qty-input"
                            class="input-text qty<?php if (!$_canChangeQty) echo ' qty-disabled' ?>"
                            type="number"
-                           name="bundle_option_qty[<?php echo $_option->getId() ?>]"
-                           value="<?php echo $_defaultQty ?>"/>
+                           name="bundle_option_qty[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
+                           value="<?php /* @escapeNotVerified */ echo $_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 278c7d501f22d..40f152cf2581d 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 echo $block->getJsonConfig()?>,
+                "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field.option"
             }
         }
@@ -27,7 +27,7 @@ $helper = $this->helper('Magento\Catalog\Helper\Output');
 </script>
         <fieldset class="fieldset bundle options">
             <legend id="customizeTitle" class="legend title">
-                <span><?php echo __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Customize %1', $helper->productAttribute($product, $product->getName(), 'name')) ?></span>
             </legend><br />
             <?php echo $block->getChildHtml('product_info_bundle_options_top');?>
             <?php foreach ($options as $option): ?>
@@ -38,6 +38,6 @@ $helper = $this->helper('Magento\Catalog\Helper\Output');
             <?php endforeach; ?>
         </fieldset>
     <?php else: ?>
-        <p class="empty"><?php echo __('No options of this product are available.') ?></p>
+        <p class="empty"><?php /* @escapeNotVerified */ echo __('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 a75d15983dd36..3f43495016c36 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
@@ -35,7 +35,7 @@
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="bundle-option-label">
                 <td colspan="3">
-                    <strong><?= $attributes['option_label'] ?></strong>
+                    <strong><?= /* @escapeNotVerified */  $attributes['option_label'] ?></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
@@ -45,7 +45,7 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= __('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">
@@ -55,14 +55,14 @@
     <?php endif; ?>
             <td class="item-qty">
                 <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= $_item->getQty() * 1 ?>
+                    <?= /* @escapeNotVerified */  $_item->getQty() * 1 ?>
                 <?php else: ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
             <td class="item-price">
                 <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= $block->getItemPrice($_item) ?>
+                    <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
                 <?php else: ?>
                     &nbsp;
                 <?php endif; ?>
@@ -77,8 +77,8 @@
             <?php if ($block->getItemOptions()): ?>
                 <dl>
                     <?php foreach ($block->getItemOptions() as $option): ?>
-                        <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-                                    <dd><?= $option['value'] ?></dd>
+                        <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                                    <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/invoice/default.phtml
index cdbf8f57a3ff1..da5f06b8b60a8 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
@@ -36,7 +36,7 @@
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="bundle-option-label">
                 <td colspan="3">
-                    <strong><em><?= $attributes['option_label'] ?></em></strong>
+                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
@@ -46,7 +46,7 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= __('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">
@@ -56,14 +56,14 @@
     <?php endif; ?>
             <td class="item-qty">
                 <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= $_item->getQty() * 1 ?>
+                    <?= /* @escapeNotVerified */  $_item->getQty() * 1 ?>
                 <?php else: ?>
                     &nbsp;
                 <?php endif; ?>
             </td>
             <td class="item-price">
                 <?php if ($block->canShowPriceInfo($_item)): ?>
-                    <?= $block->getItemPrice($_item) ?>
+                    <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
                 <?php else: ?>
                     &nbsp;
                 <?php endif; ?>
@@ -78,8 +78,8 @@
             <?php if ($block->getItemOptions()): ?>
                 <dl>
                     <?php foreach ($block->getItemOptions() as $option): ?>
-                        <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-                                    <dd><?= $option['value'] ?></dd>
+                        <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                                    <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
                     <?php endforeach; ?>
                 </dl>
             <?php endif; ?>
diff --git a/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml b/app/code/Magento/Bundle/view/frontend/templates/email/order/items/order/default.phtml
index b5b4dbe28a185..73581c053a204 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
@@ -29,7 +29,7 @@
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="bundle-option-label">
                 <td colspan="3">
-                    <strong><em><?= $attributes['option_label'] ?></em></strong>
+                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
@@ -39,13 +39,13 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
+                <p class="sku"><?= /* @escapeNotVerified */  __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
             </td>
             <td class="item-qty">
-                <?= $_item->getQtyOrdered() * 1 ?>
+                <?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?>
             </td>
             <td class="item-price">
-                <?= $block->getItemPrice($_item); ?>
+                <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
             </td>
         </tr>
     <?php else: ?>
@@ -64,8 +64,8 @@
             <?php if ($block->getItemOptions()): ?>
             <dl>
                 <?php foreach ($block->getItemOptions() as $option): ?>
-                <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-                            <dd><?= $option['value'] ?></dd>
+                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
                 <?php endforeach; ?>
             </dl>
             <?php endif; ?>
@@ -73,10 +73,10 @@
                 <table class="message-gift">
                     <tr>
                         <td>
-                            <h3><?= __('Gift Message') ?></h3>
-                            <strong><?= __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                            <br /><strong><?= __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                            <br /><strong><?= __('Message:'); ?></strong>
+                            <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>
                             <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 aafeefc5e7351..4a79c1bd4dd03 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
@@ -29,7 +29,7 @@
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="bundle-option-label">
                 <td colspan="2">
-                    <strong><em><?= $attributes['option_label'] ?></em></strong>
+                    <strong><em><?= /* @escapeNotVerified */  $attributes['option_label'] ?></em></strong>
                 </td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
@@ -39,7 +39,7 @@
         <tr class="bundle-item bundle-parent">
             <td class="item-info">
                 <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-                <p class="sku"><?= __('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">
@@ -50,9 +50,9 @@
             <td class="item-qty">
                 <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
                     <?php if (isset($shipItems[$_item->getId()])): ?>
-                        <?= $shipItems[$_item->getId()]->getQty() * 1 ?>
+                        <?= /* @escapeNotVerified */  $shipItems[$_item->getId()]->getQty() * 1 ?>
                     <?php elseif ($_item->getIsVirtual()): ?>
-                        <?= __('N/A') ?>
+                        <?= /* @escapeNotVerified */  __('N/A') ?>
                     <?php else: ?>
                         0
                     <?php endif; ?>
@@ -70,8 +70,8 @@
             <?php if ($block->getItemOptions()): ?>
             <dl>
                 <?php foreach ($block->getItemOptions() as $option): ?>
-                <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-                            <dd><?= $option['value'] ?></dd>
+                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+                            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
                 <?php endforeach; ?>
             </dl>
             <?php endif; ?>
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 b1cd0917932c0..72cbf3f1494b3 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,12 +29,12 @@
         <?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 echo $attributes['option_label'] ?></div></td>
+                <td class="col label" colspan="7"><div class="option label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?php 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 echo $attributes['option_label'] ?>"<?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; ?>>
     <?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>
@@ -52,7 +52,7 @@
     </td>
     <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Quantity')); ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $_item->getQty()*1 ?>
+            <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
@@ -66,7 +66,7 @@
     </td>
     <td class="col discount" data-th="<?php echo $block->escapeHtml(__('Discount Amount')); ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $block->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
+            <?php /* @escapeNotVerified */ echo $block->getOrder()->formatPrice(-$_item->getDiscountAmount()) ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
@@ -91,12 +91,12 @@
                         <?php if (!$block->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?php echo $_formatedOptionValue['value'] ?>
+                                <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?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 541390798c29e..8b9704a42889f 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,12 +28,12 @@
         <?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 echo $attributes['option_label'] ?></div></td>
+                <td class="col label" colspan="5"><div class="option label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr id="order-item-row-<?php 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 echo $attributes['option_label'] ?>"<?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; ?>>
     <?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>
@@ -51,7 +51,7 @@
     </td>
     <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>">
         <?php if ($block->canShowPriceInfo($_item)): ?>
-            <?php echo $_item->getQty()*1 ?>
+            <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
         <?php else: ?>
             &nbsp;
         <?php endif; ?>
@@ -76,12 +76,12 @@
                         <?php if (!$block->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?php echo $_formatedOptionValue['value'] ?>
+                                <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?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 e3061c2df35d6..d45f9be6b737f 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,12 +27,12 @@
         <?php $attributes = $block->getSelectionAttributes($_item) ?>
         <?php if ($_prevOptionId != $attributes['option_id']): ?>
             <tr class="options-label">
-                <td class="col label" colspan="5"><?php echo $attributes['option_label'] ?></td>
+                <td class="col label" colspan="5"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?php echo $attributes['option_label'] ?>"<?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; ?>>
     <?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>
@@ -40,7 +40,7 @@
     <?php else: ?>
         <td class="col value" data-th="<?php echo $block->escapeHtml(__('Product Name')); ?>"><?php echo $block->getValueHtml($_item)?></td>
     <?php endif; ?>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($_item->getSku()) ?></td>
+    <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')); ?>">
         <?php if (!$_item->getParentItem()): ?>
             <?php echo $block->getItemPriceHtml(); ?>
@@ -58,32 +58,32 @@
             (!$_item->getParentItem() && !$block->isChildCalculated())): ?>
             <?php if ($_item->getQtyOrdered() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Ordered'); ?></span>
-                    <span class="content"><?php echo $_item->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Ordered'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($_item->getQtyShipped() > 0 && !$block->isShipmentSeparately()): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Shipped'); ?></span>
-                    <span class="content"><?php echo $_item->getQtyShipped()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($_item->getQtyCanceled() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Canceled'); ?></span>
-                    <span class="content"><?php echo $_item->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Canceled'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyCanceled()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($_item->getQtyRefunded() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Refunded'); ?></span>
-                    <span class="content"><?php echo $_item->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Refunded'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyRefunded()*1 ?></span>
                 </li>
             <?php endif; ?>
         <?php elseif ($_item->getQtyShipped() > 0 && $_item->getParentItem() && $block->isShipmentSeparately()): ?>
             <li class="item">
-                <span class="title"><?php echo __('Shipped'); ?></span>
-                <span class="content"><?php echo $_item->getQtyShipped()*1 ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
+                <span class="content"><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></span>
             </li>
         <?php else: ?>
             &nbsp;
@@ -114,12 +114,12 @@
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?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 e7b304935cd49..8b9662a9b3a93 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,12 +29,12 @@
         <?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 echo $attributes['option_label'] ?></div></td>
+                <td colspan="3" class="col label"><div class="option label"><?php /* @escapeNotVerified */ echo $attributes['option_label'] ?></div></td>
             </tr>
             <?php $_prevOptionId = $attributes['option_id'] ?>
         <?php endif; ?>
     <?php endif; ?>
-    <tr id="order-item-row-<?php echo $_item->getId() ?>" class="<?php if ($_item->getParentItem()): ?>item-options-container<?php else: ?>item-parent<?php endif; ?>"<?php if ($_item->getParentItem()): ?> data-th="<?php echo $attributes['option_label'] ?>"<?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; ?>>
         <?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>
@@ -46,9 +46,9 @@
         <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Shipped')); ?>">
             <?php if (($block->isShipmentSeparately() && $_item->getParentItem()) || (!$block->isShipmentSeparately() && !$_item->getParentItem())): ?>
                 <?php if (isset($shipItems[$_item->getId()])): ?>
-                    <?php echo $shipItems[$_item->getId()]->getQty()*1 ?>
+                    <?php /* @escapeNotVerified */ echo $shipItems[$_item->getId()]->getQty()*1 ?>
                 <?php elseif ($_item->getIsVirtual()): ?>
-                    <?php echo __('N/A') ?>
+                    <?php /* @escapeNotVerified */ echo __('N/A') ?>
                 <?php else: ?>
                     0
                 <?php endif; ?>
@@ -69,12 +69,12 @@
                         <?php if (!$block->getPrintStatus()): ?>
                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                                <?php echo $_formatedOptionValue['value'] ?>
+                                <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                         </dl>
                                     </div>
                                 <?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 d8811b0a29338..150516ffe98ec 100644
--- a/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/adminhtml/templates/default.phtml
@@ -12,18 +12,18 @@
 <?php $captcha = $block->getCaptchaModel() ?>
 <div class="admin__field _required">
     <label for="captcha" class="admin__field-label">
-        <span><?php echo __('Please enter the letters from the image') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 \Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE ?>[<?php echo $block->getFormId()?>]"
+            name="<?php /* @escapeNotVerified */ echo \Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE ?>[<?php /* @escapeNotVerified */ echo $block->getFormId()?>]"
             data-validate="{required:true}"/>
         <?php if ($captcha->isCaseSensitive()) :?>
             <div class="admin__field-note">
-                <span><?php echo __('<strong>Attention</strong>: Captcha is case sensitive.') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('<strong>Attention</strong>: Captcha is case sensitive.') ?></span>
             </div>
         <?php endif; ?>
     </div>
@@ -32,19 +32,19 @@
     <img
         id="captcha-reload"
         class="captcha-reload"
-        src="<?php echo $block->getViewFileUrl('Magento_Captcha::reload.png') ?>"
-        alt="<?php echo __('Reload captcha') ?>"/>
+        src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('Magento_Captcha::reload.png') ?>"
+        alt="<?php /* @escapeNotVerified */ echo __('Reload captcha') ?>"/>
     <img
-        id="<?php echo $block->getFormId() ?>"
-        width="<?php echo $block->getImgWidth() ?>"
-        height="<?php echo $block->getImgHeight() ?>"
-        src="<?php echo $captcha->getImgSrc() ?>" />
+        id="<?php /* @escapeNotVerified */ echo $block->getFormId() ?>"
+        width="<?php /* @escapeNotVerified */ echo $block->getImgWidth() ?>"
+        height="<?php /* @escapeNotVerified */ echo $block->getImgHeight() ?>"
+        src="<?php /* @escapeNotVerified */ echo $captcha->getImgSrc() ?>" />
 </div>
 <script>
     require(["prototype", "mage/captcha"], function(){
 
 //<![CDATA[
-        var captcha = new Captcha('<?php echo $block->getRefreshUrl() ?>', '<?php echo $block->getFormId() ?>');
+        var captcha = new Captcha('<?php /* @escapeNotVerified */ echo $block->getRefreshUrl() ?>', '<?php /* @escapeNotVerified */ echo $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 7ada062a71b97..fe6730c110257 100644
--- a/app/code/Magento/Captcha/view/frontend/templates/default.phtml
+++ b/app/code/Magento/Captcha/view/frontend/templates/default.phtml
@@ -10,25 +10,25 @@
 <?php /* @var $captcha \Magento\Captcha\Model\DefaultModel */ ?>
 <?php /* @var $block \Magento\Captcha\Block\Captcha\DefaultCaptcha */ ?>
 <?php $captcha = $block->getCaptchaModel() ?>
-<div class="field captcha required" role="<?php echo $block->getFormId()?>">
-    <label for="captcha_<?php echo $block->getFormId() ?>" class="label"><span><?php echo __('Please type the letters below')?></span></label>
+<div class="field captcha required" role="<?php /* @escapeNotVerified */ echo $block->getFormId()?>">
+    <label for="captcha_<?php /* @escapeNotVerified */ echo $block->getFormId() ?>" class="label"><span><?php /* @escapeNotVerified */ echo __('Please type the letters below')?></span></label>
     <div class="control captcha">
-        <input name="<?php echo \Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE ?>[<?php echo $block->getFormId()?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?php echo $block->getFormId() ?>" />
+        <input name="<?php /* @escapeNotVerified */ echo \Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE ?>[<?php /* @escapeNotVerified */ echo $block->getFormId()?>]" type="text" class="input-text required-entry" data-validate="{required:true}" id="captcha_<?php /* @escapeNotVerified */ echo $block->getFormId() ?>" />
         <div class="nested">
             <div class="field captcha no-label"
-                 data-captcha="<?php echo $block->getFormId()?>"
-                 id="captcha-container-<?php echo $block->getFormId()?>"
-                 data-mage-init='{"captcha":{"url": "<?php echo $block->getRefreshUrl()?>",
-                                            "imageLoader": "<?php echo $block->getViewFileUrl('images/loader-2.gif') ?>",
-                                             "type": "<?php echo $block->getFormId() ?>"}}'>
+                 data-captcha="<?php /* @escapeNotVerified */ echo $block->getFormId()?>"
+                 id="captcha-container-<?php /* @escapeNotVerified */ echo $block->getFormId()?>"
+                 data-mage-init='{"captcha":{"url": "<?php /* @escapeNotVerified */ echo $block->getRefreshUrl()?>",
+                                            "imageLoader": "<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-2.gif') ?>",
+                                             "type": "<?php /* @escapeNotVerified */ echo $block->getFormId() ?>"}}'>
                 <div class="control captcha-image">
-                    <img alt="<?php echo __('Please type the letters below')?>" class="captcha-img" height="<?php echo $block->getImgHeight() ?>" src="<?php echo $captcha->getImgSrc() ?>"/>
-                    <button type="button" class="action reload captcha-reload" title="<?php echo __('Reload captcha') ?>"><span><?php echo __('Reload captcha') ?></span></button>
+                    <img alt="<?php /* @escapeNotVerified */ echo __('Please type the letters below')?>" class="captcha-img" height="<?php /* @escapeNotVerified */ echo $block->getImgHeight() ?>" src="<?php /* @escapeNotVerified */ echo $captcha->getImgSrc() ?>"/>
+                    <button type="button" class="action reload captcha-reload" title="<?php /* @escapeNotVerified */ echo __('Reload captcha') ?>"><span><?php /* @escapeNotVerified */ echo __('Reload captcha') ?></span></button>
                 </div>
             </div>
             <?php if ($captcha->isCaseSensitive()) :?>
                 <div class="captcha-note note">
-                    <?php echo __('<strong>Attention</strong>: Captcha is case sensitive.') ?>
+                    <?php /* @escapeNotVerified */ echo __('<strong>Attention</strong>: Captcha is case sensitive.') ?>
                 </div>
             <?php endif; ?>
         </div>
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 abad86787ba36..15e6732c51b00 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 echo $_divId ?>" class="tree"></div>
+<div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
 <!--[if IE]>
 <script id="ie-deferred-loader" defer="defer" src=""></script>
 <![endif]-->
@@ -75,7 +75,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 jQuery(function()
 {
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?php echo $block->getLoadTreeUrl() ?>'
+       dataUrl: '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl() ?>'
     });
 
     categoryLoader.createNode = function(config) {
@@ -154,29 +154,29 @@ jQuery(function()
         varienWindowOnload();
     });
 
-    tree = new Ext.tree.TreePanel.Enhanced('<?php echo $_divId ?>', {
+    tree = new Ext.tree.TreePanel.Enhanced('<?php /* @escapeNotVerified */ echo $_divId ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
         selModel:         new Ext.tree.CheckNodeMultiSelectionModel(),
-        rootVisible:      '<?php echo $block->getRoot()->getIsVisible() ?>',
-        useAjax:          <?php echo $block->getUseAjax() ?>,
+        rootVisible:      '<?php /* @escapeNotVerified */ echo $block->getRoot()->getIsVisible() ?>',
+        useAjax:          <?php /* @escapeNotVerified */ echo $block->getUseAjax() ?>,
         currentNodeId:    <?php echo (int) $block->getCategoryId() ?>,
         addNodeTo:        false,
         rootUIProvider:   Ext.tree.CheckboxNodeUI
     });
 
     tree.on('check', function(node, checked) {
-        <?php echo $block->getJsFormObject() ?>.updateElement.value = this.getChecked().join(', ');
+        <?php /* @escapeNotVerified */ echo $block->getJsFormObject() ?>.updateElement.value = this.getChecked().join(', ');
         varienElementMethods.setHasChanges(node.getUI().checkbox);
     }, tree);
 
     // set the root node
     var parameters = {
-        text:        '<?php echo htmlentities($block->getRoot()->getName()) ?>',
+        text:        '<?php /* @escapeNotVerified */ echo htmlentities($block->getRoot()->getName()) ?>',
         draggable:   false,
-        checked:'<?php echo $block->getRoot()->getChecked() ?>',
+        checked:'<?php /* @escapeNotVerified */ echo $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() ?>,
@@ -184,7 +184,7 @@ jQuery(function()
         category_id: <?php echo (int) $block->getCategoryId() ?>
     };
 
-    tree.loadTree({parameters:parameters, data:<?php echo $block->getTreeJson() ?>},true);
+    tree.loadTree({parameters:parameters, data:<?php /* @escapeNotVerified */ echo $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 b1d1be7b24b9e..fcf5ba45d80d6 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
@@ -40,7 +40,7 @@ require([
     * with this form, we surely delete same category in the tree and at backend
     */
     function categoryDelete(url) {
-        if (confirm('<?php echo __('Are you sure you want to delete this category?') ?>')){
+        if (confirm('<?php /* @escapeNotVerified */ echo __('Are you sure you want to delete this category?') ?>')){
             location.href = url;
         }
     }
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
index 6afb5df3690d6..933604a2f7058 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/edit/form.phtml
@@ -26,25 +26,25 @@ $categoryId = $block->getCategoryId();
 <?php else: ?>
 <div class="messages">
     <div class="message message-notice">
-        <div><?php echo __('Set root category for this store in the <a href="%1">configuration</a>.', $block->getStoreConfigurationUrl()) ?></div>
+        <div><?php /* @escapeNotVerified */ echo __('Set root category for this store in the <a href="%1">configuration</a>.', $block->getStoreConfigurationUrl()) ?></div>
     </div>
 </div>
 
 <?php endif; ?>
 <iframe name="iframeSave" style="display:none; width:100%;"
-        src="<?php echo $block->getViewFileUrl('blank.html') ?>"></iframe>
-<form id="category_edit_form" name="category-edit-form" action="<?php echo $block->getSaveUrl() ?>" method="post"
+        src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('blank.html') ?>"></iframe>
+<form id="category_edit_form" name="category-edit-form" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post"
       enctype="multipart/form-data">
     <div class="no-display">
         <input type="hidden" name="isIframe" value="1"/>
-        <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>"/>
+        <input name="form_key" type="hidden" value="<?php /* @escapeNotVerified */ echo $block->getFormKey() ?>"/>
         <input type="hidden" name="category_products" id="in_category_products" value=""/>
         <input type="hidden" name="active_tab_id" id="active_tab_id" value=""/>
         <?php if ($parentId !== 0): ?>
-            <input type="hidden" name="parent" value="<?php echo $parentId; ?>"/>
+            <input type="hidden" name="parent" value="<?php /* @escapeNotVerified */ echo $parentId; ?>"/>
         <?php endif; ?>
         <?php if ($categoryId !== 0): ?>
-            <input type="hidden" name="id" value="<?php echo $categoryId; ?>"/>
+            <input type="hidden" name="id" value="<?php /* @escapeNotVerified */ echo $categoryId; ?>"/>
         <?php endif; ?>
     </div>
     <div id="category_tab_content"></div>
@@ -52,7 +52,7 @@ $categoryId = $block->getCategoryId();
 
 <div data-id="information-dialog-category" class="messages" style="display: none;">
     <div class="message message-notice">
-        <div><?php echo __('This operation can take a long time'); ?></div>
+        <div><?php /* @escapeNotVerified */ echo __('This operation can take a long time'); ?></div>
     </div>
 </div>
 
@@ -142,7 +142,7 @@ require(['jquery', 'jquery/ui', "mage/mage", "mage/translate"], function($){
         mageDialog.needToShow();
     });
     $('#category_edit_form')
-        .mage('categoryForm', {refreshUrl: '<?php echo $block->getRefreshPathUrl() ?>'})
+        .mage('categoryForm', {refreshUrl: '<?php /* @escapeNotVerified */ echo $block->getRefreshPathUrl() ?>'})
         .mage('validation', {submitHandler: function(form){
             if (mageDialog.isNeedShow()) {
                 mageDialog.onOk(function() {
@@ -161,7 +161,7 @@ require([
     "mage/adminhtml/grid"
 ], function(){
 
-    var categoryProducts = $H(<?php echo $block->getProductsJson() ?>);
+    var categoryProducts = $H(<?php /* @escapeNotVerified */ echo $block->getProductsJson() ?>);
     $('in_category_products').value = Object.toJSON(categoryProducts);
 
     function registerCategoryProduct(grid, element, checked){
@@ -187,7 +187,7 @@ require([
             var checkbox = Element.getElementsBySelector(trElement, 'input');
             if(checkbox[0]){
                 var checked = isInput ? checkbox[0].checked : !checkbox[0].checked;
-                <?php echo $_gridJsObject ?>.setCheckboxChecked(checkbox[0], checked);
+                <?php /* @escapeNotVerified */ echo $_gridJsObject ?>.setCheckboxChecked(checkbox[0], checked);
             }
         }
     }
@@ -213,11 +213,11 @@ require([
     }
 
 
-        <?php echo $_gridJsObject ?>.rowClickCallback = categoryProductRowClick;
-        <?php echo $_gridJsObject ?>.initRowCallback = categoryProductRowInit;
-        <?php echo $_gridJsObject ?>.checkboxCheckCallback = registerCategoryProduct;
-        if(<?php echo $_gridJsObject ?>.rows) {
-            <?php echo $_gridJsObject ?>.rows.each(function(row){categoryProductRowInit(<?php echo $_gridJsObject ?>, row)});
+        <?php /* @escapeNotVerified */ echo $_gridJsObject ?>.rowClickCallback = categoryProductRowClick;
+        <?php /* @escapeNotVerified */ echo $_gridJsObject ?>.initRowCallback = categoryProductRowInit;
+        <?php /* @escapeNotVerified */ echo $_gridJsObject ?>.checkboxCheckCallback = registerCategoryProduct;
+        if(<?php /* @escapeNotVerified */ echo $_gridJsObject ?>.rows) {
+            <?php /* @escapeNotVerified */ echo $_gridJsObject ?>.rows.each(function(row){categoryProductRowInit(<?php /* @escapeNotVerified */ echo $_gridJsObject ?>, row)});
         }
 });
 <?php endif; ?>
@@ -225,11 +225,11 @@ require([
     // Temporary solution, will be replaced after refactoring of manage category functionality
     <?php $tabsBlock = $block->getLayout()->getBlock('tabs'); ?>
     require(["jquery","mage/backend/tabs"],function($){
-        var activeAnchor = $('#<?php echo $tabsBlock->getId() ?>').tabs('activeAnchor');
+        var activeAnchor = $('#<?php /* @escapeNotVerified */ echo $tabsBlock->getId() ?>').tabs('activeAnchor');
         if (activeAnchor.length) {
             $('active_tab_id').value = activeAnchor.prop('id');
         }
-        $('active_tab_id').tabsJsObject = $('#<?php echo $tabsBlock->getId() ?>');
+        $('active_tab_id').tabsJsObject = $('#<?php /* @escapeNotVerified */ echo $tabsBlock->getId() ?>');
     });
 <?php endif; ?>
 
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 ade5b5af57950..eeefa9796b4f8 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
@@ -19,9 +19,9 @@
         <?php //echo $block->getCollapseButtonHtml() ?>
         <?php //echo $block->getExpandButtonHtml() ?>
         <a href="#"
-           onclick="tree.collapseTree(); return false;"><?php echo __('Collapse All'); ?></a>
+           onclick="tree.collapseTree(); return false;"><?php /* @escapeNotVerified */ echo __('Collapse All'); ?></a>
         <span class="separator">|</span> <a href="#"
-                                            onclick="tree.expandTree(); return false;"><?php echo __('Expand All'); ?></a>
+                                            onclick="tree.expandTree(); return false;"><?php /* @escapeNotVerified */ echo __('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 echo __('This operation can take a long time'); ?></div>
+       <div><?php /* @escapeNotVerified */ echo __('This operation can take a long time'); ?></div>
     </div>
 </div>
 <!--[if IE]>
@@ -154,7 +154,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
         if (!this.collapsed) {
             this.collapsed = true;
-            this.loader.dataUrl = '<?php echo $block->getLoadTreeUrl(false) ?>';
+            this.loader.dataUrl = '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl(false) ?>';
             this.request(this.loader.dataUrl, false);
         }
     },
@@ -163,7 +163,7 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
         this.expandAll();
         if (this.collapsed) {
             this.collapsed = false;
-            this.loader.dataUrl = '<?php echo $block->getLoadTreeUrl(true) ?>';
+            this.loader.dataUrl = '<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl(true) ?>';
             this.request(this.loader.dataUrl, false);
         }
     },
@@ -198,7 +198,7 @@ function reRenderTree(switcherParams) {
     if (tree && switcherParams) {
         var url;
         if (switcherParams.useConfirm) {
-            if (!confirm("<?php echo __('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
+            if (!confirm("<?php /* @escapeNotVerified */ echo __('Please confirm site switching. All data that hasn\'t been saved will be lost.') ?>")) {
                 return false;
             }
         }
@@ -234,7 +234,7 @@ function reRenderTree(switcherParams) {
                 }
             });
         } else {
-            var baseUrl = '<?php echo $block->getEditUrl() ?>';
+            var baseUrl = '<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>';
             var urlExt = switcherParams.scopeParams + 'id/' + tree.currentNodeId + '/';
             url = parseSidUrl(baseUrl, urlExt);
             setLocation(url);
@@ -280,7 +280,7 @@ function _renderNewTree(config, scopeParams) {
 
 jQuery(function () {
     categoryLoader = new Ext.tree.TreeLoader({
-        dataUrl:'<?php echo $block->getLoadTreeUrl() ?>'
+        dataUrl:'<?php /* @escapeNotVerified */ echo $block->getLoadTreeUrl() ?>'
     });
 
     categoryLoader.processResponse = function(response, parent, callback) {
@@ -362,17 +362,17 @@ jQuery(function () {
         enableDD:true,
         containerScroll:true,
         selModel:new Ext.tree.CheckNodeMultiSelectionModel(),
-        rootVisible:'<?php echo $block->getRoot()->getIsVisible() ?>',
-        useAjax: <?php echo $block->getUseAjax() ?>,
-        switchTreeUrl:'<?php echo $block->getSwitchTreeUrl() ?>',
-        editUrl:'<?php echo $block->getEditUrl() ?>',
+        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 echo (int)$block->getCategoryId() ?>,
-        baseUrl: '<?php echo $block->getEditUrl() ?>'
+        baseUrl: '<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>'
     };
 
     defaultLoadTreeParams = {
         parameters:{
-            text:'<?php echo htmlentities($block->getRoot()->getName()) ?>',
+            text:'<?php /* @escapeNotVerified */ echo 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() ?>,
@@ -380,7 +380,7 @@ jQuery(function () {
             store_id: <?php echo (int)$block->getStore()->getId() ?>,
             category_id: <?php echo (int)$block->getCategoryId() ?>
         },
-        data: <?php echo $block->getTreeJson() ?>
+        data: <?php /* @escapeNotVerified */ echo $block->getTreeJson() ?>
     };
 
     reRenderTree();
@@ -520,7 +520,7 @@ function categoryMove(obj) {
     mageDialog.onOk(function() {
         (function($){
             $.ajax({
-                url: '<?php echo $block->getMoveUrl() ?>',
+                url: '<?php /* @escapeNotVerified */ echo $block->getMoveUrl() ?>',
                 method : 'POST',
                 data: pd.join(""),
                 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 83a74e0ccb12e..9e303fe921dfd 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 echo $_divId ?>" class="tree"></div>
+<div id="<?php /* @escapeNotVerified */ echo $_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 echo $block->getId() ?>;
+var tree<?php /* @escapeNotVerified */ echo $block->getId() ?>;
 
-var useMassaction = <?php echo $block->getUseMassaction() ? 1 : 0; ?>;
+var useMassaction = <?php /* @escapeNotVerified */ echo $block->getUseMassaction() ? 1 : 0; ?>;
 
-var isAnchorOnly = <?php echo $block->getIsAnchorOnly() ? 1 : 0; ?>;
+var isAnchorOnly = <?php /* @escapeNotVerified */ echo $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 echo $block->getNodeClickListener() ?>.createDelegate(this));
+                this.addListener('click', <?php /* @escapeNotVerified */ echo $block->getNodeClickListener() ?>.createDelegate(this));
             <?php endif; ?>
         }
 
@@ -58,10 +58,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?php echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+    var emptyNodeAdded = <?php /* @escapeNotVerified */ echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?php echo $block->getLoadTreeUrl() ?>'
+       dataUrl: '<?php /* @escapeNotVerified */ echo $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 echo __('None') ?>';
+                    empty.text = '<?php /* @escapeNotVerified */ echo __('None') ?>';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -151,25 +151,25 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?php echo $_divId; ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('<?php /* @escapeNotVerified */ echo $_divId; ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?php echo $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?php echo $_divId ?>', {
+    tree<?php /* @escapeNotVerified */ echo $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?php /* @escapeNotVerified */ echo $_divId ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
-        rootVisible:      '<?php echo $block->getRoot()->getIsVisible() ?>',
+        rootVisible:      '<?php /* @escapeNotVerified */ echo $block->getRoot()->getIsVisible() ?>',
         useAjax:          true,
         currentNodeId:    <?php echo (int) $block->getCategoryId() ?>,
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?php echo $block->getId() ?>.on('check', function(node) {
-            $('<?php echo $_divId; ?>').fire('node:changed', {node:node});
-        }, tree<?php echo $block->getId() ?>);
+        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() ?>);
     }
 
     // set the root node
@@ -181,7 +181,7 @@ jQuery(function()
         category_id: <?php echo (int) $block->getCategoryId() ?>
     };
 
-    tree<?php echo $block->getId() ?>.loadTree({parameters:parameters, data:<?php echo $block->getTreeJson() ?>},true);
+    tree<?php /* @escapeNotVerified */ echo $block->getId() ?>.loadTree({parameters:parameters, data:<?php /* @escapeNotVerified */ echo $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 3dbc3cd158c51..336c7324dd325 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
@@ -40,7 +40,7 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
     <?php if ($element->getType() == 'hidden'): ?>
         <?php echo $element->getElementHtml() ?>
     <?php else: ?>
-    <div<?php echo $fieldAttributes ?> data-attribute-code="<?php echo $element->getHtmlId() ?>"
+    <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(
             $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
         ))?>"
@@ -48,15 +48,15 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
         <?php if ($elementBeforeLabel): ?>
             <?php echo $block->getElementHtml() ?>
             <?php echo $element->getLabelHtml() ?>
-            <?php echo $note ?>
+            <?php /* @escapeNotVerified */ echo $note ?>
         <?php else: ?>
             <?php echo $element->getLabelHtml() ?>
             <div class="control">
-                <?php echo($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml(); ?>
-                <?php echo $note ?>
+                <?php /* @escapeNotVerified */ echo($addOn) ? '<div class="addon">' . $block->getElementHtml() . '</div>' : $block->getElementHtml(); ?>
+                <?php /* @escapeNotVerified */ echo $note ?>
             </div>
         <?php endif; ?>
-        <div class="field-service" value-scope="<?php echo $block->getScopeLabel()?>">
+        <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo $block->getScopeLabel()?>">
             <?php if ($block->canDisplayUseDefault()): ?>
                 <label for="<?php echo $element->getHtmlId() ?>_default" class="choice use-default">
                     <input <?php if ($element->getReadonly()):?> disabled="disabled"<?php endif; ?>
@@ -65,9 +65,9 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
                             class="use-default-control"
                             id="<?php echo $element->getHtmlId() ?>_default"
                             <?php if ($block->usedDefault()): ?> checked="checked"<?php endif; ?>
-                            onclick="<?php echo $elementToggleCode; ?>"
-                            value="<?php echo $block->getAttributeCode() ?>"/>
-                    <span class="use-default-label"><?php echo __('Use Default Value') ?></span>
+                            onclick="<?php /* @escapeNotVerified */ echo $elementToggleCode; ?>"
+                            value="<?php /* @escapeNotVerified */ echo $block->getAttributeCode() ?>"/>
+                    <span class="use-default-label"><?php /* @escapeNotVerified */ echo __('Use Default Value') ?></span>
                 </label>
             <?php endif; ?>
         </div>
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 44945b2db8596..98f5a0a65052f 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,21 +12,21 @@
  * @var $block \Magento\Backend\Block\Widget\Form\Container
  */
 ?>
-<?php echo $block->getFormInitScripts() ?>
+<?php /* @escapeNotVerified */ echo $block->getFormInitScripts() ?>
 <form id="edit_form" class="admin__scope-old" 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>
 
-<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?php echo $block->getUiId('content-header') ?>>
+<div data-mage-init='{"floatingHeader": {}}' class="page-actions attribute-popup-actions" <?php /* @escapeNotVerified */ echo $block->getUiId('content-header') ?>>
     <?php echo $block->getButtonsHtml('header') ?>
 </div>
 
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?php echo $block->getValidationUrl() ?>'});
+    jQuery('#edit_form').mage('form').mage('validation', {validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
 
 });
 </script>
-<?php echo $block->getFormScripts() ?>
+<?php /* @escapeNotVerified */ echo $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 58b6dee7081e5..1881699475464 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
@@ -189,7 +189,7 @@ function switchDefaultValueField()
         break;
 
         <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
-            case '<?php echo $type; ?>':
+            case '<?php /* @escapeNotVerified */ echo $type; ?>':
                 <?php foreach ($fields as $one): ?>
                     <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
@@ -201,7 +201,7 @@ function switchDefaultValueField()
                     <?php elseif ($one == '_scope'): ?>
                         scopeVisibility = false;
                     <?php else: ?>
-                        setRowVisibility('<?php echo $one; ?>', false);
+                        setRowVisibility('<?php /* @escapeNotVerified */ echo $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 6d647935733a2..953533a070f74 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 echo __('Manage Titles (Size, Color, etc.)') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Manage Titles (Size, Color, etc.)') ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content in collapse" id="manage-titles-content">
@@ -21,7 +21,7 @@
                 <thead>
                 <tr>
                     <?php foreach ($block->getStores() as $_store): ?>
-                        <th class="col-store-view"><?php echo $_store->getName() ?></th>
+                        <th class="col-store-view"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
                     <?php endforeach; ?>
                 </tr>
                 </thead>
@@ -30,7 +30,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 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[<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<?php echo $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 eac2f90acb1bd..46c250b71ce6a 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
@@ -9,18 +9,18 @@
 /** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php echo __('Manage Options (values of your attribute)') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (values of your attribute)') ?></span></legend>
     <div id="manage-options-panel">
         <table class="admin__control-table">
             <thead>
                 <tr id="attribute-options-table">
                     <th class="col-draggable"></th>
-                    <th class="col-default control-table-actions-th"><?php echo __('Is Default') ?></th>
+                    <th class="col-default control-table-actions-th"><?php /* @escapeNotVerified */ echo __('Is Default') ?></th>
                     <?php
                     $storelist = $block->getStores();
                     foreach ($storelist as $_store):
                         ?>
-                        <th><?php echo $_store->getName() ?></th>
+                        <th><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
                     <?php endforeach;
                     $storetotal = count($storelist) + 3;
                     ?>
@@ -29,11 +29,11 @@
             </thead>
             <tbody data-role="options-container"></tbody>
             <tfoot>
-                <th colspan="<?php echo $storetotal; ?>" class="col-actions-add">
+                <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
                     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                        <button id="add_new_option_button" title="<?php echo __('Add Option'); ?>"
+                        <button id="add_new_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Option'); ?>"
                             type="button" class="action- scalable add">
-                             <span><?php echo __('Add Option'); ?></span>
+                             <span><?php /* @escapeNotVerified */ echo __('Add Option'); ?></span>
                         </button>
                     <?php endif; ?>
                 </th>
@@ -45,7 +45,7 @@
          <tr>
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-                    <div data-role="draggable-handle" class="draggable-handle" title="<?php echo __('Sort Option'); ?>"></div>
+                    <div data-role="draggable-handle" class="draggable-handle" title="<?php /* @escapeNotVerified */ echo __('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; ?>/>
             </td>
@@ -53,15 +53,15 @@
                 <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 ($block->getStores() as $_store): ?>
-            <td class="col-<%- data.id %>"><input name="option[value][<%- data.id %>][<?php echo $_store->getId() ?>]" value="<%- data.store<?php echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?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 %>][<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<%- data.store<?php /* @escapeNotVerified */ echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?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 __('Delete') ?>" type="button"
+                    <button id="delete_button_<%- data.id %>" title="<?php /* @escapeNotVerified */ echo __('Delete') ?>" type="button"
                         class="action- scalable delete delete-option"
                         >
-                        <span><?php echo __('Delete') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -149,7 +149,7 @@ require([
     });
 
     <?php foreach ($block->getOptionValues() as $_value): ?>
-    attributeOption.add(<?php echo $_value->toJson() ?>);
+    attributeOption.add(<?php /* @escapeNotVerified */ echo $_value->toJson() ?>);
     <?php endforeach; ?>
     <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
     jQuery(function($) {
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 a63bc15d80e08..4ccbec13fdbfe 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
@@ -23,11 +23,11 @@ require([
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?php echo __('Groups') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('Groups') ?></span>
         </div>
         <?php if (!$block->getIsReadOnly()): ?>
-        <?php echo $block->getAddGroupButton() ?>&nbsp;<?php echo $block->getDeleteGroupButton() ?>
-        <p class="note-block"><?php echo __('Double click on a group to rename it.') ?></p>
+        <?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>
         <?php endif; ?>
 
         <?php echo $block->getSetsFilterHtml() ?>
@@ -35,7 +35,7 @@ require([
     </div>
     <div class="attribute-set-col fieldset-wrapper">
         <div class="fieldset-wrapper-title">
-            <span class="title"><?php echo __('Unassigned Attributes') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('Unassigned Attributes') ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
         <!--[if IE]>
@@ -45,8 +45,8 @@ require([
 define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], function(jQuery){
 
             //<![CDATA[
-            var allowDragAndDrop = <?php echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
-            var canEditGroups = <?php echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
+            var allowDragAndDrop = <?php /* @escapeNotVerified */ echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
+            var canEditGroups = <?php /* @escapeNotVerified */ echo($block->getIsReadOnly() ? 'false' : 'true'); ?>;
 
             var TreePanels = function() {
                 // shorthand
@@ -73,7 +73,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                         });
 
                         tree.setRootNode(this.root);
-                        buildCategoryTree(this.root, <?php echo $block->getGroupTreeJson() ?>);
+                        buildCategoryTree(this.root, <?php /* @escapeNotVerified */ echo $block->getGroupTreeJson() ?>);
                         // render the tree
                         tree.render();
                         this.root.expand(false, false);
@@ -81,7 +81,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
 
                         this.ge = new Ext.tree.TreeEditor(tree, {
                             allowBlank:false,
-                            blankText:'<?php echo __('A name is required.') ?>',
+                            blankText:'<?php /* @escapeNotVerified */ echo __('A name is required.') ?>',
                             selectOnFocus:true,
                             cls:'folder'
                         });
@@ -112,7 +112,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                             id:'free'
                         });
                         tree2.setRootNode(this.root2);
-                        buildCategoryTree(this.root2, <?php echo $block->getAttributeTreeJson() ?>);
+                        buildCategoryTree(this.root2, <?php /* @escapeNotVerified */ echo $block->getAttributeTreeJson() ?>);
 
                         this.root2.addListener('beforeinsert', editSet.rightBeforeInsert);
                         this.root2.addListener('beforeappend', editSet.rightBeforeAppend);
@@ -200,7 +200,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                         }
 
                         if( editSet.SystemNodesExists(editSet.currentNode) ) {
-                            alert('<?php echo $block->escapeJsQuote(__('This group contains system attributes. Please move system attributes to another group and try again.')) ?>');
+                            alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('This group contains system attributes. Please move system attributes to another group and try again.')) ?>');
                             return;
                         }
 
@@ -238,7 +238,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                     },
 
                     addGroup : function() {
-                        var group_name = prompt("<?php echo __('Please enter a new group name.') ?>","");
+                        var group_name = prompt("<?php /* @escapeNotVerified */ echo __('Please enter a new group name.') ?>","");
                         if (!group_name) {
                             return;
                         }
@@ -284,7 +284,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                         }
                         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 echo __('An attribute group named "/name/" already exists".') ?>';
+                                errorText = '<?php /* @escapeNotVerified */ echo __('An attribute group named "/name/" already exists".') ?>';
                                 alert(errorText.replace("/name/",name));
                                 result =  false;
                             }
@@ -305,7 +305,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                             editSet.req.form_key = FORM_KEY;
                         }
                         var req = {data : Ext.util.JSON.encode(editSet.req)};
-                        var con = new Ext.lib.Ajax.request('POST', '<?php echo $block->getMoveUrl() ?>', {success:editSet.success,failure:editSet.failure}, req);
+                        var con = new Ext.lib.Ajax.request('POST', '<?php /* @escapeNotVerified */ echo $block->getMoveUrl() ?>', {success:editSet.success,failure:editSet.failure}, req);
                     },
 
                     success : function(o) {
@@ -322,7 +322,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                     },
 
                     failure : function(o) {
-                        alert('<?php echo $block->escapeJsQuote(__('Sorry, we\'re unable to complete this request.')) ?>');
+                        alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Sorry, we\'re unable to complete this request.')) ?>');
                     },
 
                     groupBeforeMove : function(tree, nodeThis, oldParent, newParent) {
@@ -337,7 +337,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
 
                     rightBeforeAppend : function(tree, nodeThis, node, newParent) {
                         if (node.attributes.is_user_defined == 0) {
-                            alert('<?php echo $block->escapeJsQuote(__('You can\'t remove attributes from this product template.')) ?>');
+                            alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('You can\'t remove attributes from this product template.')) ?>');
                             return false;
                         } else {
                             return true;
@@ -351,7 +351,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                         }
 
                         if (node.attributes.is_unassignable == 0) {
-                            alert('<?php echo $block->escapeJsQuote(__('You can\'t remove attributes from this product template.')) ?>');
+                            alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('You can\'t remove attributes from this product template.')) ?>');
                             return false;
                         } else {
                             return true;
@@ -374,7 +374,7 @@ define("tree-panel", ["jquery", "extjs/ext-tree-checkbox", "prototype"], functio
                     rightRemove : function(tree, nodeThis, node) {
                         if( nodeThis.firstChild == null && node.id != 'empty' ) {
                             var newNode = new Ext.tree.TreeNode({
-                                    text : '<?php echo __('Empty') ?>',
+                                    text : '<?php /* @escapeNotVerified */ echo __('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 be6d42c40e721..c9919d0203d7c 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/toolbar/add.phtml
@@ -8,7 +8,7 @@
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php echo $block->getFormId();?>').mage('form').mage('validation');
+    jQuery('#<?php /* @escapeNotVerified */ echo $block->getFormId();?>').mage('form').mage('validation');
 
 });
 </script>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml
index 4f7a5ff4a4178..e8fbf50b6f388 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 echo $block->getFormKey() ?>" />
+        <input type="hidden" name="form_key" value="<?php /* @escapeNotVerified */ echo $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 d5250a51abe7c..9a14380ae075a 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
@@ -16,7 +16,7 @@
 
 <fieldset id="product_composite_configure_fields_options" class="fieldset admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <legend class="legend admin__legend">
-        <span><?php echo __('Custom Options') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Custom Options') ?></span>
     </legend><br>
     <?php foreach ($options as $option): ?>
         <?php echo $block->getOptionHtml($option); ?>
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 53ffa3fca77b5..99924120237a1 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
@@ -13,7 +13,7 @@
 <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 echo $block->getFormatedPrice() ?>
+      <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
   </label>
   <div class="admin__field-control control">
 
@@ -30,8 +30,8 @@ require([
 ], function(){
 
       window.dateOption = productConfigure.opConfig.dateOption;
-      Event.observe('options_<?php echo $_optionId ?>_month', 'change', dateOption.reloadMonth.bind(dateOption));
-      Event.observe('options_<?php echo $_optionId ?>_year', 'change', dateOption.reloadMonth.bind(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));      
 });
 </script>
       <?php endif; ?>
@@ -43,7 +43,7 @@ require([
       <span class="time-picker"><?php echo $block->getTimeHtml() ?></span>
   <?php endif; ?>
 
-    <input type="hidden" name="validate_datetime_<?php echo $_optionId ?>" class="validate-datetime-<?php echo $_optionId ?>" value="" />
+    <input type="hidden" name="validate_datetime_<?php /* @escapeNotVerified */ echo $_optionId ?>" class="validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>" value="" />
     <script>
 require([
   "jquery",
@@ -52,16 +52,16 @@ require([
 
     //<![CDATA[
 <?php if ($_option->getIsRequire()): ?>
-        jQuery.validator.addMethod('validate-datetime-<?php echo $_optionId ?>', function(v) {
-            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?php echo $_optionId ?>"]');
+        jQuery.validator.addMethod('validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>', function(v) {
+            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?php /* @escapeNotVerified */ echo $_optionId ?>"]');
             for (var i=0; i < dateTimeParts.length; i++) {
                 if (dateTimeParts[i].value == "") return false;
             }
             return true;
-        }, '<?php echo $block->escapeJsQuote( __('This is a required option.') )?>');
+        }, '<?php /* @escapeNotVerified */ echo $block->escapeJsQuote( __('This is a required option.') )?>');
 <?php else: ?>
-        jQuery.validator.addMethod('validate-datetime-<?php echo $_optionId ?>', function(v) {
-            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?php echo $_optionId ?>"]');
+        jQuery.validator.addMethod('validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>', function(v) {
+            var dateTimeParts = jQuery('.datetime-picker[id^="options_<?php /* @escapeNotVerified */ echo $_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->escapeJsQuote( __('The field isn\'t complete.') )?>');
+        }, '<?php /* @escapeNotVerified */ echo $block->escapeJsQuote( __('The field isn\'t complete.') )?>');
 <?php endif; ?>
     //]]>
     
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 28bc783f49dfd..644226409aa72 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 echo $_rand; ?> = {
+    opFile<?php /* @escapeNotVerified */ echo $_rand; ?> = {
         initializeFile: function(inputBox) {
-            this.inputFile = inputBox.select('input[name="<?php echo $_fileName; ?>"]')[0];
-            this.inputFileAction = inputBox.select('input[name="<?php echo $_fieldNameAction; ?>"]')[0];
-            this.fileNameBox = inputBox.up('dd').select('.<?php echo $_fileNamed ?>')[0];
+            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];
         },
 
         toggleFileChange: function(inputBox) {
@@ -64,39 +64,39 @@ 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 echo $block->getFormatedPrice() ?>
+        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
     </label>
     <div class="admin__field-control control">
         <?php if ($_fileExists): ?>
-            <span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
-            <a href="javascript:void(0)" class="label" onclick="opFile<?php echo $_rand; ?>.toggleFileChange($(this).next('.input-box'))">
-                <?php echo __('Change') ?>
+            <span class="<?php /* @escapeNotVerified */ echo $_fileNamed ?>"><?php /* @escapeNotVerified */ echo $_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') ?>
             </a>&nbsp;
             <?php if (!$_option->getIsRequire()): ?>
-                <input type="checkbox" onclick="opFile<?php echo $_rand; ?>.toggleFileDelete($(this), $(this).next('.input-box'))" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>"/>
-                <span class="label"><?php echo __('Delete') ?></span>
+                <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>
             <?php endif; ?>
         <?php endif; ?>
         <div class="input-box" <?php echo $_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 echo $_fileName; ?>" class="product-custom-option<?php echo $_option->getIsRequire() ? ' required-entry' : '' ?>" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" <?php echo $_fileExists ? 'disabled="disabled"' : '' ?>/>
-            <input type="hidden" name="<?php echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
+            <input type="file" name="<?php /* @escapeNotVerified */ 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; ?>" />
 
             <?php if ($_option->getFileExtension()): ?>
                 <div class="admin__field-note">
-                    <span><?php echo __('Compatible file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Compatible file extensions to upload')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getFileExtension() ?></strong></span>
                 </div>
             <?php endif; ?>
 
             <?php if ($_option->getImageSizeX() > 0): ?>
                 <div class="admin__field-note">
-                    <span><?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Maximum image width')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeX() ?> <?php /* @escapeNotVerified */ echo __('px.')?></strong></span>
                 </div>
             <?php endif; ?>
 
             <?php if ($_option->getImageSizeY() > 0): ?>
                 <div class="admin__field-note">
-                    <span><?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Maximum image height')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeY() ?> <?php /* @escapeNotVerified */ echo __('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 aced0e6a83071..0a3acca15ccae 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
@@ -17,7 +17,7 @@
         <?php echo $block->getValuesHtml() ?>
         <?php if ($_option->getIsRequire()): ?>
             <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
-                <span id="options-<?php echo $_option->getId() ?>-container"></span>
+                <span id="options-<?php /* @escapeNotVerified */ echo $_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 190c4d6dd69d4..62b35eec7de0d 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
@@ -12,17 +12,17 @@
 <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 echo $block->getFormatedPrice() ?>
+        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
     </label>
     <div class="control admin__field-control">
         <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_FIELD): ?>
-            <input type="text" id="options_<?php echo $_option->getId() ?>_text" class="input-text admin__control-text <?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php echo $_option->getId() ?>]" value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>" />
+            <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)) ?>" />
         <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
-            <textarea id="options_<?php echo $_option->getId() ?>_text" class="admin__control-textarea <?php echo $_option->getIsRequire() ? ' required-entry' : '' ?> <?php echo $_option->getMaxCharacters() ? ' validate-length maximum-length-' . $_option->getMaxCharacters() : '' ?> product-custom-option" name="options[<?php echo $_option->getId() ?>]" rows="5" cols="25" price="<?php echo $block->getCurrencyPrice($_option->getPrice(true)) ?>"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>
+            <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>
         <?php endif;?>
 
         <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note"><?php echo __('Maximum number of characters:')?> <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
+            <p class="note"><?php /* @escapeNotVerified */ echo __('Maximum number of characters:')?> <strong><?php /* @escapeNotVerified */ echo $_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 1f398b405d55f..1c03aa1ad498b 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
@@ -13,9 +13,9 @@
 <fieldset id="product_composite_configure_fields_qty"
           class="fieldset product-composite-qty-block admin__fieldset <?php echo $block->getIsLastFieldset() ? 'last-fieldset' : '' ?>">
     <div class="field admin__field">
-        <label class="label admin__field-label"><span><?php echo __('Quantity') ?></span></label>
+        <label class="label admin__field-label"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getQtyValue() * 1 ?>">
+            <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 ?>">
         </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 6dc43f6f2bbb5..bfafbcb02d220 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,7 +17,7 @@
         <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 echo $block->getAttributeSetName()?></span>
+                    <span><?php /* @escapeNotVerified */ echo $block->getAttributeSetName()?></span>
                 </button>
                 <ul class="dropdown-menu">
                     <li><input type="text" id="product-template-suggest" class="search"
@@ -30,9 +30,9 @@
             <input type="checkbox" id="product-online-switcher" name="product-online-switcher" />
             <label class="switcher-label"
                    for="product-online-switcher"
-                   data-text-on="<?php echo __('Product online'); ?>"
-                   data-text-off="<?php echo __('Product offline'); ?>"
-                   title="<?php echo __('Product online status'); ?>"></label>
+                   data-text-on="<?php /* @escapeNotVerified */ echo __('Product online'); ?>"
+                   data-text-off="<?php /* @escapeNotVerified */ echo __('Product offline'); ?>"
+                   title="<?php /* @escapeNotVerified */ echo __('Product online status'); ?>"></label>
         </div>
 
         <?php if ($block->getProductId()): ?>
@@ -46,14 +46,14 @@
     </div>
 </div>
 <?php if ($block->getUseContainer()): ?>
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data"
-      data-form="edit-product" data-product-id="<?php echo $block->getProduct()->getId()?>">
+<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()?>">
 <?php endif; ?>
     <?php echo $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 echo $block->getProduct()->getTypeId()?>"/>
-    <input type="hidden" id="attribute_set_id" value="<?php echo $block->getProduct()->getAttributeSetId()?>"/>
+    <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()?>"/>
     <button type="submit" class="hidden"></button>
 <?php if ($block->getUseContainer()): ?>
 </form>
@@ -68,7 +68,7 @@ require([
     "domReady!"
 ], function($){
     var $form = $('[data-form=edit-product]');
-    $form.data('typeSwitcher', new TypeSwitcher(<?php echo $block->getTypeSwitcherData();?>).bindAll());
+    $form.data('typeSwitcher', new TypeSwitcher(<?php /* @escapeNotVerified */ echo $block->getTypeSwitcherData();?>).bindAll());
 
     var scriptTagManager = (function($) {
         var hiddenPrefix = 'hidden',
@@ -130,10 +130,10 @@ require([
             }
         }
     });
-    $form.mage('validation', {validationUrl: '<?php echo $block->getValidationUrl() ?>'});
+    $form.mage('validation', {validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
 
-    var masks = <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getFieldsAutogenerationMasks())?>;
-    var availablePlaceholders = <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getAttributesAllowedForAutogeneration())?>;
+    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 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 964ff78a76934..eb968094c85d6 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 echo $block->getSaveUrl() ?>" method="post" id="attributes-edit-form" class="attributes-edit-form" enctype="multipart/form-data">
+<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>
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
     jQuery('#attributes-edit-form').mage('form')
-        .mage('validation', {validationUrl: '<?php echo $block->getValidationUrl() ?>'});
+        .mage('validation', {validationUrl: '<?php /* @escapeNotVerified */ echo $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 20e1b045d7cf7..7bb314f2766b0 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 echo __('Advanced Inventory') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('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 echo __('Manage Stock') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Manage Stock') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_manage_stock" name="<?php echo $block->getFieldSuffix() ?>[manage_stock]"
+                        <select id="inventory_manage_stock" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[manage_stock]"
                                 class="select" disabled="disabled">
-                            <option value="1"><?php echo __('Yes') ?></option>
+                            <option value="1"><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+                                value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">
-                        <input name="<?php echo $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
+                        <input name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field required">
             <label class="label" for="inventory_qty">
-                <span><?php echo __('Qty') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[qty]"
-                               value="<?php echo $block->getDefaultConfigValue('qty') * 1 ?>" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[qty]"
+                               value="<?php /* @escapeNotVerified */ echo $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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field with-addon">
             <label class="label" for="inventory_min_qty">
-                <span><?php echo __('Out-of-Stock Threshold') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[min_qty]"
-                               value="<?php echo $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[min_qty]"
+                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('min_qty') * 1 ?>" disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_min_qty"
-                               name="<?php echo $block->getFieldSuffix() ?>[use_config_min_qty]" value="1"
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_min_sale_qty">
-                <span><?php echo __('Minimum Qty Allowed in Shopping Cart') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[min_sale_qty]"
-                               value="<?php echo $block->getDefaultConfigValue('min_sale_qty') * 1 ?>"
+                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[min_sale_qty]"
+                               value="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldSuffix() ?>[use_config_min_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_max_sale_qty">
-                <span><?php echo __('Maximum Qty Allowed in Shopping Cart') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[max_sale_qty]"
-                               value="<?php echo $block->getDefaultConfigValue('max_sale_qty') * 1 ?>"
+                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[max_sale_qty]"
+                               value="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldSuffix() ?>[use_config_max_sale_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_is_qty_decimal">
-                <span><?php echo __('Qty Uses Decimals') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Qty Uses Decimals') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_is_qty_decimal"
-                                name="<?php echo $block->getFieldSuffix() ?>[is_qty_decimal]" class="select"
+                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[is_qty_decimal]" class="select"
                                 disabled="disabled">
-                            <option value="0"><?php echo __('No') ?></option>
+                            <option value="0"><?php /* @escapeNotVerified */ echo __('No') ?></option>
                             <option
-                                value="1"<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?php echo __('Yes') ?></option>
+                                value="1"<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_backorders">
-                <span><?php echo __('Backorders') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Backorders') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
-                        <select id="inventory_backorders" name="<?php echo $block->getFieldSuffix() ?>[backorders]"
+                        <select id="inventory_backorders" name="<?php /* @escapeNotVerified */ echo $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 echo $option['value'] ?>"<?php echo $_selected ?>><?php echo $option['label'] ?></option>
+                                    value="<?php /* @escapeNotVerified */ echo $option['value'] ?>"<?php /* @escapeNotVerified */ echo $_selected ?>><?php /* @escapeNotVerified */ echo $option['label'] ?></option>
                             <?php endforeach; ?>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_backorders"
-                               name="<?php echo $block->getFieldSuffix() ?>[use_config_backorders]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                        <label for="inventory_backorders_checkbox" class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
 
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_notify_stock_qty">
-                <span><?php echo __('Notify for Quantity Below') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[notify_stock_qty]"
-                               value="<?php echo $block->getDefaultConfigValue('notify_stock_qty') * 1 ?>"
+                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[notify_stock_qty]"
+                               value="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldSuffix() ?>[use_config_notify_stock_qty]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_enable_qty_increments">
-                <span><?php echo __('Enable Qty Increments') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Enable Qty Increments') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_enable_qty_increments"
-                                name="<?php echo $block->getFieldSuffix() ?>[enable_qty_increments]" class="select"
+                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[enable_qty_increments]" class="select"
                                 disabled="disabled">
-                            <option value="1"><?php echo __('Yes') ?></option>
+                            <option value="1"><?php /* @escapeNotVerified */ echo __('Yes') ?></option>
                             <option
-                                value="0"<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+                                value="0"<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('No') ?></option>
                         </select>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_enable_qty_increments"
-                               name="<?php echo $block->getFieldSuffix() ?>[use_config_enable_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_qty_increments">
-                <span><?php echo __('Qty Increments') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[qty_increments]"
-                               value="<?php echo $block->getDefaultConfigValue('qty_increments') * 1 ?>"
+                               name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[qty_increments]"
+                               value="<?php /* @escapeNotVerified */ echo $block->getDefaultConfigValue('qty_increments') * 1 ?>"
                                disabled="disabled"/>
                     </div>
                     <div class="field choice">
                         <input type="checkbox" id="inventory_use_config_qty_increments"
-                               name="<?php echo $block->getFieldSuffix() ?>[use_config_qty_increments]" value="1" data-role="toggle-editability" checked="checked" disabled="disabled"/>
+                               name="<?php /* @escapeNotVerified */ echo $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 echo __('Use Config Settings') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?>"></div>
         </div>
 
         <div class="field">
             <label class="label" for="inventory_stock_availability">
-                <span><?php echo __('Stock Availability') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Stock Availability') ?></span>
             </label>
 
             <div class="control">
                 <div class="fields-group-2">
                     <div class="field">
                         <select id="inventory_stock_availability"
-                                name="<?php echo $block->getFieldSuffix() ?>[is_in_stock]" class="select"
+                                name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[is_in_stock]" class="select"
                                 disabled="disabled">
-                            <option value="1"><?php echo __('In Stock') ?></option>
+                            <option value="1"><?php /* @escapeNotVerified */ echo __('In Stock') ?></option>
                             <option
-                                value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0): ?> selected<?php endif; ?>><?php echo __('Out of Stock') ?></option>
+                                value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0): ?> selected<?php endif; ?>><?php /* @escapeNotVerified */ echo __('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 echo __('Change') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></label>
                     </div>
                 </div>
             </div>
-            <div class="field-service" value-scope="<?php echo __('[GLOBAL]') ?>"></div>
+            <div class="field-service" value-scope="<?php /* @escapeNotVerified */ echo __('[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 bb333b6f8d976..120062e251165 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,17 +11,17 @@
 <div class="fieldset-wrapper" id="add-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?php echo __('Add Product To Websites') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('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 echo $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="add_product_website_<?php echo $_website->getId() ?>" type="checkbox" />
-                        <label for="add_product_website_<?php echo $_website->getId() ?>"><?php echo $block->escapeHtml($_website->getName()) ?></label>
+                        <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>
                     </div>
-                    <dl class="webiste-groups" id="add_product_website_<?php echo $_website->getId() ?>_data">
+                    <dl class="webiste-groups" id="add_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>_data">
                         <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
                             <dt><?php echo $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
@@ -44,22 +44,22 @@
 <div class="fieldset-wrapper" id="remove-products-to-website-wrapper">
     <fieldset class="fieldset" id="grop_fields">
         <legend class="legend">
-            <span><?php echo __('Remove Product From Websites') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Remove Product From Websites') ?></span>
         </legend>
         <br>
         <div class="messages">
             <div class="message message-notice">
-                <div><?php echo __('To hide an item in catalog or search results, set the status to "Disabled".') ?></div>
+                <div><?php /* @escapeNotVerified */ echo __('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 echo $_website->getId() ?>" <?php if ($block->getWebsitesReadonly()): ?>disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="remove_product_website_<?php echo $_website->getId() ?>" type="checkbox" />
-                        <label for="remove_product_website_<?php echo $_website->getId() ?>"><?php echo $block->escapeHtml($_website->getName()) ?></label>
+                        <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>
                     </div>
-                    <dl class="webiste-groups" id="remove_product_website_<?php echo $_website->getId() ?>_data">
+                    <dl class="webiste-groups" id="remove_product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>_data">
                         <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
                             <dt><?php echo $block->escapeHtml($_group->getName()) ?></dt>
                             <dd class="group-stores">
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 8ecc1010f041e..6a168ef5440f2 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 echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
+            .mage('suggest',<?php /* @escapeNotVerified */ echo $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 d4cb76cc42e30..2745a87508945 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 echo $block->getNameInLayout() ?>" style="display:none">
+<div id="<?php /* @escapeNotVerified */ echo $block->getNameInLayout() ?>" style="display:none">
     <?php echo $block->getFormHtml();?>
     <?php echo $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 e2873c01dcb2d..aa49671e94509 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">
     <div class="fieldset-wrapper-title">
         <strong class="title">
-            <span><?php echo __('Custom Options') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Custom Options') ?></span>
         </strong>
     </div>
     <div class="fieldset-wrapper-content" id="product-custom-options-content">
@@ -20,7 +20,7 @@
             <div class="messages">
                 <div class="message message-error" id="dynamic-price-warning" style="display: none;">
                     <div class="message-inner">
-                        <div class="message-content"><?php echo __('We can\'t save custom-defined options for bundles with dynamic pricing.') ?></div>
+                        <div class="message-content"><?php /* @escapeNotVerified */ echo __('We can\'t save custom-defined options for bundles with dynamic pricing.') ?></div>
                     </div>
                 </div>
             </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/option.phtml
index b33b32dcd132b..3403d4447f82f 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
@@ -19,30 +19,30 @@
                 <span id="option_<%- data.id %>_header_title"><%- data.title %></span>
             </strong>
             <div class="actions">
-                <button type="button" title="<?php echo __('Delete Custom Option'); ?>" class="action-delete" id="<?php echo $block->getFieldId() ?>_<%- data.id %>_delete">
-                    <span><?php echo __('Delete Custom Option'); ?></span>
+                <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>
             </div>
-            <div id="<?php echo $block->getFieldId() ?>_<%- data.id %>_move" data-role="draggable-handle" class="draggable-handle"
-                 title="<?php echo __('Sort Custom Options'); ?>"></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>
         <div class="fieldset-wrapper-content in collapse" id="<%- data.id %>-content">
             <fieldset class="fieldset">
-                <fieldset class="fieldset-alt" id="<?php echo $block->getFieldId() ?>_<%- data.id %>">
-                    <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_is_delete" name="<?php echo $block->getFieldName() ?>[<%- data.id %>][is_delete]" type="hidden" value=""/>
-                    <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_previous_type" name="<?php echo $block->getFieldName() ?>[<%- data.id %>][previous_type]" type="hidden" value="<%- data.type %>"/>
-                    <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_previous_group" name="<?php echo $block->getFieldName() ?>[<%- data.id %>][previous_group]" type="hidden" value=""/>
-                    <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_id" name="<?php echo $block->getFieldName() ?>[<%- data.id %>][id]" type="hidden" value="<%- data.id %>"/>
-                    <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_option_id" name="<?php echo $block->getFieldName() ?>[<%- data.id %>][option_id]" type="hidden" value="<%- data.option_id %>"/>
-                    <input name="<?php echo $block->getFieldName() ?>[<%- data.id %>][sort_order]" type="hidden" value="<%- data.sort_order %>"/>
+                <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 %>"/>
 
                     <div class="field field-option-title required">
-                        <label class="label" for="<?php echo $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?php echo __('Option Title') ?>
+                        <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_title">
+                            <?php /* @escapeNotVerified */ echo __('Option Title') ?>
                         </label>
                         <div class="control">
-                            <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_title"
-                                   name="<?php echo $block->getFieldName() ?>[<%- data.id %>][title]"
+                            <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_title"
+                                   name="<?php /* @escapeNotVerified */ echo $block->getFieldName() ?>[<%- data.id %>][title]"
                                    class="required-entry input-text"
                                    type="text"
                                    value="<%- data.title %>"
@@ -54,8 +54,8 @@
                     </div>
 
                     <div class="field field-option-input-type required">
-                        <label class="label" for="<?php echo $block->getFieldId() ?>_<%- data.id %>_title">
-                            <?php echo __('Input Type') ?>
+                        <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_title">
+                            <?php /* @escapeNotVerified */ echo __('Input Type') ?>
                         </label>
                         <div class="control opt-type">
                             <?php echo $block->getTypeSelectHtml() ?>
@@ -64,9 +64,9 @@
 
                     <div class="field field-option-req">
                         <div class="control">
-                            <input id="<?php echo $block->getFieldId() ?>_<%- data.id %>_required" class="is-required" type="checkbox" checked="checked"/>
+                            <input id="<?php /* @escapeNotVerified */ echo $block->getFieldId() ?>_<%- data.id %>_required" class="is-required" type="checkbox" checked="checked"/>
                             <label for="field-option-req">
-                                <?php echo __('Required')?>
+                                <?php /* @escapeNotVerified */ echo __('Required')?>
                             </label>
                             <span style="display:none"><?php echo $block->getRequireSelectHtml() ?></span>
                         </div>
@@ -89,7 +89,7 @@ require([
 
 jQuery(function ($) {
     var fieldSet = $('#Custom_Options');
-    fieldSet.customOptions(<?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
+    fieldSet.customOptions(<?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
         [
             'fieldId' => $block->getFieldId(),
             'productGridUrl' => $block->getProductGridUrl(),
@@ -102,7 +102,7 @@ jQuery(function ($) {
     //adding data to templates
     <?php /** @var $_value \Magento\Framework\DataObject */ ?>
     <?php foreach ($block->getOptionValues() as $_value): ?>
-        fieldSet.customOptions('addOption', <?php echo $_value->toJson() ?>);
+        fieldSet.customOptions('addOption', <?php /* @escapeNotVerified */ echo $_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 1824268324a17..dc8c8f8ce1990 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 echo __('Price') ?></th>
-                <th><?php echo __('Price Type') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Price') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
                 <?php endif; ?>
-                <th><?php echo __('SKU') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
             </tr>
             </thead>
             <tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/file.phtml
index ada4c887c666e..afe552f4ab829 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 echo __('Price'); ?></th>
-                <th><?php echo __('Price Type'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Price'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Price Type'); ?></th>
                 <?php endif; ?>
-                <th><?php echo __('SKU'); ?></th>
-                <th><?php echo __('Compatible File Extensions'); ?></th>
-                <th><?php echo __('Maximum Image Size'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('SKU'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Compatible File Extensions'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Maximum Image Size'); ?></th>
             </tr>
             </thead>
             <tr>
@@ -42,10 +42,10 @@
                 <td>
                     <input name="product[options][<%- data.option_id %>][file_extension]" class="input-text" type="text" value="<%- data.file_extension %>">
                 </td>
-                <td class="col-file"><?php echo __('%1 <span>x</span> %2 <span>px.</span>',
+                <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 echo __('Please leave blank if it is not an image.') ?></div>
+                    <div class="note"><?php /* @escapeNotVerified */ echo __('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 06552fa3a7e4d..eae5c113215ce 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,12 +14,12 @@
             <thead>
                 <tr>
                     <th class="col-draggable">&nbsp;</th>
-                    <th class="col-name required"><?php echo __('Title') ?><span class="required">*</span></th>
+                    <th class="col-name required"><?php /* @escapeNotVerified */ echo __('Title') ?><span class="required">*</span></th>
                     <?php if ($block->getCanReadPrice() !== false) : ?>
-                    <th class="col-price"><?php echo __('Price') ?></th>
-                    <th class="col-price-type"><?php echo __('Price Type') ?></th>
+                    <th class="col-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
+                    <th class="col-price-type"><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
                     <?php endif; ?>
-                    <th class="col-sku"><?php echo __('SKU') ?></th>
+                    <th class="col-sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
                     <th class="col-actions">&nbsp;</th>
                 </tr>
             </thead>
@@ -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 echo __('Sort Custom Option'); ?>"></div>
+                 title="<?php /* @escapeNotVerified */ echo __('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">
@@ -57,7 +57,7 @@
                    disabled="disabled"
                 <?php endif; ?>>
         </td>
-        <td class="col-price-type select-opt-price-type"><?php echo $block->getPriceTypeSelectHtml('<% if (typeof data.scopePriceDisabled != "undefined" && data.scopePriceDisabled != null) { %> disabled="disabled" <% } %>') ?><%- data.checkboxScopePrice %></td>
+        <td class="col-price-type select-opt-price-type"><?php /* @escapeNotVerified */ echo $block->getPriceTypeSelectHtml('<% 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">
         <input id="product_option_<%- data.id %>_select_<%- data.select_id %>_price_type" name="product[options][<%- data.id %>][values][<%- data.select_id %>][price_type]" type="hidden">
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/options/type/text.phtml
index 0edce14be9b86..bcc6f5171dc64 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 echo __('Price') ?></th>
-                <th class="type-type"><?php echo __('Price Type') ?></th>
+                <th class="type-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
+                <th class="type-type"><?php /* @escapeNotVerified */ echo __('Price Type') ?></th>
                 <?php endif; ?>
-                <th class="type-sku"><?php echo __('SKU') ?></th>
-                <th class="type-last last"><?php echo __('Max Characters') ?></th>
+                <th class="type-sku"><?php /* @escapeNotVerified */ echo __('SKU') ?></th>
+                <th class="type-last last"><?php /* @escapeNotVerified */ echo __('Max Characters') ?></th>
             </tr>
             </thead>
             <tr>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
index 9a4fee8b9ea02..d9f179b7ab50d 100644
--- a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
+++ b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/price/group.phtml
@@ -18,24 +18,24 @@ $_priceValueValidation = $block->getPriceValidation('validate-zero-or-greater');
 
 $_showWebsite = $block->isMultiWebsites();
 ?>
-<div class="field" id="attribute-<?php echo $_htmlId?>-container" data-attribute-code="<?php echo $_htmlId?>"
+<div class="field" id="attribute-<?php /* @escapeNotVerified */ echo $_htmlId?>-container" data-attribute-code="<?php /* @escapeNotVerified */ echo $_htmlId?>"
      data-apply-to="<?php echo $block->escapeHtml(
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
              $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
          )
      )?>">
-    <label class="label"><span><?php echo $block->getElement()->getLabel(); ?></span></label>
+    <label class="label"><span><?php /* @escapeNotVerified */ echo $block->getElement()->getLabel(); ?></span></label>
     <div class="control">
         <table class="admin__control-table" id="group_prices_table">
             <thead>
                 <tr>
-                    <th <?php if (!$_showWebsite): ?>style="display: none;"<?php endif; ?>><?php echo __('Web Site'); ?></th>
-                    <th class="required"><?php echo __('Customer Group'); ?></th>
-                    <th class="required"><?php echo $block->getPriceColumnHeader(__('Price')); ?></th>
-                    <th class="col-delete"><?php echo __('Action'); ?></th>
+                    <th <?php if (!$_showWebsite): ?>style="display: none;"<?php endif; ?>><?php /* @escapeNotVerified */ echo __('Web Site'); ?></th>
+                    <th class="required"><?php /* @escapeNotVerified */ echo __('Customer Group'); ?></th>
+                    <th class="required"><?php /* @escapeNotVerified */ echo $block->getPriceColumnHeader(__('Price')); ?></th>
+                    <th class="col-delete"><?php /* @escapeNotVerified */ echo __('Action'); ?></th>
                 </tr>
             </thead>
-            <tbody id="<?php echo $_htmlId; ?>_container"></tbody>
+            <tbody id="<?php /* @escapeNotVerified */ echo $_htmlId; ?>_container"></tbody>
             <tfoot>
                 <tr>
                     <td colspan="<?php if (!$_showWebsite): ?>5<?php else: ?>4<?php endif; ?>" class="col-actions-add"><?php echo $block->getAddButtonHtml(); ?></td>
@@ -53,20 +53,20 @@ require([
 //<![CDATA[
 var groupPriceRowTemplate = '<tr>'
     + '<td<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
-    + '<select class="<?php echo $_htmlClass; ?> required-entry" name="<?php echo $_htmlName; ?>[<%- data.index %>][website_id]" id="group_price_row_<%- data.index %>_website">'
+    + '<select class="<?php /* @escapeNotVerified */ echo $_htmlClass; ?> required-entry" name="<?php /* @escapeNotVerified */ echo $_htmlName; ?>[<%- data.index %>][website_id]" id="group_price_row_<%- data.index %>_website">'
     <?php foreach ($block->getWebsites() as $_websiteId => $_info) : ?>
-    + '<option value="<?php echo $_websiteId; ?>"><?php echo $block->escapeJsQuote($block->escapeHtml($_info['name'])); ?><?php if (!empty($_info['currency'])) : ?> [<?php echo $block->escapeHtml($_info['currency']); ?>]<?php endif; ?></option>'
+    + '<option value="<?php /* @escapeNotVerified */ echo $_websiteId; ?>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote($block->escapeHtml($_info['name'])); ?><?php if (!empty($_info['currency'])) : ?> [<?php echo $block->escapeHtml($_info['currency']); ?>]<?php endif; ?></option>'
     <?php endforeach; ?>
     + '</select></td>'
-    + '<td><select class="<?php echo $_htmlClass; ?> custgroup required-entry" name="<?php echo $_htmlName; ?>[<%- data.index %>][cust_group]" id="group_price_row_<%- data.index %>_cust_group">'
+    + '<td><select class="<?php /* @escapeNotVerified */ echo $_htmlClass; ?> custgroup required-entry" name="<?php /* @escapeNotVerified */ echo $_htmlName; ?>[<%- data.index %>][cust_group]" id="group_price_row_<%- data.index %>_cust_group">'
     <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName): ?>
-    + '<option value="<?php echo $_groupId; ?>"><?php echo $block->escapeJsQuote($block->escapeHtml($_groupName)); ?></option>'
+    + '<option value="<?php /* @escapeNotVerified */ echo $_groupId; ?>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote($block->escapeHtml($_groupName)); ?></option>'
     <?php endforeach; ?>
     + '</select></td>'
-    + '<td><input class="<?php echo $_htmlClass; ?> required-entry <?php echo $_priceValueValidation; ?>" type="text" name="<?php echo $_htmlName; ?>[<%- data.index %>][price]" value="<%- data.price %>" id="group_price_row_<%- data.index %>_price" /></td>'
-    + '<td class="col-delete"><input type="hidden" name="<?php echo $_htmlName; ?>[<%- data.index %>][delete]" class="delete" value="" id="group_price_row_<%- data.index %>_delete" />'
-    + '<button title="<?php echo __('Delete Group Price'); ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="group_price_row_<%- data.index %>_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
-    + '<span><?php echo __('Delete'); ?></span></button></td>'
+    + '<td><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="group_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="group_price_row_<%- data.index %>_delete" />'
+    + '<button title="<?php /* @escapeNotVerified */ echo __('Delete Group Price'); ?>" type="button" class="action- scalable delete icon-btn delete-product-option" id="group_price_row_<%- data.index %>_delete_button" onclick="return groupPriceControl.deleteItem(event);">'
+    + '<span><?php /* @escapeNotVerified */ echo __('Delete'); ?></span></button></td>'
     + '</tr>';
 
 var groupPriceControl = {
@@ -79,8 +79,8 @@ var groupPriceControl = {
         }
         <?php endif; ?>
         var data = {
-            website_id: '<?php echo $block->getDefaultWebsite(); ?>',
-            group: '<?php echo $block->getDefaultCustomerGroup(); ?>',
+            website_id: '<?php /* @escapeNotVerified */ echo $block->getDefaultWebsite(); ?>',
+            group: '<?php /* @escapeNotVerified */ echo $block->getDefaultCustomerGroup(); ?>',
             price: '',
             readOnly: false,
             index: this.itemsCount++
@@ -95,7 +95,7 @@ var groupPriceControl = {
             data.readOnly = arguments[3];
         }
 
-        Element.insert($('<?php echo $_htmlId; ?>_container'), {
+        Element.insert($('<?php /* @escapeNotVerified */ echo $_htmlId; ?>_container'), {
             bottom : this.template({
                 data: data
             })
@@ -120,10 +120,10 @@ var groupPriceControl = {
         }
 
         <?php if ($_readonly): ?>
-        $('<?php echo $_htmlId; ?>_container').select('input', 'select').each(this.disableElement);
-        $('<?php echo $_htmlId; ?>_container').up('table').select('button').each(this.disableElement);
+        $('<?php /* @escapeNotVerified */ echo $_htmlId; ?>_container').select('input', 'select').each(this.disableElement);
+        $('<?php /* @escapeNotVerified */ echo $_htmlId; ?>_container').up('table').select('button').each(this.disableElement);
         <?php else: ?>
-        $('<?php echo $_htmlId; ?>_container').select('input', 'select').each(function(element) {
+        $('<?php /* @escapeNotVerified */ echo $_htmlId; ?>_container').select('input', 'select').each(function(element) {
             Event.observe(element, 'change', element.setHasChanges.bind(element));
         });
         <?php endif; ?>
@@ -148,10 +148,10 @@ var groupPriceControl = {
     }
 };
 <?php foreach ($block->getValues() as $_item) : ?>
-groupPriceControl.addItem('<?php echo $_item['website_id']; ?>', '<?php echo $_item['cust_group']; ?>', '<?php echo $_item['price']; ?>', <?php echo (int)!empty($_item['readonly']); ?>);
+groupPriceControl.addItem('<?php /* @escapeNotVerified */ echo $_item['website_id']; ?>', '<?php /* @escapeNotVerified */ echo $_item['cust_group']; ?>', '<?php /* @escapeNotVerified */ echo $_item['price']; ?>', <?php echo (int)!empty($_item['readonly']); ?>);
 <?php endforeach; ?>
 <?php if ($_readonly) : ?>
-$('<?php echo $_htmlId; ?>_container').up('table').select('button')
+$('<?php /* @escapeNotVerified */ echo $_htmlId; ?>_container').up('table').select('button')
     .each(groupPriceControl.disableElement);
 <?php endif; ?>
 //]]>
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 e869eb86981ee..9e9fd65395776 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,25 +20,25 @@ $element = $block->getElement();
 
 <?php $_showWebsite = $block->isShowWebsiteColumn(); ?>
 <?php $_showWebsite = $block->isMultiWebsites(); ?>
-<div class="field" id="attribute-<?php echo $_htmlId?>-container" data-attribute-code="<?php echo $_htmlId?>"
+<div class="field" id="attribute-<?php /* @escapeNotVerified */ echo $_htmlId?>-container" data-attribute-code="<?php /* @escapeNotVerified */ echo $_htmlId?>"
      data-apply-to="<?php echo $block->escapeHtml(
          $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode(
              $element->hasEntityAttribute() ? $element->getEntityAttribute()->getApplyTo() : []
          )
      )?>">
-    <label class="label"><span><?php echo $block->getElement()->getLabel() ?></span></label>
+    <label class="label"><span><?php /* @escapeNotVerified */ echo $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 echo __('Web Site') ?></th>
-                    <th class="col-customer-group"><?php echo __('Customer Group') ?></th>
-                    <th class="col-qty required"><?php echo __('Quantity') ?></th>
-                    <th class="col-price required"><?php echo $block->getPriceColumnHeader(__('Item Price')) ?></th>
-                    <th class="col-delete"><?php echo __('Action') ?></th>
+                    <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>
                 </tr>
             </thead>
-            <tbody id="<?php echo $_htmlId ?>_container"></tbody>
+            <tbody id="<?php /* @escapeNotVerified */ echo $_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>
@@ -56,22 +56,22 @@ require([
 //<![CDATA[
 var tierPriceRowTemplate = '<tr>'
     + '<td class="col-websites"<?php if (!$_showWebsite): ?> style="display:none"<?php endif; ?>>'
-    + '<select class="<?php echo $_htmlClass ?> required-entry" name="<?php echo $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
+    + '<select class="<?php /* @escapeNotVerified */ echo $_htmlClass ?> required-entry" name="<?php /* @escapeNotVerified */ echo $_htmlName ?>[<%- data.index %>][website_id]" id="tier_price_row_<%- data.index %>_website">'
     <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-    + '<option value="<?php echo $_websiteId ?>"><?php echo $block->escapeJsQuote($block->escapeHtml($_info['name'])) ?><?php if (!empty($_info['currency'])): ?> [<?php echo $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
+    + '<option value="<?php /* @escapeNotVerified */ echo $_websiteId ?>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote($block->escapeHtml($_info['name'])) ?><?php if (!empty($_info['currency'])): ?> [<?php echo $block->escapeHtml($_info['currency']) ?>]<?php endif; ?></option>'
     <?php endforeach ?>
     + '</select></td>'
-    + '<td class="col-customer-group"><select class="<?php echo $_htmlClass ?> custgroup required-entry" name="<?php echo $_htmlName ?>[<%- data.index %>][cust_group]" id="tier_price_row_<%- data.index %>_cust_group">'
+    + '<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">'
     <?php foreach ($block->getCustomerGroups() as $_groupId => $_groupName): ?>
-    + '<option value="<?php echo $_groupId ?>"><?php echo $block->escapeJsQuote($block->escapeHtml($_groupName)) ?></option>'
+    + '<option value="<?php /* @escapeNotVerified */ echo $_groupId ?>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote($block->escapeHtml($_groupName)) ?></option>'
     <?php endforeach ?>
     + '</select></td>'
-    + '<td class="col-qty"><small class="nobr" title="<?php echo __("and above")?>"><?php echo __("and above")?></small><input class="<?php echo $_htmlClass ?> qty required-entry validate-greater-than-zero" type="text" name="<?php echo $_htmlName ?>[<%- data.index %>][price_qty]" value="<%- data.qty %>" id="tier_price_row_<%- data.index %>_qty" />'
+    + '<td class="col-qty"><small class="nobr" title="<?php /* @escapeNotVerified */ echo __("and above")?>"><?php /* @escapeNotVerified */ echo __("and above")?></small><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" />'
     + '</td>'
-    + '<td class="col-price"><input class="<?php echo $_htmlClass ?> required-entry <?php echo $_priceValueValidation ?>" type="text" name="<?php 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 echo $_htmlName ?>[<%- data.index %>][delete]" class="delete" value="" id="tier_price_row_<%- data.index %>_delete" />'
-    + '<button title="<?php echo __("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 echo __("Delete") ?></span></button></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 __("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>'
     + '</tr>';
 
 var tierPriceControl = {
@@ -84,8 +84,8 @@ var tierPriceControl = {
         }
         <?php endif; ?>
         var data = {
-            website_id: '<?php echo $block->getDefaultWebsite() ?>',
-            group: '<?php echo $block->getDefaultCustomerGroup() ?>',
+            website_id: '<?php /* @escapeNotVerified */ echo $block->getDefaultWebsite() ?>',
+            group: '<?php /* @escapeNotVerified */ echo $block->getDefaultCustomerGroup() ?>',
             qty: '',
             price: '',
             readOnly: false,
@@ -102,7 +102,7 @@ var tierPriceControl = {
             data.readOnly = arguments[4];
         }
 
-        Element.insert($('<?php echo $_htmlId ?>_container'), {
+        Element.insert($('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container'), {
             bottom : this.template({
                 data: data
             })
@@ -127,10 +127,10 @@ var tierPriceControl = {
         }
 
         <?php if ($_readonly): ?>
-        $('<?php echo $_htmlId ?>_container').select('input', 'select').each(this.disableElement);
-        $('<?php echo $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
+        $('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').select('input', 'select').each(this.disableElement);
+        $('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').up('table').select('button').each(this.disableElement);
         <?php else: ?>
-        $('<?php echo $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
+        $('<?php /* @escapeNotVerified */ echo $_htmlId ?>_container').select('input', 'select').each(function(el){ Event.observe(el, 'change', el.setHasChanges.bind(el)); });
         <?php endif; ?>
     },
     disableElement: function(el) {
@@ -149,10 +149,10 @@ var tierPriceControl = {
     }
 };
 <?php foreach ($block->getValues() as $_item): ?>
-tierPriceControl.addItem('<?php echo $_item['website_id'] ?>', '<?php echo $_item['cust_group'] ?>', '<?php echo $_item['price_qty']*1 ?>', '<?php echo $_item['price'] ?>', <?php echo (int)!empty($_item['readonly'])?>);
+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'])?>);
 <?php endforeach; ?>
 <?php if ($_readonly): ?>
-$('<?php echo $_htmlId ?>_container').up('table').select('button')
+$('<?php /* @escapeNotVerified */ echo $_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 c52a0c168b81f..9e657dadbc828 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 echo $block->getInputElementName()?>"  value="" id="<?php echo $_id?>" />
+<input type="hidden" name="<?php /* @escapeNotVerified */ echo $block->getInputElementName()?>"  value="" id="<?php /* @escapeNotVerified */ echo $_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 20128abd4d013..3677d05e5386e 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,12 +8,12 @@
 
 ?>
 <fieldset id="grop_fields" class="fieldset">
-    <legend class="legend"><span><?php echo __('Product In Websites') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Product In Websites') ?></span></legend>
     <br>
     <?php if ($block->getProductId()): ?>
     <div class="messages">
         <div class="message message-notice">
-            <?php echo __('To hide an item in catalog or search results, set the status to "Disabled".') ?>
+            <?php /* @escapeNotVerified */ echo __('To hide an item in catalog or search results, set the status to "Disabled".') ?>
         </div>
     </div>
     <?php endif; ?>
@@ -23,10 +23,10 @@
             <?php $_websites = $block->getWebsiteCollection() ?>
             <?php foreach ($_websites as $_website): ?>
             <div class="website-name">
-                <input name="product[website_ids][]" value="<?php echo $_website->getId() ?>" <?php if ($block->isReadonly()): ?>  disabled="disabled"<?php endif;?> class="checkbox website-checkbox" id="product_website_<?php 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 echo $_website->getId() ?>"><?php echo $block->escapeHtml($_website->getName()) ?></label>
+                <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>
             </div>
-            <dl class="webiste-groups" id="product_website_<?php echo $_website->getId() ?>_data">
+            <dl class="webiste-groups" id="product_website_<?php /* @escapeNotVerified */ echo $_website->getId() ?>_data">
                 <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
                 <dt><?php echo $block->escapeHtml($_group->getName()) ?></dt>
                 <dd>
@@ -35,7 +35,7 @@
                         <li>
                             <?php echo $block->escapeHtml($_store->getName()) ?>
                             <?php if ($block->getWebsites() && !$block->hasWebsite($_website->getId())): ?>
-                            <span class="website-<?php echo $_website->getId() ?>-select" style="display:none">
+                            <span class="website-<?php /* @escapeNotVerified */ echo $_website->getId() ?>-select" style="display:none">
                             <?php echo __('(Copy data from: %1)', $block->getChooseFromStoreHtml($_store)) ?>
                             </span>
                             <?php endif; ?>
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 3592bc23eecdd..d89e7f9a6ec70 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
@@ -22,8 +22,8 @@ $elementName = $block->getElement()->getName() . '[images]';
         <div class="image image-placeholder">
             <?php echo $block->getUploaderHtml();
     ?>
-            <img class="spacer" src="<?php echo $block->getViewFileUrl('images/spacer.gif')?>"/>
-            <p class="image-placeholder-text"><?php echo __('Click here or drag and drop to add images.');
+            <img class="spacer" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/spacer.gif')?>"/>
+            <p class="image-placeholder-text"><?php /* @escapeNotVerified */ echo __('Click here or drag and drop to add images.');
     ?></p>
         </div>
     <?php
@@ -42,12 +42,12 @@ $elementName = $block->getElement()->getName() . '[images]';
     <script id="<?php echo $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 echo $elementName ?>[<%- data.file_id %>][position]" value="<%- data.position %>" class="position"/>
-            <input type="hidden" name="<?php echo $elementName ?>[<%- data.file_id %>][file]" value="<%- data.file %>"/>
-            <input type="hidden" name="<?php echo $elementName ?>[<%- data.file_id %>][value_id]" value="<%- data.value_id %>"/>
-            <input type="hidden" name="<?php echo $elementName ?>[<%- data.file_id %>][label]" value="<%- data.label %>"/>
-            <input type="hidden" name="<?php echo $elementName ?>[<%- data.file_id %>][disabled]" value="<%- data.disabled %>"/>
-            <input type="hidden" name="<?php echo $elementName ?>[<%- data.file_id %>][removed]" value="" class="is-removed"/>
+            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][position]" value="<%- data.position %>" class="position"/>
+            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][file]" value="<%- data.file %>"/>
+            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][value_id]" value="<%- data.value_id %>"/>
+            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][label]" value="<%- data.label %>"/>
+            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][disabled]" value="<%- data.disabled %>"/>
+            <input type="hidden" name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][removed]" value="" class="is-removed"/>
             <ul class="type-labels" style="display: none">
                 <?php foreach ($block->getImageTypes() as $typeData) {
     ?>
@@ -58,19 +58,19 @@ $elementName = $block->getElement()->getName() . '[images]';
 
 } ?>
             </ul>
-            <img class="spacer" src="<?php echo $block->getViewFileUrl('images/spacer.gif')?>"/>
+            <img class="spacer" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/spacer.gif')?>"/>
             <img class="product-image" src="<%- data.url %>" alt="<%- data.label %>"/>
             <div class="actions" >
-                <button type="button" class="action-delete" data-role="delete-button" title="<?php echo __('Delete image') ?>">
-                    <span> <?php echo __('Delete image') ?></span >
+                <button type="button" class="action-delete" data-role="delete-button" title="<?php /* @escapeNotVerified */ echo __('Delete image') ?>">
+                    <span> <?php /* @escapeNotVerified */ echo __('Delete image') ?></span >
                 </button>
-                <button type="button" class="action-make-base" data-role="make-base-button" title="<?php echo __('Make Base') ?>">
-                    <span><?php echo __('Make Base') ?></span >
+                <button type="button" class="action-make-base" data-role="make-base-button" title="<?php /* @escapeNotVerified */ echo __('Make Base') ?>">
+                    <span><?php /* @escapeNotVerified */ echo __('Make Base') ?></span >
                 </button >
                 <div class="draggable-handle" ></div >
             </div >
             <div class="image-label"></div>
-            <div class="image-fade"><span><?php echo __('Hidden') ?></span></div>
+            <div class="image-fade"><span><?php /* @escapeNotVerified */ echo __('Hidden') ?></span></div>
         </div>
     </script>
     <script class="dialog-template" type="text/x-magento-template"  data-title="Image Options">
@@ -84,18 +84,18 @@ $elementName = $block->getElement()->getName() . '[images]';
                 <fieldset class="fieldset fieldset-image-panel">
                     <div class="field field-image-description">
                         <label class="label" for="image-description">
-                            <span><?php echo __('Alt Text')?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('Alt Text')?></span>
                         </label>
                         <div class="control">
                             <textarea id="image-description"
                                       rows="3"
-                                      name="<?php echo $elementName ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
+                                      name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][label]"><%- data.label %></textarea>
                         </div>
                     </div>
 
                     <div class="field field-image-role">
                         <label class="label">
-                            <span><?php echo __('Role')?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('Role')?></span>
                         </label>
                         <div class="control">
                             <ul class="multiselect-alt">
@@ -123,16 +123,16 @@ $elementName = $block->getElement()->getName() . '[images]';
                             <input type="checkbox"
                                    data-role="visibility-trigger"
                                    value="1"
-                                   name="<?php echo $elementName ?>[<%- data.file_id %>][disabled]"
+                                   name="<?php /* @escapeNotVerified */ echo $elementName ?>[<%- data.file_id %>][disabled]"
                             <% if (data.disabled == 1) { %>checked="checked"<% } %> />
-                            <span><?php echo __('Hide from Product Page')?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('Hide from Product Page')?></span>
                         </label>
                     </div>
                 </fieldset>
             </div>
 
-            <button type="button" class="action-close" data-role="close-panel" title="<?php echo __('Close panel'); ?>">
-                <span><?php echo __('Close panel'); ?></span>
+            <button type="button" class="action-close" data-role="close-panel" title="<?php /* @escapeNotVerified */ echo __('Close panel'); ?>">
+                <span><?php /* @escapeNotVerified */ echo __('Close panel'); ?></span>
             </button>
             <div class="image-pointer"></div>
         </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml b/app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/js.phtml
index 2ec92b99d7ff0..c2188a838df90 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 echo $this->helper('Magento\Tax\Helper\Data')->getPriceFormat($block->getStore()); ?>;
-var taxRates = <?php echo $block->getAllRatesByProductClassJson(); ?>;
+var priceFormat = <?php /* @escapeNotVerified */ echo $this->helper('Magento\Tax\Helper\Data')->getPriceFormat($block->getStore()); ?>;
+var taxRates = <?php /* @escapeNotVerified */ echo $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 echo $tabsBlock->getId() ?>').length && jQuery('#<?php echo $tabsBlock->getId() ?>').is(':mage-tabs')) {
-        var activeAnchor = jQuery('#<?php echo $tabsBlock->getId() ?>').tabs('activeAnchor');
+    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 (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 18bb8af085319..b39facbe29eb6 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
@@ -14,7 +14,7 @@
 ?>
 <div id="alert_messages_block"><?php echo $block->getMessageHtml() ?></div>
 <div>
-    <h4 class="icon-head head-edit-form"><?php echo __('Product Alerts') ?></h4>
+    <h4 class="icon-head head-edit-form"><?php /* @escapeNotVerified */ echo __('Product Alerts') ?></h4>
 </div>
 <div class="clear"></div>
 <?php echo $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 ecaa3dd1b64a1..e86e04e36ea73 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 echo __('Advanced Inventory') ?></span></legend>
+<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Advanced Inventory') ?></span></legend>
 <br>
 <div id="table_cataloginventory">
 <div class="field">
     <label class="label" for="inventory_manage_stock">
-        <span><?php echo __('Manage Stock') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Manage Stock') ?></span>
     </label>
     <div class="control">
-        <select id="inventory_manage_stock" name="<?php echo $block->getFieldSuffix() ?>[stock_data][manage_stock]" <?php echo $_readonly;?>>
-            <option value="1"><?php echo __('Yes') ?></option>
-            <option value="0"<?php if ($block->getFieldValue('manage_stock') == 0): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+        <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>
-        <input type="hidden" id="inventory_manage_stock_default" value="<?php echo $block->getDefaultConfigValue('manage_stock'); ?>">
+        <input type="hidden" id="inventory_manage_stock_default" value="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldSuffix() ?>[stock_data][use_config_manage_stock]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
-        <label for="inventory_use_config_manage_stock"><?php echo __('Use Config Settings') ?></label>
+        <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>
         <?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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <?php if (!$block->getProduct()->isComposite()): ?>
 <div class="field">
     <label class="label" for="inventory_qty">
-        <span><?php echo __('Qty') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
     </label>
     <div class="control">
         <?php if (!$_readonly): ?>
-        <input type="hidden" id="original_inventory_qty" name="<?php echo $block->getFieldSuffix() ?>[stock_data][original_inventory_qty]" value="<?php echo $block->getFieldValue('qty') * 1 ?>">
+        <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 ?>">
         <?php endif;?>
-        <input type="text" class="input-text validate-number" id="inventory_qty" name="<?php echo $block->getFieldSuffix() ?>[stock_data][qty]" value="<?php echo $block->getFieldValue('qty') * 1 ?>" <?php echo $_readonly;?>>
+        <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;?>>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_min_qty">
-        <span><?php echo __('Out-of-Stock Threshold') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Out-of-Stock Threshold') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_min_qty" name="<?php echo $block->getFieldSuffix() ?>[stock_data][min_qty]" value="<?php echo $block->getFieldValue('min_qty') * 1 ?>" <?php echo $_readonly;?>>
+        <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;?>>
 
         <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 echo $block->getFieldSuffix() ?>[stock_data][use_config_min_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_min_qty"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_min_sale_qty">
-        <span><?php echo __('Minimum Qty Allowed in Shopping Cart') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[stock_data][min_sale_qty]"
-               value="<?php echo $block->getFieldValue('min_sale_qty') * 1 ?>" <?php echo $_readonly;?>>
+               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;?>>
         <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 echo $block->getFieldSuffix() ?>[stock_data][use_config_min_sale_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_min_sale_qty"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_max_sale_qty">
-        <span><?php echo __('Maximum Qty Allowed in Shopping Cart') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getFieldSuffix() ?>[stock_data][max_sale_qty]" value="<?php echo $block->getFieldValue('max_sale_qty') * 1 ?>" <?php echo $_readonly;?>>
+        <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;?>>
         <?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 echo $block->getFieldSuffix() ?>[stock_data][use_config_max_sale_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" class="checkbox" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_max_sale_qty"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
     <?php if ($block->canUseQtyDecimals()): ?>
     <div class="field">
         <label class="label" for="inventory_is_qty_decimal">
-            <span><?php echo __('Qty Uses Decimals') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Qty Uses Decimals') ?></span>
         </label>
         <div class="control">
-            <select id="inventory_is_qty_decimal" name="<?php echo $block->getFieldSuffix() ?>[stock_data][is_qty_decimal]" <?php echo $_readonly;?>>
-                <option value="0"><?php echo __('No') ?></option>
-                <option value="1"<?php if ($block->getFieldValue('is_qty_decimal') == 1): ?> selected="selected"<?php endif; ?>><?php echo __('Yes') ?></option>
+            <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>
         </div>
         <?php if (!$block->isSingleStoreMode()): ?>
-        <div class="field-service"><?php echo __('[GLOBAL]') ?></div>
+        <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
         <?php endif; ?>
     </div>
 
         <?php if (!$block->isVirtual()) : ?>
         <div class="field">
             <label class="label" for="inventory_is_decimal_divided">
-                <span><?php echo __('Allow Multiple Boxes for Shipping.') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Allow Multiple Boxes for Shipping.') ?></span>
             </label>
             <div class="control">
-                <select id="inventory_is_decimal_divided" name="<?php echo $block->getFieldSuffix() ?>[stock_data][is_decimal_divided]" <?php echo $_readonly;?>>
-                    <option value="0"><?php echo __('No') ?></option>
-                    <option value="1"<?php if ($block->getFieldValue('is_decimal_divided') == 1): ?> selected="selected"<?php endif; ?>><?php echo __('Yes') ?></option>
+                <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>
             </div>
             <?php if (!$block->isSingleStoreMode()): ?>
-            <div class="field-service"><?php echo __('[GLOBAL]') ?></div>
+            <div class="field-service"><?php /* @escapeNotVerified */ echo __('[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 echo __('Backorders') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Backorders') ?></span>
     </label>
     <div class="control">
-        <select id="inventory_backorders" name="<?php echo $block->getFieldSuffix() ?>[stock_data][backorders]" <?php echo $_readonly;?>>
+        <select id="inventory_backorders" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][backorders]" <?php /* @escapeNotVerified */ echo $_readonly;?>>
             <?php foreach ($block->getBackordersOption() as $option): ?>
             <?php $_selected = ($option['value'] == $block->getFieldValue('backorders')) ? 'selected="selected"' : '' ?>
-            <option value="<?php echo $option['value'] ?>" <?php echo $_selected ?>><?php echo $option['label'] ?></option>
+            <option value="<?php /* @escapeNotVerified */ echo $option['value'] ?>" <?php /* @escapeNotVerified */ echo $_selected ?>><?php /* @escapeNotVerified */ echo $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 echo $block->getFieldSuffix() ?>[stock_data][use_config_backorders]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_backorders"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_notify_stock_qty">
-        <span><?php echo __('Notify for Quantity Below') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Notify for Quantity Below') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-number" id="inventory_notify_stock_qty" name="<?php echo $block->getFieldSuffix() ?>[stock_data][notify_stock_qty]" value="<?php echo $block->getFieldValue('notify_stock_qty') * 1 ?>" <?php echo $_readonly;?>>
+        <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;?>>
 
         <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 echo $block->getFieldSuffix() ?>[stock_data][use_config_notify_stock_qty]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_notify_stock_qty"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
     <?php endif; ?>
 <div class="field">
     <label class="label" for="inventory_enable_qty_increments">
-        <span><?php echo __('Enable Qty Increments') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Enable Qty Increments') ?></span>
     </label>
     <div class="control">
         <?php $qtyIncrementsEnabled = $block->getFieldValue('enable_qty_increments'); ?>
-        <select id="inventory_enable_qty_increments" name="<?php echo $block->getFieldSuffix() ?>[stock_data][enable_qty_increments]" <?php echo $_readonly;?>>
-            <option value="1"<?php if ($qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?php echo __('Yes') ?></option>
-            <option value="0"<?php if (!$qtyIncrementsEnabled): ?> selected="selected"<?php endif; ?>><?php echo __('No') ?></option>
+        <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>
-        <input type="hidden" id="inventory_enable_qty_increments_default" value="<?php echo $block->getDefaultConfigValue('enable_qty_increments'); ?>">
+        <input type="hidden" id="inventory_enable_qty_increments_default" value="<?php /* @escapeNotVerified */ echo $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 echo $block->getFieldSuffix() ?>[stock_data][use_config_enable_qty_increments]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_enable_qty_increments"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_qty_increments">
-        <span><?php echo __('Qty Increments') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Qty Increments') ?></span>
     </label>
     <div class="control">
-        <input type="text" class="input-text validate-digits" id="inventory_qty_increments" name="<?php echo $block->getFieldSuffix() ?>[stock_data][qty_increments]" value="<?php echo $block->getFieldValue('qty_increments') * 1 ?>" <?php echo $_readonly;?>>
+        <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;?>>
         <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 echo $block->getFieldSuffix() ?>[stock_data][use_config_qty_increments]" value="1" <?php echo $_checked ?> onclick="toggleValueElements(this, this.parentNode);" <?php echo $_readonly;?>>
-            <label for="inventory_use_config_qty_increments"><?php echo __('Use Config Settings') ?></label>
+            <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>
         </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 echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </div>
 
 <div class="field">
     <label class="label" for="inventory_stock_availability">
-        <span><?php echo __('Stock Availability') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Stock Availability') ?></span>
     </label>
     <div class="control">
-        <select id="inventory_stock_availability" name="<?php echo $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?php echo $_readonly;?>>
+        <select id="inventory_stock_availability" name="<?php /* @escapeNotVerified */ echo $block->getFieldSuffix() ?>[stock_data][is_in_stock]" <?php /* @escapeNotVerified */ echo $_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 echo $option['value'] ?>" <?php echo $_selected ?>><?php echo $option['label'] ?></option>
+            <option value="<?php /* @escapeNotVerified */ echo $option['value'] ?>" <?php /* @escapeNotVerified */ echo $_selected ?>><?php /* @escapeNotVerified */ echo $option['label'] ?></option>
             <?php endforeach; ?>
         </select>
     </div>
     <?php if (!$block->isSingleStoreMode()): ?>
-    <div class="field-service"><?php echo __('[GLOBAL]') ?></div>
+    <div class="field-service"><?php /* @escapeNotVerified */ echo __('[GLOBAL]') ?></div>
     <?php endif; ?>
 </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 dec1418fba371..c7223ed509f4d 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
@@ -27,7 +27,7 @@ var catalogWysiwygEditor = {
                 url: editorUrl,
                 data: {
                     element_id: elementId + '_editor',
-                    store_id: '<?php echo $block->getStoreId() ?>'
+                    store_id: '<?php /* @escapeNotVerified */ echo $block->getStoreId() ?>'
                 },
                 showLoader: true,
                 dataType: 'html',
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 0d786cd9581e6..3f6215626ad82 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,7 +11,7 @@
 <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 echo __('Add Attribute') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Add Attribute') ?></span>
         </button>
         <div class="dropdown-menu">
             <input data-role="product-attribute-search"
@@ -21,7 +21,7 @@
         </div>
     </div>
 
-<script data-template-for="product-attribute-search-<?php echo $block->getGroupId(); ?>" type="text/x-magento-template">
+<script data-template-for="product-attribute-search-<?php /* @escapeNotVerified */ echo $block->getGroupId(); ?>" type="text/x-magento-template">
     <ul data-mage-init='{"menu":[]}'>
         <% if (data.items.length) { %>
         <% _.each(data.items, function(value){ %>
@@ -29,7 +29,7 @@
         <% }); %>
         <% } else { %><span class="mage-suggest-no-records"><%- data.noRecordsText %></span><% } %>
     </ul>
-    <div class="actions"><?php echo $block->getAttributeCreate()?></div>
+    <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAttributeCreate()?></div>
 </script>
 
 <script>
@@ -51,13 +51,13 @@
             });
         });
 
-        $suggest.mage('suggest', <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSelectorOptions())?>)
+        $suggest.mage('suggest', <?php /* @escapeNotVerified */ echo $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 echo $block->getAddAttributeUrl()?>',
+                        url: '<?php /* @escapeNotVerified */ echo $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 ed1109ac296cd..476506df35de6 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 echo $block->getId() ?>"
+<div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>"
      data-mage-init='{"tabs":{
-    "active": "<?php echo $block->getActiveTabId() ?>",
-    "destination": "#<?php echo $block->getDestElementId() ?>",
-    "shadowTabs": "<?php echo $block->getAllShadowTabs()?>",
-    "tabsBlockPrefix": "<?php echo $block->getId() ?>_",
+    "active": "<?php /* @escapeNotVerified */ echo $block->getActiveTabId() ?>",
+    "destination": "#<?php /* @escapeNotVerified */ echo $block->getDestElementId() ?>",
+    "shadowTabs": "<?php /* @escapeNotVerified */ echo $block->getAllShadowTabs()?>",
+    "tabsBlockPrefix": "<?php /* @escapeNotVerified */ echo $block->getId() ?>_",
     "tabIdArgument": "active_tab",
-    "tabPanelClass": "<?php echo $block->getPanelsClass() ?>",
-    "excludedPanel": "<?php echo $block->getExcludedPanel() ?>",
+    "tabPanelClass": "<?php /* @escapeNotVerified */ echo $block->getPanelsClass() ?>",
+    "excludedPanel": "<?php /* @escapeNotVerified */ echo $block->getExcludedPanel() ?>",
     "groups": "ul.tabs"
 }}'>
     <?php foreach ($tabGroups as $tabGroupCode): ?>
@@ -34,10 +34,10 @@
 
         <div class="admin__page-nav <?php if (!$isBasic): ?> <?php echo '_collapsed';?> <?php endif;?>"
             data-role="container"
-            id="<?php echo $tabGroupId ?>"
+            id="<?php /* @escapeNotVerified */ echo $tabGroupId ?>"
             <?php if (!$isBasic): ?>
                 data-mage-init='{"collapsible":{
-                "active": "<?php echo $activeCollapsible; ?>",
+                "active": "<?php /* @escapeNotVerified */ echo $activeCollapsible; ?>",
                 "openedState": "_show",
                 "closedState": "_hide",
                 "animate": 200,
@@ -45,17 +45,17 @@
                 }}'
             <?php endif;?>>
 
-            <div class="admin__page-nav-title-wrap" <?php echo $block->getUiId('title') ?> data-role="title">
+            <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;?>"
                     data-role="trigger">
                     <strong>
-                        <?php echo $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
+                        <?php /* @escapeNotVerified */ echo $isBasic ? __('Basic Settings') : __('Advanced Settings') ?>
                     </strong>
                     <span data-role="title-messages" class="admin__page-nav-title-messages"></span>
                 </div>
             </div>
 
-            <ul <?php echo $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
+            <ul <?php /* @escapeNotVerified */ echo $block->getUiId('tab', $tabGroupId) ?> class="tabs admin__page-nav-items" data-role="content">
                 <?php foreach ($tabs as $_tab): ?>
                     <?php if (!$block->canShowTab($_tab) || $_tab->getParentTab()
                         || ($_tab->getGroupCode() && $_tab->getGroupCode() != $tabGroupCode)
@@ -63,13 +63,13 @@
                     <?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 echo $block->getUiId('tab', 'item', $_tab->getId()) ?>>
+                    <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 echo $_tabHref ?>" id="<?php echo $block->getTabId($_tab) ?>"
-                           name="<?php echo $block->getTabId($_tab, false) ?>"
-                           title="<?php echo $block->getTabTitle($_tab) ?>"
-                           class="admin__page-nav-link <?php echo $_tabClass;?>"
-                           data-tab-type="<?php echo $_tabType;?>" <?php echo $block->getUiId('tab', 'link', $_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()) ?>>
 
                             <span><?php echo $block->escapeHtml($block->getTabLabel($_tab)); ?></span>
 
@@ -77,13 +77,13 @@
                                <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 echo __('Changes have been made to this section that have not been saved.'); ?>
+                                       <?php /* @escapeNotVerified */ echo __('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 echo __('This tab contains invalid data. Please resolve this before saving.'); ?>
+                                       <?php /* @escapeNotVerified */ echo __('This tab contains invalid data. Please resolve this before saving.'); ?>
                                    </span>
                                </span>
                                 <span class="admin__page-nav-item-message-loader">
@@ -95,15 +95,15 @@
                             </span>
                         </a>
 
-                        <div id="<?php echo $block->getTabId($_tab) ?>_content" class="no-display"
-                             data-tab-panel="<?=$_tab->getTabId() ?>"
-                            <?php echo $block->getUiId('tab', 'content', $_tab->getId()) ?>>
-                            <?php echo $block->getTabContent($_tab); ?>
+                        <div id="<?php /* @escapeNotVerified */ echo $block->getTabId($_tab) ?>_content" class="no-display"
+                             data-tab-panel="<?= /* @escapeNotVerified */ $_tab->getTabId() ?>"
+                            <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'content', $_tab->getId()) ?>>
+                            <?php /* @escapeNotVerified */ echo $block->getTabContent($_tab); ?>
                             <?php foreach ($tabs as $childTab): ?>
                             <?php if ($childTab->getParentTab() === $_tab->getId()):?>
-                            <div id="<?php echo $block->getTabId($childTab) ?>_content"
-                                <?php echo $block->getUiId('tab', 'content', $childTab->getId()) ?>>
-                                <?php echo $block->getTabContent($childTab); ?>
+                            <div id="<?php /* @escapeNotVerified */ echo $block->getTabId($childTab) ?>_content"
+                                <?php /* @escapeNotVerified */ echo $block->getUiId('tab', 'content', $childTab->getId()) ?>>
+                                <?php /* @escapeNotVerified */ echo $block->getTabContent($childTab); ?>
                                 <?php endif;?>
                                 <?php endforeach; ?>
                             </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 854e958d45e27..ff16849927eaf 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
@@ -19,9 +19,9 @@
             <select
                 id="<?php echo $block->getHtmlId() ?>-select"
                 class="local-validation admin__control-select">
-                <option class="admin__control-select-placeholder" value="" selected><?php echo __('Actions') ?></option>
+                <option class="admin__control-select-placeholder" value="" selected><?php /* @escapeNotVerified */ echo __('Actions') ?></option>
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <option value="<?php echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php echo $_item->getLabel() ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_item->getId() ?>"<?php echo($_item->getSelected() ? ' selected="selected"' : '')?>><?php /* @escapeNotVerified */ echo $_item->getLabel() ?></option>
                 <?php endforeach; ?>
             </select>
             <span class="outer-span" id="<?php echo $block->getHtmlId() ?>-form-hiddens"></span>
@@ -33,7 +33,7 @@
     <?php endif ?>
     <div class="no-display">
     <?php foreach ($block->getItems() as $_item): ?>
-        <div id="<?php echo $block->getHtmlId() ?>-item-<?php echo $_item->getId() ?>-block">
+        <div id="<?php echo $block->getHtmlId() ?>-item-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-block">
             <?php echo $_item->getAdditionalActionBlockHtml() ?>
         </div>
     <?php endforeach; ?>
@@ -41,21 +41,21 @@
 
     <div class="mass-select-wrap">
         <select id="<?php echo $block->getHtmlId() ?>-mass-select" data-menu="grid-mass-select">
-            <optgroup label="<?php echo __('Mass Actions')?>">
+            <optgroup label="<?php /* @escapeNotVerified */ echo __('Mass Actions')?>">
                 <option disabled selected></option>
                 <?php if ($block->getUseSelectAll()):?>
                     <option value="selectAll">
-                        <?php echo __('Select All') ?>
+                        <?php /* @escapeNotVerified */ echo __('Select All') ?>
                     </option>
                     <option value="unselectAll">
-                        <?php echo __('Unselect All') ?>
+                        <?php /* @escapeNotVerified */ echo __('Unselect All') ?>
                     </option>
                 <?php endif; ?>
                 <option value="selectVisible">
-                    <?php echo __('Select Visible') ?>
+                    <?php /* @escapeNotVerified */ echo __('Select Visible') ?>
                 </option>
                 <option value="unselectVisible">
-                    <?php echo __('Unselect Visible') ?>
+                    <?php /* @escapeNotVerified */ echo __('Unselect Visible') ?>
                 </option>
             </optgroup>
         </select>
@@ -70,17 +70,17 @@
             switch (massAction) {
                 <?php if ($block->getUseSelectAll()):?>
                 case 'selectAll':
-                    return <?php echo $block->getJsObjectName() ?>.selectAll();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectAll();
                     break
                 case 'unselectAll':
-                    return <?php echo $block->getJsObjectName() ?>.unselectAll();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectAll();
                     break
                 <?php endif; ?>
                 case 'selectVisible':
-                    return <?php echo $block->getJsObjectName() ?>.selectVisible();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.selectVisible();
                     break
                 case 'unselectVisible':
-                    return <?php echo $block->getJsObjectName() ?>.unselectVisible();
+                    return <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.unselectVisible();
                     break
             }
             this.blur();
@@ -89,7 +89,7 @@
     });
 
     <?php if (!$block->getParentBlock()->canDisplayContainer()): ?>
-        <?php echo $block->getJsObjectName() ?>.setGridIds('<?php echo $block->getGridIdsJson() ?>');
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.setGridIds('<?php /* @escapeNotVerified */ echo $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 5b61756752cb6..bf583e3089536 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 echo $block->getLink() ?>" class="link-feed"><?php echo $block->getLabel() ?></a>
+<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="link-feed"><?php /* @escapeNotVerified */ echo $block->getLabel() ?></a>
 <?php endif; ?>
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 1865f71cd6b75..2c006ad67b74c 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 echo $block->getAdjustmentCssClasses() ?>"
+<span class="price-container <?php /* @escapeNotVerified */ echo $block->getAdjustmentCssClasses() ?>"
         <?php echo $block->getSchema() ? ' itemprop="offers" itemscope itemtype="http://schema.org/Offer"' : '' ?>>
     <?php if ($block->getDisplayLabel()): ?>
-        <span class="price-label"><?php echo $block->getDisplayLabel(); ?></span>
+        <span class="price-label"><?php /* @escapeNotVerified */ echo $block->getDisplayLabel(); ?></span>
     <?php endif; ?>
-    <span <?php if ($block->getPriceId()): ?> id="<?php echo $block->getPriceId() ?>"<?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 echo $block->getDisplayValue(); ?>"
-        data-price-type="<?php echo $block->getPriceType(); ?>"
-        class="price-wrapper <?php echo $block->getPriceWrapperCss(); ?>"
+        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 echo $block->getSchema() ? ' itemprop="price"' : '' ?>>
-        <?php echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
+        <?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
-        <meta itemprop="priceCurrency" content="<?php echo $block->getDisplayCurrencyCode()?>" />
+        <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $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 484e349a154b7..798fb7f92a227 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 echo $block->renderAmount($configuredPrice->getAmount(), [
+    <?php /* @escapeNotVerified */ echo $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/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
index af7bc2413b5f6..54933e88b9957 100644
--- a/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
+++ b/app/code/Magento/Catalog/view/base/templates/product/price/default.phtml
@@ -16,7 +16,7 @@ $productId = $block->getSaleableItem()->getId();
 /** @var \Magento\Catalog\Pricing\Price\RegularPrice $priceModel */
 $priceModel = $block->getPriceType('regular_price');
 
-echo $block->renderAmount($priceModel->getAmount(), [
+/* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
     'price_id'          => $block->getPriceId('product-price-'),
     'include_container' => true
 ]);
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/final_price.phtml
index 278f3a06cf692..402c2a1b67a58 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
@@ -23,7 +23,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 ?>
 <?php if ($block->hasSpecialPrice()): ?>
     <span class="special-price">
-        <?php echo $block->renderAmount($finalPriceModel->getAmount(), [
+        <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
             'display_label'     => __('Special Price'),
             'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
             'price_type'        => 'finalPrice',
@@ -32,7 +32,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
         ]); ?>
     </span>
     <span class="old-price">
-        <?php echo $block->renderAmount($priceModel->getAmount(), [
+        <?php /* @escapeNotVerified */ echo $block->renderAmount($priceModel->getAmount(), [
             'display_label'     => __('Regular Price'),
             'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
             'price_type'        => 'oldPrice',
@@ -41,7 +41,7 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
         ]); ?>
     </span>
 <?php else: ?>
-    <?php echo $block->renderAmount($finalPriceModel->getAmount(), [
+    <?php /* @escapeNotVerified */ echo $block->renderAmount($finalPriceModel->getAmount(), [
         'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
         'price_type'        => 'finalPrice',
         'include_container' => true,
@@ -51,12 +51,12 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 
 <?php if ($block->showMinimalPrice()): ?>
     <?php if ($block->getUseLinkForAsLowAs()):?>
-        <a href="<?php echo $block->getSaleableItem()->getProductUrl(); ?>" class="minimal-price-link">
-            <?php echo $block->renderAmountMinimal(); ?>
+        <a href="<?php /* @escapeNotVerified */ echo $block->getSaleableItem()->getProductUrl(); ?>" class="minimal-price-link">
+            <?php /* @escapeNotVerified */ echo $block->renderAmountMinimal(); ?>
         </a>
     <?php else:?>
         <span class="minimal-price-link">
-            <?php echo $block->renderAmountMinimal(); ?>
+            <?php /* @escapeNotVerified */ echo $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 01dee99d6aed3..c0b494718c024 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 echo($block->hasListClass() ? $block->getListClass() : 'prices-tier items'); ?>">
+    <ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices-tier items'); ?>">
     <?php foreach ($tierPrices as $index => $price) : ?>
         <li class="item">
             <?php
@@ -53,10 +53,10 @@ $product = $block->getSaleableItem();
                         $tierPriceData['qty'] = $price['price_qty'];
                     }
                 ?>
-                <?php echo __('Buy %1 for: ', $price['price_qty']); ?>
-                <a href="#" id="<?php echo($popupId);?>"
+                <?php /* @escapeNotVerified */ echo __('Buy %1 for: ', $price['price_qty']); ?>
+                <a href="#" id="<?php /* @escapeNotVerified */ echo($popupId);?>"
                    data-tier-price="<?php echo $block->escapeHtml($block->jsonEncode($tierPriceData)); ?>">
-                    <?php echo __('Click for price'); ?></a>
+                    <?php /* @escapeNotVerified */ echo __('Click for price'); ?></a>
                 <?php else:
                     $priceAmountBlock = $block->renderAmount(
                         $price['price'],
@@ -68,7 +68,7 @@ $product = $block->getSaleableItem();
                         ]
                     );
                 ?>
-                <?php echo ($block->getShowDetailedPrice() !== false)
+                <?php /* @escapeNotVerified */ echo ($block->getShowDetailedPrice() !== false)
                         ? __(
                             'Buy %1 for %2 each and <strong class="benefit">save<span class="percent tier-%3">&nbsp;%4</span>%</strong>',
                             $price['price_qty'],
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 2ad6d6a672002..2bd7e54ba5eda 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 echo $this->helper('Magento\Catalog\Helper\Output')->categoryAttribute($block->getCurrentCategory(), $_description, 'description') ?>
+        <?php /* @escapeNotVerified */ echo $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/image.phtml b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
index 81be4c21de95d..db15d330a5a45 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/image.phtml
@@ -21,6 +21,6 @@
     if ($_imgUrl = $_category->getImageUrl()) {
         $_imgHtml = '<div class="category-image"><img src="' . $_imgUrl . '" alt="' . $block->escapeHtml($_category->getName()) . '" title="' . $block->escapeHtml($_category->getName()) . '" class="image" /></div>';
         $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
-        echo $_imgHtml;
+        /* @escapeNotVerified */ echo $_imgHtml;
     }
 ?>
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 83772c844f8a4..ca7a734cfb2e8 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 echo $block->getLink() ?>" class="action link rss"><span><?php echo $block->getLabel() ?></span></a>
+    <a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="action link rss"><span><?php /* @escapeNotVerified */ echo $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 203c6a82ece5d..0f22ff4424429 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_block.phtml
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-category-link">
-    <a <?php echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $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 63c2c2cc98be2..2b0754df7cafe 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/category/widget/link/link_inline.phtml
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <span class="widget block block-category-link-inline">
-    <a <?php echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $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 b54030e8bbfb3..08b0e88d799b5 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 echo __('Shop By') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('Shop By') ?></strong>
         </div>
         <div class="content">
-            <strong class="subtitle"><?php echo __('Shopping Options') ?></strong>
+            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('Shopping Options') ?></strong>
             <dl class="options" id="narrow-by-list2">
-                <dt><?php echo __('Category') ?></dt>
+                <dt><?php /* @escapeNotVerified */ echo __('Category') ?></dt>
                 <dd>
                     <ol class="items">
                         <?php foreach ($_categories as $_category): ?>
                             <?php if ($_category->getIsActive()): ?>
                                 <li class="item">
-                                    <a href="<?php echo $block->getCategoryUrl($_category) ?>"<?php if ($block->isCategoryActive($_category)): ?> class="current"<?php endif; ?>><?php echo $block->escapeHtml($_category->getName()) ?></a>
-                                    <span class="count"><?php echo $_category->getProductCount() ?></span>
+                                    <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>
                                 </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 28c4465191865..cc9da4a66c3cf 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 echo __('Compare Products') ?>"
+    <a class="action compare no-display" title="<?php /* @escapeNotVerified */ echo __('Compare Products') ?>"
        data-bind="attr: {'href': compareProducts().listUrl}, css: {'no-display': !compareProducts().count}"
     >
-        <?php echo __('Compare Products') ?>
+        <?php /* @escapeNotVerified */ echo __('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 echo $block->getJsLayout();?>}}
+{"[data-role=compare-products-link]": {"Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $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 d9bf3ad8303ba..3b912814e83a0 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 echo __('Print This Page') ?>">
-        <span><?php echo __('Print This Page') ?></span>
+    <a href="#" class="action print" title="<?php /* @escapeNotVerified */ echo __('Print This Page') ?>">
+        <span><?php /* @escapeNotVerified */ echo __('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 echo __('Compare Products') ?></caption>
+                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('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 echo __('Remove Product') ?></span></th>
+                            <th scope="row" class="cell label remove"><span><?php /* @escapeNotVerified */ echo __('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 echo $compareHelper->getPostDataRemove($_item); ?>'
-                               class="action delete" title="<?php echo __('Remove Product') ?>">
-                                <span><?php echo __('Remove Product') ?></span>
+                            <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>
                         </td>
                     <?php endforeach; ?>
@@ -46,39 +46,39 @@
                     <?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 echo __('Product') ?></span></th>
+                            <th scope="row" class="cell label product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
                         <?php endif; ?>
                         <td data-th="<?php echo $block->escapeHtml(__('Product')); ?>" class="cell product info">
-                            <a class="product-item-photo" href="<?php echo $block->getProductUrl($_item) ?>" title="<?php echo $block->stripTags($_item->getName(), null, true) ?>">
+                            <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(); ?>
                             </a>
                             <strong class="product-item-name">
-                                <a href="<?php echo $block->getProductUrl($_item) ?>" title="<?php echo $block->stripTags($_item->getName(), null, true) ?>">
-                                    <?php echo $_helper->productAttribute($_item, $_item->getName(), '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>
                             </strong>
                             <?php echo $block->getReviewsSummaryHtml($_item, 'short') ?>
-                            <?php echo $block->getProductPrice($_item, '-compare-list-top') ?>
+                            <?php /* @escapeNotVerified */ echo $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 echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item); ?>" method="post">
+                                        <form data-role="tocart-form" action="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Product\Compare')->getAddToCartUrl($_item); ?>" method="post">
                                             <button type="submit" class="action tocart primary">
-                                                <span><?php echo __('Add to Cart'); ?></span>
+                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart'); ?></span>
                                             </button>
                                         </form>
                                     <?php else: ?>
                                         <?php if ($_item->getIsSalable()): ?>
-                                            <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                         <?php else: ?>
-                                            <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>' class="action towishlist" data-action="add-to-wishlist">
-                                            <span><?php echo __('Add to Wish List') ?></span>
+                                        <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>
                                     </div>
                                 <?php endif; ?>
@@ -104,7 +104,7 @@
                                     <?php switch ($_attribute->getAttributeCode()) {
                                         case "price": ?>
                                             <?php
-                                                echo $block->getProductPrice(
+                                                /* @escapeNotVerified */ echo $block->getProductPrice(
                                                     $_item,
                                                     '-compare-list-' . $_attribute->getCode()
                                                 )
@@ -114,7 +114,7 @@
                                             <?php $block->getImage($_item, 'product_small_image')->toHtml(); ?>
                                             <?php break;
                                         default: ?>
-                                        <?php echo $_helper->productAttribute($_item, $block->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
+                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $block->getProductAttributeValue($_item, $_attribute), $_attribute->getAttributeCode()) ?>
                                         <?php break;
                                     } ?>
                                 </div>
@@ -135,5 +135,5 @@
             </script>
         <?php endif; ?>
 <?php else: ?>
-    <div class="message info empty"><div><?php echo __('You have no items to compare.') ?></div></div>
+    <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('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 6c032a04d412f..712ab41368dd9 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 echo __('Compare Products') ?></strong>
+        <strong id="block-compare-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('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 echo __('Remove This Item') ?>" class="action delete">
-                        <span><?php echo __('Remove This Item') ?></span>
+                    <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>
                 </li>
         </ol>
         <div class="actions-toolbar">
             <div class="primary">
-                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?php echo __('Compare') ?></span></a>
+                <a data-bind="attr: {'href': compareProducts().listUrl}" class="action compare primary"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Clear All') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Clear All') ?></span>
                 </a>
             </div>
         </div>
     </div>
     <!-- /ko -->
     <!-- ko ifnot: compareProducts().count -->
-    <div class="empty"><?php echo __('You have no items to compare.') ?></div>
+    <div class="empty"><?php /* @escapeNotVerified */ echo __('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 echo $block->getJsLayout();?>}}
+{"[data-role=compare-products-sidebar]": {"Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $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 cfc880f93d318..36986b4fb7240 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 echo $_width; ?>px;">
-    <div class="buttons-set"><a href="#" class="button" role="close-window"><span><?php echo __('Close Window') ?></span></a></div>
+<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>
     <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
         <div class="nav">
           <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
-              <a href="<?php echo $_prevUrl ?>" class="prev">&laquo; <?php echo __('Prev') ?></a>
+              <a href="<?php /* @escapeNotVerified */ echo $_prevUrl ?>" class="prev">&laquo; <?php /* @escapeNotVerified */ echo __('Prev') ?></a>
           <?php endif; ?>
           <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
-              <a href="<?php echo $_nextUrl ?>" class="next"><?php echo __('Next') ?> &raquo;</a>
+              <a href="<?php /* @escapeNotVerified */ echo $_nextUrl ?>" class="next"><?php /* @escapeNotVerified */ echo __('Next') ?> &raquo;</a>
           <?php endif; ?>
         </div>
     <?php endif; ?>
     <?php if ($_imageTitle = $block->escapeHtml($block->getCurrentImage()->getLabel())): ?>
-        <h1 class="image-label"><?php echo $_imageTitle ?></h1>
+        <h1 class="image-label"><?php /* @escapeNotVerified */ echo $_imageTitle ?></h1>
     <?php endif; ?>
     <?php
         $imageUrl = $this->helper('Magento\Catalog\Helper\Image')
@@ -30,15 +30,15 @@
             ->setImageFile($block->getImageFile())
             ->getUrl();
     ?>
-    <img src="<?php echo $imageUrl; ?>"<?php if ($_width): ?> width="<?php 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 echo __('Close Window') ?></span></a></div>
+    <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>
     <?php if ($block->getPreviousImageUrl() || $block->getNextImageUrl()): ?>
         <div class="nav">
           <?php if ($_prevUrl = $block->getPreviousImageUrl()): ?>
-              <a href="<?php echo $_prevUrl ?>" class="prev">&laquo; <?php echo __('Prev') ?></a>
+              <a href="<?php /* @escapeNotVerified */ echo $_prevUrl ?>" class="prev">&laquo; <?php /* @escapeNotVerified */ echo __('Prev') ?></a>
           <?php endif; ?>
           <?php if ($_nextUrl = $block->getNextImageUrl()): ?>
-              <a href="<?php echo $_nextUrl ?>" class="next"><?php echo __('Next') ?> &raquo;</a>
+              <a href="<?php /* @escapeNotVerified */ echo $_nextUrl ?>" class="next"><?php /* @escapeNotVerified */ echo __('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 821219b144190..df045da2e46f0 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 echo $block->getCustomAttributes(); ?>
-     src="<?php echo $block->getImageUrl(); ?>"
-     width="<?php echo $block->getWidth(); ?>"
-     height="<?php echo $block->getHeight(); ?>"
-     alt="<?php echo $block->stripTags($block->getLabel(), null, true); ?>" />
+     <?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); ?>" />
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 268079632ca41..79b24bab19545 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 echo $block->getWidth()?>px;">
+      style="width:<?php /* @escapeNotVerified */ echo $block->getWidth()?>px;">
     <span class="product-image-wrapper"
-          style="padding-bottom: <?php echo ($block->getRatio() * 100); ?>%;">
+          style="padding-bottom: <?php /* @escapeNotVerified */ echo ($block->getRatio() * 100); ?>%;">
         <img class="product-image-photo"
-             <?php echo $block->getCustomAttributes(); ?>
-             src="<?php echo $block->getImageUrl(); ?>"
-             width="<?php echo $block->getResizedImageWidth(); ?>"
-             height="<?php echo $block->getResizedImageHeight(); ?>"
-             alt="<?php echo $block->stripTags($block->getLabel(), null, true); ?>"/></span>
+             <?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>
 </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 76eb35a1f506f..3244ac50741c3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -20,7 +20,7 @@ $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
 <?php if (!$_productCollection->count()): ?>
-    <div class="message info empty"><div><?php echo __('We can\'t find products matching the selection.') ?></div></div>
+    <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('We can\'t find products matching the selection.') ?></div></div>
 <?php else: ?>
     <?php echo $block->getToolbarHtml() ?>
     <?php echo $block->getAdditionalHtml() ?>
@@ -41,12 +41,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
      */
     $pos = $block->getPositioned();
     ?>
-    <div class="products wrapper <?php echo $viewMode; ?> products-<?php echo $viewMode; ?>">
+    <div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?> products-<?php /* @escapeNotVerified */ echo $viewMode; ?>">
         <?php $iterator = 1; ?>
         <ol class="products list items product-items">
             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
             <?php foreach ($_productCollection as $_product): ?>
-                <?php echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                <?php /* @escapeNotVerified */ echo($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,7 +56,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                     }
                     ?>
                     <?php // Product Image ?>
-                    <a href="<?php echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
+                    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
                         <?php echo $productImage->toHtml(); ?>
                     </a>
                     <div class="product details product-item-details">
@@ -65,12 +65,12 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                         ?>
                         <strong class="product name product-item-name">
                             <a class="product-item-link"
-                               href="<?php echo $_product->getProductUrl() ?>">
-                                <?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
+                               href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>">
+                                <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
                             </a>
                         </strong>
                         <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?>
-                        <?php echo $block->getProductPrice($_product) ?>
+                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_product) ?>
                         <?php echo $block->getProductDetailsHtml($_product); ?>
 
                         <div class="product-item-inner">
@@ -78,20 +78,20 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                 <div class="actions-primary"<?php echo strpos($pos, $viewMode . '-primary') ? $position : ''; ?>>
                                     <?php if ($_product->isSaleable()): ?>
                                         <?php $postParams = $block->getAddToCartPostParams($_product); ?>
-                                        <form data-role="tocart-form" action="<?php echo $postParams['action']; ?>" method="post">
-                                            <input type="hidden" name="product" value="<?php echo $postParams['data']['product']; ?>">
-                                            <input type="hidden" name="<?php echo Action::PARAM_NAME_URL_ENCODED; ?>" value="<?php echo $postParams['data'][Action::PARAM_NAME_URL_ENCODED]; ?>">
+                                        <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]; ?>">
                                             <button type="submit"
                                                     title="<?php echo $block->escapeHtml(__('Add to Cart')); ?>"
                                                     class="action tocart primary">
-                                                <span><?php echo __('Add to Cart') ?></span>
+                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                             </button>
                                         </form>
                                     <?php else: ?>
                                         <?php if ($_product->getIsSalable()): ?>
-                                            <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                            <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                         <?php else: ?>
-                                            <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                            <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                 </div>
@@ -101,10 +101,10 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                            class="action towishlist"
                                            title="<?php echo $block->escapeHtml(__('Add to Wish List')); ?>"
                                            aria-label="<?php echo $block->escapeHtml(__('Add to Wish List')); ?>"
-                                           data-post='<?php echo $block->getAddToWishlistParams($_product); ?>'
+                                           data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_product); ?>'
                                            data-action="add-to-wishlist"
                                            role="button">
-                                            <span><?php echo __('Add to Wish List') ?></span>
+                                            <span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span>
                                         </a>
                                     <?php endif; ?>
                                     <?php
@@ -114,17 +114,17 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
                                        class="action tocompare"
                                        title="<?php echo $block->escapeHtml(__('Add to Compare')); ?>"
                                        aria-label="<?php echo $block->escapeHtml(__('Add to Compare')); ?>"
-                                       data-post='<?php echo $compareHelper->getPostDataParams($_product); ?>'
+                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_product); ?>'
                                        role="button">
-                                        <span><?php echo __('Add to Compare') ?></span>
+                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                     </a>
                                 </div>
                             </div>
                             <?php if ($showDescription):?>
                                 <div class="product description product-item-description">
-                                    <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
-                                    <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
-                                       class="action more"><?php echo __('Learn More') ?></a>
+                                    <?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>
                                 </div>
                             <?php endif; ?>
                         </div>
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 4c3794a255222..8e5b2277891e6 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
@@ -162,24 +162,24 @@ switch ($type = $block->getType()) {
 
     <?php if ($type == 'related' || $type == 'upsell'): ?>
         <?php if ($type == 'related'): ?>
-            <div class="block <?php echo $class; ?>" data-mage-init='{"relatedProducts":{"relatedCheckbox":".related.checkbox"}}' data-limit="<?php echo $limit; ?>" data-shuffle="<?php echo $shuffle; ?>">
+            <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; ?>">
         <?php else: ?>
-            <div class="block <?php echo $class; ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?php echo $limit; ?>" data-shuffle="<?php echo $shuffle; ?>">
+            <div class="block <?php /* @escapeNotVerified */ echo $class; ?>" data-mage-init='{"upsellProducts":{}}' data-limit="<?php /* @escapeNotVerified */ echo $limit; ?>" data-shuffle="<?php /* @escapeNotVerified */ echo $shuffle; ?>">
         <?php endif; ?>
     <?php else: ?>
-        <div class="block <?php echo $class; ?>">
+        <div class="block <?php /* @escapeNotVerified */ echo $class; ?>">
     <?php endif; ?>
     <div class="block-title title">
-        <strong id="block-<?php echo $class?>-heading" role="heading" aria-level="2"><?php echo $title; ?></strong>
+        <strong id="block-<?php /* @escapeNotVerified */ echo $class?>-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
     </div>
-    <div class="block-content content" aria-labelledby="block-<?php echo $class?>-heading">
+    <div class="block-content content" aria-labelledby="block-<?php /* @escapeNotVerified */ echo $class?>-heading">
         <?php if ($type == 'related' && $canItemsAddToCart): ?>
         <div class="block-actions">
-            <?php echo __('Check items to add to the cart or') ?>
-            <button type="button" class="action select" role="select-all"><span><?php echo __('select all') ?></span></button>
+            <?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>
         </div>
         <?php endif; ?>
-        <div class="products wrapper grid products-grid products-<?php echo $type; ?>">
+        <div class="products wrapper grid products-grid products-<?php /* @escapeNotVerified */ echo $type; ?>">
             <ol class="products list items product-items">
                 <?php $iterator = 1; ?>
                 <?php foreach ($items as $_item): ?>
@@ -190,21 +190,21 @@ switch ($type = $block->getType()) {
                     <?php endif; ?>
                 <?php endif; ?>
                 <?php if ($type == 'related' || $type == 'upsell'): ?>
-                    <?php echo($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
+                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item" style="display: none;">' : '</li><li class="item product product-item" style="display: none;">' ?>
                 <?php else: ?>
-                    <?php echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
+                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product product-item">' : '</li><li class="item product product-item">' ?>
                 <?php endif; ?>
-                <div class="product-item-info <?php echo $available; ?>">
-                    <?php echo '<!-- ' . $image . '-->' ?>
-                    <a href="<?php echo $block->getProductUrl($_item) ?>" class="product photo product-item-photo">
+                <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(); ?>
                     </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 echo $block->getProductUrl($_item) ?>">
+                        <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>
 
-                        <?php echo $block->getProductPrice($_item); ?>
+                        <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item); ?>
 
                             <?php if ($templateType): ?>
                                 <?php echo $block->getReviewsSummaryHtml($_item, $templateType) ?>
@@ -213,8 +213,8 @@ switch ($type = $block->getType()) {
                             <?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 echo $_item->getId() ?>" name="related_products[]" value="<?php echo $_item->getId() ?>" />
-                                        <label class="label" for="related-checkbox<?php echo $_item->getId() ?>"><span><?php echo __('Add to Cart') ?></span></label>
+                                        <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>
                                     </div>
                                 <?php endif; ?>
                             <?php endif; ?>
@@ -225,24 +225,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 echo $block->getAddToCartUrl($_item) ?>"}}' type="button" title="<?php echo __('Add to Cart') ?>">
-                                                        <span><?php echo __('Add to Cart') ?></span>
+                                                    <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>
                                                 <?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 echo $postData; ?>'
-                                                            type="button" title="<?php echo __('Add to Cart') ?>">
-                                                        <span><?php echo __('Add to Cart') ?></span>
+                                                            data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                            type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                     </button>
                                                 <?php endif; ?>
                                             <?php else: ?>
                                                 <?php if ($_item->getIsSalable()): ?>
-                                                    <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                 <?php else: ?>
-                                                    <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                                                 <?php endif; ?>
                                             <?php endif; ?>
                                         </div>
@@ -251,8 +251,8 @@ switch ($type = $block->getType()) {
                                     <?php if ($showWishlist || $showCompare): ?>
                                         <div class="secondary-addto-links actions-secondary" data-role="add-to-links">
                                             <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
-                                                <a href="#" data-post='<?php echo $block->getAddToWishlistParams($_item); ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wish List') ?>">
-                                                    <span><?php echo __('Add to Wish List') ?></span>
+                                                <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>
                                             <?php endif; ?>
                                             <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
@@ -260,10 +260,10 @@ switch ($type = $block->getType()) {
                                                 $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
                                                 ?>
                                                 <a href="#" class="action tocompare"
-                                                   data-post='<?php echo $compareHelper->getPostDataParams($_item);?>'
+                                                   data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
                                                    data-role="add-to-links"
-                                                   title="<?php echo __('Add to Compare'); ?>">
-                                                    <span><?php echo __('Add to Compare') ?></span>
+                                                   title="<?php /* @escapeNotVerified */ echo __('Add to Compare'); ?>">
+                                                    <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                 </a>
                                             <?php endif; ?>
                                         </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
index f54226bc7b4e3..a1ca459142ac5 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,7 +16,7 @@
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <?php if ($block->getCollection()->getSize()): ?>
-    <div class="toolbar toolbar-products" data-mage-init='<?php echo $block->getWidgetOptionsJson(); ?>'>
+    <div class="toolbar toolbar-products" data-mage-init='<?php /* @escapeNotVerified */ echo $block->getWidgetOptionsJson(); ?>'>
         <?php if ($block->isExpanded()): ?>
             <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
         <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
index 91b5688b39467..9fb71b2bb865c 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/amount.phtml
@@ -17,15 +17,15 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <p class="toolbar-amount" id="toolbar-amount">
     <?php if ($block->getLastPageNum() > 1): ?>
-        <?php echo __('Items %1-%2 of %3',
+        <?php /* @escapeNotVerified */ echo __('Items %1-%2 of %3',
             '<span class="toolbar-number">' . $block->getFirstNum() . '</span>',
             '<span class="toolbar-number">' . $block->getLastNum() . '</span>',
             '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
     <?php elseif ($block->getTotalNum() == 1): ?>
-        <?php echo __('%1 Item',
+        <?php /* @escapeNotVerified */ echo __('%1 Item',
            '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
     <?php else: ?>
-        <?php echo __('%1 Items',
+        <?php /* @escapeNotVerified */ echo __('%1 Items',
             '<span class="toolbar-number">' . $block->getTotalNum() . '</span>') ?>
     <?php endif; ?>
 </p>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar/limiter.phtml
index a5781ed842a4f..bac0d971b91b7 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 echo __('Show') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 echo $_key ?>"<?php if ($block->isLimitCurrent($_key)): ?>
+                <option value="<?php /* @escapeNotVerified */ echo $_key ?>"<?php if ($block->isLimitCurrent($_key)): ?>
                     selected="selected"<?php endif ?>>
-                    <?php echo $_limit ?>
+                    <?php /* @escapeNotVerified */ echo $_limit ?>
                 </option>
             <?php endforeach; ?>
         </select>
     </div>
-    <span class="limiter-text"><?php echo __('per page') ?></span>
+    <span class="limiter-text"><?php /* @escapeNotVerified */ echo __('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 fb41f2cc400f3..7e767273284c0 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,10 +16,10 @@
 use Magento\Catalog\Model\Product\ProductList\Toolbar;
 ?>
 <div class="toolbar-sorter sorter">
-    <label class="sorter-label" for="sorter"><?php echo __('Sort By') ?></label>
+    <label class="sorter-label" for="sorter"><?php /* @escapeNotVerified */ echo __('Sort By') ?></label>
     <select id="sorter" data-role="sorter" class="sorter-options">
         <?php foreach ($block->getAvailableOrders() as $_key => $_order): ?>
-            <option value="<?php echo $_key; ?>"
+            <option value="<?php /* @escapeNotVerified */ echo $_key; ?>"
                 <?php if ($block->isOrderCurrent($_key)): ?>
                     selected="selected"
                 <?php endif; ?>
@@ -29,12 +29,12 @@ use Magento\Catalog\Model\Product\ProductList\Toolbar;
         <?php endforeach; ?>
     </select>
     <?php if ($block->getCurrentDirection() == 'desc'): ?>
-        <a title="<?php echo __('Set Ascending Direction') ?>" href="#" class="action sorter-action sort-desc" data-role="direction-switcher" data-value="asc">
-            <span><?php echo __('Set Ascending Direction') ?></span>
+        <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>
     <?php else: ?>
-        <a title="<?php echo __('Set Descending Direction') ?>" href="#" class="action sorter-action sort-asc" data-role="direction-switcher" data-value="desc">
-            <span><?php echo __('Set Descending Direction') ?></span>
+        <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>
     <?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 3cd81f8768692..5dececf5a96df 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 echo __('View as') ?></strong>
+    <strong class="modes-label" id="modes-label"><?php /* @escapeNotVerified */ echo __('View as') ?></strong>
     <?php foreach ($block->getModes() as $_code => $_label): ?>
         <?php if ($block->isModeActive($_code)): ?>
-            <strong title="<?php echo $_label ?>"
-                class="modes-mode active mode-<?php echo strtolower($_code); ?>"
-                data-value="<?php echo strtolower($_code); ?>">
-                <span><?php echo $_label ?></span>
+            <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>
         <?php else: ?>
-            <a class="modes-mode mode-<?php echo strtolower($_code); ?>"
-               title="<?php echo $_label ?>"
+            <a class="modes-mode mode-<?php /* @escapeNotVerified */ echo strtolower($_code); ?>"
+               title="<?php /* @escapeNotVerified */ echo $_label ?>"
                href="#"
                data-role="mode-switcher"
-               data-value="<?php echo strtolower($_code); ?>"
-               id="mode-<?php echo strtolower($_code); ?>"
-               aria-labelledby="modes-label mode-<?php echo strtolower($_code); ?>">
-                <span><?php echo $_label ?></span>
+               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>
             </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 9aa915e1f82fa..b18a40d7f7433 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -20,7 +20,7 @@ $_productCollection = $block->getLoadedProductCollection();
 $_helper = $this->helper('Magento\Catalog\Helper\Output');
 ?>
 <?php if (!$_productCollection->count()): ?>
-<p class="message note"><?php echo __('We can\'t find products matching the selection.') ?></p>
+<p class="message note"><?php /* @escapeNotVerified */ echo __('We can\'t find products matching the selection.') ?></p>
 <?php else: ?>
 <?php echo $block->getToolbarHtml() ?>
 <?php echo $block->getAdditionalHtml() ?>
@@ -37,14 +37,14 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
         $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::FULL_VIEW;
     }
 ?>
-<div class="products wrapper <?php echo $viewMode; ?>">
+<div class="products wrapper <?php /* @escapeNotVerified */ echo $viewMode; ?>">
     <?php $iterator = 1; ?>
     <ol class="products list items">
         <?php foreach ($_productCollection as $_product): ?>
-        <?php echo($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
+        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="item product">' : '</li><li class="item product">' ?>
             <div class="product">
                 <?php // Product Image ?>
-                <a href="<?php echo $_product->getProductUrl() ?>" class="product photo">
+                <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="product photo">
                     <?php echo $block->getImage($_product, $image)->toHtml(); ?>
                 </a>
                 <div class="product details">
@@ -86,7 +86,7 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
 
                     $details = $block->getInfoOrder() ?: ['name','price','review','description','actions'];
                     foreach ($details as $detail) {
-                        echo $info[$detail];
+                        /* @escapeNotVerified */ echo $info[$detail];
                     }
                     ?>
 
@@ -98,4 +98,4 @@ $_helper = $this->helper('Magento\Catalog\Helper\Output');
 </div>
 <?php echo $block->getToolbarHtml() ?>
 <?php endif; ?>
-<?php echo $time_taken = microtime(true) - $start; ?>
+<?php /* @escapeNotVerified */ echo $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 7c3733965ac4a..b58004e05a86a 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 echo $_html ?>
+    <?php /* @escapeNotVerified */ echo $_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 547c54ef0a1b7..f995ee8214169 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
@@ -18,19 +18,19 @@ $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare');
     <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>
         <a href="#"
             class="action towishlist"
-            title="<?php echo __('Add to Wish List') ?>"
-            data-post='<?php echo $_wishlistSubmitParams; ?>'
-            data-action="add-to-wishlist"><span><?php echo __('Add to Wish List') ?></span></a>
+            title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>"
+            data-post='<?php /* @escapeNotVerified */ echo $_wishlistSubmitParams; ?>'
+            data-action="add-to-wishlist"><span><?php /* @escapeNotVerified */ echo __('Add to Wish List') ?></span></a>
     <?php endif; ?>
-    <a href="#" data-post='<?php echo $compareHelper->getPostDataParams($_product);?>'
+    <a href="#" data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_product);?>'
         data-role="add-to-links"
-        title="<?php echo __('Add to Compare') ?>"
-        class="action tocompare"><span><?php echo __('Add to Compare') ?></span></a>
+        title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>"
+        class="action tocompare"><span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span></a>
 </div>
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
+            "addToWishlist": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
         }
     }
 </script>
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 90c6533461042..1f623aab1008d 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,14 +15,14 @@
     <fieldset class="fieldset">
         <?php if ($block->shouldRenderQuantity()): ?>
         <div class="field qty">
-            <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
+            <label class="label" for="qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
             <div class="control">
                 <input type="number"
                        name="qty"
                        id="qty"
                        maxlength="12"
-                       value="<?php echo $block->getProductDefaultQty() * 1 ?>"
-                       title="<?php echo __('Qty') ?>" class="input-text qty"
+                       value="<?php /* @escapeNotVerified */ echo $block->getProductDefaultQty() * 1 ?>"
+                       title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty"
                        data-validate="<?php echo $block->escapeHtml(json_encode($block->getQuantityValidators())) ?>"
                        />
             </div>
@@ -30,10 +30,10 @@
         <?php endif; ?>
         <div class="actions">
             <button type="submit"
-                    title="<?php echo $buttonTitle ?>"
+                    title="<?php /* @escapeNotVerified */ echo $buttonTitle ?>"
                     class="action primary tocart"
                     id="product-addtocart-button">
-                <span><?php echo $buttonTitle ?></span>
+                <span><?php /* @escapeNotVerified */ echo $buttonTitle ?></span>
             </button>
             <?php echo $block->getChildHtml('', true) ?>
         </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/attribute.phtml
index 04d04c42ea925..4c113b77f4226 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 attibute <?php echo $_className?>">
-    <?php if ($_attributeLabel != 'none'): ?><strong class="type"><?php echo $_attributeLabel?></strong><?php endif; ?>
-    <div class="value" <?php echo $_attributeAddAttribute;?>><?php echo $_attributeValue; ?></div>
+<div class="product attibute <?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>
 <?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 e804e0833a58a..3eedf461f3225 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 echo __('More Information') ?></caption>
+            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('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 echo $_helper->productAttribute($_product, $_data['value'], $_data['code']) ?></td>
+                    <td class="col data" data-th="<?php echo $block->escapeHtml(__($_data['label'])) ?>"><?php /* @escapeNotVerified */ echo $_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 387566fa37e94..2f848be0a0ddd 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 echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($block->getProduct(), $block->getProduct()->getDescription(), 'description') ?>
+<?php /* @escapeNotVerified */ echo $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 a9828613f0ed9..b7ca4ed46e13b 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 echo $alias;?>-title"
-                     data-role="collapsible" id="tab-label-<?php echo $alias;?>">
+                     aria-labeledby="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title"
+                     data-role="collapsible" id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>">
                     <a class="data switch"
                        tabindex="-1"
                        data-toggle="switch"
-                       href="#<?php echo $alias; ?>"
-                       id="tab-label-<?php echo $alias;?>-title">
-                        <?php echo $label; ?>
+                       href="#<?php /* @escapeNotVerified */ echo $alias; ?>"
+                       id="tab-label-<?php /* @escapeNotVerified */ echo $alias;?>-title">
+                        <?php /* @escapeNotVerified */ echo $label; ?>
                     </a>
                 </div>
-                <div class="data item content" id="<?php echo $alias; ?>" data-role="content">
-                    <?php echo $html; ?>
+                <div class="data item content" id="<?php /* @escapeNotVerified */ echo $alias; ?>" data-role="content">
+                    <?php /* @escapeNotVerified */ echo $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 adcb5bf7c6610..6d66986c559be 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,9 +16,9 @@
 <?php $_product = $block->getProduct(); ?>
 
 <div class="product-add-form">
-    <form action="<?php echo $block->getSubmitUrl($_product) ?>" method="post"
+    <form action="<?php /* @escapeNotVerified */ echo $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 echo $_product->getId() ?>" />
+        <input type="hidden" name="product" value="<?php /* @escapeNotVerified */ echo $_product->getId() ?>" />
         <input type="hidden" name="selected_configurable_option" value="" />
         <input type="hidden" name="related_product" id="related-products-field" value="" />
         <?php echo $block->getChildHtml('form_top'); ?>
@@ -47,6 +47,6 @@
             return !$(elem).find('.price-from').length;
         });
 
-        priceBoxes.priceBox({'priceConfig': <?php echo $block->getJsonConfig() ?>});
+        priceBoxes.priceBox({'priceConfig': <?php /* @escapeNotVerified */ echo $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 3089c2cf50f6f..b7887a9648142 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
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * Product media data template
  *
@@ -17,25 +19,25 @@
             "mage/gallery/gallery": {
                 "mixins":["magnifier/magnify"],
                 "magnifierOpts": {
-                    "enabled": <?php echo $block->getVar("magnifier:enabled"); ?>,
-                    "eventType": "<?php echo $block->getVar("magnifier:action"); ?>",
-                    "width": "<?php echo $block->getVar("magnifier:width"); ?>",
-                    "height": "<?php echo $block->getVar("magnifier:height"); ?>",
-                    "top": "<?php echo $block->getVar("magnifier:top"); ?>",
-                    "left": "<?php echo $block->getVar("magnifier:left"); ?>"
+                    "enabled": <?php /* @escapeNotVerified */ echo $block->getVar("magnifier:enabled"); ?>,
+                    "eventType": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:action"); ?>",
+                    "width": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:width"); ?>",
+                    "height": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:height"); ?>",
+                    "top": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:top"); ?>",
+                    "left": "<?php /* @escapeNotVerified */ echo $block->getVar("magnifier:left"); ?>"
                 },
-                "data": <?php echo $block->getGalleryImagesJson(); ?>,
+                "data": <?php /* @escapeNotVerified */ echo $block->getGalleryImagesJson(); ?>,
                 "options": {
-                    "nav": "<?php echo $block->getVar("gallery:navigation"); ?>",
-                    "loop": <?php echo $block->getVar("gallery:loop"); ?>,
-                    "keyboard": <?php echo $block->getVar("gallery:keyboard"); ?>,
-                    "arrows": <?php echo $block->getVar("gallery:arrows"); ?>,
-                    "showCaption": <?php echo $block->getVar("gallery:show_caption"); ?>,
-                    "width": <?php echo $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
-                    "thumbwidth": <?php echo $block->getImageAttribute('product_page_image_small', 'width'); ?>,
-                    "thumbheight": <?php echo $block->getImageAttribute('product_page_image_small', 'height')
+                    "nav": "<?php /* @escapeNotVerified */ echo $block->getVar("gallery:navigation"); ?>",
+                    "loop": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:loop"); ?>,
+                    "keyboard": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:keyboard"); ?>,
+                    "arrows": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:arrows"); ?>,
+                    "showCaption": <?php /* @escapeNotVerified */ echo $block->getVar("gallery:show_caption"); ?>,
+                    "width": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
+                    "thumbwidth": <?php /* @escapeNotVerified */ echo $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'); ?>,
-                    "height": <?php echo $block->getImageAttribute('product_page_image_medium', 'height')
+                    "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')
                         ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>
                 },
                 "breakpoints": {
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 f9eac3a082c57..1280316a54a8f 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,7 +9,7 @@
 ?>
 <?php $_product = $block->getProduct() ?>
 <?php if ($block->canEmailToFriend()): ?>
-    <a title="<?php echo __('Email') ?>"
-       href="<?php echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
-       class="action mailto friend"><span><?php echo __('Email') ?></span></a>
+    <a title="<?php /* @escapeNotVerified */ echo __('Email') ?>"
+       href="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Product')->getEmailToFriendUrl($_product) ?>"
+       class="action mailto friend"><span><?php /* @escapeNotVerified */ echo __('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 f9787cf3088ea..0cd3e08471de4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/opengraph/currency.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /** @var $block \Magento\Directory\Block\Currency */
 ?>
-<meta property="product:price:currency" content="<?php echo $block->stripTags($block->getCurrentCurrencyCode()); ?>"/>
+<meta property="product:price:currency" content="<?php /* @escapeNotVerified */ echo $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 0c3b2e7a62f21..50aa2335e398d 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->stripTags($block->getProduct()->getName()); ?>" />
-<meta property="og:image" content="<?php echo $block->stripTags($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()); ?>" />
-<meta property="og:description" content="<?php echo $block->stripTags($block->getProduct()->getShortDescription()); ?>" />
-<meta property="og:url" content="<?php echo $block->stripTags($block->getProduct()->getProductUrl()); ?>" />
+<meta property="og:title" content="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getProduct()->getName()); ?>" />
+<meta property="og:image" content="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getImage($block->getProduct(), 'product_base_image')->getImageUrl()); ?>" />
+<meta property="og:description" content="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getProduct()->getShortDescription()); ?>" />
+<meta property="og:url" content="<?php /* @escapeNotVerified */ echo $block->stripTags($block->getProduct()->getProductUrl()); ?>" />
 <?php if ($priceAmount = $block->getProduct()->getFinalPrice()):?>
-    <meta property="product:price:amount" content="<?php echo $priceAmount; ?>"/>
+    <meta property="product:price:amount" content="<?php /* @escapeNotVerified */ echo $priceAmount; ?>"/>
     <?php echo $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 97db31b4c789f..31177ebbc04c5 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
@@ -15,7 +15,7 @@
     {
         "#product_addtocart_form": {
             "priceOptions": {
-                "optionConfig": <?php echo $block->getJsonConfig()?>,
+                "optionConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig()?>,
                 "controlContainer": ".field",
                 "priceHolderSelector": "[data-role=priceBox]"
             }
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/date.phtml
index 5b98a739879f0..49b9bdfb8716d 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,12 +10,12 @@
 <?php $_option = $block->getOption() ?>
 <?php $_optionId = $_option->getId() ?>
 <?php $class = ($_option->getIsRequire()) ? ' required' : ''; ?>
-<div class="field date<?php echo $class; ?>"
+<div class="field date<?php /* @escapeNotVerified */ echo $class; ?>"
     data-mage-init='{"priceOptionDate":{"fromSelector":"#product_addtocart_form"}}'>
-    <fieldset class="fieldset fieldset-product-options-inner<?php echo $class; ?>">
+    <fieldset class="fieldset fieldset-product-options-inner<?php /* @escapeNotVerified */ echo $class; ?>">
         <legend class="legend">
             <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
-            <?php echo $block->getFormatedPrice() ?>
+            <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
         </legend>
         <div class="control">
             <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_DATE_TIME
@@ -32,16 +32,16 @@
 
             <?php if ($_option->getIsRequire()): ?>
                 <input type="hidden"
-                       name="validate_datetime_<?php echo $_optionId ?>"
-                       class="validate-datetime-<?php echo $_optionId ?>"
+                       name="validate_datetime_<?php /* @escapeNotVerified */ echo $_optionId ?>"
+                       class="validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>"
                        value=""
-                       data-validate="{'validate-required-datetime':<?php echo $_optionId?>}"/>
+                       data-validate="{'validate-required-datetime':<?php /* @escapeNotVerified */ echo $_optionId?>}"/>
             <?php else: ?>
                 <input type="hidden"
-                       name="validate_datetime_<?php echo $_optionId ?>"
-                       class="validate-datetime-<?php echo $_optionId ?>"
+                       name="validate_datetime_<?php /* @escapeNotVerified */ echo $_optionId ?>"
+                       class="validate-datetime-<?php /* @escapeNotVerified */ echo $_optionId ?>"
                        value=""
-                       data-validate="{'validate-optional-datetime':<?php echo $_optionId?>}"/>
+                       data-validate="{'validate-optional-datetime':<?php /* @escapeNotVerified */ echo $_optionId?>}"/>
             <?php endif; ?>
             <script type="text/x-magento-init">
             {
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 9e8165e3da4c0..a7c60b9f3a920 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 echo $class; ?>">
-    <label class="label" for="<?php echo $_fileName; ?>" id="<?php echo $_fileName; ?>-label">
+<div class="field file<?php /* @escapeNotVerified */ echo $class; ?>">
+    <label class="label" for="<?php /* @escapeNotVerified */ echo $_fileName; ?>" id="<?php /* @escapeNotVerified */ echo $_fileName; ?>-label">
         <span><?php echo  $block->escapeHtml($_option->getTitle()) ?></span>
-        <?php echo $block->getFormatedPrice() ?>
+        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
     </label>
     <?php if ($_fileExists): ?>
     <div class="control">
-        <span class="<?php echo $_fileNamed ?>"><?php echo $_fileInfo->getTitle(); ?></span>
-        <a href="javascript:void(0)" class="label" id="change-<?php echo $_fileName ?>" >
-            <?php echo __('Change') ?>
+        <span class="<?php /* @escapeNotVerified */ echo $_fileNamed ?>"><?php /* @escapeNotVerified */ echo $_fileInfo->getTitle(); ?></span>
+        <a href="javascript:void(0)" class="label" id="change-<?php /* @escapeNotVerified */ echo $_fileName ?>" >
+            <?php /* @escapeNotVerified */ echo __('Change') ?>
         </a>
         <?php if (!$_option->getIsRequire()): ?>
-            <input type="checkbox" id="delete-<?php echo $_fileName ?>" />
-            <span class="label"><?php echo __('Delete') ?></span>
+            <input type="checkbox" id="delete-<?php /* @escapeNotVerified */ echo $_fileName ?>" />
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
         <?php endif; ?>
     </div>
     <?php endif; ?>
-    <div class="control" id="input-box-<?php echo $_fileName ?>"
+    <div class="control" id="input-box-<?php /* @escapeNotVerified */ echo $_fileName ?>"
              data-mage-init='{"priceOptionFile":{
-                "fileName":"<?php echo $_fileName ?>",
-                "fileNamed":"<?php echo $_fileNamed ?>",
-                "fieldNameAction":"<?php echo $_fieldNameAction ?>",
-                "changeFileSelector":"#change-<?php echo $_fileName ?>",
-                "deleteFileSelector":"#delete-<?php echo $_fileName ?>"}
+                "fileName":"<?php /* @escapeNotVerified */ echo $_fileName ?>",
+                "fileNamed":"<?php /* @escapeNotVerified */ echo $_fileNamed ?>",
+                "fieldNameAction":"<?php /* @escapeNotVerified */ echo $_fieldNameAction ?>",
+                "changeFileSelector":"#change-<?php /* @escapeNotVerified */ echo $_fileName ?>",
+                "deleteFileSelector":"#delete-<?php /* @escapeNotVerified */ echo $_fileName ?>"}
              }'
             <?php echo $_fileExists ? 'style="display:none"' : '' ?>>
         <input type="file"
-               name="<?php echo $_fileName; ?>"
-               id="<?php echo $_fileName; ?>"
+               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 echo $_fieldNameAction; ?>" value="<?php echo $_fieldValueAction; ?>" />
+        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $_fieldNameAction; ?>" value="<?php /* @escapeNotVerified */ echo $_fieldValueAction; ?>" />
         <?php if ($_option->getFileExtension()): ?>
             <p class="note">
-                <?php echo __('Compatible file extensions to upload')?>: <strong><?php echo $_option->getFileExtension() ?></strong>
+                <?php /* @escapeNotVerified */ echo __('Compatible file extensions to upload')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getFileExtension() ?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeX() > 0): ?>
             <p class="note">
-                <?php echo __('Maximum image width')?>: <strong><?php echo $_option->getImageSizeX() ?> <?php echo __('px.')?></strong>
+                <?php /* @escapeNotVerified */ echo __('Maximum image width')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeX() ?> <?php /* @escapeNotVerified */ echo __('px.')?></strong>
             </p>
         <?php endif; ?>
         <?php if ($_option->getImageSizeY() > 0): ?>
             <p class="note">
-                <?php echo __('Maximum image height')?>: <strong><?php echo $_option->getImageSizeY() ?> <?php echo __('px.')?></strong>
+                <?php /* @escapeNotVerified */ echo __('Maximum image height')?>: <strong><?php /* @escapeNotVerified */ echo $_option->getImageSizeY() ?> <?php /* @escapeNotVerified */ echo __('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 9426ee97c1121..9a9629d395cdb 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 echo $class; ?>">
-    <label class="label" for="select_<?php echo $_option->getId() ?>">
+<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>
     </label>
     <div class="control">
         <?php echo $block->getValuesHtml() ?>
         <?php if ($_option->getIsRequire()): ?>
             <?php if ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_RADIO || $_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_CHECKBOX): ?>
-                <span id="options-<?php echo $_option->getId() ?>-container"></span>
+                <span id="options-<?php /* @escapeNotVerified */ echo $_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 0708395034465..d4f5aaa771972 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\Model\Product\Option::OPTION_TYPE_AREA) {
     echo ' textarea';
-} ?><?php echo $class ?>">
-    <label class="label" for="options_<?php echo $_option->getId() ?>_text">
+} ?><?php /* @escapeNotVerified */ echo $class ?>">
+    <label class="label" for="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text">
         <span><?php echo $block->escapeHtml($_option->getTitle()) ?></span>
-        <?php echo $block->getFormatedPrice() ?>
+        <?php /* @escapeNotVerified */ echo $block->getFormatedPrice() ?>
     </label>
 
     <div class="control">
@@ -31,12 +31,12 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
             }
             ?>
             <input type="text"
-                   id="options_<?php echo $_option->getId() ?>_text"
+                   id="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text"
                    class="input-text product-custom-option"
                    <?php if (!empty($_textValidate)) {?>
                    data-validate="<?php echo  $block->escapeHtml(json_encode($_textValidate));?>"
                    <?php } ?>
-                   name="options[<?php echo $_option->getId() ?>]"
+                   name="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
                    value="<?php echo $block->escapeHtml($block->getDefaultValue()) ?>"/>
         <?php elseif ($_option->getType() == \Magento\Catalog\Model\Product\Option::OPTION_TYPE_AREA): ?>
             <?php $_textAreaValidate = null;
@@ -47,18 +47,18 @@ $class = ($_option->getIsRequire()) ? ' required' : '';
                 $_textAreaValidate['maxlength'] = $_option->getMaxCharacters();
             }
             ?>
-            <textarea id="options_<?php echo $_option->getId() ?>_text"
+            <textarea id="options_<?php /* @escapeNotVerified */ echo $_option->getId() ?>_text"
                       class="product-custom-option"
                     <?php if (!empty($_textAreaValidate)) {?>
                         data-validate="<?php echo $block->escapeHtml(json_encode($_textAreaValidate));?>"
                     <?php } ?>
-                      name="options[<?php echo $_option->getId() ?>]"
+                      name="options[<?php /* @escapeNotVerified */ echo $_option->getId() ?>]"
                       rows="5"
                       cols="25"><?php echo $block->escapeHtml($block->getDefaultValue()) ?></textarea>
         <?php endif; ?>
         <?php if ($_option->getMaxCharacters()): ?>
-            <p class="note"><?php echo __('Maximum number of characters:') ?>
-                <strong><?php echo $_option->getMaxCharacters() ?></strong></p>
+            <p class="note"><?php /* @escapeNotVerified */ echo __('Maximum number of characters:') ?>
+                <strong><?php /* @escapeNotVerified */ echo $_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 5e2b883207ba5..6a759a9def0e6 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,7 +10,7 @@ if ($block->hasRequiredOptions()) {
     $required = ' data-hasrequired="' . __('* Required Fields') . '"';
 }
 ?>
-<div class="product-options-wrapper" id="product-options-wrapper"<?php echo $required; ?>>
+<div class="product-options-wrapper" id="product-options-wrapper"<?php /* @escapeNotVerified */ echo $required; ?>>
     <fieldset class="fieldset" tabindex="0">
         <?php echo $block->getChildHtml('', true);?>
     </fieldset>
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 a56574075b924..bc59efaf63b1c 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 echo __('Availability') ?>">
-            <span><?php echo __('In stock') ?></span>
+        <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+            <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
         </div>
     <?php else: ?>
-        <div class="stock unavailable" title="<?php echo __('Availability') ?>">
-            <span><?php echo __('Out of stock') ?></span>
+        <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+            <span><?php /* @escapeNotVerified */ echo __('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 6d580220aaa3f..0c049537b6cd4 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_block.phtml
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-product-link">
-    <a <?php echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $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 e977e14e25f1e..fbe0800f3e72e 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div class="widget block block-product-link-inline">
-    <a <?php echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><span><?php echo $block->escapeHtml($block->getLabel()) ?></span></a>
 </div>
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 87d6600c2e324..f45efa0579082 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 echo __('New Products') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
             <?php $iterator = 1; ?>
-            <ol class="product-items" id="widget-new-products-<?php echo $suffix; ?>">
+            <ol class="product-items" id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>">
                 <?php foreach ($_products->getItems() as $_product): ?>
-                    <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                    <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                     <div class="product-item-info">
-                        <a class="product-item-photo" href="<?php echo $_product->getProductUrl() ?>"
-                           title="<?php echo $block->stripTags($_product->getName(), null, true) ?>">
+                        <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>
                         <div class="product-item-details">
                             <strong class="product-item-name">
-                                <a href="<?php echo $_product->getProductUrl() ?>"
-                                   title="<?php echo $block->stripTags($_product->getName(), null, true) ?>)" class="product-item-link">
-                                    <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), '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>
                             </strong>
-                            <?php echo $block->getProductPriceHtml($_product, '-widget-new-' . $suffix) ?>
+                            <?php /* @escapeNotVerified */ echo $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 echo __('Add to Cart') ?>"
+                                            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
                                                     class="action tocart primary"
-                                                    data-mage-init='{"redirectUrl":{"url":"<?php echo $block->getAddToCartUrl($_product) ?>"}}'>
-                                                <span><?php echo __('Add to Cart') ?></span>
+                                                    data-mage-init='{"redirectUrl":{"url":"<?php /* @escapeNotVerified */ echo $block->getAddToCartUrl($_product) ?>"}}'>
+                                                <span><?php /* @escapeNotVerified */ echo __('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 echo __('Add to Cart') ?>"
+                                            <button type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
                                                     class="action tocart primary"
-                                                    data-post='<?php echo $postData; ?>'>
-                                                <span><?php echo __('Add to Cart') ?></span>
+                                                    data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
+                                                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                             </button>
                                         <?php endif; ?>
                                     <?php else: ?>
                                         <?php if ($_product->getIsSalable()): ?>
-                                            <div class="stock available" title="<?php echo __('Availability') ?>">
-                                                <span><?php echo __('In stock') ?></span>
+                                            <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                                                <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
                                             </div>
                                         <?php else: ?>
-                                            <div class="stock unavailable" title="<?php echo __('Availability') ?>">
-                                                <span><?php echo __('Out of stock') ?></span>
+                                            <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                                                <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
                                             </div>
                                         <?php endif; ?>
                                     <?php endif; ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_images_list.phtml
index 5aa665158250b..570ab8d61abdc 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,15 +10,15 @@
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
     <div class="block widget block-new-products-images">
         <div class="block-title">
-            <strong><?php echo __('New Products') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?php echo $suffix; ?>" class="product-items product-items-images">
+            <ol id="widget-new-products-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
                 <?php foreach ($_products->getItems() as $_product): ?>
                     <li class="product-item">
-                        <a class="product-item-photo" href="<?php echo $_product->getProductUrl() ?>"
-                           title="<?php echo $block->stripTags($_product->getName(), null, true) ?>">
+                        <a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                           title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>">
                             <?php /* new_products_images_only_widget */ ?>
                             <?php echo $block->getImage($_product, 'new_products_images_only_widget')->toHtml(); ?>
                         </a>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/column/new_names_list.phtml
index 3c5741e38107a..4a7ec2686d094 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,18 +10,18 @@
 <?php if (($_products = $block->getProductCollection()) && $_products->getSize()): ?>
     <div class="block widget block-new-products-names">
         <div class="block-title">
-            <strong><?php echo __('New Products') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('New Products') ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-new-products-<?php echo $suffix; ?>" class="product-items product-items-names">
+            <ol id="widget-new-products-<?php /* @escapeNotVerified */ echo $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 echo $_product->getProductUrl() ?>"
-                               title="<?php echo $block->stripTags($_product->getName(), null, true) ?>)"
+                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>)"
                                class="product-item-link">
-                                <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
                     </li>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
index 35306346c6fb4..bc2984cad9d53 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,25 +31,25 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-new-products <?php echo $mode; ?>">
+    <div class="block widget block-new-products <?php /* @escapeNotVerified */ echo $mode; ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>"
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
                                        class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
@@ -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 echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?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 echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('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 echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php echo __('Add to Compare') ?>">
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
index 89b3915701d21..a34891c417852 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,25 +32,25 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-new-products <?php echo $mode; ?>">
+    <div class="block widget block-new-products <?php /* @escapeNotVerified */ echo $mode; ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>"
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
                                        class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
@@ -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 echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?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 echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('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 echo __('Add to Compare') ?>"
-                                                       data-post='<?php echo $compareHelper->getPostDataParams($_item);?>'>
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>"
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'>
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -116,10 +116,10 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                 <?php endif; ?>
                                 <?php if ($description):?>
                                     <div class="product-item-description">
-                                        <?php echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
                                         <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php echo __('Learn More') ?></a>
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml b/app/code/Magento/CatalogInventory/view/frontend/templates/qtyincrements.phtml
index 2261d062a8f65..420ae1d607525 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 echo __('%1 is available to buy in increments of %2', $block->getProductName(), $block->getProductQtyIncrements()) ?>
+        <?php /* @escapeNotVerified */ echo __('%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 bfc2b34b08b46..d832302efbb6e 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 echo $block->getDetailsPlaceholderId() ?>"}}'
-           id="<?php echo $block->getPlaceholderId() ?>"
-           title="<?php echo __('Only %1 left', ($block->getStockQtyLeft())) ?>"
+           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())) ?>"
            class="action show">
-            <?php echo __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
+            <?php /* @escapeNotVerified */ echo __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
         </a>
     </div>
-    <div class="availability only detailed" id="<?php echo $block->getDetailsPlaceholderId() ?>">
+    <div class="availability only detailed" id="<?php /* @escapeNotVerified */ echo $block->getDetailsPlaceholderId() ?>">
         <div class="table-wrapper">
             <table class="data table">
-                <caption class="table-caption"><?php echo __('Product availability'); ?></caption>
+                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Product availability'); ?></caption>
                 <thead>
                 <tr>
-                    <th class="col item" scope="col"><?php echo __('Product Name') ?></th>
-                    <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
+                    <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+                    <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('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 echo $childProduct->getName() ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Qty')); ?>" class="col qty"><?php echo $childProductStockQty ?></td>
+                            <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>
                         </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 d1ae7fd5f805d..c5ecc7b484d9e 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 echo __('Only %1 left', ($block->getStockQtyLeft())) ?>">
-        <?php echo __('Only %1 left', "<strong>{$block->getStockQtyLeft()}</strong>") ?>
+    <div class="availability only" title="<?php /* @escapeNotVerified */ echo __('Only %1 left', ($block->getStockQtyLeft())) ?>">
+        <?php /* @escapeNotVerified */ echo __('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 47cf7458c7c9d..2408ce2660edd 100644
--- a/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
+++ b/app/code/Magento/CatalogRule/view/adminhtml/templates/promo/fieldset.phtml
@@ -9,8 +9,8 @@
 ?>
 <?php $_element = $block->getElement() ?>
 <div class="rule-tree">
-    <fieldset id="<?php echo $_element->getHtmlId() ?>" <?php echo $_element->serialize(['class']) ?> class="fieldset">
-        <legend class="legend"><span><?php echo $_element->getLegend() ?></span></legend>
+    <fieldset id="<?php echo $_element->getHtmlId() ?>" <?php /* @escapeNotVerified */ echo $_element->serialize(['class']) ?> class="fieldset">
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo $_element->getLegend() ?></span></legend>
         <br>
     <?php if ($_element->getComment()): ?>
         <div class="messages">
@@ -28,7 +28,7 @@ require([
     "prototype"
 ], function(VarienRulesForm){
 
-window.<?php echo $_element->getHtmlId() ?> = new VarienRulesForm('<?php echo $_element->getHtmlId() ?>', '<?php echo $block->getNewChildUrl() ?>');
+window.<?php echo $_element->getHtmlId() ?> = new VarienRulesForm('<?php echo $_element->getHtmlId() ?>', '<?php /* @escapeNotVerified */ echo $block->getNewChildUrl() ?>');
 <?php if ($_element->getReadonly()): ?>
     <?php echo $_element->getHtmlId() ?>.setReadonly(true);
 <?php endif; ?>
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 be6cccbd60270..52850ebbdd8ed 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/advanced/form.phtml
@@ -15,13 +15,13 @@
  */
 ?>
 <?php $maxQueryLength = $this->helper('Magento\CatalogSearch\Helper\Data')->getMaxQueryLength();?>
-<form class="form search advanced" action="<?php echo $block->getSearchPostUrl() ?>" method="get" id="form-validate">
+<form class="form search advanced" action="<?php /* @escapeNotVerified */ echo $block->getSearchPostUrl() ?>" method="get" id="form-validate">
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php echo __('Search Settings') ?></span></legend><br />
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Search Settings') ?></span></legend><br />
     <?php foreach ($block->getSearchableAttributes() as $_attribute): ?>
     <?php $_code = $_attribute->getAttributeCode() ?>
-        <div class="field <?php echo $_code ?>">
-            <label class="label" for="<?php echo $_code ?>">
+        <div class="field <?php /* @escapeNotVerified */ echo $_code ?>">
+            <label class="label" for="<?php /* @escapeNotVerified */ echo $_code ?>">
                 <span><?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?></span>
             </label>
             <div class="control">
@@ -31,25 +31,25 @@
                     <div class="field no-label">
                         <div class="control">
                             <input type="text"
-                                   name="<?php echo $_code ?>[from]"
+                                   name="<?php /* @escapeNotVerified */ echo $_code ?>[from]"
                                    value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
-                                   id="<?php echo $_code ?>"
+                                   id="<?php /* @escapeNotVerified */ echo $_code ?>"
                                    title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
-                                   maxlength="<?php echo $maxQueryLength;?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
+                                   maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>_to'}" />
                         </div>
                     </div>
                     <div class="field no-label">
                         <div class="control">
                             <input type="text"
-                                   name="<?php echo $_code ?>[to]"
+                                   name="<?php /* @escapeNotVerified */ echo $_code ?>[to]"
                                    value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
-                                   id="<?php echo $_code ?>_to"
+                                   id="<?php /* @escapeNotVerified */ echo $_code ?>_to"
                                    title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
-                                   maxlength="<?php echo $maxQueryLength;?>"
-                                   data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+                                   maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
+                                   data-validate="{number:true, 'greater-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_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 echo $_code ?>[from]"
+                            <input name="<?php /* @escapeNotVerified */ echo $_code ?>[from]"
                                    value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'from')) ?>"
-                                   id="<?php echo $_code ?>"
+                                   id="<?php /* @escapeNotVerified */ echo $_code ?>"
                                    title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                    class="input-text"
                                    type="text"
-                                   maxlength="<?php echo $maxQueryLength;?>"
-                                   data-validate="{number:true, 'less-than-equals-to':'#<?php echo $_code ?>_to'}" />
+                                   maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
+                                   data-validate="{number:true, 'less-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>_to'}" />
                         </div>
                     </div>
                     <div class="field with-addon no-label">
                         <div class="control">
                             <div class="addon">
-                                <input name="<?php echo $_code ?>[to]"
+                                <input name="<?php /* @escapeNotVerified */ echo $_code ?>[to]"
                                        value="<?php echo $block->escapeHtml($block->getAttributeValue($_attribute, 'to')) ?>"
-                                       id="<?php echo $_code ?>_to"
+                                       id="<?php /* @escapeNotVerified */ echo $_code ?>_to"
                                        title="<?php echo $block->escapeHtml($block->getAttributeLabel($_attribute)) ?>"
                                        class="input-text"
                                        type="text"
-                                       maxlength="<?php echo $maxQueryLength;?>"
-                                       data-validate="{number:true, 'greater-than-equals-to':'#<?php echo $_code ?>'}" />
+                                       maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>"
+                                       data-validate="{number:true, 'greater-than-equals-to':'#<?php /* @escapeNotVerified */ echo $_code ?>'}" />
                                 <label class="addafter"
-                                       for="<?php echo $_code ?>_to">
-                                    <?php echo $block->getCurrency($_attribute); ?>
+                                       for="<?php /* @escapeNotVerified */ echo $_code ?>_to">
+                                    <?php /* @escapeNotVerified */ echo $block->getCurrency($_attribute); ?>
                                 </label>
                             </div>
                         </div>
@@ -89,33 +89,33 @@
                 </div>
                 <?php break;
                 case 'select': ?>
-                    <?php echo $block->getAttributeSelectElement($_attribute) ?>
+                    <?php /* @escapeNotVerified */ echo $block->getAttributeSelectElement($_attribute) ?>
                 <?php break;
                 case 'yesno': ?>
-                    <?php echo $block->getAttributeYesNoElement($_attribute) ?>
+                    <?php /* @escapeNotVerified */ echo $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 echo $block->getDateInput($_attribute, 'from') ?>
+                            <?php /* @escapeNotVerified */ echo $block->getDateInput($_attribute, 'from') ?>
                         </div>
                     </div>
                     <div class="field date no-label">
                         <div class="control">
-                            <?php echo $block->getDateInput($_attribute, 'to') ?>
+                            <?php /* @escapeNotVerified */ echo $block->getDateInput($_attribute, 'to') ?>
                         </div>
                     </div>
                 </div>
                 <?php break;
                 default: ?>
                 <input type="text"
-                       name="<?php echo $_code ?>"
-                       id="<?php echo $_code ?>"
+                       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 echo $block->getAttributeValidationClass($_attribute) ?>"
-                       maxlength="<?php echo $maxQueryLength;?>" />
+                       class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass($_attribute) ?>"
+                       maxlength="<?php /* @escapeNotVerified */ echo $maxQueryLength;?>" />
             <?php endswitch; ?>
             </div>
         </div>
@@ -126,7 +126,7 @@
     <button type="submit"
             class="action search primary"
             title="<?php echo $block->escapeHtml(__('Search')) ?>">
-        <span><?php echo __('Search') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 d360f98e153a3..d2558ea32ae0a 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 echo $helper->getAdvancedSearchUrl(); ?>">
-        <?php echo __('Advanced Search'); ?>
+    <a class="action advanced" href="<?php /* @escapeNotVerified */ echo $helper->getAdvancedSearchUrl(); ?>">
+        <?php /* @escapeNotVerified */ echo __('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 e96c86c5f8aff..7ac234a70ddba 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 echo __('<strong>%1 item</strong> were found using the following search criteria', $results); ?>
+            <?php /* @escapeNotVerified */ echo __('<strong>%1 item</strong> were found using the following search criteria', $results); ?>
         <?php else: ?>
-            <?php echo __('<strong>%1 items</strong> were found using the following search criteria', $results); ?>
+            <?php /* @escapeNotVerified */ echo __('<strong>%1 items</strong> were found using the following search criteria', $results); ?>
         <?php endif; ?>
     </div>
 <?php else: ?>
     <div class="message error">
         <div>
-            <?php echo __('We can\'t find any items matching these search criteria.');?> <a href="<?php echo $block->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
+            <?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>
         </div>
     </div>
 <?php endif; ?>
@@ -43,8 +43,8 @@
 <?php if ($block->getResultCount()): ?>
     <div class="message notice">
         <div>
-            <?php echo __("Don't see what you're looking for?"); ?>
-            <a href="<?php echo $block->getFormUrl(); ?>"><?php echo __('Modify your search'); ?></a>
+            <?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>
         </div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
index 92fe9a3e3c1a6..981846f2b9c6e 100644
--- a/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
+++ b/app/code/Magento/CatalogSearch/view/frontend/templates/result.phtml
@@ -14,7 +14,7 @@
     <div class="message notice">
         <div>
             <?php foreach ($messages as $message):?>
-                <?php echo $message?><br />
+                <?php /* @escapeNotVerified */ echo $message?><br />
             <?php endforeach;?>
         </div>
     </div>
@@ -25,11 +25,11 @@
 
 <div class="message notice">
     <div>
-        <?php echo($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?>
+        <?php /* @escapeNotVerified */ echo($block->getNoResultText()) ? $block->getNoResultText() : __('Your search returned no results.') ?>
         <?php echo $block->getAdditionalHtml() ?>
         <?php if ($messages = $block->getNoteMessages()):?>
             <?php foreach ($messages as $message):?>
-                <br /><?php echo $message?>
+                <br /><?php /* @escapeNotVerified */ echo $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 b79d885bf2c4c..295cd29a70cb1 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
@@ -15,7 +15,7 @@ $fieldClass .= ($element->getRequired()) ? ' required' : '';
 $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' . $block->getUiId('form-field', $element->getId());
 ?>
 
-<div<?php echo $fieldAttributes ?>>
+<div<?php /* @escapeNotVerified */ echo $fieldAttributes ?>>
     <?php echo $element->getLabelHtml() ?>
     <div class="control">
         <div class="rule-tree">
@@ -32,6 +32,6 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' . $block->getUiId(
         "Magento_Rule/rules",
         "prototype"
     ], function(VarienRulesForm){
-        window.<?php echo $block->getHtmlId() ?> = new VarienRulesForm('<?php echo $block->getHtmlId() ?>', '<?php echo $block->getNewChildUrl() ?>');
+        window.<?php echo $block->getHtmlId() ?> = new VarienRulesForm('<?php echo $block->getHtmlId() ?>', '<?php /* @escapeNotVerified */ echo $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 19c6e42e6d1ff..249fe3206ee9b 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
@@ -30,27 +30,27 @@
     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::DEFAULT_VIEW;
     $description = false;
 ?>
-    <div class="block widget block-products-list <?php echo $mode; ?>">
+    <div class="block widget block-products-list <?php /* @escapeNotVerified */ echo $mode; ?>">
         <?php if ($title):?>
         <div class="block-title">
-            <strong><?php echo $title; ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <?php endif ?>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>"
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
                                        class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
@@ -70,9 +70,9 @@
                                                 <?php if ($_item->isSaleable()): ?>
                                                     <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
                                                         <button class="action tocart primary"
-                                                                data-mage-init='{"redirectUrl":{"url":"<?php echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?php else: ?>
                                                         <?php
@@ -80,16 +80,16 @@
                                                             $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
                                                         ?>
                                                         <button class="action tocart primary"
-                                                                data-post='<?php echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                                                     <?php endif; ?>
                                                 <?php endif; ?>
                                             </div>
@@ -98,18 +98,18 @@
                                             <div class="actions-secondary" data-role="add-to-links">
                                                 <?php if ($this->helper('Magento\Wishlist\Helper\Data')->isAllow() && $showWishlist): ?>
                                                     <a href="#"
-                                                       data-post='<?php echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
                                                        class="action towishlist" data-action="add-to-wishlist"
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('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 echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php echo __('Add to Compare') ?>">
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/button.phtml
index 5ca58ececbf28..e7e8efae46ea4 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 echo __('<a href="%1" onclick="this.target=\'_blank\'" class="print">Print receipt</a>', $block->getPrintUrl()) ?>
+    <?php /* @escapeNotVerified */ echo __('<a href="%1" onclick="this.target=\'_blank\'" class="print">Print receipt</a>', $block->getPrintUrl()) ?>
     <?php echo $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 e5681d0792546..85025f95cc170 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/coupon.phtml
@@ -9,11 +9,11 @@
 ?>
 <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 echo __('Discount Codes') ?></strong>
+        <strong id="block-discount-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Discount Codes') ?></strong>
     </div>
     <div class="content" data-role="content" aria-labelledby="block-discount-heading">
         <form id="discount-coupon-form"
-              action="<?php echo $block->getUrl('checkout/cart/couponPost') ?>"
+              action="<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart/couponPost') ?>"
               method="post"
               data-mage-init='{"discountCode":{"couponCodeSelector": "#coupon_code",
                                                "removeCouponSelector": "#remove-coupon",
@@ -22,7 +22,7 @@
             <div class="fieldset coupon<?php 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 echo __('Enter your code') ?></span></label>
+                    <label for="coupon_code" class="label"><span><?php /* @escapeNotVerified */ echo __('Enter your 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 your code'));?>" />
                     </div>
@@ -30,13 +30,13 @@
                 <div class="actions-toolbar">
                     <?php if (!strlen($block->getCouponCode())): ?>
                     <div class="primary">
-                        <button class="action apply primary" type="button" value="<?php echo __('Apply Coupon') ?>">
-                            <span><?php echo __('Apply Coupon') ?></span>
+                        <button class="action apply primary" type="button" value="<?php /* @escapeNotVerified */ echo __('Apply Coupon') ?>">
+                            <span><?php /* @escapeNotVerified */ echo __('Apply Coupon') ?></span>
                         </button>
                     </div>
                     <?php else: ?>
                         <div class="primary">
-                            <button  type="button" class="action cancel primary" value="<?php echo __('Cancel Coupon') ?>"><span><?php echo __('Cancel Coupon') ?></span></button>
+                            <button  type="button" class="action cancel primary" value="<?php /* @escapeNotVerified */ echo __('Cancel Coupon') ?>"><span><?php /* @escapeNotVerified */ echo __('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 4c8e105f7cdce..01f6ebc0c87dc 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml
@@ -10,7 +10,7 @@
 ?>
 <?php $mergedCells = ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices() ? 2 : 1); ?>
 <?php echo $block->getChildHtml('form_before') ?>
-<form action="<?php echo $block->getUrl('checkout/cart/updatePost') ?>"
+<form action="<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart/updatePost') ?>"
           method="post"
           id="form-validate"
           data-mage-init='{"validation":{}}'
@@ -21,13 +21,13 @@
                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 echo __('Shopping Cart Items') ?></caption>
+            <caption role="heading" aria-level="2" class="table-caption"><?php /* @escapeNotVerified */ echo __('Shopping Cart Items') ?></caption>
             <thead>
                 <tr>
-                    <th class="col item" scope="col"><span><?php echo __('Item') ?></span></th>
-                    <th class="col price" scope="col"><span><?php echo __('Price') ?></span></th>
-                    <th class="col qty" scope="col"><span><?php echo __('Qty') ?></span></th>
-                    <th class="col subtotal" scope="col"><span><?php echo __('Subtotal') ?></span></th>
+                    <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>
                 </tr>
             </thead>
             <?php foreach ($block->getItems() as $_item): ?>
@@ -40,7 +40,7 @@
             <a class="action continue"
                href="<?php echo $block->escapeUrl($block->getContinueShoppingUrl()) ?>"
                title="<?php echo $block->escapeHtml(__('Continue Shopping')); ?>">
-                <span><?php echo __('Continue Shopping') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Continue Shopping') ?></span>
             </a>
         <?php endif; ?>
         <button type="submit"
@@ -49,7 +49,7 @@
                 value="empty_cart"
                 title="<?php echo $block->escapeHtml(__('Clear Shopping Cart')); ?>"
                 class="action clear" id="empty_cart_button">
-            <span><?php echo __('Clear Shopping Cart'); ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Clear Shopping Cart'); ?></span>
         </button>
         <button type="submit"
                 name="update_cart_action"
@@ -57,7 +57,7 @@
                 value="update_qty"
                 title="<?php echo $block->escapeHtml(__('Update Shopping Cart')); ?>"
                 class="action update">
-            <span><?php echo __('Update Shopping Cart'); ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Update Shopping Cart'); ?></span>
         </button>
         <input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
     </div>
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 014c5666c698f..50298d9e93e5e 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,18 +15,18 @@
         <fieldset class="fieldset">
             <?php if ($block->shouldRenderQuantity()): ?>
             <div class="field qty">
-                <label class="label" for="qty"><span><?php echo __('Qty') ?></span></label>
+                <label class="label" for="qty"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
                 <div class="control">
-                    <input type="number" name="qty" id="qty" maxlength="12" value="<?php echo $block->getProductDefaultQty() * 1 ?>" title="<?php echo __('Qty') ?>" class="input-text qty" data-validate="{'required-number':true,digits:true}"/>
+                    <input type="number" name="qty" id="qty" maxlength="12" value="<?php /* @escapeNotVerified */ echo $block->getProductDefaultQty() * 1 ?>" title="<?php /* @escapeNotVerified */ echo __('Qty') ?>" class="input-text qty" data-validate="{'required-number':true,digits:true}"/>
                 </div>
             </div>
             <?php endif; ?>
             <div class="actions">
                 <button type="button"
-                        title="<?php echo $buttonTitle ?>"
+                        title="<?php /* @escapeNotVerified */ echo $buttonTitle ?>"
                         class="action primary tocart"
                         id="product-updatecart-button">
-                    <span><?php echo $buttonTitle ?></span>
+                    <span><?php /* @escapeNotVerified */ echo $buttonTitle ?></span>
                 </button>
                 <?php echo $block->getChildHtml('', true) ?>
             </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 8b2295ce6b80c..ceac006d2a6af 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
@@ -19,7 +19,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
     <tr class="item-info">
         <td data-th="<?php echo $block->escapeHtml(__('Item')); ?>" class="col item">
             <?php if ($block->hasProductUrl()):?>
-                <a href="<?php echo $block->getProductUrl() ?>"
+                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"
                    title="<?php echo $block->escapeHtml($block->getProductName()) ?>"
                    tabindex="-1"
                    class="product-item-photo">
@@ -35,7 +35,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
             <div class="product-item-details">
                 <strong class="product-item-name">
                     <?php if ($block->hasProductUrl()):?>
-                        <a href="<?php echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a>
                     <?php else: ?>
                         <?php echo $block->escapeHtml($block->getProductName()) ?>
                     <?php endif; ?>
@@ -47,9 +47,9 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                             <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
                             <dd>
                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                                    <?php echo $_formatedOptionValue['full_view'] ?>
+                                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
                                 <?php else: ?>
-                                    <?php echo $_formatedOptionValue['value'] ?>
+                                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>
@@ -57,7 +57,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                 <?php endif;?>
                 <?php if ($messages = $block->getMessages()): ?>
                     <?php foreach ($messages as $message): ?>
-                        <div class="cart item message <?php echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div>
+                        <div class="cart item message <?php /* @escapeNotVerified */ echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div>
                     <?php endforeach; ?>
                 <?php endif; ?>
                 <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
@@ -71,10 +71,10 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
         <?php if ($canApplyMsrp): ?>
             <td class="col msrp" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
                 <span class="pricing msrp">
-                    <span class="msrp notice"><?php echo __('See price before order confirmation.'); ?></span>
+                    <span class="msrp notice"><?php /* @escapeNotVerified */ echo __('See price before order confirmation.'); ?></span>
                     <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
-                    <a href="#" class="action help map" id="<?php echo($helpLinkId); ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php echo $helpLinkId;?>","productName": "<?php echo $product->getName(); ?>","showAddToCart": false}}'>
-                        <span><?php echo __("What's this?"); ?></span>
+                    <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>
                 </span>
                 <?php $cols++; ?>
@@ -87,14 +87,14 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
         <?php endif; ?>
         <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
             <div class="field qty">
-                <label class="label" for="cart-<?php echo $_item->getId() ?>-qty">
-                    <span><?php echo __('Qty') ?></span>
+                <label class="label" for="cart-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-qty">
+                    <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
                 </label>
                 <div class="control qty">
-                    <input id="cart-<?php echo $_item->getId() ?>-qty"
-                           name="cart[<?php echo $_item->getId() ?>][qty]"
-                           data-cart-item-id="<?php echo $_item->getSku() ?>"
-                           value="<?php echo $block->getQty() ?>"
+                    <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() ?>"
                            type="number"
                            size="4"
                            title="<?php echo $block->escapeHtml(__('Qty')); ?>"
@@ -117,9 +117,9 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
         </td>
     </tr>
     <tr class="item-actions">
-        <td colspan="<?php echo $cols;?>">
+        <td colspan="<?php /* @escapeNotVerified */ echo $cols;?>">
             <div class="actions-toolbar">
-                <?php echo $block->getActions($_item) ?>
+                <?php /* @escapeNotVerified */ echo $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 04ae569829d55..0405e3bc6a54d 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 echo __('Price')?></span>
-    <span class="price-wrapper"><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?></span>
+    <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>
 </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 4123e6419a32c..e28f68f6febd4 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 echo $block->getConfigureUrl() ?>"
+       href="<?php /* @escapeNotVerified */ echo $block->getConfigureUrl() ?>"
        title="<?php echo $block->escapeHtml(__('Edit item parameters')); ?>">
         <span>
-            <?php echo __('Edit') ?>
+            <?php /* @escapeNotVerified */ echo __('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 bed34897aec6c..65bc29c713539 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
@@ -11,8 +11,8 @@
 <a href="#"
    title="<?php echo $block->escapeHtml(__('Remove item')); ?>"
    class="action action-delete"
-   data-post='<?php echo $block->getDeletePostJson(); ?>'>
+   data-post='<?php /* @escapeNotVerified */ echo $block->getDeletePostJson(); ?>'>
     <span>
-        <?php echo __('Remove item')?>
+        <?php /* @escapeNotVerified */ echo __('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 bbfe17de6c368..ddae295218c65 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 echo $methodHtml; ?></li>
+    <li class="item"><?php /* @escapeNotVerified */ echo $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 2dc516c80d005..6ccdd1531ba37 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 echo $block->getShoppingCartUrl(); ?>"
+    <a class="action showcart" href="<?php /* @escapeNotVerified */ echo $block->getShoppingCartUrl(); ?>"
        data-bind="scope: 'minicart_content'">
-        <span class="text"><?php echo __('My Cart'); ?></span>
+        <span class="text"><?php /* @escapeNotVerified */ echo __('My Cart'); ?></span>
         <span class="counter qty empty"
               data-bind="css: { empty: cart().summary_count == 0 }, blockLoader: isLoading">
             <span class="counter-number"><!-- ko text: cart().summary_count --><!-- /ko --></span>
@@ -42,15 +42,15 @@
         </div>
     <?php endif ?>
     <script>
-        window.checkout = <?php echo \Zend_Json::encode($block->getConfig()); ?>;
+        window.checkout = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getConfig()); ?>;
     </script>
     <script type="text/x-magento-init">
     {
         "[data-block='minicart']": {
-            "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?>
+            "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
         },
         "*": {
-            "Magento_Ui/js/block-loader": "<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
+            "Magento_Ui/js/block-loader": "<?php /* @escapeNotVerified */ echo $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 338399e00ee85..fa152a38f0186 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/noItems.phtml
@@ -8,8 +8,8 @@
 ?>
 <div class="cart-empty">
     <?php echo $block->getChildHtml('checkout_cart_empty_widget'); ?>
-    <p><?php echo __('You have no items in your shopping cart.') ?></p>
-    <p><?php echo __('Click <a href="%1">here</a> to continue shopping.',
+    <p><?php /* @escapeNotVerified */ echo __('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'); ?>
 </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 0c25763298a8a..cb8fe81510c71 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 echo $block->getQuote()->isVirtual() ? __('Estimate Tax') : __('Estimate Shipping and Tax') ?>
+            <?php /* @escapeNotVerified */ echo $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 echo $block->getJsLayout();?>
+                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
                 }
             }
         </script>
         <script>
-            window.checkoutConfig = <?php echo \Zend_Json::encode($block->getCheckoutConfig()); ?>;
+            window.checkoutConfig = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getCheckoutConfig()); ?>;
             window.customerData = window.checkoutConfig.customerData;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             require([
                 'mage/url',
                 'Magento_Ui/js/block-loader'
             ], function(url, blockLoader) {
-                blockLoader("<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>");
-                return url.setBaseUrl('<?php echo $block->getBaseUrl();?>');
+                blockLoader("<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>");
+                return url.setBaseUrl('<?php /* @escapeNotVerified */ echo $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 90a951a38e1a2..09a0a244987d7 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 echo $block->getJsLayout();?>
+                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $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 0836b52c6eb2c..2f0037f86fd97 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
@@ -12,6 +12,6 @@ $_item = $block->getItem();
 ?>
 <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax'));?>">
     <span class="cart-price">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+        <?php /* @escapeNotVerified */ echo $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 b9ec79f8ebf34..00971a409bac9 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
@@ -12,6 +12,6 @@ $_item = $block->getItem();
 ?>
 <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
     <span class="cart-price">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
     </span>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index 1f05ef68ff3a4..b62f0856fdb34 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -3,18 +3,20 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
     <div id="checkout" data-bind="scope:'checkout'" class="checkout-container">
         <!-- ko template: getTemplate() --><!-- /ko -->
         <script type="text/x-magento-init">
             {
                 "#checkout": {
-                    "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?>
+                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
                 }
             }
         </script>
         <script>
-            window.checkoutConfig = <?php echo \Zend_Json::encode($block->getCheckoutConfig()); ?>;
+            window.checkoutConfig = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getCheckoutConfig()); ?>;
             // Create aliases for customer.js model from customer module
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             window.customerData = window.checkoutConfig.customerData;
@@ -26,8 +28,8 @@
                 'Magento_Ui/js/block-loader'
             ], function(url, loader, blockLoader) {
                 loader.registerLoader();
-                blockLoader("<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>");
-                return url.setBaseUrl('<?php echo $block->getBaseUrl();?>');
+                blockLoader("<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/loader-1.gif'); ?>");
+                return url.setBaseUrl('<?php /* @escapeNotVerified */ echo $block->getBaseUrl();?>');
             })
         </script>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
index d2468e2aeda0a..05bcdf18b1f26 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/billing.phtml
@@ -12,60 +12,60 @@
  * @removeCandidate
  */
 ?>
-<form class="form billing" id="co-billing-form" data-hasrequired="<?php echo __('* Required Fields') ?>">
+<form class="form billing" id="co-billing-form" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
 
     <?php if ($block->customerHasAddresses()): ?>
         <div class="field addresses">
-            <label class="label" for="billing:address-select"><span><?php echo __('Select a billing address from your address book or enter a new address.') ?></span></label>
+            <label class="label" for="billing:address-select"><span><?php /* @escapeNotVerified */ echo __('Select a billing address from your address book or enter a new address.') ?></span></label>
             <div class="control">
                 <?php echo $block->getAddressesHtmlSelect('billing') ?>
             </div>
         </div>
     <?php endif; ?>
     <fieldset class="fieldset address" id="billing-new-address-form"<?php if ($block->customerHasAddresses()): ?> style="display:none;"<?php endif; ?>>
-        <input type="hidden" name="billing[address_id]" value="<?php echo $block->getAddress()->getId() ?>" id="billing:address_id" />
+        <input type="hidden" name="billing[address_id]" value="<?php /* @escapeNotVerified */ echo $block->getAddress()->getId() ?>" id="billing:address_id" />
 
         <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getAddress()->getFirstname() ? $block->getAddress() : $block->getQuote()->getCustomer())->setForceUseCustomerRequiredAttributes(!$block->isCustomerLoggedIn())->setFieldIdFormat('billing:%s')->setFieldNameFormat('billing[%s]')->toHtml() ?>
 
         <?php if (!$block->isCustomerLoggedIn()): ?>
                 <div class="field required email">
-                    <label class="label" for="billing:email"><span><?php echo __('Email') ?></span></label>
+                    <label class="label" for="billing:email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
                     <div class="control">
-                        <input type="email" name="billing[email]" id="billing:email" value="<?php echo $block->escapeHtml($block->getAddress()->getEmail()) ?>" title="<?php echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
+                        <input type="email" name="billing[email]" id="billing:email" value="<?php echo $block->escapeHtml($block->getAddress()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}"/>
                     </div>
                 </div>
         <?php endif; ?>
 
         <div class="field company">
-            <label class="label" for="billing:company"><span><?php echo __('Company') ?></span></label>
+            <label class="label" for="billing:company"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
             <div class="control">
-                <input type="text" id="billing:company" name="billing[company]" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
+                <input type="text" id="billing:company" name="billing[company]" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
             </div>
         </div>
 
         <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
         <div class="field taxvat">
-            <label class="label" for="billing:vat_id"><span><?php echo __('VAT Number') ?></span></label>
+            <label class="label" for="billing:vat_id"><span><?php /* @escapeNotVerified */ echo __('VAT Number') ?></span></label>
             <div class="control">
-                <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
+                <input type="text" id="billing:vat_id" name="billing[vat_id]" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>" title="<?php /* @escapeNotVerified */ echo __('VAT Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
             </div>
         </div>
         <?php endif; ?>
 
         <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
         <div class="field street required">
-            <label class="label" for="billing:street1"><span><?php echo __('Address') ?></span></label>
+            <label class="label" for="billing:street1"><span><?php /* @escapeNotVerified */ echo __('Address') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" name="billing[street][]" id="billing:street1" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine(1)) ?>" class="input-text <?php /* @escapeNotVerified */ echo $_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="billing:street<?php echo $_i ?>">
-                                <span><?php echo __('Address') ?></span>
+                            <label class="label" for="billing:street<?php /* @escapeNotVerified */ echo $_i ?>">
+                                <span><?php /* @escapeNotVerified */ echo __('Address') ?></span>
                             </label>
                             <div class="control">
-                                <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="billing[street][]" id="billing:street<?php echo $_i ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
+                                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Street Address %1', $_i) ?>" name="billing[street][]" id="billing:street<?php /* @escapeNotVerified */ echo $_i ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine($_i)) ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>" />
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -75,59 +75,59 @@
 
 
         <div class="field city required">
-            <label class="label" for="billing:city"><span><?php echo __('City') ?></span></label>
+            <label class="label" for="billing:city"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('City') ?>" name="billing[city]" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="billing:city" />
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('City') ?>" name="billing[city]" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="billing:city" />
             </div>
         </div>
 
         <div class="field region required">
-            <label class="label" for="billing:region_id"><span><?php echo __('State/Province') ?></span></label>
+            <label class="label" for="billing:region_id"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
             <div class="control">
                 <select id="billing:region_id"
                         name="billing[region_id]"
-                        title="<?php echo __('State/Province') ?>"
+                        title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>"
                         data-validate="{'validate-select':true}"
                         <?php if ($block->getConfig('general/region/display_all') === 0):?>disabled="disabled"<?php endif; ?>
                         style="display:none;">
-                    <option value=""><?php echo __('Please select a region, state or province.') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Please select a region, state or province.') ?></option>
                 </select>
                 <input  type="text"
                         id="billing:region"
                         name="billing[region]"
                         value="<?php echo $block->escapeHtml($block->getAddress()->getRegion()) ?>"
-                        title="<?php echo __('State/Province') ?>"
-                        class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"
+                        title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>"
+                        class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"
                         <?php if ($block->getConfig('general/region/display_all') === 0):?>disabled="disabled"<?php endif; ?>
                         style="display:none;" />
             </div>
         </div>
 
         <div class="field zip required">
-            <label class="label" for="billing:postcode"><span><?php echo __('Zip/Postal Code') ?></span></label>
+            <label class="label" for="billing:postcode"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" name="billing[postcode]" id="billing:postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}"/>
             </div>
         </div>
 
         <div class="field country required">
-            <label class="label" for="billing:country_id"><span><?php echo __('Country') ?></span></label>
+            <label class="label" for="billing:country_id"><span><?php /* @escapeNotVerified */ echo __('Country') ?></span></label>
             <div class="control">
                 <?php echo $block->getCountryHtmlSelect('billing') ?>
             </div>
         </div>
 
         <div class="field telephone required">
-            <label class="label" for="billing:telephone"><span><?php echo __('Phone Number') ?></span></label>
+            <label class="label" for="billing:telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
             <div class="control">
-                <input type="text" name="billing[telephone]" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
+                <input type="text" name="billing[telephone]" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Telephone') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="billing:telephone" />
             </div>
         </div>
 
         <div class="field fax">
-            <label class="label" for="billing:fax"><span><?php echo __('Fax') ?></span></label>
+            <label class="label" for="billing:fax"><span><?php /* @escapeNotVerified */ echo __('Fax') ?></span></label>
             <div class="control">
-                <input type="text" name="billing[fax]" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
+                <input type="text" name="billing[fax]" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" title="<?php /* @escapeNotVerified */ echo __('Fax') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="billing:fax" />
             </div>
         </div>
 
@@ -152,23 +152,23 @@
             <?php echo $customerAttributes->toHtml()?>
         <?php endif;?>
         <div class="field password required">
-            <label class="label" for="billing:customer_password"><span><?php echo __('Password') ?></span></label>
+            <label class="label" for="billing:customer_password"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
             <div class="control">
-                <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
+                <input type="password" name="billing[customer_password]" id="billing:customer_password" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}"/>
             </div>
         </div>
         <div class="field confirm required">
-            <label class="label" for="billing:confirm_password"><span><?php echo __('Confirm Password') ?></span></label>
+            <label class="label" for="billing:confirm_password"><span><?php /* @escapeNotVerified */ echo __('Confirm Password') ?></span></label>
             <div class="control">
-                <input type="password" name="billing[confirm_password]" title="<?php echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true, equalTo: '#billing\\:customer_password'}"/>
+                <input type="password" name="billing[confirm_password]" title="<?php /* @escapeNotVerified */ echo __('Confirm Password') ?>" id="billing:confirm_password" class="input-text" data-validate="{required:true, 'validate-cpassword':true, equalTo: '#billing\\:customer_password'}"/>
             </div>
         </div>
         <?php endif; ?>
         <?php echo $block->getChildHtml('form_additional_info'); ?>
         <?php if ($block->isCustomerLoggedIn() && $block->customerHasAddresses()):?>
             <div class="field save choice">
-                <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="billing:save_in_address_book" <?php if ($block->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" />
-                <label class="label" for="billing:save_in_address_book"><span><?php echo __('Save in address book') ?></span></label>
+                <input type="checkbox" name="billing[save_in_address_book]" value="1" title="<?php /* @escapeNotVerified */ echo __('Save in address book') ?>" id="billing:save_in_address_book" <?php if ($block->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" />
+                <label class="label" for="billing:save_in_address_book"><span><?php /* @escapeNotVerified */ echo __('Save in address book') ?></span></label>
             </div>
         <?php else:?>
             <input type="hidden" name="billing[save_in_address_book]" value="1" />
@@ -181,13 +181,13 @@
         <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_yes" value="1"<?php if ($block->isUseBillingAddressForShipping()) {
     ?> checked="checked"<?php 
 }?> class="radio" />
-        <label class="label" for="billing:use_for_shipping_yes"><span><?php echo  __('Ship to this address') ?></span></label>
+        <label class="label" for="billing:use_for_shipping_yes"><span><?php /* @escapeNotVerified */ echo  __('Ship to this address') ?></span></label>
     </div>
     <div class="field choice">
         <input type="radio" name="billing[use_for_shipping]" id="billing:use_for_shipping_no" value="0"<?php if (!$block->isUseBillingAddressForShipping()) {
     ?> checked="checked"<?php 
 }?> class="radio" />
-        <label class="label" for="billing:use_for_shipping_no"><span><?php echo __('Ship to different address') ?></span></label>
+        <label class="label" for="billing:use_for_shipping_no"><span><?php /* @escapeNotVerified */ echo __('Ship to different address') ?></span></label>
     </div>
 <?php endif; ?>
 
@@ -195,20 +195,20 @@
     <input type="hidden" name="billing[use_for_shipping]" value="1" />
 <?php endif; ?>
 <div class="actions" id="billing-buttons-container">
-    <div class="primary"><button data-role="opc-continue" type="button" class="button action continue primary"><span><?php echo __('Continue') ?></span></button></div>
+    <div class="primary"><button data-role="opc-continue" type="button" class="button action continue primary"><span><?php /* @escapeNotVerified */ echo __('Continue') ?></span></button></div>
 </div>
 </form>
 <script type="text/x-magento-init">
     {
         "#billing\\:country_id": {
             "regionUpdater": {
-                "optionalRegionAllowed": <?php echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+                "optionalRegionAllowed": <?php /* @escapeNotVerified */ echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
                 "regionListId": "#billing\\:region_id",
                 "regionInputId": "#billing\\:region",
                 "postcodeId": "#billing\\:postcode",
-                "regionJson": <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php echo $block->getAddress()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
+                "defaultRegion": "<?php /* @escapeNotVerified */ echo $block->getAddress()->getRegionId() ?>",
+                "countriesWithOptionalZip": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
             }
         }
     }
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 b39d5f71940ab..1d79d3d48667d 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 echo __('Order #') . $block->getRealOrderId() ?></p><?php endif ?>
-<?php if ($error = $block->getErrorMessage()) : ?><p><?php echo $error ?></p><?php endif ?>
-<p><?php echo __('Click <a href="%1">here</a> to continue shopping.', $block->escapeUrl($block->getContinueShoppingUrl())) ?></p>
+<?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>
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 04a295afdce88..658e051eef98c 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 echo __('Proceed to Checkout') ?>"
-            data-mage-init='{"Magento_Checkout/js/proceed-to-checkout":{"checkoutUrl":"<?php echo $block->getCheckoutUrl(); ?>"}}'
+            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' : ''; ?>"
             <?php if ($block->isDisabled()):?>disabled="disabled"<?php endif; ?>>
-        <span><?php echo __('Proceed to Checkout') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Proceed to Checkout') ?></span>
     </button>
 <?php endif?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
index 2c334689a2c65..8f28e59c07305 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment.phtml
@@ -15,7 +15,7 @@
     <?php echo $block->getBlockHtml('formkey') ?>
     <fieldset class="fieldset">
         <legend class="legend payments-title">
-            <span><?php echo __('Payment Information') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
         </legend><br>
         <?php echo $block->getChildChildHtml('methods_additional') ?>
         <div id="checkout-payment-method-load" class="opc-payment"></div>
@@ -23,10 +23,10 @@
     <?php echo $block->getChildChildHtml('additional') ?>
     <div class="actions-toolbar" id="payment-buttons-container">
         <div class="primary">
-            <button data-role="opc-continue" type="button" class="button action continue primary"><span><?php echo __('Continue') ?></span></button>
+            <button data-role="opc-continue" type="button" class="button action continue primary"><span><?php /* @escapeNotVerified */ echo __('Continue') ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="#"><span><?php echo __('Back') ?></span></a>
+            <a class="action back" href="#"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
         </div>
     </div>
 </form>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
index 6f80ee1744db2..38d0d293ae439 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/payment/methods.phtml
@@ -25,24 +25,24 @@
 ?>
 <?php if (empty($methods)): ?>
     <dt class="item-title">
-        <?php echo __('No Payment Methods') ?>
+        <?php /* @escapeNotVerified */ echo __('No Payment Methods') ?>
     </dt>
 <?php else:
     foreach ($methods as $_method):
         $_code = $_method->getCode();
 ?>
-    <dt class="item-title <?php echo $_code ?>">
+    <dt class="item-title <?php /* @escapeNotVerified */ echo $_code ?>">
     <?php if (!$oneMethod): ?>
-        <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" title="<?php echo $block->escapeHtml($_method->getTitle()) ?>" <?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio" />
+        <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()) ?>" <?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?> class="radio" />
     <?php else: ?>
-        <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio no-display" />
+        <input id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" type="radio" name="payment[method]" checked="checked" class="radio no-display" />
         <?php $oneMethod = $_code; ?>
     <?php endif; ?>
-        <label for="p_method_<?php echo $_code ?>"><?php echo $block->escapeHtml($block->getMethodTitle($_method)) ?> <?php echo $block->getMethodLabelAfterHtml($_method) ?></label>
+        <label for="p_method_<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($block->getMethodTitle($_method)) ?> <?php echo $block->getMethodLabelAfterHtml($_method) ?></label>
     </dt>
     <?php if ($html = $block->getPaymentMethodFormHtml($_method)): ?>
-    <dd class="item-content <?php echo $_code ?>">
-        <?php echo $html; ?>
+    <dd class="item-content <?php /* @escapeNotVerified */ echo $_code ?>">
+        <?php /* @escapeNotVerified */ echo $html; ?>
     </dd>
     <?php endif; ?>
 <?php endforeach;
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/button.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/button.phtml
index b2c80c18c3410..971bde0c161f7 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/button.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/button.phtml
@@ -3,10 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 /**
  * @deprecated
  * @removeCandidate
  */
 ?>
-<button data-role="review-save" type="submit" title="<?php echo __('Place Order') ?>"
-        class="button action primary checkout"><span><?php echo __('Place Order') ?></span></button>
+<button data-role="review-save" type="submit" title="<?php /* @escapeNotVerified */ echo __('Place Order') ?>"
+        class="button action primary checkout"><span><?php /* @escapeNotVerified */ echo __('Place Order') ?></span></button>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
index 410eb15288344..812f7b4502504 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/info.phtml
@@ -17,13 +17,13 @@
 <div id="checkout-review-table-wrapper" class="order-review-wrapper table-wrapper">
     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): $colspan = $rowspan = 2; else: $colspan = $rowspan = 1; endif; ?>
     <table class="data table table-order-review items" id="checkout-review-table">
-        <caption class="table-caption"><?php echo __('Order Review'); ?></caption>
+        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Order Review'); ?></caption>
         <thead>
             <tr>
-                <th class="col item" scope="col"><?php echo __('Product Name') ?></th>
-                <th class="col price" scope="col"><?php echo __('Price') ?></th>
-                <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
-                <th class="col subtotal" scope="col"><?php echo __('Subtotal') ?></th>
+                <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>
             </tr>
         </thead>
         <tbody>
@@ -43,12 +43,12 @@
         <div class="primary"><?php echo $block->getChildHtml('button') ?></div>
         <div class="secondary">
             <span id="checkout-review-edit-label">
-                <?php echo __('Forgot an Item?') ?>
+                <?php /* @escapeNotVerified */ echo __('Forgot an Item?') ?>
             </span>
-            <a href="<?php echo $block->getUrl('checkout/cart') ?>"
+            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart') ?>"
                aria-describedby="checkout-review-edit-label"
                class="action edit">
-                <span><?php echo __('Edit Your Cart') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Edit Your Cart') ?></span>
             </a>
         </div>
     </div>
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 de7bb1b1ecb70..2466bae94057f 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
@@ -30,9 +30,9 @@ $_item = $block->getItem();
                     <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
                     <dd>
                         <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                            <?php echo $_formatedOptionValue['full_view'] ?>
+                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
                         <?php else: ?>
-                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
                         <?php endif; ?>
                     </dd>
                     <?php endforeach; ?>
@@ -55,7 +55,7 @@ $_item = $block->getItem();
                 </span>
             <?php endif; ?>
         </td>
-        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><span class="qty"><?php echo $_item->getQty() ?></span></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'));?>">
             <?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'));?>">
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 84dadaa0d45cf..f4f20582bb638 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
@@ -16,5 +16,5 @@
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getRowTotal()) ?>
+    <?php /* @escapeNotVerified */ echo $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 5f354f7f7634d..b957ecb04ab1f 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
@@ -17,5 +17,5 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
 <span class="cart-price">
-    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+    <?php /* @escapeNotVerified */ echo $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 4c29e0507fa79..dde06bd176d0b 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
@@ -16,5 +16,5 @@
 $_item = $block->getItem();
 ?>
 <span class="cart-price">
-    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+    <?php /* @escapeNotVerified */ echo $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 b77c3a972fc9e..a41c88f2063b4 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
@@ -17,5 +17,5 @@ $_item = $block->getItem();
 ?>
 <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
 <span class="cart-price">
-    <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+    <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml
index 9213b53700f1d..3c16c49d4efbe 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/review/totals.phtml
@@ -17,15 +17,15 @@
 ?>
 <?php if ($block->getTotals()): ?>
     <?php $_colspan = 3; ?>
-    <?php echo $block->renderTotals(null, $_colspan); ?>
-    <?php echo $block->renderTotals('footer', $_colspan); ?>
+    <?php /* @escapeNotVerified */ echo $block->renderTotals(null, $_colspan); ?>
+    <?php /* @escapeNotVerified */ echo $block->renderTotals('footer', $_colspan); ?>
     <?php if ($block->needDisplayBaseGrandtotal()):?>
     <tr class="totals charge">
-        <th class="mark" colspan="<?php echo $_colspan; ?>" scope="row">
-            <?php echo __('Your credit card will be charged for') ?>
+        <th class="mark" colspan="<?php /* @escapeNotVerified */ echo $_colspan; ?>" scope="row">
+            <?php /* @escapeNotVerified */ echo __('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 echo $block->displayBaseGrandtotal() ?>
+            <?php /* @escapeNotVerified */ echo $block->displayBaseGrandtotal() ?>
         </td>
     </tr>
     <?php endif?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
index 335269fe4a1c6..1144b9f16c8c6 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping.phtml
@@ -11,45 +11,45 @@
  * @removeCandidate
  */
 ?>
-<form class="form shipping address" id="co-shipping-form" data-hasrequired="<?php echo __('* Required Fields') ?>">
+<form class="form shipping address" id="co-shipping-form" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
 
 <?php if ($block->customerHasAddresses()): ?>
    <div class="field addresses">
-       <label class="label" for="shipping:address-select"><span><?php echo __('Select a shipping address from your address book or enter a new address.') ?></span></label>
+       <label class="label" for="shipping:address-select"><span><?php /* @escapeNotVerified */ echo __('Select a shipping address from your address book or enter a new address.') ?></span></label>
        <div class="control"><?php echo $block->getAddressesHtmlSelect('shipping') ?></div>
    </div>
 <?php endif ?>
     <fieldset class="fieldset address" id="shipping-new-address-form"<?php if ($block->customerHasAddresses()): ?> style="display:none;"<?php endif ?>>
-        <input type="hidden" name="shipping[address_id]" value="<?php echo $block->getAddress()->getId() ?>" id="shipping:address_id" />
+        <input type="hidden" name="shipping[address_id]" value="<?php /* @escapeNotVerified */ echo $block->getAddress()->getId() ?>" id="shipping:address_id" />
         <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getAddress())->setFieldIdFormat('shipping:%s')->setFieldNameFormat('shipping[%s]')->toHtml() ?>
         <div class="field company">
-            <label class="label" for="shipping:company"><span><?php echo __('Company') ?></span></label>
+            <label class="label" for="shipping:company"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
             <div class="control">
-                <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
+                <input type="text" id="shipping:company" name="shipping[company]" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>" />
             </div>
         </div>
         <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
         <div class="field taxvat">
-            <label class="label" for="shipping:vat_id"><span><?php echo __('VAT Number'); ?></span></label>
+            <label class="label" for="shipping:vat_id"><span><?php /* @escapeNotVerified */ echo __('VAT Number'); ?></span></label>
             <div class="control">
-                <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()); ?>" title="<?php echo __('VAT Number'); ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
+                <input type="text" id="shipping:vat_id" name="shipping[vat_id]" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()); ?>" title="<?php /* @escapeNotVerified */ echo __('VAT Number'); ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" />
             </div>
         </div>
         <?php endif; ?>
         <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
         <div class="field street required">
-            <label class="label" for="shipping:street1"><span><?php echo __('Address') ?></span></label>
+            <label class="label" for="shipping:street1"><span><?php /* @escapeNotVerified */ echo __('Address') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine(1)) ?>" class="input-text <?php /* @escapeNotVerified */ echo $_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="shipping:street<?php echo $_i ?>">
-                             <span><?php echo __('Street Address %1', $_i) ?></span>
+                         <label class="label" for="shipping:street<?php /* @escapeNotVerified */ echo $_i ?>">
+                             <span><?php /* @escapeNotVerified */ echo __('Street Address %1', $_i) ?></span>
                          </label>
                         <div class="control">
-                            <input type="text" title="<?php echo __('Street Address %1', $_i) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" />
+                            <input type="text" title="<?php /* @escapeNotVerified */ echo __('Street Address %1', $_i) ?>" name="shipping[street][]" id="shipping:street<?php /* @escapeNotVerified */ echo $_i ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getStreetLine($_i)) ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>" />
                         </div>
                     </div>
                 <?php endfor; ?>
@@ -58,49 +58,49 @@
         </div>
 
         <div class="field city required">
-            <label class="label" for="shipping:city"><span><?php echo __('City') ?></span></label>
+            <label class="label" for="shipping:city"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('City') ?>" name="shipping[city]" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="shipping:city" />
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('City') ?>" name="shipping[city]" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="shipping:city" />
             </div>
         </div>
         <div class="field region required">
-            <label class="label" for="shipping:region"><span><?php echo __('State/Province') ?></span></label>
+            <label class="label" for="shipping:region"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
             <div class="control">
-                <select id="shipping:region_id" name="shipping[region_id]" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                    <option value=""><?php echo __('Please select a region, state or province.') ?></option>
+                <select id="shipping:region_id" name="shipping[region_id]" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" style="display:none;">
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Please select a region, state or province.') ?></option>
                 </select>
-                <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $block->escapeHtml($block->getAddress()->getRegion()) ?>" title="<?php echo __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
+                <input type="text" id="shipping:region" name="shipping[region]" value="<?php echo $block->escapeHtml($block->getAddress()->getRegion()) ?>" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;" />
             </div>
         </div>
         <div class="field zip required">
-            <label class="label" for="shipping:postcode"><span><?php echo __('Zip/Postal Code') ?></span></label>
+            <label class="label" for="shipping:postcode"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" title="<?php echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}" />
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" name="shipping[postcode]" id="shipping:postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>" data-validate="{'required':true, 'validate-zip-international':true}" />
             </div>
         </div>
         <div class="field country required">
-            <label class="label" for="shipping:country_id"><span><?php echo __('Country') ?></span></label>
+            <label class="label" for="shipping:country_id"><span><?php /* @escapeNotVerified */ echo __('Country') ?></span></label>
             <div class="control">
                 <?php echo $block->getCountryHtmlSelect('shipping') ?>
             </div>
         </div>
         <div class="field telephone required">
-            <label class="label" for="shipping:telephone"><span><?php echo __('Phone Number') ?></span></label>
+            <label class="label" for="shipping:telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
             <div class="control">
-                <input type="text" name="shipping[telephone]" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php echo __('Telephone') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" />
+                <input type="text" name="shipping[telephone]" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Telephone') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="shipping:telephone" />
             </div>
         </div>
         <div class="field fax">
-            <label class="label" for="shipping:fax"><span><?php echo __('Fax') ?></span></label>
+            <label class="label" for="shipping:fax"><span><?php /* @escapeNotVerified */ echo __('Fax') ?></span></label>
             <div class="control">
-                <input type="text" name="shipping[fax]" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" title="<?php echo __('Fax') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" />
+                <input type="text" name="shipping[fax]" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" title="<?php /* @escapeNotVerified */ echo __('Fax') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>" id="shipping:fax" />
             </div>
         </div>
 
         <?php if ($block->isCustomerLoggedIn() && $block->customerHasAddresses()):?>
             <div class="field choice save">
-                <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php echo __('Save in address book') ?>" id="shipping:save_in_address_book" <?php if ($block->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" />
-                <label class="label" for="shipping:save_in_address_book"><span><?php echo __('Save in address book') ?></span></label>
+                <input type="checkbox" name="shipping[save_in_address_book]" value="1" title="<?php /* @escapeNotVerified */ echo __('Save in address book') ?>" id="shipping:save_in_address_book" <?php if ($block->getAddress()->getSaveInAddressBook()):?> checked="checked"<?php endif;?> class="checkbox" />
+                <label class="label" for="shipping:save_in_address_book"><span><?php /* @escapeNotVerified */ echo __('Save in address book') ?></span></label>
             </div>
         <?php else:?>
             <input type="hidden" name="shipping[save_in_address_book]" value="1" />
@@ -108,26 +108,26 @@
     </fieldset>
     <div class="choice field">
             <input type="checkbox" name="shipping[same_as_billing]" id="shipping:same_as_billing" value="1"<?php if ($block->getAddress()->getSameAsBilling()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-        <label class="label" for="shipping:same_as_billing"><span><?php echo __('Use Billing Address') ?></span></label>
+        <label class="label" for="shipping:same_as_billing"><span><?php /* @escapeNotVerified */ echo __('Use Billing Address') ?></span></label>
     </div>
     <div class="actions-toolbar" id="shipping-buttons-container">
         <div class="primary">
-            <button data-role="opc-continue" type="button" class="action continue primary"><span><?php echo __('Continue') ?></span></button>
+            <button data-role="opc-continue" type="button" class="action continue primary"><span><?php /* @escapeNotVerified */ echo __('Continue') ?></span></button>
         </div>
-        <div class="secondary"><a href="#" class="action back"><span><?php echo __('Back') ?></span></a></div>
+        <div class="secondary"><a href="#" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a></div>
     </div>
 </form>
 <script type="text/x-magento-init">
     {
         "#shipping\\:country_id": {
             "regionUpdater": {
-                "optionalRegionAllowed": <?php echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+                "optionalRegionAllowed": <?php /* @escapeNotVerified */ echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
                 "regionListId": "#shipping\\:region_id",
                 "regionInputId": "#shipping\\:region",
                 "postcodeId": "#shipping\\:postcode",
-                "regionJson": <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php echo $block->getAddress()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
+                "defaultRegion": "<?php /* @escapeNotVerified */ echo $block->getAddress()->getRegionId() ?>",
+                "countriesWithOptionalZip": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
             }
         }
     }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
index d4b9d858d0e4c..41ac2e61b3b8f 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method.phtml
@@ -18,8 +18,8 @@
     </div>
     <div class="actions-toolbar" id="shipping-method-buttons-container">
         <div class="primary">
-            <button data-role="opc-continue" type="button" class="button action continue primary"><span><?php echo __('Continue') ?></span></button>
+            <button data-role="opc-continue" type="button" class="button action continue primary"><span><?php /* @escapeNotVerified */ echo __('Continue') ?></span></button>
         </div>
-        <div class="secondary"><a class="action back" href="#"><span><?php echo __('Back') ?></span></a></div>
+        <div class="secondary"><a class="action back" href="#"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a></div>
     </div>
 </form>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml
index da4b581b633b3..abf5d0b218dfa 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/additional.phtml
@@ -12,5 +12,5 @@
  */
 ?>
 <?php if (!$block->getQuote()->isVirtual()): ?>
-    <?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('onepage_checkout', $block->getQuote(), $block->getDontDisplayContainer()) ?>
+    <?php /* @escapeNotVerified */ echo $this->helper('Magento\GiftMessage\Helper\Message')->getInline('onepage_checkout', $block->getQuote(), $block->getDontDisplayContainer()) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
index 439778300fa6d..4ccf006d34eae 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage/shipping_method/available.phtml
@@ -14,13 +14,13 @@
 <?php /** @var $block \Magento\Checkout\Block\Onepage\Shipping\Method\Available */ ?>
 <?php $_shippingRateGroups = $block->getShippingRates(); ?>
 <?php if (!$_shippingRateGroups): ?>
-    <p><?php echo __('Sorry, no quotes are available for this order right now.') ?></p>
+    <p><?php /* @escapeNotVerified */ echo __('Sorry, no quotes are available for this order right now.') ?></p>
 <?php else: ?>
     <dl class="items methods-shipping">
     <?php $shippingCodePrice = []; ?>
     <?php $_sole = count($_shippingRateGroups) == 1; foreach ($_shippingRateGroups as $code => $_rates): ?>
-        <dt class="item-title <?php echo $code ?>"><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></dt>
-        <dd class="item-content <?php echo $code ?>">
+        <dt class="item-title <?php /* @escapeNotVerified */ echo $code ?>"><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></dt>
+        <dd class="item-content <?php /* @escapeNotVerified */ echo $code ?>">
             <fieldset class="fieldset">
                 <legend class="legend"><span><?php echo $block->escapeHtml($block->getCarrierName($code)) ?></span></legend><br>
                 <?php $_sole = $_sole && count($_rates) == 1; foreach ($_rates as $_rate): ?>
@@ -30,13 +30,13 @@
                         <div class="message error"><div><?php echo $block->escapeHtml($_rate->getErrorMessage()) ?></div></div>
                        <?php else: ?>
                             <?php if ($_sole) : ?>
-                            <span class="no-display"><input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>" checked="checked" /></span>
+                            <span class="no-display"><input name="shipping_method" type="radio" value="<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>" id="s_method_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>" checked="checked" /></span>
                             <?php else: ?>
                             <div class="control">
-                                <input name="shipping_method" type="radio" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
+                                <input name="shipping_method" type="radio" value="<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>" id="s_method_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod()) echo ' checked="checked"' ?> class="radio"/>
                             </div>
                             <?php endif; ?>
-                            <label class="label" for="s_method_<?php echo $_rate->getCode() ?>"><span><?php echo $block->escapeHtml($_rate->getMethodTitle()) ?>
+                            <label class="label" for="s_method_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>"><span><?php echo $block->escapeHtml($_rate->getMethodTitle()) ?>
                             <?php echo $block->getShippingPriceHtml($_rate); ?>
                             </span>
                             </label>
@@ -47,5 +47,5 @@
         </dd>
     <?php endforeach; ?>
     </dl>
-    <div class="no-display" data-shipping-code-price='{<?php echo implode(",",$shippingCodePrice); ?>}'></div>
+    <div class="no-display" data-shipping-code-price='{<?php /* @escapeNotVerified */ echo implode(",",$shippingCodePrice); ?>}'></div>
 <?php endif; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
index a05fb3d33c067..32647df1dfb8b 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/registration.phtml
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div id="registration" data-bind="scope:'registration'">
     <br />
@@ -15,8 +17,8 @@
                         "registration": {
                             "component": "Magento_Checkout/js/view/registration",
                             "config": {
-                                "registrationUrl": "<?php echo $block->getCreateAccountUrl(); ?>",
-                                "email": "<?php echo $block->getEmailAddress(); ?>"
+                                "registrationUrl": "<?php /* @escapeNotVerified */ echo $block->getCreateAccountUrl(); ?>",
+                                "email": "<?php /* @escapeNotVerified */ echo $block->getEmailAddress(); ?>"
                             }
                         }
                     }
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 a2f52ead514c9..45ed9f5c6bf36 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 echo $shippingPrice; ?>
+<?php /* @escapeNotVerified */ echo $shippingPrice; ?>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index 9a5162afc572f..83ba32c1985cf 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -15,14 +15,14 @@
         <?php  else :?>
             <p><?php echo __('Your order # is: <span>%1</span>.', $block->escapeHtml($block->getOrderId())) ?></p>
         <?php endif;?>
-            <p><?php echo __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
+            <p><?php /* @escapeNotVerified */ echo __('We\'ll email you an order confirmation with details and tracking info.') ?></p>
     <?php endif;?>
 
     <?php echo $block->getAdditionalInfoHtml() ?>
 
     <div class="actions-toolbar">
         <div class="primary">
-            <a class="action primary continue" title="<?php echo __('Continue Shopping') ?>" href="<?php echo $block->getUrl() ?>"><span><?php echo __('Continue Shopping') ?></span></a>
+            <a class="action primary continue" title="<?php /* @escapeNotVerified */ echo __('Continue Shopping') ?>" href="<?php /* @escapeNotVerified */ echo $block->getUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('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 aab393e8e4eb5..b3e2eb78dd9b9 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 echo $block->getColspan(); ?>" style="<?php echo $block->getTotal()->getStyle() ?>" class="mark" scope="row">
+    <th colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="mark" scope="row">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </th>
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
+    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <span><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></span>
+            <span><?php /* @escapeNotVerified */ echo $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 c582f40c6215b..1ba02c56524cc 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/additional_agreements.phtml
@@ -21,25 +21,25 @@
         <li class="item">
             <div class="agreement content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
                 <?php if ($agreement->getIsHtml()):?>
-                    <?php echo $agreement->getContent() ?>
+                    <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
                 <?php else:?>
                     <?php echo nl2br($block->escapeHtml($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
             <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-            <div id="checkout-agreements-form-<?php echo $agreement->getAgreementId()?>" class="field choice agree required">
+            <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree required">
                 <input type="checkbox"
-                       id="agreement-<?php echo $agreement->getAgreementId()?>"
-                       name="agreement[<?php echo $agreement->getAgreementId()?>]"
+                       id="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>"
+                       name="agreement[<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>]"
                        value="1"
                        title="<?php echo $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox""/>
-                <label class="label" for="agreement-<?php echo $agreement->getAgreementId()?>">
+                <label class="label" for="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>">
                     <span><?php echo $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 echo $agreement->getAgreementId()?>" class="field choice agree">
+            <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>
             <?php endif; ?>
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
index 877058ab5b726..45d4ac45ed5f0 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/agreements.phtml
@@ -21,25 +21,25 @@
         <li class="item">
             <div class="agreement content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
                 <?php if ($agreement->getIsHtml()):?>
-                    <?php echo $agreement->getContent() ?>
+                    <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
                 <?php else:?>
                     <?php echo nl2br($block->escapeHtml($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
-            <form id="checkout-agreements-form-<?php echo $agreement->getAgreementId()?>" class="field choice agree required">
+            <form id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree required">
                 <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
                 <input type="checkbox"
-                       id="agreement-<?php echo $agreement->getAgreementId()?>"
-                       name="agreement[<?php echo $agreement->getAgreementId()?>]"
+                       id="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>"
+                       name="agreement[<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>]"
                        value="1"
                        title="<?php echo $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox"
                        data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?php echo $agreement->getAgreementId()?>">
+                <label class="label" for="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>">
                     <span><?php echo $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 echo $agreement->getAgreementId()?>" class="field choice agree">
+                <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>
                 <?php endif; ?>
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 4330aeda95fc8..9ac34c47102a6 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/templates/multishipping_agreements.phtml
@@ -21,26 +21,26 @@
         <li class="item">
             <div class="agreement content"<?php echo($agreement->getContentHeight() ? ' style="height:' . $agreement->getContentHeight() . '"' : '')?>>
                 <?php if ($agreement->getIsHtml()):?>
-                    <?php echo $agreement->getContent() ?>
+                    <?php /* @escapeNotVerified */ echo $agreement->getContent() ?>
                 <?php else:?>
                     <?php echo nl2br($block->escapeHtml($agreement->getContent())) ?>
                 <?php endif; ?>
             </div>
             <?php if($agreement->getMode() == \Magento\CheckoutAgreements\Model\AgreementModeOptions::MODE_MANUAL): ?>
-            <div id="checkout-agreements-form-<?php echo $agreement->getAgreementId()?>" class="field choice agree required">
+            <div id="checkout-agreements-form-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>" class="field choice agree required">
                 <input type="checkbox"
-                       id="agreement-<?php echo $agreement->getAgreementId()?>"
-                       name="agreement[<?php echo $agreement->getAgreementId()?>]"
+                       id="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>"
+                       name="agreement[<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>]"
                        value="1"
                        title="<?php echo $block->escapeHtml($agreement->getCheckboxText()) ?>"
                        class="checkbox"
                        data-validate="{required:true}"/>
-                <label class="label" for="agreement-<?php echo $agreement->getAgreementId()?>">
+                <label class="label" for="agreement-<?php /* @escapeNotVerified */ echo $agreement->getAgreementId()?>">
                     <span><?php echo $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 echo $agreement->getAgreementId()?>" class="field choice agree">
+            <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>
             <?php endif; ?>
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 7838058ef1db0..54f22698a0ffe 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml
@@ -17,7 +17,7 @@
                 <div class="insert-actions">
                     <?php echo $block->getButtonsHtml() ?>
                 </div>
-                <div class="title"><?php echo $block->getHeaderText() ?></div>
+                <div class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></div>
             </div>
         </div>
         <div id="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_images.uploader') ?></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 17f9cdf40d5c6..d54a08accbe43 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->getFileId($file) ?>">
-        <p class="nm" style="height:<?php echo $_height ?>px;width:<?php echo $_width ?>px;">
+    <div data-row="file" class="filecnt" id="<?php /* @escapeNotVerified */ echo $block->getFileId($file) ?>">
+        <p class="nm" style="height:<?php /* @escapeNotVerified */ echo $_height ?>px;width:<?php /* @escapeNotVerified */ echo $_width ?>px;">
         <?php if ($block->getFileThumbUrl($file)):?>
-            <img src="<?php echo $block->getFileThumbUrl($file) ?>" alt="<?php echo $block->getFileName($file) ?>"/>
+            <img src="<?php /* @escapeNotVerified */ echo $block->getFileThumbUrl($file) ?>" alt="<?php /* @escapeNotVerified */ echo $block->getFileName($file) ?>"/>
         <?php endif; ?>
         </p>
         <?php if ($block->getFileWidth($file)): ?>
-            <small><?php echo $block->getFileWidth($file) ?>x<?php echo $block->getFileHeight($file) ?> <?php echo __('px.') ?></small><br/>
+            <small><?php /* @escapeNotVerified */ echo $block->getFileWidth($file) ?>x<?php /* @escapeNotVerified */ echo $block->getFileHeight($file) ?> <?php /* @escapeNotVerified */ echo __('px.') ?></small><br/>
         <?php endif; ?>
-        <small><?php echo $block->getFileShortName($file); ?></small>
+        <small><?php /* @escapeNotVerified */ echo $block->getFileShortName($file); ?></small>
     </div>
     <?php endforeach; ?>
 <?php else: ?>
-    <div class="empty"><?php echo __('No files found') ?></div>
+    <div class="empty"><?php /* @escapeNotVerified */ echo __('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 f381b09b570eb..a85309f709ba7 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
@@ -11,8 +11,8 @@
 
 <div id="<?php echo $block->getHtmlId() ?>" class="uploader">
     <span class="fileinput-button form-buttons">
-        <span><?php echo __('Browse Files...') ?></span>
-        <input class="fileupload" type="file" name="<?php echo $block->getConfig()->getFileField() ?>" data-url="<?php echo $block->getConfig()->getUrl() ?>" multiple>
+        <span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>
+        <input class="fileupload" type="file" name="<?php /* @escapeNotVerified */ echo $block->getConfig()->getFileField() ?>" data-url="<?php /* @escapeNotVerified */ echo $block->getConfig()->getUrl() ?>" multiple>
     </span>
     <div class="clear"></div>
     <script type="text/x-magento-template" id="<?php echo $block->getHtmlId() ?>-template">
@@ -39,7 +39,7 @@ require([
         },
         sequentialUploads: true,
         acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-        maxFileSize: <?php echo $block->getFileSizeService()->getMaxFileSize() ?> ,
+        maxFileSize: <?php /* @escapeNotVerified */ echo $block->getFileSizeService()->getMaxFileSize() ?> ,
         add: function (e, data) {
             var progressTmpl = mageTemplate('#<?php echo $block->getHtmlId(); ?>-template'),
                 fileSize,
@@ -91,11 +91,11 @@ require([
         process: [{
             action: 'load',
             fileTypes: /^image\/(gif|jpeg|png)$/,
-            maxFileSize: <?php echo $block->getFileSizeService()->getMaxFileSize() ?> * 10
+            maxFileSize: <?php /* @escapeNotVerified */ echo $block->getFileSizeService()->getMaxFileSize() ?> * 10
         }, {
             action: 'resize',
-            maxWidth: <?php echo \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
-            maxHeight: <?php echo \Magento\Framework\File\Uploader::MAX_IMAGE_HEIGHT ?>
+            maxWidth: <?php /* @escapeNotVerified */ echo \Magento\Framework\File\Uploader::MAX_IMAGE_WIDTH ?> ,
+            maxHeight: <?php /* @escapeNotVerified */ echo \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 a626c79bfa2af..bf185e3f36ccc 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/tree.phtml
@@ -11,9 +11,9 @@
 <div class="tree-panel" >
     <div class="categories-side-col">
         <div class="tree-actions">
-            <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?php echo __('Collapse All'); ?></a>
+            <a onclick="jQuery('[data-role=tree]').jstree('close_all');"><?php /* @escapeNotVerified */ echo __('Collapse All'); ?></a>
             <span class="separator">|</span>
-            <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?php echo __('Expand All'); ?></a>
+            <a onclick="jQuery('[data-role=tree]').jstree('open_all');"><?php /* @escapeNotVerified */ echo __('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())); ?>'>
diff --git a/app/code/Magento/Cms/view/frontend/templates/content.phtml b/app/code/Magento/Cms/view/frontend/templates/content.phtml
index fe227c664e5ed..5cb2eccaf5c6a 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 echo $pageData->getPageContent(); ?>
+<?php /* @escapeNotVerified */ echo $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 bf71d4807b825..f574e178c47bf 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 echo $pageData->getPageMetaKeywords() ?>"/>
+<meta name="keywords" content="<?php /* @escapeNotVerified */ echo $pageData->getPageMetaKeywords() ?>"/>
 <?php endif; ?>
 <?php if ($pageData->getPageMetaDescription()): ?>
-<meta name="description" content="<?php echo $pageData->getPageMetaDescription() ?>"/>
+<meta name="description" content="<?php /* @escapeNotVerified */ echo $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 8f0a5d63e3905..f574861b35bb4 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
@@ -5,7 +5,7 @@
  */
 ?>
 <div class="widget block block-cms-link">
-    <a <?php echo $block->getLinkAttributes() ?>>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>>
         <span><?php echo $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 3004d3191f7c5..12d3154dc5c4a 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
@@ -5,7 +5,7 @@
  */
 ?>
 <div class="widget block block-cms-link-inline">
-    <a <?php echo $block->getLinkAttributes() ?>>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>>
         <span><?php echo $block->escapeHtml($block->getLabel()) ?></span>
     </a>
 </div>
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 6a28aae8ba423..ab333ccd0d1bc 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
@@ -5,5 +5,5 @@
  */
 ?>
 <div class="widget block block-static-block">
-    <?php echo $block->getText(); ?>
+    <?php /* @escapeNotVerified */ echo $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 f415cee26ae36..bf9d53180008d 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
@@ -19,7 +19,7 @@ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data');
     ], function () {
         window.resetRobotsToDefault = function(){
             $('design_search_engine_robots_custom_instructions').value = <?php
-                echo $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
+                /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($block->getRobotsDefaultCustomInstructions())
             ?>;
         }
     });
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index f36929feb8ffe..dc585c33cea08 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,7 +16,7 @@
  *  getForm() - html
  */
 ?>
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
+<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="config-edit-form" enctype="multipart/form-data">
     <?php echo $block->getBlockHtml('formkey')?>
     <div class="accordion">
         <?php echo $block->getChildHtml('form') ?>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
index b11bdbaf028be..e11901779f7f2 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 echo $_htmlId; ?>">
+<div class="design_theme_ua_regexp" id="grid<?php /* @escapeNotVerified */ echo $_htmlId; ?>">
     <div class="admin__control-table-wrapper">
         <table class="admin__control-table">
             <thead>
             <tr>
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                    <th><?php echo $column['label']; ?></th>
+                    <th><?php /* @escapeNotVerified */ echo $column['label']; ?></th>
                 <?php endforeach;?>
-                <th class="col-actions" colspan="<?php echo $_colspan; ?>">Action</th>
+                <th class="col-actions" colspan="<?php /* @escapeNotVerified */ echo $_colspan; ?>">Action</th>
             </tr>
             </thead>
             <tfoot>
             <tr>
                 <td colspan="<?php echo count($block->getColumns())+$_colspan; ?>" class="col-actions-add">
-                    <button id="addToEndBtn<?php echo $_htmlId; ?>" class="action-add" title="<?php echo __('Add'); ?>" type="button">
-                        <span><?php echo $block->getAddButtonLabel(); ?><?php echo __('Add'); ?></span>
+                    <button id="addToEndBtn<?php /* @escapeNotVerified */ echo $_htmlId; ?>" class="action-add" title="<?php /* @escapeNotVerified */ echo __('Add'); ?>" type="button">
+                        <span><?php /* @escapeNotVerified */ echo $block->getAddButtonLabel(); ?><?php /* @escapeNotVerified */ echo __('Add'); ?></span>
                     </button>
                 </td>
             </tr>
             </tfoot>
-            <tbody id="addRow<?php echo $_htmlId; ?>"></tbody>
+            <tbody id="addRow<?php /* @escapeNotVerified */ echo $_htmlId; ?>"></tbody>
         </table>
     </div>
-    <input type="hidden" name="<?php echo $block->getElement()->getName(); ?>[__empty]" value="" />
+    <input type="hidden" name="<?php /* @escapeNotVerified */ echo $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 echo $_htmlId ?> = {
+        window.arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?> = {
 
             // define row prototypeJS template
             template: mageTemplate(
                     '<tr id="<%- _id %>">'
                     <?php foreach ($block->getColumns() as $columnName => $column): ?>
                             + '<td>'
-                            + '<?php echo $block->renderCellTemplate($columnName)?>'
+                            + '<?php /* @escapeNotVerified */ echo $block->renderCellTemplate($columnName)?>'
                             + '<\/td>'
                         <?php endforeach; ?>
 
                     <?php if ($block->isAddAfter()): ?>
-                            + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span><?php echo __('Add after'); ?><\/span><\/button><\/td>'
+                            + '<td><button class="action-add" type="button" id="addAfterBtn<%- _id %>"><span><?php /* @escapeNotVerified */ echo __('Add after'); ?><\/span><\/button><\/td>'
                         <?php endif; ?>
 
-                            + '<td class="col-actions"><button onclick="arrayRow<?php echo $_htmlId ?>.del(\'<%- _id %>\')" class="action-delete" type="button"><span><?php echo __('Delete'); ?><\/span><\/button><\/td>'
+                            + '<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>'
                             +'<\/tr>'
             ),
 
@@ -74,7 +74,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
                     var d = new Date();
                     templateValues = {
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
-                    <?php echo $columnName ?>: '',
+                    <?php /* @escapeNotVerified */ echo $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 echo $_htmlId ?>'), {bottom: this.template(templateValues)});
+            Element.insert($('addRow<?php /* @escapeNotVerified */ echo $_htmlId ?>'), {bottom: this.template(templateValues)});
         }
 
         // Fill controls with data
@@ -110,18 +110,18 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
         }
 
         // bind add action to "Add" button in last row
-        Event.observe('addToEndBtn<?php echo $_htmlId ?>', 'click', arrayRow<?php echo $_htmlId ?>.add.bind(arrayRow<?php echo $_htmlId ?>, false, false));
+        Event.observe('addToEndBtn<?php /* @escapeNotVerified */ echo $_htmlId ?>', 'click', arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?>.add.bind(arrayRow<?php /* @escapeNotVerified */ echo $_htmlId ?>, false, false));
 
         // add existing rows
         <?php
         foreach ($block->getArrayRows() as $_rowId => $_row) {
-            echo "arrayRow{$_htmlId}.add(" . $_row->toJson() . ");\n";
+            /* @escapeNotVerified */ echo "arrayRow{$_htmlId}.add(" . $_row->toJson() . ");\n";
         }
         ?>
 
         // Toggle the grid availability, if element is disabled (depending on scope)
         <?php if ($block->getElement()->getDisabled()):?>
-        toggleValueElements({checked: true}, $('grid<?php echo $_htmlId; ?>').parentNode);
+        toggleValueElements({checked: true}, $('grid<?php /* @escapeNotVerified */ echo $_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 46087c34939ea..86fec1f52fec5 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 echo $block->getUrl('directory/json/countryRegion') ?>";
+        this.regionsUrl = "<?php /* @escapeNotVerified */ echo $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 4cec327329db0..ac30b708c36c6 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 echo __('Current Configuration Scope:') ?></label>
+    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('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,11 +17,11 @@
             <?php if ($_option['is_close']): ?>
                 </optgroup>
             <?php else: ?>
-                <optgroup label="<?php echo $block->escapeHtml($_option['label']) ?>" style="<?php echo $_option['style'] ?>">
+                <optgroup label="<?php echo $block->escapeHtml($_option['label']) ?>" style="<?php /* @escapeNotVerified */ echo $_option['style'] ?>">
             <?php endif; ?>
             <?php continue ?>
         <?php endif; ?>
-          <option value="<?php echo $block->escapeHtml($_value) ?>" url="<?php echo $_option['url'] ?>" <?php echo $_option['selected'] ? 'selected="selected"' : '' ?> style="<?php echo $_option['style'] ?>">
+          <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>
         <?php endforeach ?>
@@ -30,7 +30,7 @@
     <?php echo $block->getHintHtml() ?>
     <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
         <div class="actions">
-            <a href="<?php echo $block->getUrl('*/system_store') ?>"><?php echo __('Stores') ?></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl('*/system_store') ?>"><?php /* @escapeNotVerified */ echo __('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 d954aedfeb227..1cbdcec8a1974 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 echo $block->getId() ?>" class="config-nav">
+    <div id="<?php /* @escapeNotVerified */ echo $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 echo $_tab->getClass() ?>
+                    <?php /* @escapeNotVerified */ echo $_tab->getClass() ?>
                 <?php endif ?>"
-                 data-mage-init='{"collapsible":{"active": "<?php echo $activeCollapsible;?>",
+                 data-mage-init='{"collapsible":{"active": "<?php /* @escapeNotVerified */ echo $activeCollapsible;?>",
                  "openedState": "_show",
                  "closedState": "_hide",
                  "collapsible": true,
                  "animate": 200}}'>
                 <div class="admin__page-nav-title title _collapsible" data-role="title">
-                    <strong><?php echo $_tab->getLabel() ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo $_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 echo $_section->getClass() ?>
+                            <?php /* @escapeNotVerified */ echo $_section->getClass() ?>
                             <?php if ($block->isSectionActive($_section)): ?> _active<?php endif ?>
                             <?php echo $_tab->getChildren()->isLast($_section) ? ' _last' : '' ?>">
-                            <a href="<?php echo $block->getSectionUrl($_section) ?>"
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getSectionUrl($_section) ?>"
                                class="admin__page-nav-link item-nav">
-                               <span><?php echo $_section->getLabel() ?></span>
+                               <span><?php /* @escapeNotVerified */ echo $_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 c92d432da6858..a9add91f67608 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 echo $block->getAttributesBlockJson() ?>;
+    var data = <?php /* @escapeNotVerified */ echo $block->getAttributesBlockJson() ?>;
     var set = data.set || {id: $('#attribute_set_id').val()};
     if (data.tab == 'variations') {
         $('[data-role=product-variations-generator]').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 486bd4943dbee..d78e50b66be1f 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
@@ -25,7 +25,7 @@ ConfigurableNodeExists = function(currentNode) {
 editSet.submit = editSet.submit.wrap(function(original) {
     if (editSet.currentNode){
         if (ConfigurableNodeExists(editSet.currentNode)) {
-            alert('<?php echo $block->escapeJsQuote(__('This group contains attributes used in configurable products. Please move these attributes to another group and try again.')) ?>');
+            alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('This group contains attributes used in configurable products. Please move these attributes to another group and try again.')) ?>');
             return;
         }
     }
@@ -34,7 +34,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('<?php echo $block->escapeJsQuote(__('This attribute is used in configurable products. You cannot remove it from the product template.')) ?>');
+        alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('This attribute is used in configurable products. You cannot remove it from the product template.')) ?>');
         return false;
     }
     return original(tree, nodeThis, node, newParent);
@@ -42,7 +42,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('<?php echo $block->escapeJsQuote(__('This attribute is used in configurable products. You cannot remove it from the product template.')) ?>');
+        alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('This attribute is used in configurable products. You cannot remove it from the product template.')) ?>');
         return false;
     }
     return original(tree, nodeThis, node, newParent);
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 48fbaa7bc66ef..6b9ba6a541a2f 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
@@ -14,16 +14,16 @@
 <?php $_skipSaleableCheck = $this->helper('Magento\Catalog\Helper\Product')->getSkipSaleableCheck(); ?>
 <?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 echo __('Associated Products') ?></span></legend>
+    <legend class="legend admin__legend"><span><?php /* @escapeNotVerified */ echo __('Associated Products') ?></span></legend>
     <div class="product-options">
         <div class="field admin__field _required required">
             <?php foreach ($_attributes as $_attribute): ?>
-                <label class="label admin__field-label"><?php echo $_attribute->getLabel() ?></label>
+                <label class="label admin__field-label"><?php /* @escapeNotVerified */ echo $_attribute->getLabel() ?></label>
                 <div class="control admin__field-control <?php if ($_attribute->getDecoratedIsLast()):?> last<?php endif; ?>">
-                    <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]"
-                            id="attribute<?php echo $_attribute->getAttributeId() ?>"
+                    <select name="super_attribute[<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>]"
+                            id="attribute<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>"
                             class="admin__control-select required-entry super-attribute-select">
-                        <option><?php echo __('Choose an Option...') ?></option>
+                        <option><?php /* @escapeNotVerified */ echo __('Choose an Option...') ?></option>
                     </select>
                 </div>
             <?php endforeach; ?>
@@ -36,7 +36,7 @@ require([
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(){
 
-    var config = <?php echo $block->getJsonConfig() ?>;
+    var config = <?php /* @escapeNotVerified */ echo $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 9485d0efef19d..0d4a59a617928 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,10 +8,10 @@
 
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\AttributeValues */
 ?>
-<div data-bind="scope: '<?= $block->getComponentName()?>'">
-    <h2 class="steps-wizard-title"><?= __('Step 2: Attribute Values') ?></h2>
+<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
+    <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 2: Attribute Values') ?></h2>
     <div class="steps-wizard-info">
-        <span><?= __('Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.') ?></span>
+        <span><?= /* @escapeNotVerified */  __('Select values from each attribute to include in this product. Each unique combination of values creates a unigue product SKU.') ?></span>
     </div>
     <div data-bind="foreach: attributes, sortableList: attributes">
 
@@ -25,7 +25,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>
-                        <?= __('Options') ?>)
+                        <?= /* @escapeNotVerified */  __('Options') ?>)
                     </div>
                 </div>
 
@@ -34,19 +34,19 @@
                             class="action-select-all action-tertiary"
                             data-bind="click: $parent.selectAllAttributes"
                             title="<?= $block->escapeHtml(__('Select All')) ?>">
-                        <span><?= __('Select All') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Select All') ?></span>
                     </button>
                     <button type="button"
                             class="action-deselect-all action-tertiary"
                             data-bind="click: $parent.deSelectAllAttributes"
                             title="<?= $block->escapeHtml(__('Deselect All')) ?>">
-                        <span><?= __('Deselect All') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Deselect All') ?></span>
                     </button>
                     <button type="button"
                             class="action-remove-all action-tertiary"
                             data-bind="click: $parent.removeAttribute.bind($parent)"
                             title="<?= $block->escapeHtml(__('Remove Attribute')) ?>">
-                        <span><?= __('Remove Attribute') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Remove Attribute') ?></span>
                     </button>
                 </div>
             </div>
@@ -74,14 +74,14 @@
                                     title="<?= $block->escapeHtml(__('Save Option')) ?>"
                                     data-action="save"
                                     data-bind="click: $parents[1].saveOption.bind($parent)">
-                                <span><?= __('Save Option') ?></span>
+                                <span><?= /* @escapeNotVerified */  __('Save Option') ?></span>
                             </button>
                             <button type="button"
                                     class="action-remove"
                                     title="<?= $block->escapeHtml(__('Remove Option')) ?>"
                                     data-action="remove"
                                     data-bind="click: $parents[1].removeOption.bind($parent)">
-                                <span><?= __('Remove Option') ?></span>
+                                <span><?= /* @escapeNotVerified */  __('Remove Option') ?></span>
                             </button>
                         </div>
                     </li>
@@ -91,7 +91,7 @@
                     type="button"
                     data-action="addOption"
                     data-bind="click: $parent.createOption">
-                <span><?= __('Create New Value') ?></span>
+                <span><?= /* @escapeNotVerified */  __('Create New Value') ?></span>
             </button>
         </div>
     </div>
@@ -101,11 +101,11 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= $block->getComponentName()?>": {
+                    "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/attributes_values",
-                        "appendTo": "<?= $block->getParentComponentName()?>",
-                        "optionsUrl": "<?= $block->getUrl('catalog/product_attribute/getAttributes')?>",
-                        "createOptionsUrl": "<?= $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/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 4a75244b9f883..9c58b7a7fb6a6 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,17 +9,17 @@
 /* @var $block \Magento\ConfigurableProduct\Block\Adminhtml\Product\Steps\Bulk */
 ?>
 
-<div data-bind="scope: '<?= $block->getComponentName()?>'" data-role="bulk-step">
-    <h2 class="steps-wizard-title"><?= __('Step 3: Bulk Images, Price, and Quantity') ?></h2>
+<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'" data-role="bulk-step">
+    <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 3: Bulk Images, Price, and Quantity') ?></h2>
     <div class="steps-wizard-info">
-        <?= __('Based on your selections <span class="new-products-count" data-bind="text:countVariations"></span>
+        <?= /* @escapeNotVerified */  __('Based on your selections <span class="new-products-count" data-bind="text:countVariations"></span>
         new products will be created. Use this step to customize images and price for your new products.') ?>
     </div>
 
     <div data-bind="with: sections().images" class="steps-wizard-section">
         <div data-role="section">
         <div class="steps-wizard-section-title">
-            <span><?= __('Images') ?></span>
+            <span><?= /* @escapeNotVerified */  __('Images') ?></span>
         </div>
 
         <ul class="steps-wizard-section-list">
@@ -31,7 +31,7 @@
                            value="single"
                            data-bind="checked:type">
                     <label for="apply-single-set-radio" class="admin__field-label">
-                        <span><?= __('Apply single set of images to all SKUs') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Apply single set of images to all SKUs') ?></span>
                     </label>
                 </div>
             </li>
@@ -43,7 +43,7 @@
                            value="each"
                            data-bind="checked:type">
                     <label for="apply-unique-images-radio" class="admin__field-label">
-                        <span><?= __('Apply unique images by attribute to each SKU') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Apply unique images by attribute to each SKU') ?></span>
                     </label>
                 </div>
             </li>
@@ -56,7 +56,7 @@
                            checked
                            data-bind="checked:type">
                     <label for="skip-images-uploading-radio" class="admin__field-label">
-                        <span><?= __('Skip image uploading at this time') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Skip image uploading at this time') ?></span>
                     </label>
                 </div>
             </li>
@@ -67,16 +67,16 @@
                 <div class="image image-placeholder">
                     <div data-role="uploader" class="uploader">
                         <div class="image-browse">
-                            <span><?= __('Browse Files...') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Browse Files...') ?></span>
                             <input type="file"
                                    id=""
                                    name="image"
                                    class="admin__control-file"
                                    multiple="multiple"
-                                   data-url="<?=$block->getUrl('catalog/product_gallery/upload') ?>" />
+                                   data-url="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product_gallery/upload') ?>" />
                         </div>
                     </div>
-                    <p class="image-placeholder-text"><?= __('Browse to find or drag image here') ?></p>
+                    <p class="image-placeholder-text"><?= /* @escapeNotVerified */  __('Browse to find or drag image here') ?></p>
                 </div>
 
                 <input name="product[image]"
@@ -130,11 +130,11 @@
                                 class="action-remove"
                                 data-role="delete-button"
                                 title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                            <span><?= __('Remove image') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Remove image') ?></span>
                         </button>
                         <div class="draggable-handle"></div>
                         <div class="image-label" title="<?= $block->escapeHtml(__('Edit role')) ?>"></div>
-                        <div class="image-fade"><span><?= __('Hidden') ?></span></div>
+                        <div class="image-fade"><span><?= /* @escapeNotVerified */  __('Hidden') ?></span></div>
                     </div>
                 </script>
 
@@ -149,11 +149,11 @@
                                 class="action-remove"
                                 data-role="delete-button"
                                 title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                            <span><?= __('Remove image') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Remove image') ?></span>
                         </button>
                         <div class="draggable-handle"></div>
                         <div class="image-label" title="<?= $block->escapeHtml(__('Edit role')) ?>"></div>
-                        <div class="image-fade"><span><?= __('Hidden') ?></span></div>
+                        <div class="image-fade"><span><?= /* @escapeNotVerified */  __('Hidden') ?></span></div>
                     </div>
                 </script>
 
@@ -168,7 +168,7 @@
                             <fieldset class="admin__fieldset fieldset-image-panel">
                                 <div class="field field-image-description">
                                     <label class="field field-image-description">
-                                        <span><?= __('Alt Text') ?></span>
+                                        <span><?= /* @escapeNotVerified */  __('Alt Text') ?></span>
                                     </label>
                                     <div class="control">
                                         <textarea id="image-description"
@@ -181,7 +181,7 @@
 
                                 <div class="field field-image-role">
                                     <label class="label">
-                                        <span><?= __('Role') ?></span>
+                                        <span><?= /* @escapeNotVerified */  __('Role') ?></span>
                                     </label>
                                     <div class="control">
                                         <ul class="multiselect-alt">
@@ -191,7 +191,7 @@
                                                            data-role="type-selector"
                                                            type="checkbox"
                                                            value="image"
-                                                        /><?= __('Base Image') ?></label>
+                                                        /><?= /* @escapeNotVerified */  __('Base Image') ?></label>
                                             </li>
                                             <li class="item">
                                                 <label>
@@ -199,7 +199,7 @@
                                                            data-role="type-selector"
                                                            type="checkbox"
                                                            value="small_image"
-                                                        /><?= __('Small Image') ?></label>
+                                                        /><?= /* @escapeNotVerified */  __('Small Image') ?></label>
                                             </li>
                                             <li class="item">
                                                 <label>
@@ -207,7 +207,7 @@
                                                            data-role="type-selector"
                                                            type="checkbox"
                                                            value="thumbnail"
-                                                        /><?= __('Thumbnail') ?></label>
+                                                        /><?= /* @escapeNotVerified */  __('Thumbnail') ?></label>
                                             </li>
                                         </ul>
                                     </div>
@@ -220,7 +220,7 @@
                                                value="1"
                                                name="product[media_gallery][images][<%- data.file_id %>][disabled]"
                                         <% if (data.disabled == 1) { %>checked="checked"<% } %> />
-                                        <span><?= __('Hide from Product Page') ?></span>
+                                        <span><?= /* @escapeNotVerified */  __('Hide from Product Page') ?></span>
                                     </label>
                                 </div>
                             </fieldset>
@@ -230,7 +230,7 @@
                                 class="action-close"
                                 data-role="close-panel"
                                 title="<?= $block->escapeHtml(__('Close panel')) ?>">
-                            <span><?= __('Close panel') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Close panel') ?></span>
                         </button>
                         <div class="image-pointer"></div>
                     </div>
@@ -242,7 +242,7 @@
             <fieldset class="admin__fieldset bulk-attribute-values">
                 <div class="admin__field _required">
                     <label class="admin__field-label" for="apply-images-attributes">
-                        <span><?= __('Select attribute')?></span>
+                        <span><?= /* @escapeNotVerified */  __('Select attribute')?></span>
                     </label>
                     <div class="admin__field-control">
                         <select
@@ -252,7 +252,7 @@
                                 options: $parent.attributes,
                                 optionsText: 'label',
                                 value: attribute,
-                                optionsCaption: '<?= __("Select")?>'
+                                optionsCaption: '<?= /* @escapeNotVerified */  __("Select")?>'
                                 ">
                         </select>
                     </div>
@@ -270,12 +270,12 @@
                         <div class="image image-placeholder">
                             <div data-role="uploader" class="uploader">
                                 <div class="image-browse">
-                                    <span><?= __('Browse Files...') ?></span>
+                                    <span><?= /* @escapeNotVerified */  __('Browse Files...') ?></span>
                                     <input type="file" name="image" multiple="multiple"
-                                           data-url="<?=$block->getUrl('catalog/product_gallery/upload') ?>" />
+                                           data-url="<?= /* @escapeNotVerified */ $block->getUrl('catalog/product_gallery/upload') ?>" />
                                 </div>
                             </div>
-                            <p class="image-placeholder-text"><?= __('Browse to find or drag image here') ?></p>
+                            <p class="image-placeholder-text"><?= /* @escapeNotVerified */  __('Browse to find or drag image here') ?></p>
                             <div class="spinner">
                                <span></span><span></span><span></span><span></span>
                                <span></span><span></span><span></span><span></span>
@@ -330,9 +330,9 @@
                                        value=""
                                        class="is-removed"/>
                                 <ul class="type-labels" style="display: none">
-                                    <li class="type-image"><?= __('Base Image') ?></li>
-                                    <li class="type-small_image"><?= __('Small Image') ?></li>
-                                    <li class="type-thumbnail"><?= __('Thumbnail') ?></li>
+                                    <li class="type-image"><?= /* @escapeNotVerified */  __('Base Image') ?></li>
+                                    <li class="type-small_image"><?= /* @escapeNotVerified */  __('Small Image') ?></li>
+                                    <li class="type-thumbnail"><?= /* @escapeNotVerified */  __('Thumbnail') ?></li>
                                 </ul>
                                 <img class="product-image" src="<%- data.url %>" alt="<%- data.label %>"/>
 
@@ -340,11 +340,11 @@
                                         class="action-remove"
                                         data-role="delete-button"
                                         title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                    <span><?= __('Remove image') ?></span>
+                                    <span><?= /* @escapeNotVerified */  __('Remove image') ?></span>
                                 </button>
                                 <div class="draggable-handle"></div>
                                 <div class="image-label" title="<?= $block->escapeHtml(__('Edit role')) ?>"></div>
-                                <div class="image-fade"><span><?= __('Hidden') ?></span></div>
+                                <div class="image-fade"><span><?= /* @escapeNotVerified */  __('Hidden') ?></span></div>
                             </div>
                         </script>
 
@@ -360,11 +360,11 @@
                                         class="action-remove"
                                         data-role="delete-button"
                                         title="<?= $block->escapeHtml(__('Remove image')) ?>">
-                                    <span><?= __('Remove image') ?></span>
+                                    <span><?= /* @escapeNotVerified */  __('Remove image') ?></span>
                                 </button>
                                 <div class="draggable-handle"></div>
                                 <div class="image-label" title="<?= $block->escapeHtml(__('Edit role')) ?>"></div>
-                                <div class="image-fade"><span><?= __('Hidden') ?></span></div>
+                                <div class="image-fade"><span><?= /* @escapeNotVerified */  __('Hidden') ?></span></div>
                             </div>
                         </script>
 
@@ -379,7 +379,7 @@
                                     <fieldset class="admin__fieldset fieldset-image-panel">
                                         <div class="field field-image-description">
                                             <label class="label" for="image-description">
-                                                <span><?= __('Alt Text') ?></span>
+                                                <span><?= /* @escapeNotVerified */  __('Alt Text') ?></span>
                                             </label>
                                             <div class="control">
                                                 <textarea
@@ -391,7 +391,7 @@
 
                                         <div class="field field-image-role">
                                             <label class="label">
-                                                <span><?= __('Role') ?></span>
+                                                <span><?= /* @escapeNotVerified */  __('Role') ?></span>
                                             </label>
                                             <div class="control">
                                                 <ul class="multiselect-alt">
@@ -402,7 +402,7 @@
                                                                    type="checkbox"
                                                                    value="image"
                                                                 />
-                                                            <?= __('Base Image') ?>
+                                                            <?= /* @escapeNotVerified */  __('Base Image') ?>
                                                         </label>
                                                     </li>
                                                     <li class="item">
@@ -412,7 +412,7 @@
                                                                    type="checkbox"
                                                                    value="small_image"
                                                                 />
-                                                            <?= __('Small Image') ?>
+                                                            <?= /* @escapeNotVerified */  __('Small Image') ?>
                                                         </label>
                                                     </li>
                                                     <li class="item">
@@ -422,7 +422,7 @@
                                                                    type="checkbox"
                                                                    value="thumbnail"
                                                                 />
-                                                            <?= __('Thumbnail') ?>
+                                                            <?= /* @escapeNotVerified */  __('Thumbnail') ?>
                                                         </label>
                                                     </li>
                                                 </ul>
@@ -436,7 +436,7 @@
                                                        value="1"
                                                        name="product[media_gallery][images][<%- data.file_id %>][disabled]"
                                                        <% if (data.disabled == 1) { %>checked="checked"<% } %> />
-                                                <span><?= __('Hide from Product Page') ?></span>
+                                                <span><?= /* @escapeNotVerified */  __('Hide from Product Page') ?></span>
                                             </label>
                                         </div>
                                     </fieldset>
@@ -446,7 +446,7 @@
                                         class="action-close"
                                         data-role="close-panel"
                                         title="<?= $block->escapeHtml(__('Close panel')) ?>">
-                                    <span><?= __('Close panel') ?></span>
+                                    <span><?= /* @escapeNotVerified */  __('Close panel') ?></span>
                                 </button>
                                 <div class="image-pointer"></div>
                             </div>
@@ -463,7 +463,7 @@
     <div data-bind="with: sections().price" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-                <span><?= __('Price') ?></span>
+                <span><?= /* @escapeNotVerified */  __('Price') ?></span>
             </div>
             <ul class="steps-wizard-section-list">
                 <li>
@@ -475,7 +475,7 @@
                                data-bind="checked:type" />
                         <label for="apply-single-price-radio"
                                class="admin__field-label">
-                            <span><?= __('Apply single price to all SKUs') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Apply single price to all SKUs') ?></span>
                         </label>
                     </div>
                 </li>
@@ -488,7 +488,7 @@
                                data-bind="checked:type" />
                         <label for="apply-unique-prices-radio"
                                class="admin__field-label">
-                            <span><?= __('Apply unique prices by attribute to each SKU') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Apply unique prices by attribute to each SKU') ?></span>
                         </label>
                     </div>
                 </li>
@@ -501,7 +501,7 @@
                                checked
                                data-bind="checked:type" />
                         <label for="skip-pricing-radio" class="admin__field-label">
-                            <span><?= __('Skip price at this time') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Skip price at this time') ?></span>
                         </label>
                     </div>
                 </li>
@@ -510,7 +510,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><?= __('Price') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Price') ?></span>
                     </label>
                     <div class="admin__field-control">
                         <div class="currency-addon">
@@ -527,7 +527,7 @@
                 <fieldset class="admin__fieldset bulk-attribute-values">
                     <div class="admin__field _required">
                         <label for="select-each-price" class="admin__field-label">
-                            <span><?= __('Select attribute') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Select attribute') ?></span>
                         </label>
                         <div class="admin__field-control">
                             <select id="select-each-price" class="admin__control-select" data-bind="
@@ -566,7 +566,7 @@
     <div data-bind="with: sections().quantity" class="steps-wizard-section">
         <div data-role="section">
             <div class="steps-wizard-section-title">
-                <span><?= __('Quantity') ?></span>
+                <span><?= /* @escapeNotVerified */  __('Quantity') ?></span>
             </div>
             <ul class="steps-wizard-section-list">
                 <li>
@@ -577,7 +577,7 @@
                                value="single"
                                data-bind="checked: type" />
                         <label for="apply-single-inventory-radio" class="admin__field-label">
-                            <span><?= __('Apply single quantity to each SKUs') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Apply single quantity to each SKUs') ?></span>
                         </label>
                     </div>
                 </li>
@@ -589,7 +589,7 @@
                                value="each"
                                data-bind="checked: type" />
                         <label for="apply-unique-inventory-radio" class="admin__field-label">
-                            <span><?= __('Apply unique quantity by attribute to each SKU') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Apply unique quantity by attribute to each SKU') ?></span>
                         </label>
                     </div>
                 </li>
@@ -602,7 +602,7 @@
                                checked
                                data-bind="checked: type" />
                         <label for="skip-inventory-radio" class="admin__field-label">
-                            <span><?= __('Skip quantity at this time') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Skip quantity at this time') ?></span>
                         </label>
                     </div>
                 </li>
@@ -612,7 +612,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><?= __('Quantity') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Quantity') ?></span>
                     </label>
                     <div class="admin__field-control">
                         <input type="text"
@@ -628,7 +628,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><?= __('Select attribute') ?></span>
+                            <span><?= /* @escapeNotVerified */  __('Select attribute') ?></span>
                         </label>
                         <div class="admin__field-control">
                             <select id="apply-single-price-input-qty" class="admin__control-select" data-bind="
@@ -667,11 +667,11 @@
     "*": {
         "Magento_Ui/js/core/app": {
             "components": {
-                "<?= $block->getComponentName()?>": {
+                "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
                     "component": "Magento_ConfigurableProduct/js/variations/steps/bulk",
-                    "appendTo": "<?= $block->getParentComponentName()?>",
-                    "noImage": "<?= $block->getNoImageUrl() ?>",
-                    "currencySymbol": "<?= $block->getCurrencySymbol() ?>",
+                    "appendTo": "<?= /* @escapeNotVerified */  $block->getParentComponentName()?>",
+                    "noImage": "<?= /* @escapeNotVerified */  $block->getNoImageUrl() ?>",
+                    "currencySymbol": "<?= /* @escapeNotVerified */  $block->getCurrencySymbol() ?>",
                     "variationsComponent": "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 95e2b43dc31f2..90e42d8b04e74 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,11 +10,11 @@
 ?>
 <div class="select-attributes-block">
     <div class="select-attributes-actions" data-type="skipKO">
-        <?= $block->getAddNewAttributeButton(); ?>
+        <?= /* @escapeNotVerified */  $block->getAddNewAttributeButton(); ?>
     </div>
-    <h2 class="steps-wizard-title"><?= __('Step 1: Select Attributes') ?></h2>
-    <div class="selected-attributes" data-bind="scope: '<?= $block->getComponentName()?>'">
-        <?= __('Selected Attributes:') ?>
+    <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 1: Select Attributes') ?></h2>
+    <div class="selected-attributes" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
+        <?= /* @escapeNotVerified */  __('Selected Attributes:') ?>
         <div data-bind="text: selectedAttributes() || '--'"></div>
     </div>
     <?= $block->getChildHtml(); ?>
@@ -27,12 +27,12 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= $block->getComponentName()?>": {
+                    "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/select_attributes",
                         "multiselectName":
                             "product_attributes_listing.product_attributes_listing.product_attributes_columns.ids",
                         "providerName": "product_attributes_listing.product_attributes_listing_data_source",
-                        "appendTo": "<?= $block->getParentComponentName()?>"
+                        "appendTo": "<?= /* @escapeNotVerified */  $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 32d619aee3d89..a93fcf5837519 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: '<?= $block->getComponentName()?>'">
-    <h2 class="steps-wizard-title"><?= __('Step 4: Summary') ?></h2>
+<div data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
+    <h2 class="steps-wizard-title"><?= /* @escapeNotVerified */  __('Step 4: Summary') ?></h2>
 
     <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
         <!-- ko if: gridNew().length -->
@@ -46,9 +46,9 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                    "<?= $block->getComponentName()?>": {
+                    "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
                         "component": "Magento_ConfigurableProduct/js/variations/steps/summary",
-                        "appendTo": "<?= $block->getParentComponentName()?>",
+                        "appendTo": "<?= /* @escapeNotVerified */  $block->getParentComponentName()?>",
                         "variationsComponent": "configurableVariations"
                     }
                 }
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/associated-product-grid.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/associated-product-grid.phtml
index 8d7803b7f5146..d6c1154113a3d 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/associated-product-grid.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/associated-product-grid.phtml
@@ -14,9 +14,9 @@
         <div class="message ">
             <div>
                 <?php if ($block->isHasRows()): ?>
-                    <?= __('Choose a new product to delete and replace the current product configuration.') ?>
+                    <?= /* @escapeNotVerified */  __('Choose a new product to delete and replace the current product configuration.') ?>
                 <?php else: ?>
-                    <?=  __('For better results, add attributes and attribute values to your products.') ?>
+                    <?= /* @escapeNotVerified */   __('For better results, add attributes and attribute values to your products.') ?>
                 <?php endif ?>
             </div>
         </div>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
index 2263608804598..a8c7a24ac844b 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/attribute-template.phtml
@@ -11,26 +11,26 @@
 $id = $block->escapeHtml($attribute['attribute_id']);
 ?>
 <div data-role="configurable-attribute">
-    <input name="attributes[]" id="configurable_attribute_<?php echo $id ?>" value="<?php echo $id; ?>" type="hidden"/>
+    <input name="attributes[]" id="configurable_attribute_<?php /* @escapeNotVerified */ echo $id ?>" value="<?php /* @escapeNotVerified */ echo $id; ?>" type="hidden"/>
     <input value="<?php echo $block->escapeHtml($attribute['id']); ?>" type="hidden"
-           name="product[configurable_attributes_data][<?php echo $id ?>][id]"/>
+           name="product[configurable_attributes_data][<?php /* @escapeNotVerified */ echo $id ?>][id]"/>
     <input value="<?php echo $block->escapeHtml($attribute['attribute_code']); ?>" type="hidden"
-           name="product[configurable_attributes_data][<?php echo $id ?>][code]"/>
-    <input value="<?php echo $id; ?>" type="hidden"
-           name="product[configurable_attributes_data][<?php echo $id ?>][attribute_id]"/>
+           name="product[configurable_attributes_data][<?php /* @escapeNotVerified */ echo $id ?>][code]"/>
+    <input value="<?php /* @escapeNotVerified */ echo $id; ?>" type="hidden"
+           name="product[configurable_attributes_data][<?php /* @escapeNotVerified */ echo $id ?>][attribute_id]"/>
     <input value="<?php echo $block->escapeHtml($attribute['position']); ?>" type="hidden"
-           name="product[configurable_attributes_data][<?php echo $id ?>][position]"/>
+           name="product[configurable_attributes_data][<?php /* @escapeNotVerified */ echo $id ?>][position]"/>
     <input type="hidden" value="<?php echo $block->escapeHtml($attribute['label']); ?>"
-           name="product[configurable_attributes_data][<?php echo $id ?>][label]"/>
-    <input value="1" type="hidden" name="product[configurable_attributes_data][<?php echo $id ?>][use_default]"/>
+           name="product[configurable_attributes_data][<?php /* @escapeNotVerified */ echo $id ?>][label]"/>
+    <input value="1" type="hidden" name="product[configurable_attributes_data][<?php /* @escapeNotVerified */ echo $id ?>][use_default]"/>
     <?php
     $namePrefix = 'product[configurable_attributes_data][' . $id . '][values]';
     foreach ($attribute['options'] as $option) {
         $valueIndex = $option['value'];
         ?>
-        <input type="hidden" name="<?php echo $namePrefix ?>[<?php echo $valueIndex ?>][value_index]"
+        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $namePrefix ?>[<?php /* @escapeNotVerified */ echo $valueIndex ?>][value_index]"
                value="<?php echo $block->escapeHtml($valueIndex); ?>">
-        <input type="hidden" name="<?php echo $namePrefix ?>[<?php echo $valueIndex ?>][include]" value="1"/>
+        <input type="hidden" name="<?php /* @escapeNotVerified */ echo $namePrefix ?>[<?php /* @escapeNotVerified */ echo $valueIndex ?>][include]" value="1"/>
     <?php
     } ?>
 </div>
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 826e09432967e..ec21236758100 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
@@ -10,19 +10,19 @@
 
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 ?>
-<div class="entry-edit form-inline" id="<?php echo $block->getId() ?>">
-    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php echo $block->getId() ?>-wrapper" data-panel="product-variations">
+<div class="entry-edit form-inline" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>-wrapper" data-panel="product-variations">
         <div class="fieldset-wrapper-title">
-            <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php echo $block->getId() ?>-content">
-                <span><?= __('Configurations') ?></span>
+            <strong class="admin__collapsible-title" data-toggle="collapse" data-target="#<?php /* @escapeNotVerified */ echo $block->getId() ?>-content">
+                <span><?= /* @escapeNotVerified */  __('Configurations') ?></span>
             </strong>
         </div>
 
-        <div class="fieldset-wrapper-content collapse" data-collapsed="true" id="<?php echo $block->getId() ?>-content">
+        <div class="fieldset-wrapper-content collapse" data-collapsed="true" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>-content">
             <div data-bind="scope: 'variation-steps-wizard'" class="product-create-configuration">
                 <div class="product-create-configuration-info">
                     <div class="note">
-                        <?= __('Configurable products allow customers to choose options (Ex: shirt color).
+                        <?= /* @escapeNotVerified */  __('Configurable products allow customers to choose options (Ex: shirt color).
                     You need to create a simple product for each configuration (Ex: a product for each color).');?>
                     </div>
                 </div>
@@ -34,8 +34,8 @@ use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
                 <div class="product-create-configuration-actions">
                     <button data-action="open-steps-wizard" title="Create Product Configurations"
                             class="action-secondary" data-bind="click: open">
-                        <span data-role="button-label" data-edit-label="<?= __('Edit Configurations') ?>">
-                            <?= $block->getProduct()->getId()
+                        <span data-role="button-label" data-edit-label="<?= /* @escapeNotVerified */  __('Edit Configurations') ?>">
+                            <?= /* @escapeNotVerified */  $block->getProduct()->getId()
                                 && $block->getProduct()->getTypeId() === 'configurable'
                                 ? __('Edit Configurations')
                                 : __('Create Configurations')
@@ -71,8 +71,8 @@ require([
 ], function($, mageTemplate){
     'use strict';
 
-    var variationsContainer = $("#<?php echo $block->getId()?>"),
-        collapsableWrapper = $("#<?php echo $block->getId()?>-wrapper"),
+    var variationsContainer = $("#<?php /* @escapeNotVerified */ echo $block->getId()?>"),
+        collapsableWrapper = $("#<?php /* @escapeNotVerified */ echo $block->getId()?>-wrapper"),
         collapsableArea = $('> .collapse', collapsableWrapper),
         stockAvailabilityField = $('#quantity_and_stock_status'),
         qtyField = $('#qty'),
@@ -80,8 +80,8 @@ require([
         inventoryAvailabilityField = $('#inventory_stock_availability'),
         currentProductTemplateControl = $('#product-template-suggest-container .action-dropdown > .action-toggle'),
         attributesInput = $("input[name='attributes[]']", variationsContainer),
-        hasVariations = <?php echo($block->getProduct()->getTypeId() === Configurable::TYPE_CODE || $block->getRequest()->has('attributes')) ? 'true' : 'false' ?>,
-        noImageUrl = '<?= $block->getNoImageUrl() ?>',
+        hasVariations = <?php /* @escapeNotVerified */ echo($block->getProduct()->getTypeId() === Configurable::TYPE_CODE || $block->getRequest()->has('attributes')) ? 'true' : 'false' ?>,
+        noImageUrl = '<?= /* @escapeNotVerified */  $block->getNoImageUrl() ?>',
         isLocked = function (element) {
             return element.is('[data-locked]');
         },
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/manual-product-grid.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/manual-product-grid.phtml
index f11680ef3fbe2..41c67a6f96a3e 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/manual-product-grid.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/super/manual-product-grid.phtml
@@ -13,8 +13,8 @@
     <div data-role="messages" class="messages">
         <div class="message ">
             <div>
-                <?= __('Choose a new product to delete and replace the current product configuration.') ?>
-                <?= __('For better results, add attributes and attribute values to your products.') ?>
+                <?= /* @escapeNotVerified */  __('Choose a new product to delete and replace the current product configuration.') ?>
+                <?= /* @escapeNotVerified */  __('For better results, add attributes and attribute values to your products.') ?>
             </div>
         </div>
     </div>
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 46411219c3d95..9d66be34c0d79 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
@@ -72,7 +72,7 @@ if ($variations) {
 
 <div data-bind="scope: 'configurableVariations'">
     <h3 class="hidden" data-bind="css: {hidden: !showVariations() }" class="title">
-        <?php echo __('Current Variations'); ?>
+        <?php /* @escapeNotVerified */ echo __('Current Variations'); ?>
     </h3>
 
     <script data-template-for="variation-image" type="text/x-magento-template">
@@ -117,22 +117,22 @@ if ($variations) {
                     <thead>
                         <tr>
                             <th class="data-grid-th data-grid-thumbnail-cell col-image" data-column="image">
-                                <?= __('Image'); ?>
+                                <?= /* @escapeNotVerified */  __('Image'); ?>
                             </th>
                             <th class="data-grid-th col-name" data-column="name">
-                                <?= __('Name'); ?>
+                                <?= /* @escapeNotVerified */  __('Name'); ?>
                             </th>
                             <th class="data-grid-th col-sku" data-column="sku">
-                                <?= __('SKU'); ?>
+                                <?= /* @escapeNotVerified */  __('SKU'); ?>
                             </th>
                             <th class="data-grid-th col-price" data-column="price">
-                                <?= __('Price'); ?>
+                                <?= /* @escapeNotVerified */  __('Price'); ?>
                             </th>
                             <th class="data-grid-th col-qty" data-column="qty">
-                                <?= __('Quantity'); ?>
+                                <?= /* @escapeNotVerified */  __('Quantity'); ?>
                             </th>
                             <th class="data-grid-th col-weight" data-column="weight">
-                                <?= __('Weight'); ?>
+                                <?= /* @escapeNotVerified */  __('Weight'); ?>
                             </th>
                             <!-- ko foreach: getAttributesOptions() -->
                                 <th data-bind="attr: {class:'data-grid-th col-' + $data.attribute_code},
@@ -140,7 +140,7 @@ if ($variations) {
                                 </th>
                             <!-- /ko -->
                             <th class="data-grid-th">
-                                <?= __('Actions'); ?>
+                                <?= /* @escapeNotVerified */  __('Actions'); ?>
                             </th>
                         </tr>
                     </thead>
@@ -158,7 +158,7 @@ if ($variations) {
                                             <input type="hidden" data-bind="
                                                 attr: {id: $parent.getRowId(variation, 'image'),
                                                 name: $parent.getVariationRowName(variation, 'image')}"/>
-                                            <span><?= __('Upload Image'); ?></span>
+                                            <span><?= /* @escapeNotVerified */  __('Upload Image'); ?></span>
                                             <input name="image" type="file"
                                                    data-url="<?= $block->escapeHtml($block->getImageUploadUrl()) ?>"
                                                    title="<?= $block->escapeHtml(__('Upload image')); ?>"/>
@@ -172,11 +172,11 @@ if ($variations) {
                                     <!-- /ko -->
                                     <button type="button" class="action toggle no-display" data-toggle="dropdown"
                                             data-mage-init='{"dropdown":{}}'>
-                                        <span><?= __('Select'); ?></span>
+                                        <span><?= /* @escapeNotVerified */  __('Select'); ?></span>
                                     </button>
                                     <ul class="dropdown">
                                         <li>
-                                            <a class="item" data-action="no-image"><?= __('No Image'); ?></a>
+                                            <a class="item" data-action="no-image"><?= /* @escapeNotVerified */  __('No Image'); ?></a>
                                         </li>
                                     </ul>
                                 </div>
@@ -278,7 +278,7 @@ if ($variations) {
                                                 "
                                                data-action="choose"
                                                href="#">
-                                                <?= __('Choose a different Product');?>
+                                                <?= /* @escapeNotVerified */  __('Choose a different Product');?>
                                             </a>
                                         </li>
                                         <li>
@@ -289,7 +289,7 @@ if ($variations) {
                                         </li>
                                         <li>
                                             <a class="action-menu-item" data-bind="click: $parent.removeProduct.bind($parent, $index())">
-                                                <?= __('Remove Product');?>
+                                                <?= /* @escapeNotVerified */  __('Remove Product');?>
                                             </a>
                                         </li>
                                     </ul>
@@ -303,11 +303,11 @@ if ($variations) {
     <!-- /ko -->
 </div>
 <div data-role="step-wizard-dialog"
-     data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= __('Create Product Configurations') ?>",
+     data-mage-init='{"Magento_Ui/js/modal/modal":{"type":"slide","title":"<?= /* @escapeNotVerified */  __('Create Product Configurations') ?>",
      "buttons":[]}}'
      class="no-display">
     <?php
-    echo $block->getVariationWizard([
+    /* @escapeNotVerified */ echo $block->getVariationWizard([
         'attributes' => $attributes,
         'configurations' => $productMatrix
     ]);
@@ -320,9 +320,9 @@ if ($variations) {
                 "components": {
                     "configurableVariations": {
                         "component": "Magento_ConfigurableProduct/js/variations/variations",
-                        "variations": <?= $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
-                        "productAttributes": <?= $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
-                        "productUrl": "<?= $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
+                        "variations": <?= /* @escapeNotVerified */  $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($productMatrix) ?>,
+                        "productAttributes": <?= /* @escapeNotVerified */  $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($attributes) ?>,
+                        "productUrl": "<?= /* @escapeNotVerified */  $block->getUrl('catalog/product/edit', ['id' => '%id%']) ?>",
                         "associatedProductsFilter": "configurable_associated_product_listing.configurable_associated_product_listing.listing_top.listing_filters",
                         "associatedProductsProvider": "configurable_associated_product_listing.data_source"
 
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 d3c532d52bc53..61cd9a7741f61 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
@@ -8,12 +8,12 @@
 
 /* @var $block \Magento\Framework\View\Element\Template */
 ?>
-<div id="<?php echo $block->getNameInLayout() ?>" style="display: none" data-role="dialog" data-id="affected-attribute-set-selector">
+<div id="<?php /* @escapeNotVerified */ echo $block->getNameInLayout() ?>" style="display: none" data-role="dialog" data-id="affected-attribute-set-selector">
     <form action="" class="affected-attribute-set">
         <div class="messages">
             <div class="message message-notice notice">
                 <div>
-                    <?php echo __("Product template comprising all selected configurable attributes need to be in order to save generated variations.") ?>
+                    <?php /* @escapeNotVerified */ echo __("Product template comprising all selected configurable attributes need to be in order to save generated variations.") ?>
                 </div>
             </div>
             <div class="message message-error error" style="display: none"></div>
@@ -28,7 +28,7 @@
                            checked="checked"
                            class="admin__control-radio"/>
                     <label class="admin__field-label" for="affected-attribute-set-current">
-                        <span><?php echo __('Add configurable attributes to the current set ("<span data-role="name-container">%1</span>")', $block->getLayout()->getBlock('product_edit')->getAttributeSetName()) ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Add configurable attributes to the current set ("<span data-role="name-container">%1</span>")', $block->getLayout()->getBlock('product_edit')->getAttributeSetName()) ?></span>
                     </label>
                 </div>
             </div>
@@ -41,14 +41,14 @@
                            value="new"
                            class="admin__control-radio"/>
                     <label class="admin__field-label" for="affected-attribute-set-new">
-                        <span><?php echo __('Add configurable attributes to the new set based on current')?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Add configurable attributes to the new set based on current')?></span>
                     </label>
                 </div>
             </div>
 
             <div class="admin__field _required" id="affected-attribute-set-new-name-container" style="display: none">
                 <label class="admin__field-label" for="new-attribute-set-name">
-                    <span><?php echo __('New product template name')?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('New product template name')?></span>
                 </label>
 
                 <div class="admin__field-control">
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 4db2417ab520d..354305ae89dd1 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
@@ -33,9 +33,9 @@
 
         $form
             .dialog({
-                title: '<?php echo __('Choose Affected Product Template'); ?>',
+                title: '<?php /* @escapeNotVerified */ echo __('Choose Affected Product Template'); ?>',
                 autoOpen: false,
-                id: '<?php echo $block->getJsId() ?>',
+                id: '<?php /* @escapeNotVerified */ echo $block->getJsId() ?>',
                 width: '75%',
                 modal: true,
                 resizable: false,
@@ -55,8 +55,8 @@
                     $(this).closest('.ui-dialog').removeClass('ui-dialog-active');
                 },
                 buttons: [{
-                    text: '<?php echo __('Confirm'); ?>',
-                    id: '<?php echo $block->getJsId('confirm-button') ?>',
+                    text: '<?php /* @escapeNotVerified */ echo __('Confirm'); ?>',
+                    id: '<?php /* @escapeNotVerified */ echo $block->getJsId('confirm-button') ?>',
                     'class': 'action-primary',
                     click: function() {
                         if ($form.find('input[name=affected-attribute-set]:checked').val() == 'current') {
@@ -74,12 +74,12 @@
 
                         $.ajax({
                             type: 'POST',
-                            url: '<?php echo $block->getAttributeSetCreationUrl()?>',
+                            url: '<?php /* @escapeNotVerified */ echo $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 echo $block->getFormKey()?>',
+                                form_key: '<?php /* @escapeNotVerified */ echo $block->getFormKey()?>',
                                 return_session_messages_only: 1
                             },
                             dataType: 'json',
@@ -99,8 +99,8 @@
                         return false;
                     }
                 },{
-                    text: '<?php echo __('Cancel'); ?>',
-                    id: '<?php echo $block->getJsId('close-button') ?>',
+                    text: '<?php /* @escapeNotVerified */ echo __('Cancel'); ?>',
+                    id: '<?php /* @escapeNotVerified */ echo $block->getJsId('close-button') ?>',
                     'class': 'action-close',
                     click: function() {
                         $form.dialog('close');
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
index 2600f2790c504..74fcb45a2b677 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/attribute-selector/js.phtml
@@ -4,12 +4,14 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /** @var $block \Magento\ConfigurableProduct\Block\Product\Configurable\AttributeSelector */
 ?>
 <script>
 require(["jquery","mage/mage","mage/backend/suggest"], function($){
     var options = <?php
-        echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSuggestWidgetOptions())
+        /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getSuggestWidgetOptions())
     ?>;
     $('#configurable-attribute-selector')
         .mage('suggest', options)
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 c2739e3e87dd3..fce7c65534053 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,15 +16,15 @@ $_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 echo $_attribute->getAttributeId() ?>">
+            <label class="label" for="attribute<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>">
                 <span><?php echo $block->escapeHtml($_attribute->getProductAttribute()->getStoreLabel()) ?></span>
             </label>
             <div class="control">
-                <select name="super_attribute[<?php echo $_attribute->getAttributeId() ?>]"
+                <select name="super_attribute[<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>]"
                         data-validate="{required:true}"
-                        id="attribute<?php echo $_attribute->getAttributeId() ?>"
+                        id="attribute<?php /* @escapeNotVerified */ echo $_attribute->getAttributeId() ?>"
                         class="super-attribute-select">
-                    <option value=""><?php echo __('Choose an Option...') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Choose an Option...') ?></option>
                 </select>
             </div>
         </div>
@@ -33,7 +33,7 @@ $_attributes = $block->decorateArray($block->getAllowAttributes());
         {
             "#product_addtocart_form": {
                 "configurable": {
-                    "spConfig": <?php echo $block->getJsonConfig() ?>
+                    "spConfig": <?php /* @escapeNotVerified */ echo $block->getJsonConfig() ?>
                 }
             }
         }
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
index fb03cadfcdc7d..ff9c4da8f00d1 100644
--- a/app/code/Magento/Contact/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -8,36 +8,36 @@
 
 ?>
 <form class="form contact"
-      action="<?php echo $block->getFormAction(); ?>"
+      action="<?php /* @escapeNotVerified */ echo $block->getFormAction(); ?>"
       id="contact-form"
       method="post"
-      data-hasrequired="<?php echo __('* Required Fields') ?>"
+      data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>"
       data-mage-init='{"validation":{}}'>
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo __('Write Us') ?></span></legend><br />
-        <div class="field note no-label"><?php echo __('Jot us a note and we’ll get back to you as quickly as possible.') ?></div>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Write Us') ?></span></legend><br />
+        <div class="field note no-label"><?php /* @escapeNotVerified */ echo __('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 __('Name') ?></span></label>
+            <label class="label" for="name"><span><?php /* @escapeNotVerified */ echo __('Name') ?></span></label>
             <div class="control">
-                <input name="name" id="name" title="<?php echo __('Name') ?>" value="<?php echo $block->escapeHtml($this->helper('Magento\Contact\Helper\Data')->getUserName()) ?>" class="input-text" type="text" data-validate="{required:true}"/>
+                <input name="name" id="name" title="<?php /* @escapeNotVerified */ echo __('Name') ?>" value="<?php echo $block->escapeHtml($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 __('Email') ?></span></label>
+            <label class="label" for="email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
-                <input name="email" id="email" title="<?php echo __('Email') ?>" value="<?php echo $block->escapeHtml($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="<?php /* @escapeNotVerified */ echo __('Email') ?>" value="<?php echo $block->escapeHtml($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 __('Phone Number') ?></span></label>
+            <label class="label" for="telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
             <div class="control">
-                <input name="telephone" id="telephone" title="<?php echo __('Phone Number') ?>" value="" class="input-text" type="text" />
+                <input name="telephone" id="telephone" title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>" value="" class="input-text" type="text" />
             </div>
         </div>
         <div class="field comment required">
-            <label class="label" for="comment"><span><?php echo __('What’s on your mind?') ?></span></label>
+            <label class="label" for="comment"><span><?php /* @escapeNotVerified */ echo __('What’s on your mind?') ?></span></label>
             <div class="control">
-                <textarea name="comment" id="comment" title="<?php echo __('What’s on your mind?') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
+                <textarea name="comment" id="comment" title="<?php /* @escapeNotVerified */ echo __('What’s on your mind?') ?>" class="input-text" cols="5" rows="3" data-validate="{required:true}"></textarea>
             </div>
         </div>
         <?php echo $block->getChildHtml('form.additional.info'); ?>
@@ -45,8 +45,8 @@
     <div class="actions-toolbar">
         <div class="primary">
             <input type="hidden" name="hideit" id="hideit" value="" />
-            <button type="submit" title="<?php echo __('Submit') ?>" class="action submit primary">
-                <span><?php echo __('Submit') ?></span>
+            <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Submit') ?>" class="action submit primary">
+                <span><?php /* @escapeNotVerified */ echo __('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 e22d0fa8f092f..65c83471cc422 100644
--- a/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/Cookie/View/frontend/templates/html/notices.phtml
@@ -12,12 +12,12 @@
     <div class="message global cookie" id="notice-cookie-block" style="display: none">
         <div class="content">
             <p>
-                <strong><?php echo __('We use cookies to make your experience better.') ?></strong>
-                <span><?php echo __('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.') ?></span>
-                <?php echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?></p>
+                <strong><?php /* @escapeNotVerified */ echo __('We use cookies to make your experience better.') ?></strong>
+                <span><?php /* @escapeNotVerified */ echo __('To comply with the new e-Privacy directive, we need to ask for your consent to set the cookies.') ?></span>
+                <?php /* @escapeNotVerified */ echo __('<a href="%1">Learn more</a>.', $block->getPrivacyPolicyLink()) ?></p>
             <div class="actions">
                 <button id="btn-cookie-allow" class="action allow primary">
-                    <span><?php echo __('Allow Cookies');?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Allow Cookies');?></span>
                 </button>
             </div>
         </div>
@@ -27,10 +27,10 @@
             "#notice-cookie-block": {
                 "cookieNotices": {
                     "cookieAllowButtonSelector": "#btn-cookie-allow",
-                    "cookieName": "<?php echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
-                    "cookieValue": <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>,
-                    "cookieLifetime": <?php echo $this->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,
-                    "noCookiesUrl": "<?php echo $block->getUrl('cookie/index/noCookies') ?>"
+                    "cookieName": "<?php /* @escapeNotVerified */ echo \Magento\Cookie\Helper\Cookie::IS_USER_ALLOWED_SAVE_COOKIE ?>",
+                    "cookieValue": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Cookie\Helper\Cookie')->getAcceptedSaveCookiesWebsiteIds() ?>,
+                    "cookieLifetime": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Cookie\Helper\Cookie')->getCookieRestrictionLifetime()?>,
+                    "noCookiesUrl": "<?php /* @escapeNotVerified */ echo $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 b35219ac975ec..99d168e079964 100644
--- a/app/code/Magento/Cookie/View/frontend/templates/require_cookie.phtml
+++ b/app/code/Magento/Cookie/View/frontend/templates/require_cookie.phtml
@@ -8,7 +8,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "requireCookie": <?php echo $block->getScriptOptions(); ?>
+            "requireCookie": <?php /* @escapeNotVerified */ echo $block->getScriptOptions(); ?>
         }
     }
 </script>
\ No newline at end of file
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/grid.phtml
index 8e47b51aecb40..184a5579f3752 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 echo $block->getFormActionUrl() ?>" method="post">
-    <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
+<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() ?>" />
     <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 echo $code; ?>">
-                <span><?php echo $code; ?> (<?php echo $data['displayName']; ?>)</span>
+            <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>
             <div class="admin__field-control">
-                <input id="custom_currency_symbol<?php echo $code; ?>"
+                <input id="custom_currency_symbol<?php /* @escapeNotVerified */ echo $code; ?>"
                        class="required-entry admin__control-text"
                        type="text"
                        value="<?php echo $block->escapeQuote($data['displaySymbol']); ?>"
                        <?php echo $data['inherited'] ? ' disabled="disabled"' : '';?>
-                       name="custom_currency_symbol[<?php echo $code; ?>]">
+                       name="custom_currency_symbol[<?php /* @escapeNotVerified */ echo $code; ?>]">
                 <div class="admin__field admin__field-option">
-                    <input id="custom_currency_symbol_inherit<?php echo $code; ?>"
+                    <input id="custom_currency_symbol_inherit<?php /* @escapeNotVerified */ echo $code; ?>"
                            class="admin__control-checkbox" type="checkbox"
-                           onclick="toggleUseDefault(<?php echo '\'' . $code . '\',\'' . $block->escapeQuote($data['parentSymbol'], true) . '\''; ?>)"
+                           onclick="toggleUseDefault(<?php /* @escapeNotVerified */ echo '\'' . $code . '\',\'' . $block->escapeQuote($data['parentSymbol'], true) . '\''; ?>)"
                             <?php echo $data['inherited'] ? ' checked="checked"' : ''; ?>
                            value="1"
-                           name="inherit_custom_currency_symbol[<?php echo $code; ?>]">
-                    <label class="admin__field-label" for="custom_currency_symbol_inherit<?php echo $code; ?>"><span><?php echo $block->getInheritText(); ?></span></label>
+                           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>
                 </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 ec8f0e5599038..be2df0aae29af 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
@@ -17,7 +17,7 @@ $_oldRates = $block->getOldRates();
 $_newRates = $block->getNewRates();
 $_rates = ($_newRates) ? $_newRates : $_oldRates;
 ?>
-<form name="rateForm" id="rate-form" method="post" action="<?php echo $block->getRatesFormAction(); ?>">
+<form name="rateForm" id="rate-form" method="post" action="<?php /* @escapeNotVerified */ echo $block->getRatesFormAction(); ?>">
     <?php echo $block->getBlockHtml('formkey')?>
     <div class="admin__control-table-wrapper">
         <table class="admin__control-table">
@@ -25,7 +25,7 @@ $_rates = ($_newRates) ? $_newRates : $_oldRates;
                 <tr>
                     <th>&nbsp;</th>
                     <?php $_i = 0; foreach ($block->getAllowedCurrencies() as $_currencyCode): ?>
-                        <th><span><?php echo $_currencyCode ?></span></th>
+                        <th><span><?php /* @escapeNotVerified */ echo $_currencyCode ?></span></th>
                     <?php endforeach; ?>
                 </tr>
             </thead>
@@ -34,26 +34,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 echo $_currencyCode ?></span></td>
+                            <td><span class="admin__control-support-text"><?php /* @escapeNotVerified */ echo $_currencyCode ?></span></td>
                             <td>
                                 <input type="text"
-                                       name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]"
+                                       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] : '')) ?>"
                                        class="admin__control-text"
                                         <?php echo($_currencyCode == $_rate) ? ' disabled' : '' ?> />
                                 <?php if (isset($_newRates) && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                <div class="admin__field-note"><?php echo __('Old rate:') ?> <b><?php echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                <div class="admin__field-note"><?php /* @escapeNotVerified */ echo __('Old rate:') ?> <b><?php /* @escapeNotVerified */ echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
                                 <?php endif; ?>
                             </td>
                         <?php else: ?>
                             <td>
                                 <input type="text"
-                                       name="rate[<?php echo $_currencyCode ?>][<?php echo $_rate ?>]"
+                                       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] : '')) ?>"
                                        class="admin__control-text"
                                        <?php echo($_currencyCode == $_rate) ? ' disabled' : '' ?> />
                                 <?php if (isset($_newRates)  && $_currencyCode != $_rate && isset($_oldRates[$_currencyCode][$_rate])): ?>
-                                <div class="admin__field-note"><?php echo __('Old rate:') ?> <b><?php echo $_oldRates[$_currencyCode][$_rate] ?></b></div>
+                                <div class="admin__field-note"><?php /* @escapeNotVerified */ echo __('Old rate:') ?> <b><?php /* @escapeNotVerified */ echo $_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 fa11e6fe5da2e..9480b6ecde95d 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,7 +13,7 @@
  */
 ?>
 <div class="admin__field">
-    <label class="admin__field-label"><span><?php echo __('Import Service') ?></span></label>
+    <label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Import Service') ?></span></label>
     <div class="admin__field-control">
         <?php echo $block->getChildHtml('import_services') ?>
     </div>
diff --git a/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml b/app/code/Magento/CurrencySymbol/view/adminhtml/templates/system/currency/rates.phtml
index b686fdf6b692d..747099f724a08 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,7 +13,7 @@
  */
 ?>
 
-<form action="<?php echo $block->getImportFormAction() ?>" method="post" class="import-service">
+<form action="<?php /* @escapeNotVerified */ echo $block->getImportFormAction() ?>" method="post" class="import-service">
     <?php echo $block->getBlockHtml('formkey')?>
     <fieldset class="admin__fieldset admin__fieldset-import-service">
         <?php echo $block->getServicesHtml() ?>
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 e25b244605606..5910f9a300015 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
@@ -19,11 +19,11 @@ $_validateButton = $block->getValidateButton();
     <div class="hidden"><?php echo $_element->getElementHtml(); ?></div>
     <?php else: ?>
     <?php echo $_element->getLabelHtml(); ?>
-    <div class="admin__field-control <?php echo $_element->hasValueClass() ? $_element->getValueClass() : 'value'; ?><?php echo $_class ? " {$_class}-value" : ''; ?>">
+    <div class="admin__field-control <?php /* @escapeNotVerified */ echo $_element->hasValueClass() ? $_element->getValueClass() : 'value'; ?><?php echo $_class ? " {$_class}-value" : ''; ?>">
         <?php echo $_element->getElementHtml(); ?>
         <?php if ($_note): ?>
-            <div class="admin__field-note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php echo $_element->getId(); ?>">
-                <span><?php echo $_note; ?></span>
+            <div class="admin__field-note<?php echo $_class ? " {$_class}-note" : ''; ?>" id="note_<?php /* @escapeNotVerified */ echo $_element->getId(); ?>">
+                <span><?php /* @escapeNotVerified */ echo $_note; ?></span>
             </div>
         <?php endif; ?>
         <div class="actions">
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 5fc873ad7490d..d9916cb30d0d2 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
@@ -20,18 +20,18 @@ require(['prototype'], function(){
         var validationMessage = $('validation_result');
 
         params = {
-            country: $('<?php echo $block->getMerchantCountryField(); ?>').value,
-            vat: $('<?php echo $block->getMerchantVatNumberField(); ?>').value
+            country: $('<?php /* @escapeNotVerified */ echo $block->getMerchantCountryField(); ?>').value,
+            vat: $('<?php /* @escapeNotVerified */ echo $block->getMerchantVatNumberField(); ?>').value
         };
 
-        new Ajax.Request('<?php echo $block->getAjaxUrl() ?>', {
+        new Ajax.Request('<?php /* @escapeNotVerified */ echo $block->getAjaxUrl() ?>', {
             parameters: params,
             onSuccess: function(response) {
-                result = '<?php echo __('Please enter a valid VAT number.') ?>';
+                result = '<?php /* @escapeNotVerified */ echo __('Please enter a valid VAT number.') ?>';
                 try {
                     response = response.responseText;
                     if (response == 1) {
-                        result = '<?php echo __('VAT Number is valid.') ?>';
+                        result = '<?php /* @escapeNotVerified */ echo __('VAT Number is valid.') ?>';
                         validationMessage.removeClassName('hidden').addClassName('success')
                     } else {
                         validationMessage.removeClassName('hidden').addClassName('error')
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 7c3f93191d4d3..82cd7c7066718 100644
--- a/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
+++ b/app/code/Magento/Customer/view/adminhtml/templates/tab/cart.phtml
@@ -12,7 +12,7 @@
 <div class="content-header skip-header">
     <table>
         <tr>
-            <td style="width:50%;"><h4><?php echo $block->getCartHeader(); ?></h4></td>
+            <td style="width:50%;"><h4><?php /* @escapeNotVerified */ echo $block->getCartHeader(); ?></h4></td>
         </tr>
     </table>
 </div>
@@ -27,19 +27,19 @@ require([
     "Magento_Catalog/catalog/product/composite/configure"
 ], function(){
 
-<?php echo $block->getJsObjectName() ?>cartControl = {
+<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>cartControl = {
     reload: function (params) {
         if (!params) {
             params = {};
         }
-        <?php echo $block->getJsObjectName() ?>.reloadParams = params;
-        <?php echo $block->getJsObjectName() ?>.reload();
-        <?php echo $block->getJsObjectName() ?>.reloadParams = {};
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.reloadParams = params;
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.reload();
+        <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.reloadParams = {};
     },
 
     configureItem: function (itemId) {
-        productConfigure.setOnLoadIFrameCallback('<?php echo $listType ?>', this.cbOnLoadIframe.bind(this));
-        productConfigure.showItemConfiguration('<?php echo $listType ?>', itemId);
+        productConfigure.setOnLoadIFrameCallback('<?php /* @escapeNotVerified */ echo $listType ?>', this.cbOnLoadIframe.bind(this));
+        productConfigure.showItemConfiguration('<?php /* @escapeNotVerified */ echo $listType ?>', itemId);
         return false;
     },
 
@@ -52,10 +52,10 @@ require([
 
     removeItem: function (itemId) {
         if (!itemId) {
-            alert('<?php echo $block->escapeJsQuote(__('No item specified.')) ?>');
+            alert('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('No item specified.')) ?>');
             return false;
         }
-        if(!confirm('<?php echo $block->escapeJsQuote(__('Are you sure you want to remove this item?')) ?>')) {
+        if(!confirm('<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Are you sure you want to remove this item?')) ?>')) {
             return false;
         }
 
@@ -72,10 +72,10 @@ $params = [
 ];
 ?>
 productConfigure.addListType(
-    '<?php echo $listType ?>',
+    '<?php /* @escapeNotVerified */ echo $listType ?>',
     {
-        urlFetch: '<?php echo $block->getUrl('customer/cart_product_composite_cart/configure', $params) ?>',
-        urlConfirm: '<?php echo $block->getUrl('customer/cart_product_composite_cart/update', $params) ?>'
+        urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('customer/cart_product_composite_cart/configure', $params) ?>',
+        urlConfirm: '<?php /* @escapeNotVerified */ echo $block->getUrl('customer/cart_product_composite_cart/update', $params) ?>'
     }
 );
 
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 eb03596398341..ade28198142c2 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
@@ -19,47 +19,47 @@ $createDateStore = $block->getStoreCreateDate();
 
 <div class="fieldset-wrapper customer-information">
     <div class="fieldset-wrapper-title">
-        <span class="title"><?php echo __('Personal Information') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Personal Information') ?></span>
     </div>
     <table class="admin__table-secondary">
         <tbody>
         <?php echo $block->getChildHtml(); ?>
         <tr>
-            <th><?php echo __('Last Logged In:') ?></th>
-            <td><?php echo $lastLoginDateAdmin ?> (<?php echo $block->getCurrentStatus() ?>)</td>
+            <th><?php /* @escapeNotVerified */ echo __('Last Logged In:') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $lastLoginDateAdmin ?> (<?php /* @escapeNotVerified */ echo $block->getCurrentStatus() ?>)</td>
         </tr>
         <?php if ($lastLoginDateAdmin != $lastLoginDateStore): ?>
         <tr>
-            <th><?php echo __('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone()) ?></th>
-            <td><?php echo $lastLoginDateStore ?> (<?php echo $block->getCurrentStatus() ?>)</td>
+            <th><?php /* @escapeNotVerified */ echo __('Last Logged In (%1):', $block->getStoreLastLoginDateTimezone()) ?></th>
+            <td><?php /* @escapeNotVerified */ echo $lastLoginDateStore ?> (<?php /* @escapeNotVerified */ echo $block->getCurrentStatus() ?>)</td>
         </tr>
         <?php endif; ?>
         <tr>
-            <th><?php echo __('Confirmed email:') ?></th>
-            <td><?php echo $block->getIsConfirmedStatus() ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Confirmed email:') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $block->getIsConfirmedStatus() ?></td>
         </tr>
         <tr>
-            <th><?php echo __('Account Created:') ?></th>
-            <td><?php echo $createDateAdmin ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Account Created:') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $createDateAdmin ?></td>
         </tr>
         <?php if ($createDateAdmin != $createDateStore): ?>
             <tr>
-                <th><?php echo __('Account Created on (%1):', $block->getStoreCreateDateTimezone()) ?></th>
-                <td><?php echo $createDateStore ?></td>
+                <th><?php /* @escapeNotVerified */ echo __('Account Created on (%1):', $block->getStoreCreateDateTimezone()) ?></th>
+                <td><?php /* @escapeNotVerified */ echo $createDateStore ?></td>
             </tr>
         <?php endif; ?>
         <tr>
-            <th><?php echo __('Account Created in:') ?></th>
-            <td><?php echo $block->getCreatedInStore() ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Account Created in:') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $block->getCreatedInStore() ?></td>
         </tr>
         <tr>
-            <th><?php echo __('Customer Group:') ?></th>
-            <td><?php echo $block->getGroupName() ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Customer Group:') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $block->getGroupName() ?></td>
         </tr>
         </tbody>
     </table>
     <address>
-        <strong><?php echo __('Default Billing Address') ?></strong><br/>
+        <strong><?php /* @escapeNotVerified */ echo __('Default Billing Address') ?></strong><br/>
         <?php echo $block->getBillingAddressHtml() ?>
     </address>
 
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 a2768814f1871..ffefe22aab09f 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
@@ -12,27 +12,27 @@
 <div class="entry-edit fieldset-wrapper">
 
     <div class="fieldset-wrapper-title">
-        <span class="title"><?php echo __('Sales Statistics') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Sales Statistics') ?></span>
     </div>
 
     <table class="data-table">
         <thead>
         <tr>
             <?php if (!$singleStoreMode): ?>
-            <th><?php echo __('Web Site') ?></th>
-            <th><?php echo __('Store') ?></th>
-            <th><?php echo __('Store View') ?></th>
+            <th><?php /* @escapeNotVerified */ echo __('Web Site') ?></th>
+            <th><?php /* @escapeNotVerified */ echo __('Store') ?></th>
+            <th><?php /* @escapeNotVerified */ echo __('Store View') ?></th>
             <?php endif; ?>
-            <th><?php echo __('Lifetime Sales') ?></th>
-            <th class="last"><?php echo __('Average Sale') ?></th>
+            <th><?php /* @escapeNotVerified */ echo __('Lifetime Sales') ?></th>
+            <th class="last"><?php /* @escapeNotVerified */ echo __('Average Sale') ?></th>
         </tr>
         </thead>
         <?php if (!$singleStoreMode): ?>
         <tfoot>
         <tr>
-            <td colspan="3"><strong><?php echo __('All Store Views') ?></strong></td>
-            <td class="emph"><strong><?php echo $block->formatCurrency($block->getTotals()->getBaseLifetime()) ?></strong></td>
-            <td class="emph last"><strong><?php echo $block->formatCurrency($block->getTotals()->getAvgsale()) ?></strong></td>
+            <td colspan="3"><strong><?php /* @escapeNotVerified */ echo __('All Store Views') ?></strong></td>
+            <td class="emph"><strong><?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getTotals()->getBaseLifetime()) ?></strong></td>
+            <td class="emph last"><strong><?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getTotals()->getAvgsale()) ?></strong></td>
         </tr>
         </tfoot>
         <?php endif; ?>
@@ -46,24 +46,24 @@
                 <?php foreach ($_stores as $_row): ?>
                     <?php if (!$singleStoreMode): ?>
                         <?php if ($_row->getStoreId() == 0): ?>
-                        <td colspan="3"><?php echo $_row->getStoreName() ?></td>
+                        <td colspan="3"><?php /* @escapeNotVerified */ echo $_row->getStoreName() ?></td>
                             <?php else: ?>
                     <tr<?php echo($_i++ % 2 ? ' class="even"' : '') ?>>
                             <?php if (!$_websiteRow): ?>
-                                <td rowspan="<?php echo $block->getWebsiteCount($_websiteId) ?>"><?php echo $_row->getWebsiteName() ?></td>
+                                <td rowspan="<?php /* @escapeNotVerified */ echo $block->getWebsiteCount($_websiteId) ?>"><?php /* @escapeNotVerified */ echo $_row->getWebsiteName() ?></td>
                                 <?php $_websiteRow = true; ?>
                                 <?php endif; ?>
                             <?php if (!$_groupRow): ?>
-                                <td rowspan="<?php echo count($_stores) ?>"><?php echo $_row->getGroupName() ?></td>
+                                <td rowspan="<?php echo count($_stores) ?>"><?php /* @escapeNotVerified */ echo $_row->getGroupName() ?></td>
                                 <?php $_groupRow = true; ?>
                                 <?php endif; ?>
-                            <td><?php echo $_row->getStoreName() ?></td>
+                            <td><?php /* @escapeNotVerified */ echo $_row->getStoreName() ?></td>
                             <?php endif; ?>
                         <?php else: ?>
                     <tr>
                         <?php endif; ?>
-                    <td><?php echo $block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId()) ?></td>
-                    <td><?php echo $block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId()) ?></td>
+                    <td><?php /* @escapeNotVerified */ echo $block->formatCurrency($_row->getLifetime(), $_row->getWebsiteId()) ?></td>
+                    <td><?php /* @escapeNotVerified */ echo $block->formatCurrency($_row->getAvgsale(), $_row->getWebsiteId()) ?></td>
                     </tr>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
@@ -71,7 +71,7 @@
         </tbody>
         <?php else: ?>
         <tbody>
-        <tr class="hidden"><td colspan="<?php echo !$singleStoreMode ? '5' : '2'; ?>"></td></tr>
+        <tr class="hidden"><td colspan="<?php /* @escapeNotVerified */ echo !$singleStoreMode ? '5' : '2'; ?>"></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 77062d09d2408..c352b72105154 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
@@ -3,19 +3,21 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <li id="authenticationPopup" data-bind="scope:'authenticationPopup'">
     <script>
-        window.authenticationPopup = <?php echo \Zend_Json::encode($block->getConfig()); ?>;
+        window.authenticationPopup = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getConfig()); ?>;
     </script>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {
             "#authenticationPopup": {
-                "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?>
+                "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
             },
             "*": {
-                "Magento_Ui/js/block-loader": "<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
+                "Magento_Ui/js/block-loader": "<?php /* @escapeNotVerified */ echo $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 6d64d9f962881..4d208d4136c98 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/customer.phtml
@@ -20,7 +20,7 @@
             <button type="button"
                     class="action switch"
                     tabindex="-1">
-                <span><?php echo __('Change')?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Change')?></span>
             </button>
         </span>
         <script type="text/x-magento-init">
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 cc5e3ab0e09b1..9be6e36723a31 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,13 +10,13 @@
 ?>
 <div class="block block-dashboard-addresses">
     <div class="block-title">
-        <strong><?php echo __('Address Book') ?></strong>
-        <a class="action edit" href="<?php echo $block->getAddressBookUrl() ?>"><span><?php echo __('Manage Addresses') ?></span></a>
+        <strong><?php /* @escapeNotVerified */ echo __('Address Book') ?></strong>
+        <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getAddressBookUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Manage Addresses') ?></span></a>
     </div>
     <div class="block-content">
         <div class="box box-billing-address">
             <strong class="box-title">
-                <span><?php echo __('Default Billing Address') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Default Billing Address') ?></span>
             </strong>
             <div class="box-content">
                 <address>
@@ -24,12 +24,12 @@
                 </address>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?php echo $block->getPrimaryBillingAddressEditUrl() ?>" data-ui-id="default-billing-edit-link"><span><?php echo __('Edit Address') ?></span></a>
+                <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getPrimaryBillingAddressEditUrl() ?>" data-ui-id="default-billing-edit-link"><span><?php /* @escapeNotVerified */ echo __('Edit Address') ?></span></a>
             </div>
         </div>
         <div class="box box-shipping-address">
             <strong class="box-title">
-                <span><?php echo __('Default Shipping Address') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Default Shipping Address') ?></span>
             </strong>
             <div class="box-content">
                 <address>
@@ -37,7 +37,7 @@
                 </address>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?php echo $block->getPrimaryShippingAddressEditUrl() ?>" data-ui-id="default-shipping-edit-link"><span><?php echo __('Edit Address') ?></span></a>
+                <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getPrimaryShippingAddressEditUrl() ?>" data-ui-id="default-shipping-edit-link"><span><?php /* @escapeNotVerified */ echo __('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 6659f62b175c4..f9c4e8ae91ea8 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,11 +9,11 @@
 /** @var \Magento\Customer\Block\Account\Dashboard\Info $block */
 ?>
 <div class="block block-dashboard-info">
-    <div class="block-title"><strong><?php echo __('Account Information') ?></strong></div>
+    <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Account Information') ?></strong></div>
     <div class="block-content">
         <div class="box box-information">
             <strong class="box-title">
-                <span><?php echo __('Contact Information') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Contact Information') ?></span>
             </strong>
             <div class="box-content">
                 <p>
@@ -22,32 +22,32 @@
                 </p>
             </div>
             <div class="box-actions">
-                <a class="action edit" href="<?php echo $block->getUrl('customer/account/edit') ?>">
-                    <span><?php echo __('Edit') ?></span>
+                <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/account/edit') ?>">
+                    <span><?php /* @escapeNotVerified */ echo __('Edit') ?></span>
                 </a>
-                <a href="<?php echo $block->getChangePasswordUrl() ?>" class="action change-password">
-                    <?php echo __('Change Password') ?>
+                <a href="<?php /* @escapeNotVerified */ echo $block->getChangePasswordUrl() ?>" class="action change-password">
+                    <?php /* @escapeNotVerified */ echo __('Change Password') ?>
                 </a>
             </div>
         </div>
         <?php if ($block->isNewsletterEnabled()): ?>
             <div class="box box-newsletter">
                 <strong class="box-title">
-                    <span><?php echo __('Newsletters') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Newsletters') ?></span>
                 </strong>
                 <div class="box-content">
                     <p>
                         <?php if ($block->getIsSubscribed()): ?>
-                            <?php echo __('You subscribe to "General Subscription".') ?>
+                            <?php /* @escapeNotVerified */ echo __('You subscribe to "General Subscription".') ?>
                         <?php else: ?>
-                            <?php echo __('You don\'t subscribe to our newsletter.') ?>
+                            <?php /* @escapeNotVerified */ echo __('You don\'t subscribe to our newsletter.') ?>
                         <?php endif; ?>
                     </p>
                     <?php /* Extensions placeholder */ ?>
                     <?php echo $block->getChildHtml('customer.account.dashboard.info.extra')?>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?php echo $block->getUrl('newsletter/manage') ?>"><span><?php echo __('Edit') ?></span></a>
+                    <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getUrl('newsletter/manage') ?>"><span><?php /* @escapeNotVerified */ echo __('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 9733b737690f8..1bf7c1c05ee69 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
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /** @var $block \Magento\Customer\Block\Account\AuthorizationLink */
 $dataPostParam = '';
 if ($block->isLoggedIn()) {
@@ -11,7 +13,7 @@ if ($block->isLoggedIn()) {
 }
 ?>
 <li class="authorization-link" data-label="<?php echo $block->escapeHtml(__('or')); ?>">
-    <a <?php echo $block->getLinkAttributes(); ?><?php echo $dataPostParam; ?>>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes(); ?><?php /* @escapeNotVerified */ echo $dataPostParam; ?>>
         <?php echo $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 21461913262f2..d86582d98be6d 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 __('Back') ?></span></a></div>
+    <div class="secondary"><a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('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 6744af5e2f98a..f084d6cfca071 100644
--- a/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/account/navigation.phtml
@@ -8,7 +8,7 @@
 <?php /** @var $block \Magento\Customer\Block\Account\Navigation */ ?>
 <div class="block account-nav">
     <div class="title">
-        <strong><?php echo __('My Account'); ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('My Account'); ?></strong>
     </div>
     <div class="content">
         <nav class="account-nav">
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 1f1a472fb7282..22f9784369d52 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/book.phtml
@@ -14,12 +14,12 @@
  */
 ?>
 <div class="block block-addresses-default">
-    <div class="block-title"><strong><?php echo __('Default Addresses') ?></strong></div>
+    <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('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 __('Default Billing Address') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Default Billing Address') ?></span>
                 </strong>
                 <div class="box-content">
                     <address>
@@ -27,16 +27,16 @@
                     </address>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?php echo $block->getAddressEditUrl($_pAddsses) ?>">
-                        <span><?php echo __('Change Billing Address') ?></span>
+                    <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getAddressEditUrl($_pAddsses) ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('Change Billing Address') ?></span>
                     </a>
                 </div>
             </div>
         <?php else: ?>
             <div class="box box-billing-address">
-                <strong class="box-title"><span><?php echo __('Default Billing Address') ?></span></strong>
+                <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Default Billing Address') ?></span></strong>
                 <div class="box-content">
-                    <p><?php echo __('You have no default billing address in your address book.') ?></p>
+                    <p><?php /* @escapeNotVerified */ echo __('You have no default billing address in your address book.') ?></p>
                 </div>
             </div>
         <?php endif ?>
@@ -44,7 +44,7 @@
         <?php if ($_pAddsses = $block->getDefaultShipping()): ?>
             <div class="box box-address-shipping">
                 <strong class="box-title">
-                    <span><?php echo __('Default Shipping Address') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Default Shipping Address') ?></span>
                 </strong>
                 <div class="box-content">
                     <address>
@@ -52,16 +52,16 @@
                     </address>
                 </div>
                 <div class="box-actions">
-                    <a class="action edit" href="<?php echo $block->getAddressEditUrl($_pAddsses) ?>">
-                        <span><?php echo __('Change Shipping Address') ?></span>
+                    <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getAddressEditUrl($_pAddsses) ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('Change Shipping Address') ?></span>
                     </a>
                 </div>
             </div>
         <?php else: ?>
             <div class="box box-shipping-address">
-                <strong class="box-title"><span><?php echo __('Default Shipping Address') ?></span></strong>
+                <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Default Shipping Address') ?></span></strong>
                 <div class="box-content">
-                    <p><?php echo __('You have no default shipping address in your address book.') ?></p>
+                    <p><?php /* @escapeNotVerified */ echo __('You have no default shipping address in your address book.') ?></p>
                 </div>
             </div>
         <?php endif ?>
@@ -69,7 +69,7 @@
 </div>
 
 <div class="block block-addresses-list">
-    <div class="block-title"><strong><?php echo __('Additional Address Entries') ?></strong></div>
+    <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Additional Address Entries') ?></strong></div>
     <div class="block-content">
         <?php if ($_pAddsses = $block->getAdditionalAddresses()): ?>
             <ol class="items addresses">
@@ -79,24 +79,24 @@
                             <?php echo $block->getAddressHtml($_address) ?><br />
                         </address>
                         <div class="item actions">
-                            <a class="action edit" href="<?php echo $block->getUrl('customer/address/edit', ['id' => $_address->getId()]) ?>"><span><?php echo __('Edit Address') ?></span></a>
-                            <a class="action delete" href="#" role="delete-address" data-address="<?php echo $_address->getId() ?>"><span><?php echo __('Delete Address') ?></span></a>
+                            <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/address/edit', ['id' => $_address->getId()]) ?>"><span><?php /* @escapeNotVerified */ echo __('Edit Address') ?></span></a>
+                            <a class="action delete" href="#" role="delete-address" data-address="<?php /* @escapeNotVerified */ echo $_address->getId() ?>"><span><?php /* @escapeNotVerified */ echo __('Delete Address') ?></span></a>
                         </div>
                     </li>
                 <?php endforeach; ?>
             </ol>
         <?php else: ?>
-            <p class="empty"><?php echo __('You have no other address entries in your address book.') ?></p>
+            <p class="empty"><?php /* @escapeNotVerified */ echo __('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 __('Add New Address') ?>" class="action primary add"><span><?php echo __('Add New Address') ?></span></button>
+        <button type="button" role="add-address" title="<?php /* @escapeNotVerified */ echo __('Add New Address') ?>" class="action primary add"><span><?php /* @escapeNotVerified */ echo __('Add New Address') ?></span></button>
     </div>
     <div class="secondary">
-        <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a>
+        <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
     </div>
 </div>
 <script type="text/x-magento-init">
@@ -104,9 +104,9 @@
         ".page-main": {
             "address": {
                 "deleteAddress": "li.item a[role='delete-address']",
-                "deleteUrlPrefix": "<?php echo $block->getDeleteUrl() ?>id/",
+                "deleteUrlPrefix": "<?php /* @escapeNotVerified */ echo $block->getDeleteUrl() ?>id/",
                 "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?php echo $block->getAddAddressUrl() ?>"
+                "addAddressLocation": "<?php /* @escapeNotVerified */ echo $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 7573696088027..94bb7a91c7505 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -14,48 +14,48 @@
  * @var $block \Magento\Customer\Block\Address\Edit
  */
 ?>
-<form class="form-address-edit" action="<?php echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php echo __('* Required Fields') ?>">
+<form class="form-address-edit" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo __('Contact Information') ?></span></legend><br>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Contact Information') ?></span></legend><br>
         <?php echo $block->getBlockHtml('formkey')?>
-        <input type="hidden" name="success_url" value="<?php echo $block->getSuccessUrl() ?>">
-        <input type="hidden" name="error_url" value="<?php echo $block->getErrorUrl() ?>">
+        <input type="hidden" name="success_url" value="<?php /* @escapeNotVerified */ echo $block->getSuccessUrl() ?>">
+        <input type="hidden" name="error_url" value="<?php /* @escapeNotVerified */ echo $block->getErrorUrl() ?>">
         <?php echo $block->getNameBlockHtml() ?>
         <div class="field company">
-            <label class="label" for="company"><span><?php echo __('Company') ?></span></label>
+            <label class="label" for="company"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
             <div class="control">
-                <input type="text" name="company" id="company" title="<?php echo __('Company') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
+                <input type="text" name="company" id="company" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getCompany()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
             </div>
         </div>
         <div class="field telephone required">
-            <label class="label" for="telephone"><span><?php echo __('Phone Number') ?></span></label>
+            <label class="label" for="telephone"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
             <div class="control">
-                <input type="text" name="telephone" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php echo __('Phone Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="telephone">
+                <input type="text" name="telephone" value="<?php echo $block->escapeHtml($block->getAddress()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>" id="telephone">
             </div>
         </div>
         <div class="field fax">
-            <label class="label" for="fax"><span><?php echo __('Fax') ?></span></label>
+            <label class="label" for="fax"><span><?php /* @escapeNotVerified */ echo __('Fax') ?></span></label>
             <div class="control">
-                <input type="text" name="fax" id="fax" title="<?php echo __('Fax') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>">
+                <input type="text" name="fax" id="fax" title="<?php /* @escapeNotVerified */ echo __('Fax') ?>" value="<?php echo $block->escapeHtml($block->getAddress()->getFax()) ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('fax') ?>">
             </div>
         </div>
     </fieldset>
     <fieldset class="fieldset">
-        <legend class="legend"><span><?php echo __('Address') ?></span></legend><br>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('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 __('Street Address') ?></span></label>
+            <label for="street_1" class="label"><span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span></label>
             <div class="control">
-                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine(1)) ?>" title="<?php echo __('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>"  />
+                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine(1)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */ echo $_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 echo $_i+1 ?>">
-                                <span><?php echo __('Street Address %1', $_i+1) ?></span>
+                            <label class="label" for="street_<?php /* @escapeNotVerified */ echo $_i+1 ?>">
+                                <span><?php /* @escapeNotVerified */ echo __('Street Address %1', $_i+1) ?></span>
                             </label>
                             <div class="control">
-                                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine($_i+1)) ?>" title="<?php echo __('Street Address %1', $_i+1) ?>" id="street_<?php echo $_i+1 ?>" class="input-text <?php echo $_streetValidationClass ?>">
+                                <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getStreetLine($_i+1)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address %1', $_i+1) ?>" id="street_<?php /* @escapeNotVerified */ echo $_i+1 ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
                             </div>
                         </div>
                     <?php endfor; ?>
@@ -65,57 +65,57 @@
 
         <?php if ($this->helper('Magento\Customer\Helper\Address')->isVatAttributeVisible()) : ?>
             <div class="field taxvat">
-                <label class="label" for="vat_id"><span><?php echo __('VAT Number') ?></span></label>
+                <label class="label" for="vat_id"><span><?php /* @escapeNotVerified */ echo __('VAT Number') ?></span></label>
                 <div class="control">
-                    <input type="text" name="vat_id" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>" title="<?php echo __('VAT Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('vat_id') ?>" id="vat_id">
+                    <input type="text" name="vat_id" value="<?php echo $block->escapeHtml($block->getAddress()->getVatId()) ?>" title="<?php /* @escapeNotVerified */ echo __('VAT Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $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 __('City') ?></span></label>
+            <label class="label" for="city"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
             <div class="control">
-                <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city">
+                <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getAddress()->getCity()) ?>" title="<?php /* @escapeNotVerified */ echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */ echo $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 __('State/Province') ?></span></label>
+            <label class="label" for="region_id"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
             <div class="control">
-                <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" <?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>>
-                    <option value=""><?php echo __('Please select a region, state or province.') ?></option>
+                <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" <?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('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 __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>/>
+                <input type="text" id="region" name="region" value="<?php echo $block->escapeHtml($block->getRegion()) ?>"  title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>"<?php echo(!$block->getConfig('general/region/display_all')) ? ' disabled="disabled"' : '';?>/>
             </div>
         </div>
         <div class="field zip required">
-            <label class="label" for="zip"><span><?php echo __('Zip/Postal Code') ?></span></label>
+            <label class="label" for="zip"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
             <div class="control">
-                <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
+                <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getAddress()->getPostcode()) ?>" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
             </div>
         </div>
         <div class="field country required">
-            <label class="label" for="country"><span><?php echo __('Country') ?></span></label>
+            <label class="label" for="country"><span><?php /* @escapeNotVerified */ echo __('Country') ?></span></label>
             <div class="control">
                 <?php echo $block->getCountryHtmlSelect() ?>
             </div>
         </div>
 
         <?php if ($block->isDefaultBilling()): ?>
-            <div class="field note default"><?php echo __('Default Billing Address') ?></div>
+            <div class="field note default"><?php /* @escapeNotVerified */ echo __('Default Billing Address') ?></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 __('Use as my default billing address') ?></span></label>
+                <label class="label" for="primary_billing"><span><?php /* @escapeNotVerified */ echo __('Use as my default billing address') ?></span></label>
             </div>
         <?php else: ?>
             <input type="hidden" name="default_billing" value="1" />
         <?php endif; ?>
 
         <?php if ($block->isDefaultShipping()): ?>
-            <div class="field note default"><?php echo __('Default Shipping Address') ?></div>
+            <div class="field note default"><?php /* @escapeNotVerified */ echo __('Default Shipping Address') ?></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 __('Use as my default shipping address') ?></span></label>
+                <label class="label" for="primary_shipping"><span><?php /* @escapeNotVerified */ echo __('Use as my default shipping address') ?></span></label>
             </div>
         <?php else: ?>
             <input type="hidden" name="default_shipping" value="1">
@@ -123,12 +123,12 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action save primary" data-action="save-address" title="<?php echo __('Save Address') ?>">
-                <span><?php echo __('Save Address') ?></span>
+            <button type="submit" class="action save primary" data-action="save-address" title="<?php /* @escapeNotVerified */ echo __('Save Address') ?>">
+                <span><?php /* @escapeNotVerified */ echo __('Save Address') ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo __('Go back') ?></span></a>
+            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Go back') ?></span></a>
         </div>
     </div>
 </form>
@@ -139,14 +139,14 @@
         },
         "#country": {
             "regionUpdater": {
-                "optionalRegionAllowed": <?php echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+                "optionalRegionAllowed": <?php /* @escapeNotVerified */ echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php echo $block->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
+                "defaultRegion": "<?php /* @escapeNotVerified */ echo $block->getRegionId() ?>",
+                "countriesWithOptionalZip": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->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 24a8a5382d674..eb060a4188ec8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/confirmation.phtml
@@ -8,10 +8,10 @@
 
 ?>
 <form action="" method="post" id="form-validate" class="form send confirmation" data-mage-init='{"validation":{}}'>
-    <fieldset class="fieldset" data-hasrequired="<?php echo __('* Required Fields') ?>">
-        <p class="field note"><?php echo __('Please enter your email below and we will send you the confirmation link.') ?></p>
+    <fieldset class="fieldset" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
+        <p class="field note"><?php /* @escapeNotVerified */ echo __('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 __('Email') ?></span></label>
+            <label for="email_address" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
                 <input type="email" name="email" id="email_address" class="input-text" value="<?php echo $block->escapeHtml($block->getEmail()) ?>" data-validate="{required:true, 'validate-email':true}">
             </div>
@@ -19,10 +19,10 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action send primary"><span><?php echo __('Send confirmation link') ?></span></button>
+            <button type="submit" class="action send primary"><span><?php /* @escapeNotVerified */ echo __('Send confirmation link') ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php echo $block->getLoginUrl() ?>" class="action back"><span><?php echo __('Back to Sign In') ?></span></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getLoginUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('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 9e339b4a4423b..c8759eff33483 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -8,15 +8,15 @@
 
 /** @var \Magento\Customer\Block\Form\Edit $block */
 ?>
-<form class="form form-edit-account" action="<?php echo $block->getUrl('customer/account/editPost') ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php echo __('* Required Fields') ?>" autocomplete="off">
+<form class="form form-edit-account" action="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/account/editPost') ?>" method="post" id="form-validate" enctype="multipart/form-data" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>" autocomplete="off">
     <fieldset class="fieldset info">
         <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo __('Account Information') ?></span></legend><br>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Account Information') ?></span></legend><br>
         <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getCustomer())->toHtml() ?>
         <div class="field email required">
-            <label class="label" for="email"><span><?php echo __('Email') ?></span></label>
+            <label class="label" for="email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
-                <input type="email" name="email" id="email" value="<?php echo $block->escapeHtml($block->getCustomer()->getEmail()) ?>" title="<?php echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" id="email" value="<?php echo $block->escapeHtml($block->getCustomer()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <?php $_dob = $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Dob') ?>
@@ -32,27 +32,27 @@
             <?php echo $_gender->setGender($block->getCustomer()->getGender())->toHtml() ?>
         <?php endif ?>
         <div class="field choice">
-            <input type="checkbox" name="change_password" id="change-password" value="1" title="<?php echo __('Change Password') ?>"<?php if ($block->getChangePassword()): ?> checked="checked"<?php endif; ?> class="checkbox"/>
-            <label class="label" for="change-password"><span><?php echo __('Change Password') ?></span></label>
+            <input type="checkbox" name="change_password" id="change-password" value="1" title="<?php /* @escapeNotVerified */ echo __('Change Password') ?>"<?php if ($block->getChangePassword()): ?> checked="checked"<?php endif; ?> class="checkbox"/>
+            <label class="label" for="change-password"><span><?php /* @escapeNotVerified */ echo __('Change Password') ?></span></label>
         </div>
     </fieldset>
 
     <fieldset class="fieldset password">
-        <legend class="legend"><span><?php echo __('Change Password') ?></span></legend><br>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Change Password') ?></span></legend><br>
         <div class="field password current required">
-            <label class="label" for="current-password"><span><?php echo __('Current Password') ?></span></label>
+            <label class="label" for="current-password"><span><?php /* @escapeNotVerified */ echo __('Current Password') ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="current_password" id="current-password">
             </div>
         </div>
         <div class="field new password required">
-            <label class="label" for="password"><span><?php echo __('New Password') ?></span></label>
+            <label class="label" for="password"><span><?php /* @escapeNotVerified */ echo __('New Password') ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password" id="password">
             </div>
         </div>
         <div class="field confirm password required">
-            <label class="label" for="password-confirmation"><span><?php echo __('Confirm New Password') ?></span></label>
+            <label class="label" for="password-confirmation"><span><?php /* @escapeNotVerified */ echo __('Confirm New Password') ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password_confirmation" id="password-confirmation">
             </div>
@@ -60,10 +60,10 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action save primary" title="<?php echo __('Save') ?>"><span><?php echo __('Save') ?></span></button>
+            <button type="submit" class="action save primary" title="<?php /* @escapeNotVerified */ echo __('Save') ?>"><span><?php /* @escapeNotVerified */ echo __('Save') ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo __('Go back') ?></span></a>
+            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Go back') ?></span></a>
         </div>
     </div>
 </form>
@@ -73,7 +73,7 @@
         "mage/mage"
     ], function($){
         var dataForm = $('#form-validate');
-        var ignore = <?php echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
+        var ignore = <?php /* @escapeNotVerified */ echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
         
         dataForm.mage('validation', {
         <?php if ($_dob->isEnabled()): ?>
@@ -105,7 +105,7 @@
                 "passwordId": "#password",
                 "confirmationId": "#password-confirmation",
                 "passwordContainer": "fieldset.fieldset.password",
-                "showOnDefault": <?php echo $block->getChangePassword() ? 'true' : 'false' ?>
+                "showOnDefault": <?php /* @escapeNotVerified */ echo $block->getChangePassword() ? 'true' : 'false' ?>
             }
         }
     }
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 fcb9d44aff84c..03ef7ad934824 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml
@@ -10,14 +10,14 @@
 
 ?>
 <form class="form password forget"
-      action="<?php echo $block->getUrl('*/*/forgotpasswordpost') ?>"
+      action="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/forgotpasswordpost') ?>"
       method="post"
       id="form-validate"
       data-mage-init='{"validation":{}}'>
-    <fieldset class="fieldset" data-hasrequired="<?php echo __('* Required Fields') ?>">
-        <div class="field note"><?php echo __('Please enter your email address below to receive a password reset link.'); ?></div>
+    <fieldset class="fieldset" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
+        <div class="field note"><?php /* @escapeNotVerified */ echo __('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 __('Email') ?></span></label>
+            <label for="email_address" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
                 <input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?php echo $block->escapeHtml($block->getEmailValue()) ?>" data-validate="{required:true, 'validate-email':true}">
             </div>
@@ -26,10 +26,10 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary"><span><?php echo __('Submit') ?></span></button>
+            <button type="submit" class="action submit primary"><span><?php /* @escapeNotVerified */ echo __('Submit') ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->getLoginUrl() ?>"><span><?php echo __('Go back') ?></span></a>
+            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getLoginUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('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 e70dd8e45db1e..9e70917da19cb 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -18,33 +18,33 @@
 ?>
 <div class="block block-customer-login">
     <div class="block-title">
-        <strong id="block-customer-login-heading" role="heading" aria-level="2"><?php echo __('Registered Customers') ?></strong>
+        <strong id="block-customer-login-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Registered Customers') ?></strong>
     </div>
     <div class="block-content" aria-labelledby="block-customer-login-heading">
         <form class="form form-login"
-              action="<?php echo $block->getPostActionUrl() ?>"
+              action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>"
               method="post"
               id="login-form"
               data-mage-init='{"validation":{}}'>
             <?php echo $block->getBlockHtml('formkey'); ?>
-            <fieldset class="fieldset login" data-hasrequired="<?php echo __('* Required Fields') ?>">
-                <div class="field note"><?php echo __('If you have an account, sign in with your email address.') ?></div>
+            <fieldset class="fieldset login" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
+                <div class="field note"><?php /* @escapeNotVerified */ echo __('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 __('Email') ?></span></label>
+                    <label class="label" for="email"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
                     <div class="control">
-                        <input name="login[username]" value="<?php echo $block->escapeHtml($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?php echo __('Email') ?>" data-validate="{required:true, 'validate-email':true}">
+                        <input name="login[username]" value="<?php echo $block->escapeHtml($block->getUsername()) ?>" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> id="email" type="email" class="input-text" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" data-validate="{required:true, 'validate-email':true}">
                     </div>
                 </div>
                 <div class="field password required">
-                    <label for="pass" class="label"><span><?php echo __('Password') ?></span></label>
+                    <label for="pass" class="label"><span><?php /* @escapeNotVerified */ echo __('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 __('Password') ?>" data-validate="{required:true, 'validate-password':true}">
+                        <input name="login[password]" type="password" <?php if ($block->isAutocompleteDisabled()) :?> autocomplete="off"<?php endif; ?> class="input-text" id="pass" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" data-validate="{required:true, 'validate-password':true}">
                     </div>
                 </div>
                 <?php echo $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 __('Login') ?></span></button></div>
-                    <div class="secondary"><a class="action remind" href="<?php echo $block->getForgotPasswordUrl() ?>"><span><?php echo __('Forgot Your Password?') ?></span></a></div>
+                    <div class="primary"><button type="submit" class="action login primary" name="send" id="send2"><span><?php /* @escapeNotVerified */ echo __('Login') ?></span></button></div>
+                    <div class="secondary"><a class="action remind" href="<?php /* @escapeNotVerified */ echo $block->getForgotPasswordUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('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 bce0e72e60632..1c8d933b43243 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/newsletter.phtml
@@ -8,20 +8,20 @@
 
 ?>
 <?php echo $block->getChildHtml('form_before')?>
-    <form class="form form-newsletter-manage" action="<?php echo $block->getAction() ?>" method="post" id="form-validate">
+    <form class="form form-newsletter-manage" action="<?php /* @escapeNotVerified */ echo $block->getAction() ?>" method="post" id="form-validate">
         <fieldset class="fieldset">
             <?php echo $block->getBlockHtml('formkey')?>
-            <legend class="legend"><span><?php echo __('Subscription option') ?></span></legend><br>
+            <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Subscription option') ?></span></legend><br>
             <div class="field choice">
-                <input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php echo __('General Subscription') ?>"<?php if ($block->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
-                <label for="subscription" class="label"><span><?php echo __('General Subscription') ?></span></label>
+                <input type="checkbox" name="is_subscribed" id="subscription" value="1" title="<?php /* @escapeNotVerified */ echo __('General Subscription') ?>"<?php if ($block->getIsSubscribed()): ?> checked="checked"<?php endif; ?> class="checkbox">
+                <label for="subscription" class="label"><span><?php /* @escapeNotVerified */ echo __('General Subscription') ?></span></label>
             </div>
             <?php /* Extensions placeholder */ ?>
             <?php echo $block->getChildHtml('customer.form.newsletter.extra')?>
         </fieldset>
         <div class="actions-toolbar">
-            <div class="primary"><button type="submit" title="<?php echo __('Save') ?>" class="action save primary"><span><?php echo __('Save') ?></span></button></div>
-            <div class="secondary"><a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a></div>
+            <div class="primary"><button type="submit" title="<?php /* @escapeNotVerified */ echo __('Save') ?>" class="action save primary"><span><?php /* @escapeNotVerified */ echo __('Save') ?></span></button></div>
+            <div class="secondary"><a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a></div>
         </div>
     </form>
 <?php /* Extensions placeholder */ ?>
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 a740bec393ff1..374e576d26e2d 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -17,22 +17,22 @@
 <?php echo $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->getPostActionUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
+<form class="form create account form-create-account" action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" id="form-validate" enctype="multipart/form-data" autocomplete="off">
     <fieldset class="fieldset create info">
-        <legend class="legend"><span><?php echo __('Personal Information') ?></span></legend><br>
-        <input type="hidden" name="success_url" value="<?php echo $block->getSuccessUrl() ?>">
-        <input type="hidden" name="error_url" value="<?php echo $block->getErrorUrl() ?>">
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Personal Information') ?></span></legend><br>
+        <input type="hidden" name="success_url" value="<?php /* @escapeNotVerified */ echo $block->getSuccessUrl() ?>">
+        <input type="hidden" name="error_url" value="<?php /* @escapeNotVerified */ echo $block->getErrorUrl() ?>">
         <?php echo $block->getLayout()->createBlock('Magento\Customer\Block\Widget\Name')->setObject($block->getFormData())->setForceUseCustomerAttributes(true)->toHtml() ?>
         <div class="field required">
-            <label for="email_address" class="label"><span><?php echo __('Email') ?></span></label>
+            <label for="email_address" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
-                <input type="email" name="email" id="email_address" value="<?php echo $block->escapeHtml($block->getFormData()->getEmail()) ?>" title="<?php echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
+                <input type="email" name="email" id="email_address" value="<?php echo $block->escapeHtml($block->getFormData()->getEmail()) ?>" title="<?php /* @escapeNotVerified */ echo __('Email') ?>" class="input-text" data-validate="{required:true, 'validate-email':true}">
             </div>
         </div>
         <?php if ($block->isNewsletterEnabled()): ?>
             <div class="field choice newsletter">
-                <input type="checkbox" name="is_subscribed" title="<?php echo __('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 __('Sign Up for Newsletter') ?></span></label>
+                <input type="checkbox" name="is_subscribed" title="<?php /* @escapeNotVerified */ echo __('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 /* @escapeNotVerified */ echo __('Sign Up for Newsletter') ?></span></label>
             </div>
             <?php /* Extensions placeholder */ ?>
             <?php echo $block->getChildHtml('customer.form.register.newsletter')?>
@@ -55,36 +55,36 @@
     </fieldset>
     <?php if ($block->getShowAddressFields()): ?>
         <fieldset class="fieldset address">
-            <legend class="legend"><span><?php echo __('Address Information') ?></span></legend><br>
+            <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Address Information') ?></span></legend><br>
             <input type="hidden" name="create_address" value="1" />
             <div class="field company">
-                <label for="company" class="label"><span><?php echo __('Company') ?></span></label>
+                <label for="company" class="label"><span><?php /* @escapeNotVerified */ echo __('Company') ?></span></label>
                 <div class="control">
-                    <input type="text" name="company" id="company" value="<?php echo $block->escapeHtml($block->getFormData()->getCompany()) ?>" title="<?php echo __('Company') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
+                    <input type="text" name="company" id="company" value="<?php echo $block->escapeHtml($block->getFormData()->getCompany()) ?>" title="<?php /* @escapeNotVerified */ echo __('Company') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('company') ?>">
                 </div>
             </div>
             <div class="field telephone">
-                <label for="telephone" class="label"><span><?php echo __('Phone Number') ?></span></label>
+                <label for="telephone" class="label"><span><?php /* @escapeNotVerified */ echo __('Phone Number') ?></span></label>
                 <div class="control">
-                    <input type="text" name="telephone" id="telephone" value="<?php echo $block->escapeHtml($block->getFormData()->getTelephone()) ?>" title="<?php echo __('Phone Number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>">
+                    <input type="text" name="telephone" id="telephone" value="<?php echo $block->escapeHtml($block->getFormData()->getTelephone()) ?>" title="<?php /* @escapeNotVerified */ echo __('Phone Number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('telephone') ?>">
                 </div>
             </div>
 
             <?php $_streetValidationClass = $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('street'); ?>
 
             <div class="field street required">
-                <label for="street_1" class="label"><span><?php echo __('Street Address') ?></span></label>
+                <label for="street_1" class="label"><span><?php /* @escapeNotVerified */ echo __('Street Address') ?></span></label>
                 <div class="control">
-                    <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getFormData()->getStreet(0)) ?>" title="<?php echo __('Street Address') ?>" id="street_1" class="input-text <?php echo $_streetValidationClass ?>">
+                    <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getFormData()->getStreet(0)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address') ?>" id="street_1" class="input-text <?php /* @escapeNotVerified */ echo $_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 echo $_i ?>">
-                                    <span><?php echo __('Address') ?></span>
+                                <label class="label" for="street_<?php /* @escapeNotVerified */ echo $_i ?>">
+                                    <span><?php /* @escapeNotVerified */ echo __('Address') ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?php echo __('Street Address %1', $_i) ?>" id="street_<?php echo $_i ?>" class="input-text <?php echo $_streetValidationClass ?>">
+                                    <input type="text" name="street[]" value="<?php echo $block->escapeHtml($block->getFormData()->getStreetLine($_i - 1)) ?>" title="<?php /* @escapeNotVerified */ echo __('Street Address %1', $_i) ?>" id="street_<?php /* @escapeNotVerified */ echo $_i ?>" class="input-text <?php /* @escapeNotVerified */ echo $_streetValidationClass ?>">
                                 </div>
                             </div>
                         <?php endfor; ?>
@@ -93,31 +93,31 @@
             </div>
 
             <div class="field required">
-                <label for="city" class="label"><span><?php echo __('City') ?></span></label>
+                <label for="city" class="label"><span><?php /* @escapeNotVerified */ echo __('City') ?></span></label>
                 <div class="control">
-                    <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getFormData()->getCity()) ?>" title="<?php echo __('City') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('city') ?>" id="city">
+                    <input type="text" name="city" value="<?php echo $block->escapeHtml($block->getFormData()->getCity()) ?>" title="<?php /* @escapeNotVerified */ echo __('City') ?>" class="input-text <?php /* @escapeNotVerified */ echo $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 __('State/Province') ?></span></label>
+                <label for="region_id" class="label"><span><?php /* @escapeNotVerified */ echo __('State/Province') ?></span></label>
                 <div class="control">
-                    <select id="region_id" name="region_id" title="<?php echo __('State/Province') ?>" class="validate-select" style="display:none;">
-                        <option value=""><?php echo __('Please select a region, state or province.') ?></option>
+                    <select id="region_id" name="region_id" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="validate-select" style="display:none;">
+                        <option value=""><?php /* @escapeNotVerified */ echo __('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 __('State/Province') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region') ?>" style="display:none;">
+                    <input type="text" id="region" name="region" value="<?php echo $block->escapeHtml($block->getRegion()) ?>" title="<?php /* @escapeNotVerified */ echo __('State/Province') ?>" class="input-text <?php /* @escapeNotVerified */ echo $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 __('Zip/Postal Code') ?></span></label>
+                <label for="zip" class="label"><span><?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?></span></label>
                 <div class="control">
-                    <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getFormData()->getPostcode()) ?>" title="<?php echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
+                    <input type="text" name="postcode" value="<?php echo $block->escapeHtml($block->getFormData()->getPostcode()) ?>" title="<?php /* @escapeNotVerified */ echo __('Zip/Postal Code') ?>" id="zip" class="input-text validate-zip-international <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('postcode') ?>">
                 </div>
             </div>
 
             <div class="field country required">
-                <label for="country" class="label"><span><?php echo __('Country') ?></span></label>
+                <label for="country" class="label"><span><?php /* @escapeNotVerified */ echo __('Country') ?></span></label>
                 <div class="control">
                     <?php echo $block->getCountryHtmlSelect() ?>
                 </div>
@@ -134,29 +134,29 @@
         </fieldset>
 
     <?php endif; ?>
-    <fieldset class="fieldset create account" data-hasrequired="<?php echo __('* Required Fields') ?>">
-        <legend class="legend"><span><?php echo __('Sign-in Information') ?></span></legend><br>
+    <fieldset class="fieldset create account" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Sign-in Information') ?></span></legend><br>
 
         <div class="field password required">
-            <label for="password" class="label"><span><?php echo __('Password') ?></span></label>
+            <label for="password" class="label"><span><?php /* @escapeNotVerified */ echo __('Password') ?></span></label>
             <div class="control">
-                <input type="password" name="password" id="password" title="<?php echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}">
+                <input type="password" name="password" id="password" title="<?php /* @escapeNotVerified */ echo __('Password') ?>" class="input-text" data-validate="{required:true, 'validate-password':true}">
             </div>
         </div>
         <div class="field confirmation required">
-            <label for="password-confirmation" class="label"><span><?php echo __('Confirm Password') ?></span></label>
+            <label for="password-confirmation" class="label"><span><?php /* @escapeNotVerified */ echo __('Confirm Password') ?></span></label>
             <div class="control">
-                <input type="password" name="password_confirmation" title="<?php echo __('Confirm Password') ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}">
+                <input type="password" name="password_confirmation" title="<?php /* @escapeNotVerified */ echo __('Confirm Password') ?>" id="password-confirmation" class="input-text" data-validate="{required:true, equalTo:'#password'}">
             </div>
         </div>
         <?php echo $block->getChildHtml('form_additional_info'); ?>
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary" title="<?php echo __('Create an Account') ?>"><span><?php echo __('Create an Account') ?></span></button>
+            <button type="submit" class="action submit primary" title="<?php /* @escapeNotVerified */ echo __('Create an Account') ?>"><span><?php /* @escapeNotVerified */ echo __('Create an Account') ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php echo __('Back') ?></span></a>
+            <a class="action back" href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
         </div>
     </div>
 </form>
@@ -167,7 +167,7 @@ require([
 ], function($){
 
     var dataForm = $('#form-validate');
-    var ignore = <?php echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
+    var ignore = <?php /* @escapeNotVerified */ echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;
     
     dataForm.mage('validation', {
     <?php if ($_dob->isEnabled()): ?>
@@ -196,14 +196,14 @@ require([
     {
         "#country": {
             "regionUpdater": {
-                "optionalRegionAllowed": <?php echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
+                "optionalRegionAllowed": <?php /* @escapeNotVerified */ echo($block->getConfig('general/region/display_all') ? 'true' : 'false'); ?>,
                 "regionListId": "#region_id",
                 "regionInputId": "#region",
                 "postcodeId": "#zip",
                 "form": "#form-validate",
-                "regionJson": <?php echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
-                "defaultRegion": "<?php echo $block->getFormData()->getRegionId() ?>",
-                "countriesWithOptionalZip": <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>
+                "regionJson": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>,
+                "defaultRegion": "<?php /* @escapeNotVerified */ echo $block->getFormData()->getRegionId() ?>",
+                "countriesWithOptionalZip": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Directory\Helper\Data')->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 432793b05dd6d..fecee7f748b4e 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/resetforgottenpassword.phtml
@@ -8,21 +8,21 @@
 
 /** @var \Magento\Customer\Block\Account\Resetpassword $block */
 ?>
-<form action="<?php echo $block->getUrl('*/*/resetpasswordpost', ['_query' => ['id' => $block->getCustomerId(), 'token' => $block->getResetPasswordLinkToken()]]); ?>"
+<form action="<?php /* @escapeNotVerified */ echo $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 __('* Required Fields'); ?>">
+    <fieldset class="fieldset" data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields'); ?>">
         <div class="field password required">
-            <label class="label" for="password"><span><?php echo __('New Password'); ?></span></label>
+            <label class="label" for="password"><span><?php /* @escapeNotVerified */ echo __('New Password'); ?></span></label>
             <div class="control">
                 <input type="password" class="input-text" name="password" id="password" data-validate="{required:true, 'validate-password':true}">
             </div>
         </div>
         <div class="field confirmation required">
-            <label class="label" for="password-confirmation"><span><?php echo __('Confirm New Password'); ?></span></label>
+            <label class="label" for="password-confirmation"><span><?php /* @escapeNotVerified */ echo __('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'}">
             </div>
@@ -30,7 +30,7 @@
     </fieldset>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action submit primary"><span><?php echo __('Set a New Password'); ?></span></button>
+            <button type="submit" class="action submit primary"><span><?php /* @escapeNotVerified */ echo __('Set a New Password'); ?></span></button>
         </div>
     </div>
 </form>
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 9d6096765518c..60441eb039d72 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
@@ -9,7 +9,7 @@
 ?>
 <script type="text/x-magento-init">
 <?php
-    echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
+    /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->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 da6eb476c3117..f5e513369db68 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
@@ -9,7 +9,7 @@
 ?>
 <script type="text/x-magento-init">
 <?php
-    echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode([
+    /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->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 24335090a2b45..63ecb01128db9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/logout.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
@@ -4,14 +4,14 @@
  * See COPYING.txt for license details.
  */
 ?>
-<p><?php echo __('You have signed out and will go to our homepage in 5 seconds.') ?></p>
+<p><?php /* @escapeNotVerified */ echo __('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->getUrl() ?>", "assign", 5000));
+   	$($.mage.redirect("<?php /* @escapeNotVerified */ echo $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 23167146ba630..d1bfd597ceff8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/newcustomer.phtml
@@ -17,13 +17,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 __('New Customers') ?></strong>
+        <strong id="block-new-customer-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('New Customers') ?></strong>
     </div>
     <div class="block-content" aria-labelledby="block-new-customer-heading">
-        <p><?php echo __('Creating an account has many benefits: check out faster, keep more than one address, track orders and more.') ?></p>
+        <p><?php /* @escapeNotVerified */ echo __('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->getCreateAccountUrl() ?>" class="action create primary"><span><?php echo __('Create an Account') ?></span></a>
+                <a href="<?php /* @escapeNotVerified */ echo $block->getCreateAccountUrl() ?>" class="action create primary"><span><?php /* @escapeNotVerified */ echo __('Create an Account') ?></span></a>
             </div>
         </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 2742051142c3b..2ac1003d7a755 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -35,12 +35,12 @@ NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css
 $fieldCssClass = 'field date field-' . $block->getHtmlId();
 $fieldCssClass .= $block->isRequired() ? ' required' : '';
 ?>
-<div class="<?php echo $fieldCssClass; ?>">
-    <label class="label" for="<?php echo $block->getHtmlId()?>"><span><?php echo $block->getLabel() ?></span></label>
+<div class="<?php /* @escapeNotVerified */ echo $fieldCssClass; ?>">
+    <label class="label" for="<?php echo $block->getHtmlId()?>"><span><?php /* @escapeNotVerified */ echo $block->getLabel() ?></span></label>
     <div class="control customer-dob">
         <?php echo $block->getFieldHtml(); ?>
         <?php if ($_message = $block->getAdditionalDescription()) : ?>
-            <div class="note"><?php echo $_message; ?></div>
+            <div class="note"><?php /* @escapeNotVerified */ echo $_message; ?></div>
         <?php endif; ?>
     </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 1c236c137f25e..4452a8b46fa6a 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/gender.phtml
@@ -8,13 +8,13 @@
 
 ?>
 <div class="field gender<?php if ($block->isRequired()) echo ' required' ?>">
-    <label class="label" for="<?php echo $block->getFieldId('gender')?>"><span><?php echo __('Gender') ?></span></label>
+    <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId('gender')?>"><span><?php /* @escapeNotVerified */ echo __('Gender') ?></span></label>
     <div class="control">
-        <select id="<?php echo $block->getFieldId('gender')?>" name="<?php echo $block->getFieldName('gender')?>" title="<?php echo __('Gender') ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?> <?php echo $block->getFieldParams() ?>>
+        <select id="<?php /* @escapeNotVerified */ echo $block->getFieldId('gender')?>" name="<?php /* @escapeNotVerified */ echo $block->getFieldName('gender')?>" title="<?php /* @escapeNotVerified */ echo __('Gender') ?>"<?php if ($block->isRequired()):?> class="validate-select" data-validate="{required:true}"<?php endif; ?> <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?>>
             <?php $options = $block->getGenderOptions(); ?>
             <?php $value = $block->getGender();?>
             <?php foreach ($options as $option):?>
-                <option value="<?php echo $option->getValue() ?>"<?php if ($option->getValue() == $value) echo ' selected="selected"' ?>><?php echo $option->getLabel() ?></option>
+                <option value="<?php /* @escapeNotVerified */ echo $option->getValue() ?>"<?php if ($option->getValue() == $value) echo ' selected="selected"' ?>><?php /* @escapeNotVerified */ echo $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 4de87e1f2b99f..7dc93732847ff 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/name.phtml
@@ -31,9 +31,9 @@ $suffix = $block->showSuffix();
 ?>
 
 <?php if ($prefix || $middle || $suffix && !$block->getNoWrap()): ?>
-<div class="field required fullname <?php echo $block->getContainerClassName() ?>">
-    <label for="<?php echo $block->getFieldId('firstname') ?>" class="label">
-        <span><?php echo __('Name') ?></span>
+<div class="field required fullname <?php /* @escapeNotVerified */ echo $block->getContainerClassName() ?>">
+    <label for="<?php /* @escapeNotVerified */ echo $block->getFieldId('firstname') ?>" class="label">
+        <span><?php /* @escapeNotVerified */ echo __('Name') ?></span>
     </label>
     <div class="control">
         <fieldset class="fieldset fieldset-fullname">
@@ -42,25 +42,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->getFieldId('prefix') ?>">
-                <span><?php echo $block->getStoreLabel('prefix') ?></span>
+            <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId('prefix') ?>">
+                <span><?php /* @escapeNotVerified */ echo $block->getStoreLabel('prefix') ?></span>
             </label>
 
             <div class="control">
                 <?php if ($block->getPrefixOptions() === false): ?>
-                    <input type="text" id="<?php echo $block->getFieldId('prefix') ?>"
-                           name="<?php echo $block->getFieldName('prefix') ?>"
+                    <input type="text" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('prefix') ?>"
+                           name="<?php /* @escapeNotVerified */ echo $block->getFieldName('prefix') ?>"
                            value="<?php echo $block->escapeHtml($block->getObject()->getPrefix()) ?>"
-                           title="<?php echo $block->getStoreLabel('prefix') ?>"
-                           class="input-text <?php echo $block->getAttributeValidationClass('prefix') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?>>
+                           title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('prefix') ?>"
+                           class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('prefix') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?>>
                 <?php else: ?>
-                    <select id="<?php echo $block->getFieldId('prefix') ?>"
-                            name="<?php echo $block->getFieldName('prefix') ?>"
-                            title="<?php echo $block->getStoreLabel('prefix') ?>"
-                            class="<?php echo $block->getAttributeValidationClass('prefix') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
+                    <select id="<?php /* @escapeNotVerified */ echo $block->getFieldId('prefix') ?>"
+                            name="<?php /* @escapeNotVerified */ echo $block->getFieldName('prefix') ?>"
+                            title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('prefix') ?>"
+                            class="<?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('prefix') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?php if ($block->isPrefixRequired()) echo ' data-validate="{required:true}"' ?> >
                         <?php foreach ($block->getPrefixOptions() as $_option): ?>
-                            <option value="<?php echo $_option ?>"<?php if ($block->getObject()->getPrefix() == $_option): ?> selected="selected"<?php endif; ?>>
-                                <?php echo __($_option) ?>
+                            <option value="<?php /* @escapeNotVerified */ echo $_option ?>"<?php if ($block->getObject()->getPrefix() == $_option): ?> selected="selected"<?php endif; ?>>
+                                <?php /* @escapeNotVerified */ echo __($_option) ?>
                             </option>
                         <?php endforeach; ?>
                     </select>
@@ -69,68 +69,68 @@ $suffix = $block->showSuffix();
         </div>
     <?php endif; ?>
         <div class="field field-name-firstname required">
-            <label class="label" for="<?php echo $block->getFieldId('firstname') ?>">
-                <span><?php echo $block->getStoreLabel('firstname') ?></span>
+            <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId('firstname') ?>">
+                <span><?php /* @escapeNotVerified */ echo $block->getStoreLabel('firstname') ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="<?php echo $block->getFieldId('firstname') ?>"
-                       name="<?php echo $block->getFieldName('firstname') ?>"
+                <input type="text" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('firstname') ?>"
+                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName('firstname') ?>"
                        value="<?php echo $block->escapeHtml($block->getObject()->getFirstname()) ?>"
-                       title="<?php echo $block->getStoreLabel('firstname') ?>"
-                       class="input-text <?php echo $block->getAttributeValidationClass('firstname') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->getAttributeValidationClass('firstname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
+                       title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('firstname') ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('firstname') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?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->getFieldId('middlename') ?>">
-                <span><?php echo $block->getStoreLabel('middlename') ?></span>
+            <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId('middlename') ?>">
+                <span><?php /* @escapeNotVerified */ echo $block->getStoreLabel('middlename') ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="<?php echo $block->getFieldId('middlename') ?>"
-                       name="<?php echo $block->getFieldName('middlename') ?>"
+                <input type="text" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('middlename') ?>"
+                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName('middlename') ?>"
                        value="<?php echo $block->escapeHtml($block->getObject()->getMiddlename()) ?>"
-                       title="<?php echo $block->getStoreLabel('middlename') ?>"
-                       class="input-text <?php echo $block->getAttributeValidationClass('middlename') ?>" <?php echo $block->getFieldParams() ?> <?php echo $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
+                       title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('middlename') ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('middlename') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?php echo $isMiddlenameRequired ? ' data-validate="{required:true}"' : '' ?>>
             </div>
         </div>
     <?php endif; ?>
         <div class="field field-name-lastname required">
-            <label class="label"  for="<?php echo $block->getFieldId('lastname') ?>">
-                <span><?php echo $block->getStoreLabel('lastname') ?></span>
+            <label class="label"  for="<?php /* @escapeNotVerified */ echo $block->getFieldId('lastname') ?>">
+                <span><?php /* @escapeNotVerified */ echo $block->getStoreLabel('lastname') ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="<?php echo $block->getFieldId('lastname') ?>"
-                       name="<?php echo $block->getFieldName('lastname') ?>"
+                <input type="text" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('lastname') ?>"
+                       name="<?php /* @escapeNotVerified */ echo $block->getFieldName('lastname') ?>"
                        value="<?php echo $block->escapeHtml($block->getObject()->getLastname()) ?>"
-                       title="<?php echo $block->getStoreLabel('lastname') ?>"
-                       class="input-text <?php echo $block->getAttributeValidationClass('lastname') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->getAttributeValidationClass('lastname') == 'required-entry') echo ' data-validate="{required:true}"' ?>>
+                       title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('lastname') ?>"
+                       class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('lastname') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?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->getFieldId('suffix') ?>">
-                <span><?php echo $block->getStoreLabel('suffix') ?></span>
+            <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId('suffix') ?>">
+                <span><?php /* @escapeNotVerified */ echo $block->getStoreLabel('suffix') ?></span>
             </label>
 
             <div class="control">
                 <?php if ($block->getSuffixOptions() === false): ?>
-                    <input type="text" id="<?php echo $block->getFieldId('suffix') ?>"
-                           name="<?php echo $block->getFieldName('suffix') ?>"
+                    <input type="text" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('suffix') ?>"
+                           name="<?php /* @escapeNotVerified */ echo $block->getFieldName('suffix') ?>"
                            value="<?php echo $block->escapeHtml($block->getObject()->getSuffix()) ?>"
-                           title="<?php echo $block->getStoreLabel('suffix') ?>"
-                           class="input-text <?php echo $block->getAttributeValidationClass('suffix') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
+                           title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('suffix') ?>"
+                           class="input-text <?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('suffix') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
                 <?php else: ?>
-                    <select id="<?php echo $block->getFieldId('suffix') ?>"
-                            name="<?php echo $block->getFieldName('suffix') ?>"
-                            title="<?php echo $block->getStoreLabel('suffix') ?>"
-                            class="<?php echo $block->getAttributeValidationClass('suffix') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
+                    <select id="<?php /* @escapeNotVerified */ echo $block->getFieldId('suffix') ?>"
+                            name="<?php /* @escapeNotVerified */ echo $block->getFieldName('suffix') ?>"
+                            title="<?php /* @escapeNotVerified */ echo $block->getStoreLabel('suffix') ?>"
+                            class="<?php /* @escapeNotVerified */ echo $block->getAttributeValidationClass('suffix') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?php if ($block->isSuffixRequired()) echo ' data-validate="{required:true}"' ?>>
                         <?php foreach ($block->getSuffixOptions() as $_option): ?>
-                            <option value="<?php echo $_option ?>"<?php if ($block->getObject()->getSuffix() == $_option): ?> selected="selected"<?php endif; ?>>
-                                <?php echo __($_option) ?>
+                            <option value="<?php /* @escapeNotVerified */ echo $_option ?>"<?php if ($block->getObject()->getSuffix() == $_option): ?> selected="selected"<?php endif; ?>>
+                                <?php /* @escapeNotVerified */ echo __($_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 45480e7db0b86..8a41674ebd09b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/taxvat.phtml
@@ -8,8 +8,8 @@
 
 ?>
 <div class="field taxvat<?php if ($block->isRequired()) echo ' required'; ?>">
-    <label class="label" for="<?php echo $block->getFieldId('taxvat')?>"><span><?php echo __('Tax/VAT number') ?></span></label>
+    <label class="label" for="<?php /* @escapeNotVerified */ echo $block->getFieldId('taxvat')?>"><span><?php /* @escapeNotVerified */ echo __('Tax/VAT number') ?></span></label>
     <div class="control">
-        <input type="text" id="<?php echo $block->getFieldId('taxvat')?>" name="<?php echo $block->getFieldName('taxvat')?>" value="<?php echo $block->escapeHtml($block->getTaxvat()) ?>" title="<?php echo __('Tax/VAT number') ?>" class="input-text <?php echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat') ?>" <?php echo $block->getFieldParams() ?> <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
+        <input type="text" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('taxvat')?>" name="<?php /* @escapeNotVerified */ echo $block->getFieldName('taxvat')?>" value="<?php echo $block->escapeHtml($block->getTaxvat()) ?>" title="<?php /* @escapeNotVerified */ echo __('Tax/VAT number') ?>" class="input-text <?php /* @escapeNotVerified */ echo $this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('taxvat') ?>" <?php /* @escapeNotVerified */ echo $block->getFieldParams() ?> <?php if ($block->isRequired()) echo ' data-validate="{required:true}"' ?>>
     </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 b13c71a4e0a42..d7d7a2473188c 100644
--- a/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
+++ b/app/code/Magento/Dhl/view/adminhtml/templates/unitofmeasure.phtml
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -15,15 +17,15 @@ require(['prototype'], function(){
     //<![CDATA[
     function changeDimensions()
     {
-        var dimensionUnit = '(<?php echo $block->getInch(); ?>)';
-        var dhlUnitOfMeasureNote = '<?php echo $block->getDivideOrderWeightNoteLbp(); ?>';
+        var dimensionUnit = '(<?php /* @escapeNotVerified */ echo $block->getInch(); ?>)';
+        var dhlUnitOfMeasureNote = '<?php /* @escapeNotVerified */ echo $block->getDivideOrderWeightNoteLbp(); ?>';
         if ($("carriers_dhl_unit_of_measure").value == "K") {
-            dimensionUnit = '(<?php echo $block->getCm(); ?>)';
-            dhlUnitOfMeasureNote = '<?php echo $block->getDivideOrderWeightNoteKg(); ?>';
+            dimensionUnit = '(<?php /* @escapeNotVerified */ echo $block->getCm(); ?>)';
+            dhlUnitOfMeasureNote = '<?php /* @escapeNotVerified */ echo $block->getDivideOrderWeightNoteKg(); ?>';
         }
-        $$('[for="carriers_dhl_height"]')[0].innerHTML = '<?php echo $block->getHeight(); ?> ' + dimensionUnit;
-        $$('[for="carriers_dhl_depth"]')[0].innerHTML = '<?php echo $block->getDepth(); ?> ' + dimensionUnit;
-        $$('[for="carriers_dhl_width"]')[0].innerHTML = '<?php echo $block->getWidth(); ?> ' + dimensionUnit;
+        $$('[for="carriers_dhl_height"]')[0].innerHTML = '<?php /* @escapeNotVerified */ echo $block->getHeight(); ?> ' + dimensionUnit;
+        $$('[for="carriers_dhl_depth"]')[0].innerHTML = '<?php /* @escapeNotVerified */ echo $block->getDepth(); ?> ' + dimensionUnit;
+        $$('[for="carriers_dhl_width"]')[0].innerHTML = '<?php /* @escapeNotVerified */ echo $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 98d362efb0215..590db65ca480b 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
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 
 <?php
@@ -19,7 +21,7 @@ require([
 ], function(){
 
 //<![CDATA[
-optionalZipCountries = <?php echo $this->helper('Magento\Directory\Helper\Data')->getCountriesWithOptionalZip(true) ?>;
+optionalZipCountries = <?php /* @escapeNotVerified */ echo $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 3301db5f897b6..47512fd571a2b 100644
--- a/app/code/Magento/Directory/view/frontend/templates/currency.phtml
+++ b/app/code/Magento/Directory/view/frontend/templates/currency.phtml
@@ -18,25 +18,25 @@
 <?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 $id?>">
-    <strong class="label switcher-label"><span><?php echo __('Currency') ?></span></strong>
+<div class="switcher currency switcher-currency" id="switcher-currency<?php /* @escapeNotVerified */ echo $id?>">
+    <strong class="label switcher-label"><span><?php /* @escapeNotVerified */ echo __('Currency') ?></span></strong>
     <div class="actions dropdown options switcher-options">
-        <div class="action toggle switcher-trigger" id="switcher-currency-trigger<?php echo $id?>">
+        <div class="action toggle switcher-trigger" id="switcher-currency-trigger<?php /* @escapeNotVerified */ echo $id?>">
             <strong class="language-<?php echo $block->escapeHtml($block->getCurrentCurrencyCode()) ?>">
                 <span><?php echo $block->escapeHtml($currentCurrencyCode) ?> - <?php echo @$block->escapeHtml($currencies[$currentCurrencyCode]) ?></span>
             </strong>
         </div>
         <ul class="dropdown switcher-dropdown" data-mage-init='{"dropdownDialog":{
-            "appendTo":"#switcher-currency<?php echo $id?> > .options",
-            "triggerTarget":"#switcher-currency-trigger<?php echo $id?>",
+            "appendTo":"#switcher-currency<?php /* @escapeNotVerified */ echo $id?> > .options",
+            "triggerTarget":"#switcher-currency-trigger<?php /* @escapeNotVerified */ echo $id?>",
             "closeOnMouseLeave": false,
             "triggerClass":"active",
             "parentClass":"active",
             "buttons":null}}'>
             <?php foreach ($currencies as $_code => $_name): ?>
                 <?php if ($_code != $currentCurrencyCode): ?>
-                    <li class="currency-<?php echo $_code ?> switcher-option">
-                        <a href="#" data-post='<?php echo $block->getSwitchCurrencyPostData($_code); ?>'><?php echo $_code ?> - <?php echo $_name ?></a>
+                    <li class="currency-<?php /* @escapeNotVerified */ echo $_code ?> switcher-option">
+                        <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getSwitchCurrencyPostData($_code); ?>'><?php /* @escapeNotVerified */ echo $_code ?> - <?php /* @escapeNotVerified */ echo $_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 0bb91da9041c8..a9c8bf2b87217 100644
--- a/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
+++ b/app/code/Magento/Directory/view/frontend/templates/currency/switch.phtml
@@ -7,5 +7,5 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<p><?php echo __('Your current currency is: %1.', $currency->getCode()) ?></p>
-<p><a href="<?php echo $block->getBaseUrl(); ?>" class="action continue"><span><?php echo __('Continue') ?></span></a></p>
+<p><?php /* @escapeNotVerified */ echo __('Your current currency is: %1.', $currency->getCode()) ?></p>
+<p><a href="<?php /* @escapeNotVerified */ echo $block->getBaseUrl(); ?>" class="action continue"><span><?php /* @escapeNotVerified */ echo __('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 eb21eecacccf5..106210391441c 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
@@ -14,30 +14,30 @@
 
 <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 echo __('Downloadable Information') ?></span></legend><br />
+    <legend class="legend admin__legend"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getLinksTitle() ?></span></label>
+        <label class="label admin__field-label"><span><?php /* @escapeNotVerified */ echo $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 echo $_link->getId() ?>"
-                           value="<?php echo $_link->getId(); ?>" <?php echo $block->getLinkCheckedValue($_link); ?>
-                           price="<?php echo $block->getCurrencyPrice($_link->getPrice()); ?>"/>
+                           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()); ?>"/>
                     <?php endif; ?>
-                    <label for="links_<?php echo $_link->getId() ?>" class="label">
+                    <label for="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>" class="label">
                         <?php echo $block->escapeHtml($_link->getTitle()) ?>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
-                            &nbsp;(<a href="<?php echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php echo __('sample') ?></a>)
+                            &nbsp;(<a href="<?php /* @escapeNotVerified */ echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow()?'onclick="this.target=\'_blank\'"':''; ?>><?php /* @escapeNotVerified */ echo __('sample') ?></a>)
                         <?php endif; ?>
                         <?php if ($_linksPurchasedSeparately): ?>
-                        <?php echo $block->getFormattedLinkPrice($_link); ?>
+                        <?php /* @escapeNotVerified */ echo $block->getFormattedLinkPrice($_link); ?>
                             <br />
-                            <?php echo $block->getLinkPrice($_link); ?>
+                            <?php /* @escapeNotVerified */ echo $block->getLinkPrice($_link); ?>
                         <?php endif; ?>
                     </label>
                 <?php if ($_isRequired): ?>
@@ -45,8 +45,8 @@
 require(['prototype'], function(){
 
     //<![CDATA[
-    $('links_<?php echo $_link->getId() ?>').advaiceContainer = 'links-advice-container';
-    $('links_<?php echo $_link->getId() ?>').callbackFunction = 'validateDownloadableCallback';
+    $('links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>').advaiceContainer = 'links-advice-container';
+    $('links_<?php /* @escapeNotVerified */ echo $_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 b09be18c66169..6892c319357bd 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
@@ -219,7 +219,7 @@ var uploaderTemplate = '<div class="no-display" id="[[idName]]-template">' +
 <script>
 require(['prototype'], function(){
 
-$(<?= $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');
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 8196069e69201..697c74ccb9d1d 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
@@ -18,22 +18,22 @@
 <fieldset class="admin__fieldset downloadable-form">
 
     <div class="admin__field" <?php echo !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : ''; ?>>
-        <label class="admin__field-label" for="downloadable_links_title"><span><?php echo __('Title')?></span></label>
+        <label class="admin__field-label" for="downloadable_links_title"><span><?php /* @escapeNotVerified */ echo __('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 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="<?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?>" <?php echo($_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 echo __('Use Default Value'); ?></span></label>
+                    <label class="admin__field-label" for="link_title_default"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Links can be purchased separately')?></span></label>
+        <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-control">
-            <?php echo $block->getPurchasedSeparatelySelect()?>
+            <?php /* @escapeNotVerified */ echo $block->getPurchasedSeparatelySelect()?>
         </div>
     </div>
     <div class="admin__field admin__field-wide">
@@ -42,15 +42,15 @@
                 <table class="admin__control-table">
                     <thead>
                         <tr>
-                            <th class="col-title _required"><span><?php echo __('Title') ?></span></th>
+                            <th class="col-title _required"><span><?php /* @escapeNotVerified */ echo __('Title') ?></span></th>
                             <?php if ($block->getCanReadPrice() !== false) : ?>
-                                <th class="col-price"><span><?php echo __('Price') ?></span></th>
+                                <th class="col-price"><span><?php /* @escapeNotVerified */ echo __('Price') ?></span></th>
                             <?php endif; ?>
-                            <th class="col-limit"><span><?php echo __('Max. Downloads') ?></span></th>
-                            <th class="col-option"><span><?php echo __('Shareable') ?></span></th>
-                            <th class="col-sample"><span><?php echo __('Sample') ?></span></th>
-                            <th class="col-file"><span><?php echo __('File') ?></span></th>
-                            <th class="col-sort"><span><?php echo __('Sort Order') ?></span></th>
+                            <th class="col-limit"><span><?php /* @escapeNotVerified */ echo __('Max. Downloads') ?></span></th>
+                            <th class="col-option"><span><?php /* @escapeNotVerified */ echo __('Shareable') ?></span></th>
+                            <th class="col-sample"><span><?php /* @escapeNotVerified */ echo __('Sample') ?></span></th>
+                            <th class="col-file"><span><?php /* @escapeNotVerified */ echo __('File') ?></span></th>
+                            <th class="col-sort"><span><?php /* @escapeNotVerified */ echo __('Sort Order') ?></span></th>
                             <th class="col-actions">&nbsp;</th>
                         </tr>
                     </thead>
@@ -64,7 +64,7 @@
                 </table>
             </div>
             <div class="admin__field-note">
-                <span><?php echo __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')?></span>
             </div>
         </div>
     </div>
@@ -89,7 +89,7 @@ require([
             <?php if ($block->getCanReadPrice() !== false) : ?>
             '<td class="input-price col-price">'+
                 '<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>[<?php echo $block->getBaseCurrencyCode($_product->getStoreId()) ?>]</label>' +
+                '<label>[<?php /* @escapeNotVerified */ echo $block->getBaseCurrencyCode($_product->getStoreId()) ?>]</label>' +
                 <?php if ($_product->getStoreId() && $block->getIsPriceWebsiteScope()) : ?>
                 '<br /><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; ?> /> <label for="downloadable_link_<%- data.id %>_price">Use Default Value</label>' +
                 <?php endif; ?>
@@ -118,10 +118,10 @@ require([
                             '<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"></div>'+
                             '<div class="fileinput-button form-buttons">'+
-                                '<span><?php echo __('Browse Files...') ?></span>' +
-                                '<input id="downloadable_link_<%- data.id %>_sample_file" type="file" name="<?php echo $block->getFileFieldName('link_samples') ?>">' +
+                                '<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') ?>">' +
                                 '<script>' +
-                                    'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?php echo $block->getUploadUrl('link_samples') ?>"); ' +
+                                    'linksUploader("#downloadable_link_<%- data.id %>_sample_file", "<?php /* @escapeNotVerified */ echo $block->getUploadUrl('link_samples') ?>"); ' +
                                 '</scr'+'ipt>'+
                             '</div>'+
                             '<div class="clear"></div>'+
@@ -144,10 +144,10 @@ require([
                             '<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 echo __('Browse Files...') ?></span>' +
-                                '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?php echo $block->getFileFieldName('links') ?>">' +
+                                '<span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>' +
+                                '<input id="downloadable_link_<%- data.id %>_file" type="file" name="<?php /* @escapeNotVerified */ echo $block->getFileFieldName('links') ?>">' +
                                 '<script>' +
-                                    'linksUploader("#downloadable_link_<%- data.id %>_file", "<?php echo $block->getUploadUrl('links') ?>"); ' +
+                                    'linksUploader("#downloadable_link_<%- data.id %>_file", "<?php /* @escapeNotVerified */ echo $block->getUploadUrl('links') ?>"); ' +
                                 '</scr'+'ipt>'+
                             '</div>'+
                             '<div class="clear"></div>'+
@@ -163,7 +163,7 @@ require([
             '</td>'+
             '<td class="col-sort"><input type="text" name="downloadable[link][<%- data.id %>][sort_order]" value="<%- data.sort_order %>" class="input-text admin__control-text sort" /></td>'+
             '<td class="col-action">'+
-                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete"><span><?php echo __('Delete'); ?></span></button>'+
+                '<button id="downloadable_link_<%- data.id %>_delete_button" type="button" class="action-delete"><span><?php /* @escapeNotVerified */ echo __('Delete'); ?></span></button>'+
             '</td>'+
         '</tr>';
 
@@ -180,7 +180,7 @@ require([
                     data.link_id  = 0;
                     data.link_type = 'file';
                     data.sample_type = 'none';
-                    data.number_of_downloads = '<?php echo $block->getConfigMaxDownloads() ?>';
+                    data.number_of_downloads = '<?php /* @escapeNotVerified */ echo $block->getConfigMaxDownloads() ?>';
                 }
 
                 data.id = this.itemCount;
@@ -272,7 +272,7 @@ require([
                     'downloadable[link]['+data.id+'][sample]',
                     data.sample_file_save,
                     'downloadable_link_'+data.id+'_sample_file',
-                    <?php echo $block->getConfigJson('link_samples') ?>
+                    <?php /* @escapeNotVerified */ echo $block->getConfigJson('link_samples') ?>
                 );
                 // link file
                 new Downloadable.FileUploader(
@@ -282,7 +282,7 @@ require([
                     'downloadable[link]['+data.id+']',
                     data.file_save,
                     'downloadable_link_'+data.id+'_file',
-                    <?php echo $block->getConfigJson() ?>
+                    <?php /* @escapeNotVerified */ echo $block->getConfigJson() ?>
                 );
 
                 linkFile = $('downloadable_link_'+data.id+'_file_type');
@@ -413,7 +413,7 @@ require([
         }
 
         <?php foreach ($block->getLinkData() as $item): ?>
-            linkItems.add(<?php echo $item->toJson()?>);
+            linkItems.add(<?php /* @escapeNotVerified */ echo $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 11f7ee94465e6..dc7a5bfebe25b 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
@@ -17,9 +17,9 @@ $block->getConfigJson();
 ?>
 <fieldset class="admin__fieldset downloadable-form">
     <div class="admin__field"<?php echo !$block->isSingleStoreMode() ? ' data-config-scope="' . __('[STORE VIEW]') . '"' : ''; ?>>
-        <label class="admin__field-label" for="downloadable_samples_title"><span><?php echo __('Title')?></span></label>
+        <label class="admin__field-label" for="downloadable_samples_title"><span><?php /* @escapeNotVerified */ echo __('Title')?></span></label>
         <div class="admin__field-control">
-            <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?php echo $block->getSamplesTitle() ?>" <?php echo($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
+            <input type="text" class="admin__control-text" id="downloadable_samples_title" name="product[samples_title]" value="<?php /* @escapeNotVerified */ echo $block->getSamplesTitle() ?>" <?php echo($_product->getStoreId() && $block->getUsedDefault()) ? 'disabled="disabled"' : '' ?>>
             <?php if ($_product->getStoreId()): ?>
                 <div class="admin__field admin__field-option">
                     <input id="sample_title_default" class="admin__control-checkbox" type="checkbox" name="use_default[]" value="samples_title" onclick="toggleValueElements(this, this.parentNode.parentNode)" <?php echo $block->getUsedDefault() ? 'checked="checked"' : '' ?> />
@@ -34,9 +34,9 @@ $block->getConfigJson();
                 <table class="admin__control-table">
                     <thead>
                         <tr>
-                            <th class="_required col-title"><span><?php echo __('Title') ?></span></th>
-                            <th class="col-file"><span><?php echo __('File') ?></span></th>
-                            <th class="col-sort"><span><?php echo __('Sort Order') ?></span></th>
+                            <th class="_required col-title"><span><?php /* @escapeNotVerified */ echo __('Title') ?></span></th>
+                            <th class="col-file"><span><?php /* @escapeNotVerified */ echo __('File') ?></span></th>
+                            <th class="col-sort"><span><?php /* @escapeNotVerified */ echo __('Sort Order') ?></span></th>
                             <th class="col-actions">&nbsp;</th>
                         </tr>
                     </thead>
@@ -50,7 +50,7 @@ $block->getConfigJson();
                 </table>
             </div>
             <div class="admin__field-note">
-                <span><?php echo __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Alphanumeric, dash and underscore characters are recommended for filenames. Improper characters are replaced with \'_\'.')?></span>
             </div>
         </div>
     </div>
@@ -80,8 +80,8 @@ require([
                                             '<div id="downloadable_sample_<%- data.id %>_file-old" class="file-row-info"></div>'+
                                             '<div id="downloadable_sample_<%- data.id %>_file-new" class="file-row-info new-file"></div>'+
                                             '<div class="fileinput-button form-buttons">'+
-                                                '<span><?php echo __('Browse Files...') ?></span>' +
-                                                '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?php echo $block->getConfig()->getFileField() ?>" data-url="<?php echo $block->getConfig()->getUrl() ?>">' +
+                                                '<span><?php /* @escapeNotVerified */ echo __('Browse Files...') ?></span>' +
+                                                '<input id="downloadable_sample_<%- data.id %>_file" type="file" name="<?php /* @escapeNotVerified */ echo $block->getConfig()->getFileField() ?>" data-url="<?php /* @escapeNotVerified */ echo $block->getConfig()->getUrl() ?>">' +
                                                 '<script>' +
                                                 '/*<![CDATA[*/' +
                                                     'sampleUploader("#downloadable_sample_<%- data.id %>_file"); ' +
@@ -162,7 +162,7 @@ require([
                     'downloadable[sample]['+data.id+']',
                     data.file_save,
                     'downloadable_sample_'+data.id+'_file',
-                    <?php echo $block->getConfigJson() ?>
+                    <?php /* @escapeNotVerified */ echo $block->getConfigJson() ?>
                 );
                 sampleUrl.advaiceContainer = 'downloadable_sample_'+data.id+'_container';
                 sampleFile = $('downloadable_sample_'+data.id+'_file_type');
@@ -199,7 +199,7 @@ require([
             (function ($, id) {
                 $(id).fileupload({
                     dataType: 'json',
-                    url: '<?php echo $block->getConfig()->getUrl() ?>',
+                    url: '<?php /* @escapeNotVerified */ echo $block->getConfig()->getUrl() ?>',
                     sequentialUploads: true,
                     maxFileSize: 2000000,
                     add: function (e, data) {
@@ -263,7 +263,7 @@ require([
         }
 
         <?php foreach ($block->getSampleData() as $item): ?>
-            sampleItems.add(<?php echo $item->toJson() ?>);
+            sampleItems.add(<?php /* @escapeNotVerified */ echo $item->toJson() ?>);
         <?php endforeach; ?>
 
     });
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 e87279b78f78e..aaa2d9cfcb67d 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 echo $_item->getName() ?></div>
-    <div><strong><?php echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?></div>
+    <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>
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php echo $_option['label'] ?></dt>
+            <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php echo $_option['value'];?>
+                <?php /* @escapeNotVerified */ echo $_option['value'];?>
             <?php else: ?>
                 <?php echo $block->truncateString($_option['value'], 55, '', $_remainder);?>
                 <?php if ($_remainder):?>
-                    ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                    ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                     <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
@@ -39,7 +39,7 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php echo $block->getLinksTitle(); ?></dt>
+            <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle(); ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
                 <dd><?php echo $block->escapeHtml($_link->getLinkTitle()); ?></dd>
             <?php endforeach; ?>
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 9a2c04fd854f8..712c57a24d842 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 echo $_item->getName() ?></div>
-    <div><strong><?php echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?></div>
+    <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>
     <?php if ($block->getOrderOptions()): ?>
         <dl class="item-options">
         <?php foreach ($block->getOrderOptions() as $_option): ?>
-            <dt><?php echo $_option['label'] ?></dt>
+            <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?></dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php echo $_option['value'];?>
+                <?php /* @escapeNotVerified */ echo $_option['value'];?>
             <?php else: ?>
                 <?php echo $block->truncateString($_option['value'], 55, '', $_remainder);?>
                 <?php if ($_remainder):?>
-                    ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                    ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                     <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
@@ -39,9 +39,9 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php echo $block->getLinksTitle(); ?></dt>
+            <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle(); ?></dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()); ?> (<?php echo $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
+                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()); ?> (<?php /* @escapeNotVerified */ echo $_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('Unlimited') ?>)</dd>
             <?php endforeach; ?>
         </dl>
     <?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 aa6712c6d459d..1e2755db2fd82 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 echo $_item->getName() ?></div>
+    <div class="product-title"><?php /* @escapeNotVerified */ echo $_item->getName() ?></div>
     <div class="product-sku-block">
-        <span><?php echo __('SKU') ?>:</span>
+        <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
         <?php echo 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 echo $_option['label'] ?>:</dt>
+            <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?>:</dt>
             <dd>
             <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                <?php echo $_option['value'];?>
+                <?php /* @escapeNotVerified */ echo $_option['value'];?>
             <?php else: ?>
                 <?php echo $block->truncateString($_option['value'], 55, '', $_remainder);?>
                 <?php if ($_remainder):?>
-                    ... <span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_remainder ?></span>
+                    ... <span id="<?php /* @escapeNotVerified */ echo $_id = 'id' . uniqid()?>"><?php /* @escapeNotVerified */ echo $_remainder ?></span>
                     <script>
 require(['prototype'], function(){
 
-    $('<?php echo $_id ?>').hide();
-    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
+    $('<?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();});
 
 });
 </script>
@@ -42,9 +42,9 @@ require(['prototype'], function(){
     <?php endif; ?>
     <?php if ($block->getLinks()): ?>
         <dl class="item-options">
-            <dt><?php echo $block->getLinksTitle(); ?>:</dt>
+            <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle(); ?>:</dt>
             <?php foreach ($block->getLinks()->getPurchasedItems() as $_link): ?>
-                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()) ?> (<?php echo $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
+                <dd><?php echo $block->escapeHtml($_link->getLinkTitle()) ?> (<?php /* @escapeNotVerified */ echo $_link->getNumberOfDownloadsUsed() . ' / ' . ($_link->getNumberOfDownloadsBought() ? $_link->getNumberOfDownloadsBought() : __('U')) ?>)</dd>
             <?php endforeach; ?>
         </dl>
     <?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 f52a10c9f480c..2d152f2c46687 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 echo $block->getLinksTitle() ?></span></legend><br>
+    <legend class="legend links-title"><span><?php /* @escapeNotVerified */ echo $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 echo $block->getLinksTitle() ?></span></label>
+        <label class="label"><span><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></span></label>
         <div class="control" id="downloadable-links-list"
              data-mage-init='{"downloadable":{
                  "linkElement":"input:checkbox[value]",
                  "allElements":"#links_all",
-                 "config":<?php echo $block->getJsonConfig() ?>}
+                 "config":<?php /* @escapeNotVerified */ echo $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 echo $_link->getId() ?>"
-                               value="<?php echo $_link->getId(); ?>" <?php echo $block->getLinkCheckedValue($_link); ?> />
+                               id="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>"
+                               value="<?php /* @escapeNotVerified */ echo $_link->getId(); ?>" <?php /* @escapeNotVerified */ echo $block->getLinkCheckedValue($_link); ?> />
                     <?php endif; ?>
-                    <label class="label" for="links_<?php echo $_link->getId() ?>">
+                    <label class="label" for="links_<?php /* @escapeNotVerified */ echo $_link->getId() ?>">
                         <span><?php echo $block->escapeHtml($_link->getTitle()); ?></span>
                         <?php if ($_link->getSampleFile() || $_link->getSampleUrl()): ?>
                             <a class="sample link"
-                               href="<?php echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>>
-                                <?php echo __('sample') ?>
+                               href="<?php /* @escapeNotVerified */ echo $block->getLinkSampleUrl($_link) ?>" <?php echo $block->getIsOpenInNewWindow() ? 'target="_blank"' : ''; ?>>
+                                <?php /* @escapeNotVerified */ echo __('sample') ?>
                             </a>
                         <?php endif; ?>
                         <?php if ($_linksPurchasedSeparately): ?>
-                            <?php echo $block->getLinkPrice($_link); ?>
+                            <?php /* @escapeNotVerified */ echo $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 echo __('Select all')?>"
-                           data-checked="<?php echo __('Unselect all')?>"
+                           data-notchecked="<?php /* @escapeNotVerified */ echo __('Select all')?>"
+                           data-checked="<?php /* @escapeNotVerified */ echo __('Unselect all')?>"
                            id="links_all" />
-                    <label class="label" for="links_all"><span><?php echo __('Select all')?></span></label>
+                    <label class="label" for="links_all"><span><?php /* @escapeNotVerified */ echo __('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 92d260dc66f8c..fb449e47568ed 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,11 +15,11 @@
 
 <?php if ($block->hasSamples()): ?>
     <dl class="items samples">
-        <dt class="item-title samples-item-title"><?php echo $block->getSamplesTitle() ?></dt>
+        <dt class="item-title samples-item-title"><?php /* @escapeNotVerified */ echo $block->getSamplesTitle() ?></dt>
         <?php $_samples = $block->getSamples() ?>
         <?php foreach ($_samples as $_sample): ?>
             <dd class="item samples-item">
-                <a href="<?php echo $block->getSampleUrl($_sample) ?>" <?php echo $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : ''; ?>
+                <a href="<?php /* @escapeNotVerified */ echo $block->getSampleUrl($_sample) ?>" <?php echo $block->getIsOpenInNewWindow() ? 'onclick="this.target=\'_blank\'"' : ''; ?>
                    class="item-link samples-item-link">
                     <?php echo $block->escapeHtml($_sample->getTitle()) ?>
                 </a>
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 6d04ee40f0a04..b2cf3ad3d9019 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 echo __('Availability') ?>">
-        <span><?php echo __('In stock') ?></span>
+    <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+        <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
     </div>
 <?php else: ?>
-    <div class="stock unavailable" title="<?php echo __('Availability') ?>">
-        <span><?php echo __('Out of stock') ?></span>
+    <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+        <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
     </div>
 <?php endif; ?>
 <?php echo $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 a67929b82978e..5c539dcbaa0d0 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 echo __('Go to <a href="%1">My Downloadable Products</a>', $block->getDownloadableProductsUrl()) ?>
+    <?php /* @escapeNotVerified */ echo __('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 a467ab5268c6c..9146b0a26a291 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,32 +16,32 @@
 <?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 echo __('Downloadable Products') ?></caption>
+            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Downloadable Products') ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php echo __('Order #') ?></th>
-                    <th scope="col" class="col date"><?php echo __('Date') ?></th>
-                    <th scope="col" class="col title"><?php echo __('Title') ?></th>
-                    <th scope="col" class="col status"><?php echo __('Status') ?></th>
-                    <th scope="col" class="col remaining"><?php echo __('Remaining Downloads') ?></th>
+                    <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>
                 </tr>
             </thead>
             <tbody>
             <?php foreach ($_items as $_item): ?>
                 <tr>
                     <td data-th="<?php echo $block->escapeHtml(__('Order #')) ?>" class="col id">
-                        <a href="<?php echo $block->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>"
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getOrderViewUrl($_item->getPurchased()->getOrderId()) ?>"
                             title="<?php echo $block->escapeHtml(__('View Order')) ?>">
-                            <?php echo $_item->getPurchased()->getOrderIncrementId() ?>
+                            <?php /* @escapeNotVerified */ echo $_item->getPurchased()->getOrderIncrementId() ?>
                         </a>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php echo $block->formatDate($_item->getPurchased()->getCreatedAt()) ?></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>
-                        <a href="<?php 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="<?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>
                     </td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Status')) ?>" class="col status"><?php echo __(ucfirst($_item->getStatus())) ?></td>
-                    <td data-th="<?php echo $block->escapeHtml(__('Remaining Downloads')) ?>" class="col remaining"><?php echo $block->getRemainingDownloads($_item) ?></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>
                 </tr>
             <?php endforeach; ?>
             </tbody>
@@ -53,13 +53,13 @@
         </div>
     <?php endif; ?>
 <?php else: ?>
-    <div class="message info empty"><span><?php echo __('You have not purchased any downloadable products yet.'); ?></span></div>
+    <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Back') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('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 837529e94c5d3..72a13b4a294bc 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,18 +13,18 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= __('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): ?>
-            <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-            <dd><?= $option['value'] ?></dd>
+            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
         <dl>
-            <dt><strong><em><?= $block->getLinksTitle() ?></em></strong></dt>
+            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
             <?php foreach ($links as $link): ?>
                 <dd>
                     <?= $block->escapeHtml($link->getLinkTitle()) ?>
@@ -34,8 +34,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= $block->getItemPrice($_item) ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml
index 4e172c477f11c..815d0820e9339 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,30 +13,30 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= __('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): ?>
-            <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-            <dd><?= $option['value'] ?></dd>
+            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
         <dl>
-            <dt><strong><em><?= $block->getLinksTitle() ?></em></strong></dt>
+            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
             <?php foreach ($links as $link): ?>
                 <dd>
                     <?= $block->escapeHtml($link->getLinkTitle()) ?>&nbsp;
-                    (<a href="<?= $block->getPurchasedLinkUrl($link) ?>"><?= __('download') ?></a>)
+                    (<a href="<?= /* @escapeNotVerified */  $block->getPurchasedLinkUrl($link) ?>"><?= /* @escapeNotVerified */  __('download') ?></a>)
                 </dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= $block->getItemPrice($_item) ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item) ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml
index dae8b75bf316f..d3d4111f058b3 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,22 +13,22 @@
 <tr>
     <td class="item-info has-extra">
         <p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
-        <p class="sku"><?= __('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): ?>
-            <dt><strong><em><?= $option['label'] ?></em></strong></dt>
-            <dd><?= $option['value'] ?></dd>
+            <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
+            <dd><?= /* @escapeNotVerified */  $option['value'] ?></dd>
             <?php endforeach; ?>
         </dl>
         <?php endif; ?>
         <?php if ($links = $block->getLinks()->getPurchasedItems()): ?>
         <dl>
-            <dt><strong><em><?= $block->getLinksTitle() ?></em></strong></dt>
+            <dt><strong><em><?= /* @escapeNotVerified */  $block->getLinksTitle() ?></em></strong></dt>
             <?php foreach ($links as $link): ?>
                 <dd>
                     <?= $block->escapeHtml($link->getLinkTitle()) ?>&nbsp;
-                    (<a href="<?= $block->getPurchasedLinkUrl($link) ?>"><?= __('download') ?></a>)
+                    (<a href="<?= /* @escapeNotVerified */  $block->getPurchasedLinkUrl($link) ?>"><?= /* @escapeNotVerified */  __('download') ?></a>)
                 </dd>
             <?php endforeach; ?>
         </dl>
@@ -38,18 +38,18 @@
             <table class="message-gift">
                 <tr>
                     <td>
-                        <h3><?= __('Gift Message') ?></h3>
-                        <strong><?= __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                        <br /><strong><?= __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                        <br /><strong><?= __('Message:'); ?></strong>
+                        <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>
                         <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                     </td>
                 </tr>
             </table>
         <?php endif; ?>
     </td>
-    <td class="item-qty"><?= $_item->getQtyOrdered() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
     <td class="item-price">
-        <?= $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
     </td>
 </tr>
diff --git a/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml b/app/code/Magento/Downloadable/view/frontend/templates/sales/order/creditmemo/items/renderer/downloadable.phtml
index b66c543051776..3685bce554741 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,7 +10,7 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr class="border" id="order-item-row-<?php echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -20,12 +20,12 @@
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
@@ -39,7 +39,7 @@
         <?php /* downloadable */?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?php echo $block->getLinksTitle() ?></dt>
+                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
@@ -53,15 +53,15 @@
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></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>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>"><?php echo $_item->getQty()*1 ?></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>
-    <td class="col discount" data-th="<?php echo $block->escapeHtml(__('Discount Amount')); ?>"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></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>
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 62cf961259ad5..8c68d7d403a0e 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,7 +10,7 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -20,12 +20,12 @@
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
@@ -39,7 +39,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?php echo $block->getLinksTitle() ?></dt>
+                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
@@ -52,12 +52,12 @@
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></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>
     <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 echo $_item->getQty()*1 ?></span>
+        <span class="qty summary" data-label="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></span>
     </td>
     <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
         <?php echo $block->getItemRowTotalHtml(); ?>
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 d0ae146840bb2..08eab2aef2ebb 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,7 +9,7 @@
 /** @var $block \Magento\Downloadable\Block\Sales\Order\Item\Renderer\Downloadable */
 ?>
 <?php $_item = $block->getItem() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -19,12 +19,12 @@
                     <?php if (!$block->getPrintStatus()): ?>
                         <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                         <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                            <?php echo $_formatedOptionValue['value'] ?>
+                            <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                                     </dl>
                                 </div>
                             <?php endif; ?>
@@ -40,7 +40,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item-options links">
-                <dt><?php echo $block->getLinksTitle() ?></dt>
+                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
@@ -53,7 +53,7 @@
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></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>
@@ -61,26 +61,26 @@
         <ul class="items-qty">
             <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Ordered'); ?></span>
-                    <span class="content"><?php echo $block->getItem()->getQtyOrdered()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Ordered'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyOrdered()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyShipped() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Shipped'); ?></span>
-                    <span class="content"><?php echo $block->getItem()->getQtyShipped() * 1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyShipped() * 1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Canceled'); ?></span>
-                    <span class="content"><?php echo $block->getItem()->getQtyCanceled()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Canceled'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyCanceled()*1 ?></span>
                 </li>
             <?php endif; ?>
             <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
                 <li class="item">
-                    <span class="title"><?php echo __('Refunded'); ?></span>
-                    <span class="content"><?php echo $block->getItem()->getQtyRefunded()*1 ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Refunded'); ?></span>
+                    <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyRefunded()*1 ?></span>
                 </li>
             <?php endif; ?>
         </ul>
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 468b8efbd795f..6ca97943019f9 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/edit.phtml
@@ -11,12 +11,12 @@ use Magento\Framework\App\TemplateTypesInterface;
 /** @var $block \Magento\Email\Block\Adminhtml\Template\Edit */
 ?>
 <?php if (!$block->getEditMode()): ?>
-<form action="<?php echo $block->getLoadUrl() ?>" method="post" id="email_template_load_form">
+<form action="<?php /* @escapeNotVerified */ echo $block->getLoadUrl() ?>" method="post" id="email_template_load_form">
     <?php echo $block->getBlockHtml('formkey')?>
     <fieldset class="fieldset form-inline">
-        <legend class="legend"><span><?php echo __('Load default template') ?></span></legend>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Load default template') ?></span></legend>
         <div class="field">
-            <label class="label" for="template_select"><?php echo __('Template') ?></label>
+            <label class="label" for="template_select"><?php /* @escapeNotVerified */ echo __('Template') ?></label>
             <div class="control">
                 <select id="template_select" name="code" class="select required-entry">
                     <?php foreach ($block->getTemplateOptions() as $group => $options): ?>
@@ -24,7 +24,7 @@ use Magento\Framework\App\TemplateTypesInterface;
                             <optgroup label="<?php echo $block->escapeHtml($group) ?>">
                         <?php endif; ?>
                         <?php foreach ($options as $option): ?>
-                            <option value="<?php echo $block->escapeHtml($option['value']) ?>"<?php echo $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?php echo $block->escapeHtml($option['label']) ?></option>
+                            <option value="<?php echo $block->escapeHtml($option['value']) ?>"<?php /* @escapeNotVerified */ echo $block->getOrigTemplateCode() == $option['value'] ? ' selected="selected"' : '' ?>><?php echo $block->escapeHtml($option['label']) ?></option>
                         <?php endforeach; ?>
                         <?php if ($group): ?>
                             </optgroup>
@@ -41,16 +41,16 @@ use Magento\Framework\App\TemplateTypesInterface;
     </fieldset>
 </form>
 <?php endif ?>
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" id="email_template_edit_form">
+<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="email_template_edit_form">
     <?php echo $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->getOrigTemplateCode() ?>" />
+    <input type="hidden" id="orig_template_code" name="orig_template_code" value="<?php /* @escapeNotVerified */ echo $block->getOrigTemplateCode() ?>" />
     <?php echo $block->getFormHtml() ?>
 </form>
-<form action="<?php echo $block->getPreviewUrl() ?>" method="post" id="email_template_preview_form" target="_blank">
+<form action="<?php /* @escapeNotVerified */ echo $block->getPreviewUrl() ?>" method="post" id="email_template_preview_form" target="_blank">
     <?php echo $block->getBlockHtml('formkey')?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?php echo $block->isTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?php /* @escapeNotVerified */ echo $block->isTextType() ? 1 : 2 ?>" />
         <input type="hidden" id="preview_text" name="text" value="" />
         <input type="hidden" id="preview_styles" name="styles" value="" />
     </div>
@@ -89,7 +89,7 @@ require([
 
             this.bindEvents();
 
-            this.renderPaths(<?php echo $block->getCurrentlyUsedForPaths(); ?>, 'currently_used_for');
+            this.renderPaths(<?php /* @escapeNotVerified */ echo $block->getCurrentlyUsedForPaths(); ?>, 'currently_used_for');
         },
 
         bindEvents: function(){
@@ -111,7 +111,7 @@ require([
         },
 
         stripTags: function () {
-            if(!window.confirm("<?php echo __('Are you sure you want to strip tags?') ?>")) {
+            if(!window.confirm("<?php /* @escapeNotVerified */ echo __('Are you sure you want to strip tags?') ?>")) {
                 return false;
             }
             this.unconvertedText = $('template_text').value;
@@ -142,9 +142,9 @@ require([
         },
         preview: function() {
             if (this.typeChange) {
-                $('preview_type').value = <?php echo TemplateTypesInterface::TYPE_TEXT ?>;
+                $('preview_type').value = <?php /* @escapeNotVerified */ echo TemplateTypesInterface::TYPE_TEXT ?>;
             } else {
-                $('preview_type').value = <?php echo $block->getTemplateType() ?>;
+                $('preview_type').value = <?php /* @escapeNotVerified */ echo $block->getTemplateType() ?>;
             }
             if (typeof tinyMCE == 'undefined' || !tinyMCE.getInstanceById('template_text')) {
                 $('preview_text').value = $('template_text').value;
@@ -162,8 +162,8 @@ require([
         },
 
         deleteTemplate: function() {
-            if(window.confirm("<?php echo __('Are you sure you want to delete this template?') ?>")) {
-                   window.location.href = '<?php echo $block->getDeleteUrl() ?>';
+            if(window.confirm("<?php /* @escapeNotVerified */ echo __('Are you sure you want to delete this template?') ?>")) {
+                   window.location.href = '<?php /* @escapeNotVerified */ echo $block->getDeleteUrl() ?>';
             }
         },
 
@@ -207,7 +207,7 @@ require([
                           }
                        }.bind(this));
                    } else {
-                       alert('<?php echo __('The template did not load. Please review the log for details.') ?>');
+                       alert('<?php /* @escapeNotVerified */ echo __('The template did not load. Please review the log for details.') ?>');
                    }
                }.bind(this)
             });
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 3dce3d91eae79..d54075edcb69b 100644
--- a/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
+++ b/app/code/Magento/Email/view/adminhtml/templates/template/preview.phtml
@@ -8,7 +8,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><?php echo __('Email Preview'); ?></title>
+    <title><?php /* @escapeNotVerified */ echo __('Email Preview'); ?></title>
 </head>
 <body>
     <?php echo $block->getChildHtml('content') ?>
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml b/app/code/Magento/GiftMessage/view/adminhtml/templates/giftoptionsform.phtml
index f2b059b2ba5d6..2f9213441a222 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 echo __('From'); ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_sender"><?php /* @escapeNotVerified */ echo __('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 echo __('To'); ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_recipient"><?php /* @escapeNotVerified */ echo __('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 echo __('Message'); ?></label>
+        <label class="admin__field-label" for="current_item_giftmessage_message"><?php /* @escapeNotVerified */ echo __('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 6aaa0d855962d..50cb2ee556a2c 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml
@@ -15,8 +15,8 @@
             <?php echo $block->getChildHtml();?>
         </div>
         <div class="ui-dialog-buttonset">
-            <button type="button" class="action-close" id="gift_options_cancel_button"><span><?php echo __('Cancel'); ?></span></button>
-            <button type="button" class="action-primary" id="gift_options_ok_button"><span><?php echo __('OK'); ?></span></button>
+            <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>
         </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 b810ccccd95d8..764be364c5196 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 echo $_item->getId() ?>"><?php echo __('Gift Options') ?></a>
+                <a class="action-link" href="#" id="gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><?php /* @escapeNotVerified */ echo __('Gift Options') ?></a>
                 <script>
 require([
     "Magento_Sales/order/giftoptions_tooltip"
 ], function(){
 
-    giftOptionsTooltip.addTargetLink('gift_options_link_<?php echo $_item->getId() ?>', <?php echo $_item->getId() ?>);
+    giftOptionsTooltip.addTargetLink('gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>', <?php /* @escapeNotVerified */ echo $_item->getId() ?>);
 
 });
 </script>
-                <div id="gift_options_data_<?php echo $_item->getId() ?>">
-                    <?php echo $_childHtml ?>
+                <div id="gift_options_data_<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
+                    <?php /* @escapeNotVerified */ echo $_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 412932f41a432..625c7834410d2 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 echo $block->getItem()->getId(); ?>">
+        <div id="gift-message-form-data-<?php /* @escapeNotVerified */ echo $block->getItem()->getId(); ?>">
             <?php echo $block->getFormHtml();?>
         </div>
 
         <?php if ($block->getMessageText()): ?>
         <div class="gift-options-tooltip-content">
-            <div><strong><?php echo __('Gift Message')?></strong>:</div>
-            <div><?php echo $block->getMessageText(); ?></div>
+            <div><strong><?php /* @escapeNotVerified */ echo __('Gift Message')?></strong>:</div>
+            <div><?php /* @escapeNotVerified */ echo $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 ffd0943713799..1a4813a9ab0de 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 echo $_item->getId() ?>"><?php echo __('Gift Options') ?></a>
+        <a class="action-link" href="#" id="gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><?php /* @escapeNotVerified */ echo __('Gift Options') ?></a>
         <script>
 require([
 	"Magento_Sales/order/giftoptions_tooltip"
 ], function(){
 
-	giftOptionsTooltip.addTargetLink('gift_options_link_<?php echo $_item->getId() ?>', <?php echo $_item->getId() ?>);
+	giftOptionsTooltip.addTargetLink('gift_options_link_<?php /* @escapeNotVerified */ echo $_item->getId() ?>', <?php /* @escapeNotVerified */ echo $_item->getId() ?>);
 
 });
 </script>
-        <div id="gift_options_data_<?php echo $_item->getId() ?>">
-            <?php echo $_childHtml ?>
+        <div id="gift_options_data_<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
+            <?php /* @escapeNotVerified */ echo $_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 c791bf53015e2..450413f99b4af 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 echo $block->getItem()->getId(); ?>" class="no-display">
-    <form id="<?php echo $block->getFieldId('form') ?>" action="<?php echo $block->getSaveUrl() ?>">
-        <input type="hidden" id="<?php echo $block->getFieldId('type') ?>" name="<?php echo $block->getFieldName('type') ?>" value="order_item" />
-        <input type="hidden" id="<?php echo $block->getFieldId('sender') ?>" name="<?php echo $block->getFieldName('sender') ?>" value="<?php echo $block->getSender() ?>" />
-        <input type="hidden" id="<?php echo $block->getFieldId('recipient') ?>" name="<?php echo $block->getFieldName('recipient') ?>"  value="<?php echo $block->getRecipient() ?>" />
-        <input type="hidden" id="<?php echo $block->getFieldId('message') ?>" name="<?php echo $block->getFieldName('message') ?>"  value="<?php echo $block->getMessageText() ?>" />
+<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() ?>" />
     </form>
 
     <?php if ($block->getMessageText()): ?>
     <div class="gift-options-tooltip-content">
-        <div><strong><?php echo __('Gift Message')?></strong>: </div>
-        <div><?php echo $block->getMessageText() ?></div>
+        <div><strong><?php /* @escapeNotVerified */ echo __('Gift Message')?></strong>: </div>
+        <div><?php /* @escapeNotVerified */ echo $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 af4d469a652da..73a645e5565b3 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 echo $block->getJsLayout();?>
+                "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
             }
         }
     </script>
     <script>
-        window.giftOptionsConfig = <?php echo $block->getGiftOptionsConfigJson(); ?>;
+        window.giftOptionsConfig = <?php /* @escapeNotVerified */ echo $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 10388eabe3817..c90e7b45f3edc 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 echo $block->getItem()->getId() ?>"
-        data-bind="scope:'giftOptionsCartItem-<?php echo $block->getItem()->getId() ?>'"
+    <div id="gift-options-cart-item-<?php /* @escapeNotVerified */ echo $block->getItem()->getId() ?>"
+        data-bind="scope:'giftOptionsCartItem-<?php /* @escapeNotVerified */ echo $block->getItem()->getId() ?>'"
         class="gift-options-cart-item">
         <!-- ko template: getTemplate() --><!-- /ko -->
         <script type="text/x-magento-init">
             {
-                "#gift-options-cart-item-<?php echo $block->getItem()->getId() ?>": {
-                    "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?>
+                "#gift-options-cart-item-<?php /* @escapeNotVerified */ echo $block->getItem()->getId() ?>": {
+                    "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $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 c647d0ac14a85..62f2e6be7b081 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -11,52 +11,52 @@
 <?php switch ($block->getCheckoutType()): ?>
 <?php case 'onepage_checkout': ?>
     <fieldset class="fieldset gift-message">
-        <legend class="legend"><span><?php echo __('Do you have any gift items in your order?'); ?></span></legend><br>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Do you have any gift items in your order?'); ?></span></legend><br>
 
-        <div class="field choice" id="add-gift-options-<?php echo $block->getEntity()->getId() ?>">
+        <div class="field choice" id="add-gift-options-<?php /* @escapeNotVerified */ echo $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 echo __('Add gift options') ?></span></label>
+            <label for="allow_gift_options" class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getEntity()->getId() ?>" class="order-title">
+            <dt id="add-gift-options-for-order-<?php /* @escapeNotVerified */ echo $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 echo __('Gift Options for the Entire Order'); ?></span></label>
+                    <label for="allow_gift_options_for_order" class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getEntity()->getId() ?>"></div>
-                    <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'><?php echo __('Gift Message') ?></a>
+                <div class="options-order-container" id="options-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></div>
+                    <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'><?php /* @escapeNotVerified */ echo __('Gift Message') ?></a>
                     <div id="allow-gift-messages-for-order-container" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?php echo __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
+                            <p><?php /* @escapeNotVerified */ echo __('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 echo __('From') ?></span></label>
+                                <label for="gift-message-whole-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?php echo $block->getEntity()->getId() ?>][from]" id="gift-message-whole-from" title="<?php echo __('From') ?>"  value="<?php echo $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <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">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-whole-to" class="label"><span><?php echo __('To') ?></span></label>
+                                <label for="gift-message-whole-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote][<?php echo $block->getEntity()->getId() ?>][to]" id="gift-message-whole-to" title="<?php echo __('To') ?>" value="<?php echo $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <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">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-whole-message" class="label"><span><?php echo __('Message') ?></span></label>
+                                <label for="gift-message-whole-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
                                 <div class="control">
-                                    <textarea id="gift-message-whole-message" class="input-text" name="giftmessage[quote][<?php echo $block->getEntity()->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="10"><?php echo $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <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>
                                 </div>
                             </div>
                         </fieldset>
                         <script>
 require(['jquery'], function(jQuery){
 
-    jQuery('#add-gift-options-<?php echo $block->getEntity()->getId() ?>')
-        .add('#add-gift-options-for-order-<?php echo $block->getEntity()->getId() ?>').removeClass('hidden');
+    jQuery('#add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>')
+        .add('#add-gift-options-for-order-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>').removeClass('hidden');
 
 });
 </script>
@@ -64,10 +64,10 @@ require(['jquery'], function(jQuery){
             </dd>
             <?php endif ?>
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?php echo $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?php /* @escapeNotVerified */ echo $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 echo __('Gift Options for Individual Items'); ?></span></label>
+                    <label for="allow_gift_options_for_items" class="label"><span><?php /* @escapeNotVerified */ echo __('Gift Options for Individual Items'); ?></span></label>
                 </div>
             </dt>
 
@@ -78,7 +78,7 @@ require(['jquery'], function(jQuery){
                     <li class="item">
                          <div class="product">
                              <div class="number">
-                                 <?php echo __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?>
+                                 <?php /* @escapeNotVerified */ echo __('<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(); ?>
@@ -86,28 +86,28 @@ require(['jquery'], function(jQuery){
                              <strong class="product name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
                          </div>
                          <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?php echo $block->getEntity()->getId() ?>-<?php echo $_item->getId() ?>"></div>
+                             <div class="options-items-container" id="options-items-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"></div>
                              <?php if ($block->isItemMessagesAvailable($_item)): ?>
-                             <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php echo $_item->getId() ?>"}}'><?php echo __('Gift Message') ?></a>
-                             <div id="gift-messages-for-item-container-<?php echo $_item->getId() ?>" class="block message hidden">
+                             <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"}}'><?php /* @escapeNotVerified */ echo __('Gift Message') ?></a>
+                             <div id="gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="block message hidden">
                                  <fieldset class="fieldset">
-                                     <p><?php echo __('Leave a box blank if you don\'t want to add a gift message for that item.') ?></p>
+                                     <p><?php /* @escapeNotVerified */ echo __('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 echo $_item->getId() ?>-from" class="label"><span><?php echo __('From') ?></span></label>
+                                         <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
                                          <div class="control">
-                                             <input type="text" name="giftmessage[quote_item][<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                             <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">
                                          </div>
                                      </div>
                                      <div class="field to">
-                                        <label for="gift-message-<?php echo $_item->getId() ?>-to" class="label"><span><?php echo __('To') ?></span></label>
+                                        <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
                                         <div class="control">
-                                            <input type="text" name="giftmessage[quote_item][<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                            <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">
                                         </div>
                                      </div>
                                      <div class="field text">
-                                         <label for="gift-message-<?php echo $_item->getId() ?>-message" class="label"><span><?php echo __('Message') ?></span></label>
+                                         <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
                                          <div class="control">
-                                            <textarea id="gift-message-<?php echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_item][<?php echo $_item->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="40"><?php echo $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                            <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>
                                          </div>
                                      </div>
                                 </fieldset>
@@ -121,13 +121,13 @@ require(['jquery'], function(jQuery){
             <script>
 require(['jquery'], function(jQuery){
 
-    jQuery('#add-gift-options-<?php echo $block->getEntity()->getId() ?>')
-        .add('#add-gift-options-for-items-<?php echo $block->getEntity()->getId() ?>').removeClass('hidden');
+    jQuery('#add-gift-options-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>')
+        .add('#add-gift-options-for-items-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>').removeClass('hidden');
 
 });
 </script>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?php echo $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></dt>
         </dl>
     </fieldset>
 <script type="text/x-magento-init">
@@ -140,46 +140,46 @@ require(['jquery'], function(jQuery){
 <?php break; ?>
 
 <?php case 'multishipping_address': ?>
-    <fieldset id="add-gift-options-<?php echo $block->getEntity()->getId() ?>" class="fieldset gift-message">
-        <legend class="legend"><span><?php echo __('Do you have any gift items in your order?'); ?></span></legend><br>
+    <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>
 
-        <div class="field choice" id="add-gift-options-<?php echo $block->getEntity()->getId() ?>">
-            <input type="checkbox" name="allow_gift_options_<?php echo $block->getEntity()->getId() ?>" id="allow_gift_options_<?php echo $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-container-<?php echo $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages() || $block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-            <label for="allow_gift_options_<?php echo $block->getEntity()->getId() ?>" class="label"><span><?php echo __('Add gift options') ?></span></label>
+        <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>
 
-        <dl class="options-items" id="allow-gift-options-container-<?php echo $block->getEntity()->getId() ?>">
-            <dt id="add-gift-options-for-order-<?php echo $block->getEntity()->getId() ?>" class="order-title">
+        <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">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_order_<?php echo $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?php echo $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?php echo $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_order_<?php echo $block->getEntity()->getId() ?>" class="label"><span><?php echo __('Add Gift Options for the Entire Order') ?></span></label>
+                    <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>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-order-container-<?php echo $block->getEntity()->getId() ?>" class="order-options">
-                <div class="options-order-container" id="options-order-container-<?php echo $block->getEntity()->getId() ?>"></div>
+            <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>
                 <?php if ($block->isMessagesAvailable()): ?>
                     <?php $_giftMessage = true; ?>
-                    <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?php echo $block->getEntity()->getId() ?>"}}'><?php echo __('Gift Message') ?></a>
-                    <div id="gift-messages-for-order-container-<?php echo $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
+                    <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"}}'><?php /* @escapeNotVerified */ echo __('Gift Message') ?></a>
+                    <div id="gift-messages-for-order-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="gift-messages-order hidden">
                         <fieldset class="fieldset">
-                            <p><?php echo __('You can leave this box blank if you don\'t want to add a gift message for this address.') ?></p>
+                            <p><?php /* @escapeNotVerified */ echo __('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 echo $block->getEntity()->getId() ?>-from" class="label"><span><?php echo __('From') ?></span></label>
+                                <label for="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?php echo $block->getEntity()->getId() ?>][from]" id="gift-message-<?php echo $block->getEntity()->getId() ?>-from" title="<?php echo __('From') ?>" value="<?php echo $block->getEscaped($block->getMessage()->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                    <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">
                                 </div>
                             </div>
                             <div class="field to">
-                                <label for="gift-message-<?php echo $block->getEntity()->getId() ?>-to" class="label"><span><?php echo __('To') ?></span></label>
+                                <label for="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
                                 <div class="control">
-                                    <input type="text" name="giftmessage[quote_address][<?php echo $block->getEntity()->getId() ?>][to]" id="gift-message-<?php echo $block->getEntity()->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $block->getEscaped($block->getMessage()->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                    <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">
                                 </div>
                             </div>
                             <div class="field text">
-                                <label for="gift-message-<?php echo $block->getEntity()->getId() ?>-message" class="label"><span><?php echo __('Message') ?></span></label>
+                                <label for="gift-message-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
                                 <div class="control">
-                                    <textarea id="gift-message-<?php echo $block->getEntity()->getId() ?>-message" class="input-text" name="giftmessage[quote_address][<?php echo $block->getEntity()->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="40"><?php echo $block->getEscaped($block->getMessage()->getMessage()) ?></textarea>
+                                    <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>
                                 </div>
                             </div>
                         </fieldset>
@@ -188,52 +188,52 @@ require(['jquery'], function(jQuery){
             </dd>
 
             <?php if ($block->isItemsAvailable()): ?>
-            <dt id="add-gift-options-for-items-<?php echo $block->getEntity()->getId() ?>" class="order-title individual">
+            <dt id="add-gift-options-for-items-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
-                    <input type="checkbox" name="allow_gift_options_for_items_<?php echo $block->getEntity()->getId() ?>" id="allow_gift_options_for_items_<?php echo $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-items-container-<?php echo $block->getEntity()->getId() ?>"}'<?php if ($block->getItemsHasMesssages()): ?> checked="checked"<?php endif; ?> class="checkbox" />
-                    <label for="allow_gift_options_for_items_<?php echo $block->getEntity()->getId() ?>" class="label"><span><?php echo __('Add gift options for Individual Items') ?></span></label>
+                    <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>
                 </div>
             </dt>
 
-            <dd id="allow-gift-options-for-items-container-<?php echo $block->getEntity()->getId() ?>" class="order-options individual">
+            <dd id="allow-gift-options-for-items-container-<?php /* @escapeNotVerified */ echo $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 echo __('<span>Item %1</span> of %2', $_index+1, $block->countItems()) ?></div>
+                             <div class="number"><?php /* @escapeNotVerified */ echo __('<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(); ?>
                              </div>
                              <strong class="product-name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
                          </div>
                          <div class="options">
-                             <div class="options-items-container" id="options-items-container-<?php echo $block->getEntity()->getId() ?>-<?php echo $_item->getId() ?>"></div>
-                             <input type="hidden" name="giftoptions[quote_address_item][<?php echo $_item->getId() ?>][address]" value="<?php echo $block->getEntity()->getId()?>" />
+                             <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()?>" />
 
                              <?php if ($block->isItemMessagesAvailable($_item)): ?>
                              <?php $_giftMessage = true; ?>
-                                 <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php echo $_item->getId() ?>"}}'><?php echo __('Gift Message') ?></a>
-                                 <div id="gift-messages-for-item-container-<?php echo $_item->getId() ?>" class="block message hidden">
+                                 <a href="#" class="action activate message" data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"}}'><?php /* @escapeNotVerified */ echo __('Gift Message') ?></a>
+                                 <div id="gift-messages-for-item-container-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" class="block message hidden">
                                      <fieldset class="fieldset">
-                                        <p><?php 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 echo $_item->getId() ?>][address]" value="<?php echo $block->getEntity()->getId()?>" />
+                                        <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()?>" />
                                          <div class="field from">
-                                             <label for="gift-message-<?php echo $_item->getId() ?>-from" class="label"><span><?php echo __('From') ?></span></label>
+                                             <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-from" class="label"><span><?php /* @escapeNotVerified */ echo __('From') ?></span></label>
                                              <div class="control">
-                                                 <input type="text" name="giftmessage[quote_address_item][<?php echo $_item->getId() ?>][from]" id="gift-message-<?php echo $_item->getId() ?>-from" title="<?php echo __('From') ?>"  value="<?php echo $block->getEscaped($block->getMessage($_item)->getSender(), $block->getDefaultFrom()) ?>" class="input-text">
+                                                 <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">
                                              </div>
                                          </div>
                                          <div class="field to">
-                                            <label for="gift-message-<?php echo $_item->getId() ?>-to" class="label"><span><?php echo __('To') ?></span></label>
+                                            <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-to" class="label"><span><?php /* @escapeNotVerified */ echo __('To') ?></span></label>
                                             <div class="control">
-                                                <input type="text" name="giftmessage[quote_address_item][<?php echo $_item->getId() ?>][to]" id="gift-message-<?php echo $_item->getId() ?>-to" title="<?php echo __('To') ?>" value="<?php echo $block->getEscaped($block->getMessage($_item)->getRecipient(), $block->getDefaultTo()) ?>" class="input-text">
+                                                <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">
                                             </div>
                                         </div>
                                          <div class="field text">
-                                             <label for="gift-message-<?php echo $_item->getId() ?>-message" class="label"><span><?php echo __('Message') ?></span></label>
+                                             <label for="gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-message" class="label"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
                                              <div class="control">
-                                                <textarea id="gift-message-<?php echo $_item->getId() ?>-message" class="input-text giftmessage-area" name="giftmessage[quote_address_item][<?php echo $_item->getId() ?>][message]" title="<?php echo __('Message') ?>" rows="5" cols="10"><?php echo $block->getEscaped($block->getMessage($_item)->getMessage()) ?></textarea>
+                                                <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>
                                              </div>
                                          </div>
                                      </fieldset>
@@ -245,12 +245,12 @@ require(['jquery'], function(jQuery){
                  </ol>
             </dd>
             <?php endif; ?>
-            <dt class="extra-options-container" id="extra-options-container-<?php echo $block->getEntity()->getId() ?>"></dt>
+            <dt class="extra-options-container" id="extra-options-container-<?php /* @escapeNotVerified */ echo $block->getEntity()->getId() ?>"></dt>
         </dl>
     </fieldset>
 <script type="text/x-magento-init">
     {
-        "#allow_gift_options_<?php echo $block->getEntity()->getId() ?>, #allow_gift_options_for_order_<?php echo $block->getEntity()->getId() ?>, #allow_gift_options_for_items_<?php echo $block->getEntity()->getId() ?>": {
+        "#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() ?>": {
             "giftOptions": {}
         }
     }
diff --git a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
index 0dad83405489d..dfcdf9bdf70f3 100644
--- a/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
+++ b/app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /** @var $block \Magento\GoogleAdwords\Block\Code */
@@ -10,19 +12,19 @@
 <!-- Google Code for Sale Conversion Page -->
 <script>
     /* <![CDATA[ */
-    var google_conversion_id = <?php echo $block->getHelper()->getConversionId() ?>;
-    var google_conversion_language = "<?php echo $block->getHelper()->getConversionLanguage() ?>";
-    var google_conversion_format = "<?php echo $block->getHelper()->getConversionFormat() ?>";
-    var google_conversion_color = "<?php echo $block->getHelper()->getConversionColor() ?>";
-    var google_conversion_label = "<?php echo $block->getHelper()->getConversionLabel() ?>";
-    var google_conversion_value = <?php echo $block->getHelper()->getConversionValue() ?>;
+    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() ?>;
     /* ]]> */
 </script>
-<script src="<?php echo $block->getHelper()->getConversionJsSrc()?>"></script>
+<script src="<?php /* @escapeNotVerified */ echo $block->getHelper()->getConversionJsSrc()?>"></script>
 <noscript>
     <div style="display:inline;">
         <img height="1" width="1" style="border-style:none;" alt=""
-             src="<?php echo $block->getHelper()->getConversionImgSrc() ?>"/>
+             src="<?php /* @escapeNotVerified */ echo $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 2c70e062992d2..75771803f77b0 100644
--- a/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
+++ b/app/code/Magento/GoogleAnalytics/view/frontend/templates/ga.phtml
@@ -18,8 +18,8 @@
     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    <?php echo $block->getPageTrackingCode($accountId) ?>
-    <?php echo $block->getOrdersTrackingCode() ?>
+    <?php /* @escapeNotVerified */ echo $block->getPageTrackingCode($accountId) ?>
+    <?php /* @escapeNotVerified */ echo $block->getOrdersTrackingCode() ?>
 
 //]]>
 </script>
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 08f14bf4c0755..31581b3d5684f 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
@@ -11,26 +11,26 @@
 <?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 echo __('Associated Products') ?></h4>
+    <h4><?php /* @escapeNotVerified */ echo __('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 echo __('Availability:') ?> <span><?php echo __('Out of stock') ?></span></p>
+            <p class="availability out-of-stock"><?php /* @escapeNotVerified */ echo __('Availability:') ?> <span><?php /* @escapeNotVerified */ echo __('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 echo __('ID') ?></th>
-                    <th class="col-sku"><?php echo __('SKU') ?></th>
-                    <th class="col-name"><?php echo __('Product Name') ?></th>
+                    <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>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
-                    <th class="col-price"><?php echo __('Price') ?></th>
+                    <th class="col-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
                     <?php endif; ?>
                     <?php if ($_product->isSaleable() || $_skipSaleableCheck): ?>
-                    <th class="col-qty"><?php echo __('Qty') ?></th>
+                    <th class="col-qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
                     <?php endif; ?>
                 </tr>
             </thead>
@@ -38,14 +38,14 @@
             <?php if ($_hasAssociatedProducts): ?>
                 <?php $i = 0 ?>
             <?php foreach ($_associatedProducts as $_item): ?>
-                <tr class="<?php echo(++$i % 2) ? 'even' : 'odd' ?>">
-                    <td class="col-id"><?php echo $_item->getId() ?></td>
+                <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>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
                     <td class="col-price">
                         <?php if ($block->getCanShowProductPrice($_item)): ?>
-                        <?php echo $block->getProductPrice($_item) ?>
+                        <?php /* @escapeNotVerified */ echo $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 echo $_item->getId() ?>]"
-                               id="super_group[<?php echo $_item->getId() ?>]"
+                               name="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
+                               id="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
                                maxlength="12"
-                               value="<?php echo $_item->getQty()*1 ?>"
-                               title="<?php echo __('Qty') ?>"
+                               value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"
+                               title="<?php /* @escapeNotVerified */ echo __('Qty') ?>"
                                class="input-text admin__control-text qty" />
-                        <input type="hidden" value="1" price="<?php echo $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php echo $_item->getId() ?>]" />
+                        <input type="hidden" value="1" price="<?php /* @escapeNotVerified */ echo $block->getCurrencyPrice($_item->getPrice()) ?>" qtyId="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]" />
                     <?php else: ?>
-                        <p class="availability out-of-stock"><span><?php echo __('Out of stock') ?></span></p>
+                        <p class="availability out-of-stock"><span><?php /* @escapeNotVerified */ echo __('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 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; ?>"><?php /* @escapeNotVerified */ echo __('No options of this product are available.') ?></td>
                </tr>
             <?php endif; ?>
             </tbody>
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml
index 06ada7b210415..9bd1f8212c1f3 100644
--- a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml
+++ b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/container.phtml
@@ -3,20 +3,22 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
  ?>
 
 <?php /* @var $block \Magento\GroupedProduct\Block\Product\Grouped\AssociatedProducts  */ ?>
-<div class="entry-edit" id="<?php echo $block->getId() ?>">
-    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php echo $block->getId() ?>-wrapper">
+<div class="entry-edit" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
+    <div class="fieldset-wrapper admin__collapsible-block-wrapper" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>-wrapper">
         <div class="fieldset-wrapper-title">
             <strong
                 class="admin__collapsible-title"
                 data-toggle="collapse"
-                data-target="#<?php echo $block->getId() ?>-content">
-                <span><?php echo $block->getTabLabel() ?></span>
+                data-target="#<?php /* @escapeNotVerified */ echo $block->getId() ?>-content">
+                <span><?php /* @escapeNotVerified */ echo $block->getTabLabel() ?></span>
             </strong>
         </div>
-        <div class="fieldset-wrapper-content in collapse" id="<?php echo $block->getId() ?>-content">
+        <div class="fieldset-wrapper-content in collapse" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>-content">
             <fieldset class="fieldset">
                 <?php echo $block->getChildHtml()?>
             </fieldset>
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 79826d65ce7fa..6b995678f80dc 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,9 +12,9 @@
 $_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 echo $_gridPopupBlock->getId() ?>]"}}'>
+<div id="grouped-product-container" data-mage-init='{"groupedProduct":{"gridPopup":"[data-grid-id=<?php /* @escapeNotVerified */ echo $_gridPopupBlock->getId() ?>]"}}'>
     <div class="no-products-message">
-        <?php echo __('There are no grouped products.')?>
+        <?php /* @escapeNotVerified */ echo __('There are no grouped products.')?>
     </div>
     <?php echo $block->getChildHtml('list'); ?>
     <div data-role="add-product-dialog" class="no-display">
diff --git a/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml b/app/code/Magento/GroupedProduct/view/adminhtml/templates/product/grouped/list.phtml
index 091b9941e00ad..09d875a15c4a9 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
@@ -55,16 +55,16 @@
                     <span></span>
                 </th>
                 <th data-column="name" class="no-link col-name">
-                    <span><?php echo __('Name') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Name') ?></span>
                 </th>
                 <th data-column="sku" class="no-link col-sku">
-                    <span><?php echo __('SKU') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('SKU') ?></span>
                 </th>
                 <th data-column="price" class="no-link col-price">
-                    <span><?php echo __('Price') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Price') ?></span>
                     </th>
                 <th data-column="qty" class="no-link col-qty">
-                    <span><?php echo __('Default Qty') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('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 18eb3cc9eb264..7a41d603e4b58 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 echo __('Starting at')?></span><?php echo $amountRender->toHtml();?>
+        <span class="price-label"><?php /* @escapeNotVerified */ echo __('Starting at')?></span><?php echo $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 8f57f0ba2e676..5433b4d270bb5 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 echo __('Availability') ?>">
-            <span><?php echo __('In stock') ?></span>
+        <div class="stock available" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+            <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
         </div>
     <?php else: ?>
-        <div class="stock unavailable" title="<?php echo __('Availability') ?>">
-            <span><?php echo __('Out of stock') ?></span>
+        <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+            <span><?php /* @escapeNotVerified */ echo __('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 8824109a28edd..015c5ee0e2fe2 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 echo __('Grouped product items') ?></caption>
+        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Grouped product items') ?></caption>
         <thead>
         <tr>
-            <th class="col item" scope="col"><?php echo __('Product Name') ?></th>
+            <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
             <?php if ($_product->isSaleable()): ?>
-                <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
+                <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
             <?php endif; ?>
         </tr>
         </thead>
@@ -38,7 +38,7 @@
                     <strong class="product-item-name"><?php echo $block->escapeHtml($_item->getName()) ?></strong>
                     <?php if ($block->getCanShowProductPrice($_product)): ?>
                         <?php if ($block->getCanShowProductPrice($_item)): ?>
-                            <?php echo $block->getProductPrice($_item) ?>
+                            <?php /* @escapeNotVerified */ echo $block->getProductPrice($_item) ?>
                         <?php endif; ?>
                      <?php endif; ?>
                 </td>
@@ -46,17 +46,17 @@
                 <td data-th="<?php echo $block->escapeHtml(__('Qty')); ?>" class="col qty">
                 <?php if ($_item->isSaleable()) : ?>
                     <div class="control qty">
-                        <input type="number" name="super_group[<?php echo $_item->getId() ?>]"
+                        <input type="number" name="super_group[<?php /* @escapeNotVerified */ echo $_item->getId() ?>]"
                                maxlength="12"
-                               value="<?php echo $_item->getQty() * 1 ?>"
-                               title="<?php echo __('Qty') ?>"
+                               value="<?php /* @escapeNotVerified */ echo $_item->getQty() * 1 ?>"
+                               title="<?php /* @escapeNotVerified */ echo __('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 echo __('Availability') ?>">
-                        <span><?php echo __('Out of stock') ?></span>
+                    <div class="stock unavailable" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span>
                     </div>
                 <?php endif; ?>
                 </td>
@@ -84,7 +84,7 @@
             <tr>
                 <td class="unavailable"
                     colspan="<?php if ($_product->isSaleable()): ?>4<?php else : ?>3<?php endif; ?>">
-                    <?php echo __('No options of this product are available.') ?>
+                    <?php /* @escapeNotVerified */ echo __('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 db1ffd3e47096..6ee9d36e4685f 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 echo __('Status'); ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Status'); ?></span>
     </div><br>
     <div class="messages">
         <div class="message message-success success">
-            <div><?php echo $block->getStatusMessage(); ?>hh</div>
+            <div><?php /* @escapeNotVerified */ echo $block->getStatusMessage(); ?>hh</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 b97b4f37746bb..ace41a768af02 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
@@ -3,18 +3,20 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <fieldset class="fieldset" id="export_filter_container" style="display:none;">
     <legend class="legend">
-        <span><?php echo __('Entity Attributes'); ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Entity Attributes'); ?></span>
     </legend>
     <br />
-    <form id="export_filter_form" action="<?php echo $block->getUrl('*/*/export') ?>" method="post">
-        <input name="form_key" type="hidden" value="<?php echo $block->getFormKey() ?>" />
+    <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() ?>" />
         <div id="export_filter_grid_container"><!-- --></div>
     </form>
     <button class="action- scalable" type="button" onclick="getFile();"><span><?php
-        echo __('Continue')
+        /* @escapeNotVerified */ echo __('Continue')
     ?></span></button>
 </fieldset>
 <script>
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 f8a13664b2cbd..c9084964d9ffb 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
@@ -41,7 +41,7 @@ require(['prototype'], function(){
          */
         getFilter: function() {
             if ($('entity') && $F('entity')) {
-                var url    = "<?php echo $block->getUrl('*/*/getFilter') ?>";
+                var url    = "<?php /* @escapeNotVerified */ echo $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 26275ec71c97b..73eacb73e7869 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
@@ -3,11 +3,13 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <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 echo __('Validation Results'); ?></span>
+            id="import_validation_container_header"><?php /* @escapeNotVerified */ echo __('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 ec4d7ec59ed64..78b5a7139d7bb 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
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /** @var $block \Magento\ImportExport\Block\Adminhtml\Import\Edit\Before */
@@ -23,25 +25,25 @@ require(['jquery', 'prototype'], function(jQuery){
          * List of existing behavior sets
          * @type {Array}
          */
-        uniqueBehaviors: <?php echo $block->getUniqueBehaviors() ?>,
+        uniqueBehaviors: <?php /* @escapeNotVerified */ echo $block->getUniqueBehaviors() ?>,
 
         /**
          * Behaviour codes for import entities
          * @type {Array}
          */
-        entityBehaviors: <?php echo $block->getEntityBehaviors() ?>,
+        entityBehaviors: <?php /* @escapeNotVerified */ echo $block->getEntityBehaviors() ?>,
 
         /**
          * Behaviour notes for import entities
          * @type {Array}
          */
-        entityBehaviorsNotes: <?php echo $block->getEntityBehaviorsNotes() ?>,
+        entityBehaviorsNotes: <?php /* @escapeNotVerified */ echo $block->getEntityBehaviorsNotes() ?>,
 
         /**
          * Base url
          * @type {string}
          */
-        sampleFilesBaseUrl: '<?php echo $block->getUrl('*/*/download/', ['filename' => 'entity-name']) ?>',
+        sampleFilesBaseUrl: '<?php /* @escapeNotVerified */ echo $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 3adc2a0f8e818..2ea8edb0d0cac 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 echo $block->getResponseJson() ?>);
+    top.varienImport.postToFrameComplete(<?php /* @escapeNotVerified */ echo $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 1efdefbb0206e..a58fb3f2a6ac8 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
@@ -7,8 +7,10 @@
  *
  * @var \Magento\Backend\Block\Widget\Form\Container $block
  */
+
+// @codingStandardsIgnoreFile
 ?>
-<div><p><?php echo __('The integration you selected asks you to approve access to the following:'); ?></p></div>
+<div><p><?php /* @escapeNotVerified */ echo __('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'); ?>
 </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 a0012289d9da3..52539a96e184a 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="fieldset form-inline entry-edit">
     <?php if ($block->isTreeEmpty()): ?>
-        <p class="empty"><?php echo __('No permissions requested'); ?></p>
+        <p class="empty"><?php /* @escapeNotVerified */ echo __('No permissions requested'); ?></p>
     <?php else: ?>
         <div class="field" data-role="tree-resources-container">
             <div class="control">
@@ -36,8 +36,8 @@ require(["jquery", "Magento_User/js/roles-tree"], function($){
     });
 
     $('[data-role="resource-tree"]').rolesTree({
-        'treeInitData': <?php echo $block->getResourcesTreeJson() ?>,
-        'treeInitSelectedData': <?php echo $block->getSelectedResourcesJson() ?>
+        'treeInitData': <?php /* @escapeNotVerified */ echo $block->getResourcesTreeJson() ?>,
+        'treeInitSelectedData': <?php /* @escapeNotVerified */ echo $block->getSelectedResourcesJson() ?>
     });
 
 });
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 8e9d1d18451e6..43e7996f6c192 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
@@ -7,6 +7,8 @@
  *
  * @var \Magento\Backend\Block\Template $block
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <script>
 require([
@@ -16,11 +18,11 @@ require([
 ], function($){
 
     window.integration = new Integration(
-        '<?php echo $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize']); ?>',
-        '<?php echo $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize']); ?>',
-        '<?php echo $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize']); ?>',
-        '<?php echo $block->getUrl('*/*'); ?>',
-        '<?php echo $block->getUrl('*/*/loginSuccessCallback'); ?>'
+        '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/permissionsDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize']); ?>',
+        '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/tokensDialog', ['id' => ':id', 'reauthorize' => ':isReauthorize']); ?>',
+        '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/tokensExchange', ['id' => ':id', 'reauthorize' => ':isReauthorize']); ?>',
+        '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*'); ?>',
+        '<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/loginSuccessCallback'); ?>'
     );
 
     /**
@@ -75,10 +77,10 @@ require([
 <div id="integration-delete-container"
      class="messages"
      style="display: none;"
-     title="<?php echo __('Are you sure ?'); ?>">
+     title="<?php /* @escapeNotVerified */ echo __('Are you sure ?'); ?>">
     <div class="message message-notice notice">
         <div>
-            <?php echo __("Are you sure you want to delete this integration? You can't undo this action."); ?>
+            <?php /* @escapeNotVerified */ echo __("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 c8a63fecc7d1c..be4eec5a84adf 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 echo __("Please setup or sign in into your 3rd party account to complete setup of this integration."); ?></p></div>
+<div><p><?php /* @escapeNotVerified */ echo __("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 aadf565448620..fb2e437c8aeec 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/resourcetree.phtml
@@ -16,22 +16,22 @@
 
 <fieldset class="fieldset form-inline entry-edit">
     <legend class="legend">
-        <span><?php echo __('Available APIs') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Available APIs') ?></span>
     </legend><br />
 
     <div class="field">
-        <label class="label" for="all_resources"><span><?php echo __('Resource Access') ?></span></label>
+        <label class="label" for="all_resources"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Custom') ?></option>
-                <option value="1" <?php echo($block->isEverythingAllowed() ? 'selected="selected"' : ''); ?>><?php echo __('All') ?></option>
+                <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>
             </select>
         </div>
     </div>
 
     <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
-        <label class="label"><span><?php echo __('Resources') ?></span></label>
+        <label class="label"><span><?php /* @escapeNotVerified */ echo __('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 b0fd958bae1d7..7f53406a8e05a 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
@@ -20,17 +20,17 @@
         <li class="item">
             <?php if ($filterItem->getCount() > 0): ?>
                 <a href="<?php echo $block->escapeUrl($filterItem->getUrl()) ?>">
-                    <?php echo $filterItem->getLabel() ?>
+                    <?php /* @escapeNotVerified */ echo $filterItem->getLabel() ?>
                     <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
-                        <span class="count"><?php echo $filterItem->getCount()?><span class="filter-count-label">
-                            <?php if ($filterItem->getCount() == 1):?> <?php echo __('item')?><?php else:?> <?php echo __('items') ?><?php endif;?></span></span>
+                        <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>
                     <?php endif; ?>
                 </a>
             <?php else:?>
-                <?php echo $filterItem->getLabel() ?>
+                <?php /* @escapeNotVerified */ echo $filterItem->getLabel() ?>
                 <?php if ($this->helper('\Magento\Catalog\Helper\Data')->shouldDisplayProductCountOnLayer()): ?>
-                    <span class="count"><?php echo $filterItem->getCount()?><span class="filter-count-label">
-                        <?php if ($filterItem->getCount() == 1):?><?php echo __('item')?><?php else:?><?php echo __('items') ?><?php endif;?></span></span>
+                    <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>
                 <?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 57633279a47fc..1bf3e75c0dc07 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 echo __('Now Shopping by') ?></strong>
+            data-count="<?php echo count($_filters); ?>"><?php /* @escapeNotVerified */ echo __('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 echo $block->stripTags($_filter->getLabel()) ?></span>
+                <span class="filter-value"><?php /* @escapeNotVerified */ echo $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 echo $_filter->getRemoveUrl() ?>"
-                       title="<?php echo __('Previous') ?>">
-                        <span><?php echo __('Previous') ?></span>
+                    <a class="action previous" href="<?php /* @escapeNotVerified */ echo $_filter->getRemoveUrl() ?>"
+                       title="<?php /* @escapeNotVerified */ echo __('Previous') ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('Previous') ?></span>
                     </a>
                     <a class="action remove"
                        title="<?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
-                       href="<?php echo $clearLinkUrl ?>">
+                       href="<?php /* @escapeNotVerified */ echo $clearLinkUrl ?>">
                         <span><?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
                     </a>
                 <?php else: ?>
-                    <a class="action remove" href="<?php echo $_filter->getRemoveUrl() ?>"
-                       title="<?php echo $block->escapeHtml(__('Remove')) . " " . $currentFilterName;?>">
-                        <span><?php echo __('Remove This Item') ?></span>
+                    <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>
                 <?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 798ec57534966..c0738fe43aab6 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/view.phtml
@@ -18,7 +18,7 @@
 <?php if ($block->canShowBlock()): ?>
     <div class="block filter">
         <div class="block-title filter-title">
-            <strong><?php echo __('Shop By') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('Shop By') ?></strong>
         </div>
 
         <div class="block-content filter-content">
@@ -26,18 +26,18 @@
 
             <?php if ($block->getLayer()->getState()->getFilters()): ?>
                 <div class="block-actions filter-actions">
-                    <a href="<?php echo $block->getClearUrl() ?>" class="action clear filter-clear"><span><?php echo __('Clear All') ?></span></a>
+                    <a href="<?php /* @escapeNotVerified */ echo $block->getClearUrl() ?>" class="action clear filter-clear"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Shopping Options') ?></strong>
+                    <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?php /* @escapeNotVerified */ echo __('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 echo $block->getChildBlock('renderer')->render($filter); ?></dd>
+                        <dd class="filter-options-content"><?php /* @escapeNotVerified */ echo $block->getChildBlock('renderer')->render($filter); ?></dd>
                     <?php endif; ?>
             <?php endforeach; ?>
             <?php if ($wrapOptions): ?>
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 8beaa5d360fb8..0c9080bc8db1b 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 echo $syncStorageParams['storage_type'] ?>, '<?php echo $syncStorageParams['connection_name'] ?>');
+    addAllowedStorage(<?php /* @escapeNotVerified */ echo $syncStorageParams['storage_type'] ?>, '<?php /* @escapeNotVerified */ echo $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 echo $block->getAjaxStatusUpdateUrl() ?>', {
+        u = new Ajax.PeriodicalUpdater('', '<?php /* @escapeNotVerified */ echo $block->getAjaxStatusUpdateUrl() ?>', {
             method:     'get',
             frequency:  5,
             loaderArea: false,
@@ -103,7 +103,7 @@ require([
 
                 try {
                     response = eval('(' + transport.responseText + ')');
-                    if (response.state == '<?php echo \Magento\MediaStorage\Model\File\Storage\Flag::STATE_RUNNING ?>'
+                    if (response.state == '<?php /* @escapeNotVerified */ echo \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 echo \Magento\MediaStorage\Model\File\Storage\Flag::STATE_FINISHED ?>') {
+                        if (response.state == '<?php /* @escapeNotVerified */ echo \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 echo \Magento\MediaStorage\Model\File\Storage\Flag::STATE_NOTIFIED ?>') {
+                        } else if (response.state == '<?php /* @escapeNotVerified */ echo \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 echo $block->getAjaxSyncUrl() ?>', {
+        new Ajax.Request('<?php /* @escapeNotVerified */ echo $block->getAjaxSyncUrl() ?>', {
             parameters:     params,
             loaderArea:     false,
             asynchronous:   true
@@ -179,7 +179,7 @@ require([
 
 <?php echo $block->getButtonHtml() ?>
 <span class="sync-indicator no-display" id="sync_span">
-    <img alt="Synchronize" style="margin:0 5px" src="<?php echo $block->getViewFileUrl('images/process_spinner.gif') ?>"/>
+    <img alt="Synchronize" style="margin:0 5px" src="<?php /* @escapeNotVerified */ echo $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 dec37ad6d2e77..5817486d5c420 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 echo $msrpPrice ?></span>
+    <span class="old-price map-old-price"><?php /* @escapeNotVerified */ echo $msrpPrice ?></span>
 <?php endif; ?>
 
 <?php if ($priceType->isShowPriceOnGesture()): ?>
@@ -69,25 +69,25 @@ if ($product->isSaleable()) {
             $data['addToCart']['cartForm'] = '#product_addtocart_form_from_popup';
         }
     ?>
-    <span id="<?php echo $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
+    <span id="<?php /* @escapeNotVerified */ echo $block->getPriceId() ? $block->getPriceId() : $priceElementId ?>" style="display:none"></span>
     <a href="#"
-       id="<?php echo($popupId);?>"
+       id="<?php /* @escapeNotVerified */ echo($popupId);?>"
        class="action map-show-info"
-       data-mage-init="<?=$block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data))?>"><?php echo __('Click for price'); ?>
+       data-mage-init="<?=$block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($data))?>"><?php /* @escapeNotVerified */ echo __('Click for price'); ?>
     </a>
 <?php else: ?>
     <span class="msrp-message">
-     <?php echo $priceType->getMsrpPriceMessage() ?>
+     <?php /* @escapeNotVerified */ echo $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="#"
-       id="<?php echo $helpLinkId;?>"
+       id="<?php /* @escapeNotVerified */ echo $helpLinkId;?>"
        class="action map-show-info"
-       data-mage-init='{"addToCart":{"helpLinkId": "#<?php echo $helpLinkId;?>",
-                                     "productName": "<?php echo $product->getName() ?>",
-                                     "closeButtonId": "#map-popup-close"}}'><span><?php echo __("What's this?"); ?></span>
+       data-mage-init='{"addToCart":{"helpLinkId": "#<?php /* @escapeNotVerified */ echo $helpLinkId;?>",
+                                     "productName": "<?php /* @escapeNotVerified */ echo $product->getName() ?>",
+                                     "closeButtonId": "#map-popup-close"}}'><span><?php /* @escapeNotVerified */ echo __("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 b3b50d0ee85bb..1db06c310f5fc 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 echo __('Order total will be displayed before you submit the order'); ?>
+        <?php /* @escapeNotVerified */ echo __('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 b3720b0cffd7d..917879188b4c7 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/cart/totals.phtml
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <div class="cart-totals">
-    <div class="msrp totals"><?php echo __('You will see the order total before you submit the order.'); ?></div>
+    <div class="msrp totals"><?php /* @escapeNotVerified */ echo __('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 ff65afb1f2281..252299b7fee70 100644
--- a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
+++ b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -19,13 +19,13 @@
             <div class="map-info-price" id="map-popup-content">
                 <div class="price-box">
                     <div class="map-msrp" id="map-popup-msrp-box">
-                        <span class="label"><?php echo __('Price'); ?></span>
+                        <span class="label"><?php /* @escapeNotVerified */ echo __('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 echo __('Actual Price'); ?></span>
+                        <span class="label"><?php /* @escapeNotVerified */ echo __('Actual Price'); ?></span>
                         <span id="map-popup-price" class="actual-price"></span>
                     </div>
                 </div>
@@ -39,12 +39,12 @@
                             title="<?php echo $block->escapeHtml(__('Add to Cart')); ?>"
                             class="action tocart primary"
                             id="map-popup-button">
-                        <span><?php echo __('Add to Cart'); ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart'); ?></span>
                     </button>
                 </form>
             </div>
             <div class="map-text" id="map-popup-text">
-                <?php echo $block->getExplanationMessage(); ?>
+                <?php /* @escapeNotVerified */ echo $block->getExplanationMessage(); ?>
             </div>
         </div>
     </div>
@@ -55,7 +55,7 @@
         </div>
         <div class="popup-content">
             <div class="map-help-text" id="map-popup-text-what-this">
-                <?php echo $block->getExplanationMessageWhatsThis(); ?>
+                <?php /* @escapeNotVerified */ echo $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 f21cbe891bbd3..5cd648fde6b0b 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 echo $_msrpPrice ?></span>
+        <span class="old-price"><?php /* @escapeNotVerified */ echo $_msrpPrice ?></span>
     <?php endif; ?>
     <?php if ($_catalogHelper->isShowPriceOnGesture($_product)): ?>
         <?php $priceElementId = 'product-price-' . $_id . $block->getIdSuffix(); ?>
-        <span id="<?php echo $priceElementId ?>" style="display: none"></span>
+        <span id="<?php /* @escapeNotVerified */ echo $priceElementId ?>" style="display: none"></span>
         <?php $popupId = 'msrp-popup-' . $_id . $block->getRandomString(20); ?>
         <a href="#"
-           id="<?php echo($popupId);?>"
-           data-mage-init='{"addToCart":{"popupId": "#<?php echo($popupId);?>",
-                                         "productName": "<?php echo $_product->getName() ?>",
-                                         "realPrice": <?php echo $block->getRealPriceJs($_product) ?>,
-                                         "msrpPrice": "<?php echo $_msrpPrice ?>",
-                                         "priceElementId":"<?php echo $priceElementId ?>",
+           id="<?php /* @escapeNotVerified */ echo($popupId);?>"
+           data-mage-init='{"addToCart":{"popupId": "#<?php /* @escapeNotVerified */ echo($popupId);?>",
+                                         "productName": "<?php /* @escapeNotVerified */ echo $_product->getName() ?>",
+                                         "realPrice": <?php /* @escapeNotVerified */ echo $block->getRealPriceJs($_product) ?>,
+                                         "msrpPrice": "<?php /* @escapeNotVerified */ echo $_msrpPrice ?>",
+                                         "priceElementId":"<?php /* @escapeNotVerified */ echo $priceElementId ?>",
                                          "popupCartButtonId": "#map-popup-button",
-                                         "cartForm": "#wishlist-view-form"}}'><?php echo __('Click for price') ?>
+                                         "cartForm": "#wishlist-view-form"}}'><?php /* @escapeNotVerified */ echo __('Click for price') ?>
         </a>
     <?php else: ?>
         <span class="msrp-message">
-            <?php echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
+            <?php /* @escapeNotVerified */ echo $_catalogHelper->getMsrpPriceMessage($_product) ?>
         </span>
     <?php endif; ?>
     <?php $helpLinkId = 'msrp-help-' . $_id . $block->getRandomString(20); ?>
-    <a href="#" id="<?php echo($helpLinkId);?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php echo($helpLinkId);?>", "productName": "<?php echo $_product->getName() ?>"}}' class="link tip"><?php echo __("What's this?"); ?></a>
+    <a href="#" id="<?php /* @escapeNotVerified */ echo($helpLinkId);?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php /* @escapeNotVerified */ echo($helpLinkId);?>", "productName": "<?php /* @escapeNotVerified */ echo $_product->getName() ?>"}}' class="link tip"><?php /* @escapeNotVerified */ echo __("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 c5700d3144717..77a862a4c07e1 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 echo $block->getProduct()->getProductUrl() ?>"><?php echo __('Click for price'); ?></a>
+        <a href="<?php /* @escapeNotVerified */ echo $block->getProduct()->getProductUrl() ?>"><?php /* @escapeNotVerified */ echo __('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 8d711654da66d..411f3908b6567 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
@@ -16,26 +16,26 @@
                 <address>
                     <?php echo $block->getAddressAsHtml($_address) ?>
                     <?php if ($block->isAddressDefaultBilling($_address)): ?>
-                        <br /><strong><?php echo __('Default Billing') ?></strong>
+                        <br /><strong><?php /* @escapeNotVerified */ echo __('Default Billing') ?></strong>
                     <?php endif; ?>
                     <?php if ($block->isAddressDefaultShipping($_address)): ?>
-                        <br /><strong><?php echo __('Default Shipping') ?></strong>
+                        <br /><strong><?php /* @escapeNotVerified */ echo __('Default Shipping') ?></strong>
                     <?php endif; ?>
                 </address>
             </div>
             <div class="box-actions">
-                <a href="<?php echo $block->getEditAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Edit Address') ?></span></a>
-                <a href="<?php echo $block->getSetAddressUrl($_address) ?>" class="action select"><span><?php echo __('Select Address') ?></span></a>
+                <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>
             </div>
         </div>
     <?php endforeach; ?>
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="button" class="action add primary" role="add-address" title="<?php echo __('Add New Address') ?>"><span><?php echo __('Add New Address') ?></span></button>
+            <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>
         </div>
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Billing Information') ?></span></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Billing Information') ?></span></a>
         </div>
     </div>
 </div>
@@ -44,7 +44,7 @@
         ".actions": {
             "address": {
                 "addAddress": "button[role='add-address']",
-                "addAddressLocation": "<?php echo $block->getAddNewUrl() ?>"
+                "addAddressLocation": "<?php /* @escapeNotVerified */ echo $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 f30e53359d635..1fb17a0d72d01 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 echo $block->getPostActionUrl() ?>" method="post" class="multicheckout address form">
+<form id="checkout_multishipping_form" data-mage-init='{"multiShipping":{}, "validation":{}}' action="<?php /* @escapeNotVerified */ echo $block->getPostActionUrl() ?>" method="post" class="multicheckout address form">
     <div class="title">
-        <strong><?php echo __('Please select a shipping address for applicable items.') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('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 echo __('Please select a shipping address for applicable items.') ?></caption>
+            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Please select a shipping address for applicable items.') ?></caption>
             <thead>
             <tr>
-                <th class="col product" scope="col"><?php echo __('Product') ?></th>
-                <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
-                <th class="col address" scope="col"><?php echo __('Send To') ?></th>
+                <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 actions" scope="col">&nbsp;</th>
             </tr>
             </thead>
@@ -38,21 +38,21 @@
                         <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'));?>">
                             <div class="field qty">
-                                <label for="ship-<?php echo $_index ?>-<?php echo $_item->getQuoteItemId() ?>-qty" class="label">
-                                    <span><?php echo __('Qty') ?></span>
+                                <label for="ship-<?php /* @escapeNotVerified */ echo $_index ?>-<?php /* @escapeNotVerified */ echo $_item->getQuoteItemId() ?>-qty" class="label">
+                                    <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
                                 </label>
                                 <div class="control">
-                                    <input type="number" data-multiship-item-id="<?php echo $_item->getSku() ?>" id="ship-<?php echo $_index ?>-<?php echo $_item->getQuoteItemId() ?>-qty" name="ship[<?php echo $_index ?>][<?php 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="<?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}"/>
                                 </div>
                             </div>
                         </td>
                         <td class="col address" data-th="<?php echo $block->escapeHtml(__('Send To'));?>">
                             <?php if ($_item->getProduct()->getIsVirtual()): ?>
-                                <div class="applicable"><?php echo __('A shipping selection is not applicable.'); ?></div>
+                                <div class="applicable"><?php /* @escapeNotVerified */ echo __('A shipping selection is not applicable.'); ?></div>
                             <?php else: ?>
                                 <div class="field address">
-                                    <label for="ship_<?php echo $_index ?>_<?php echo $_item->getQuoteItemId() ?>_address" class="label">
-                                        <span><?php echo __('Send To') ?></span>
+                                    <label for="ship_<?php /* @escapeNotVerified */ echo $_index ?>_<?php /* @escapeNotVerified */ echo $_item->getQuoteItemId() ?>_address" class="label">
+                                        <span><?php /* @escapeNotVerified */ echo __('Send To') ?></span>
                                     </label>
                                     <div class="control">
                                         <?php echo $block->getAddressesHtmlSelect($_item, $_index); ?>
@@ -61,8 +61,8 @@
                             <?php endif; ?>
                         </td>
                         <td class="col actions" data-th="<?php echo $block->escapeHtml(__('Actions'));?>">
-                            <a href="<?php echo $block->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="action delete" data-multiship-item-update="">
-                                <span><?php echo __('Remove item') ?></span>
+                            <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>
                             </a>
                         </td>
                     </tr>
@@ -73,12 +73,12 @@
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" title="<?php 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 echo __('Go to Shipping Information') ?></span></button>
+            <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>
         </div>
         <div class="secondary">
-            <button type="submit" data-multiship-item-update="" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty &amp; Addresses') ?></span></button>
-            <button type="button" title="<?php echo __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?php echo __('Enter a New Address') ?></span></button>
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php 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><?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>
         </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 434502fba3a78..f8ccb0b9456dc 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/billing.phtml
@@ -14,22 +14,22 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Billing
  */
 ?>
-<form action="<?php echo $block->getPostActionUrl() ?>" method="post" id="multishipping-billing-form" class="form multicheckout billing">
+<form action="<?php /* @escapeNotVerified */ echo $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 echo __('Billing Address') ?></span>
-                    <a href="<?php echo $block->getSelectAddressUrl() ?>" class="action"><span><?php echo __('Change') ?></span></a>
+                    <span><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
+                    <a href="<?php /* @escapeNotVerified */ echo $block->getSelectAddressUrl() ?>" class="action"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
                 </strong>
                 <div class="box-content">
                     <?php $_address = $block->getAddress() ?>
-                    <address><?php echo $_address->format('html') ?></address>
+                    <address><?php /* @escapeNotVerified */ echo $_address->format('html') ?></address>
                 </div>
             </div>
             <div class="box box-billing-method">
                 <fieldset class="fieldset">
-                    <legend class="legend box-title"><span><?php echo __('Payment Method') ?></span></legend><br>
+                    <legend class="legend box-title"><span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span></legend><br>
                     <div class="box-content">
                         <?php echo $block->getChildHtml('payment_methods_before') ?>
                         <?php /* Payment methods forms list */ ?>
@@ -41,15 +41,15 @@
                             <?php foreach ($_methods as $_method): $_code = $_method->getCode() ?>
                                 <dt class="item-title">
                                     <?php if ($_methodsCount > 1): ?>
-                                        <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php 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_<?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"/>
                                     <?php else : ?>
-                                        <input type="radio" id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/>
+                                        <input type="radio" id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" name="payment[method]" checked="checked" class="radio solo method"/>
                                     <?php endif; ?>
-                                    <label for="p_method_<?php echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
+                                    <label for="p_method_<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
                                 </dt>
                                 <?php if ($html = $block->getChildHtml('payment.method.' . $_code)) : ?>
                                     <dd class="item-content">
-                                        <?php echo $html; ?>
+                                        <?php /* @escapeNotVerified */ echo $html; ?>
                                     </dd>
                                 <?php endif; ?>
                             <?php endforeach; ?>
@@ -63,10 +63,10 @@
     </div>
     <div class="actions-toolbar">
         <div class="primary">
-            <button id="payment-continue" type="submit" class="action primary continue"><span><?php echo __('Go to Review Your Order') ?></span></button>
+            <button id="payment-continue" type="submit" class="action primary continue"><span><?php /* @escapeNotVerified */ echo __('Go to Review Your Order') ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Shipping Information') ?></span></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Shipping Information') ?></span></a>
         </div>
     </div>
 </form>
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 c3b4b0337ba8e..2c5f1ebc39b70 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 echo __('Other items in your order') ?></strong>
-        <a href="<?php echo $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a>
+        <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>
     </div>
     <div class="block-content">
-        <p><?php echo __('Shipping is not applicable.') ?></p>
+        <p><?php /* @escapeNotVerified */ echo __('Shipping is not applicable.') ?></p>
         <div class="table-wrapper">
             <table class="items data table" id="unavailable-shipping-table">
-                <caption class="table-caption"><?php echo __('Other items in your order') ?></caption>
+                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Other items in your order') ?></caption>
                 <thead>
                     <tr>
-                        <th class="col item" scope="col"><?php echo __('Product Name') ?></th>
-                        <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
+                        <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+                        <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('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 echo $_item->getQty() ?></td>
+                        <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><?php /* @escapeNotVerified */ echo $_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 779eaa8abc056..f4bccab5f40c0 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 echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a></strong>
+<strong class="product name product-item-name"><a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $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>
             <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                <?php echo $_formatedOptionValue['value'] ?>
+                <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
                     <dl class="item options tooltip content">
                         <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                        <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                        <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                     </dl>
                 <?php endif; ?>
             </dd>
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 7af7299bc13a1..3bcab679b7109 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 echo $block->getCheckoutUrl()?>" title="<?php echo __('Check Out with Multiple Addresses');?>"><span><?php echo __('Check Out with Multiple Addresses');?></span></a>
+<a class="action multicheckout" href="<?php /* @escapeNotVerified */ echo $block->getCheckoutUrl()?>" title="<?php /* @escapeNotVerified */ echo __('Check Out with Multiple Addresses');?>"><span><?php /* @escapeNotVerified */ echo __('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 e9b779560d777..a56a4b5b7f636 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -7,27 +7,27 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form action="<?php echo $block->getPostActionUrl() ?>" method="post" id="review-order-form" data-mage-init='{"orderOverview": {}, "validation":{}}' class="form multicheckout order-review">
+<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'); ?>
     <div class="block block-billing">
-        <div class="block-title"><strong><?php echo __('Billing Information') ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Billing Information') ?></strong></div>
         <div class="block-content">
             <div class="box box-billing-address">
                 <?php $_address = $block->getBillingAddress() ?>
                 <strong class="box-title">
-                    <span><?php echo __('Billing Address') ?></span>
-                    <a href="<?php echo $block->getEditBillingAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a>
+                    <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>
                 </strong>
                 <div class="box-content">
                     <address>
-                        <?php echo $_address->format('html') ?>
+                        <?php /* @escapeNotVerified */ echo $_address->format('html') ?>
                     </address>
                 </div>
             </div>
             <div class="box box-billing-method">
                 <strong class="box-title">
-                    <span><?php echo __('Payment Method') ?></span>
-                    <a href="<?php echo $block->getEditBillingUrl() ?>" class="action edit"><span><?php echo __('Change') ?></span></a>
+                    <span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span>
+                    <a href="<?php /* @escapeNotVerified */ echo $block->getEditBillingUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
                 </strong>
                 <div class="box-content">
                     <input type="hidden" name="payment[cc_number]" value="<?php echo $block->escapeHtml($block->getPayment()->getCcNumber())?>" />
@@ -38,28 +38,28 @@
         </div>
     </div>
     <div class="block block-shipping">
-        <div class="block-title"><strong><?php echo __('Shipping Information') ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('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 echo __('Address %1 <span>of %2</span>', ($_index+1), $block->getShippingAddressCount()) ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Address %1 <span>of %2</span>', ($_index+1), $block->getShippingAddressCount()) ?></strong>
                 </div>
                 <div class="box box-shipping-address">
                     <strong class="box-title">
-                        <span><?php echo __('Shipping To') ?></span>
-                        <a href="<?php echo $block->getEditShippingAddressUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a>
+                        <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>
                     </strong>
                     <div class="box-content">
                         <address>
-                            <?php echo $_address->format('html') ?>
+                            <?php /* @escapeNotVerified */ echo $_address->format('html') ?>
                         </address>
                     </div>
                 </div>
                 <div class="box box-shipping-method">
                     <strong class="box-title">
-                        <span><?php echo __('Shipping Method') ?></span>
-                        <a href="<?php echo $block->getEditShippingUrl() ?>" class="action edit"><span><?php echo __('Change') ?></span></a>
+                        <span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getEditShippingUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('Change') ?></span></a>
                     </strong>
                     <?php if ($_rate = $block->getShippingAddressRate($_address)): ?>
                         <div class="box-content">
@@ -68,14 +68,14 @@
                             <?php $_incl = $block->getShippingPriceInclTax($_address); ?>
 
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            <span class="price-including-tax" data-label="<?php echo __('Incl. Tax'); ?>">
+                            <span class="price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>">
                             <?php endif; ?>
-                                <?php echo $_incl; ?>
+                                <?php /* @escapeNotVerified */ echo $_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 echo __('Excl. Tax'); ?>"><?php echo $_excl; ?></span>
+                                <span class="price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>"><?php /* @escapeNotVerified */ echo $_excl; ?></span>
                             <?php endif; ?>
                         </div>
                     <?php endif; ?>
@@ -83,16 +83,16 @@
                 <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 echo $_address->getId() ?>">
-                                <caption class="table-caption"><?php echo __('Order Review') ?></caption>
+                            <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>
                                 <thead>
                                 <tr>
-                                    <th class="col item" scope="col"><?php echo __('Item') ?>
-                                        <a href="<?php echo $block->getAddressesEditUrl() ?>" class="action edit"><span><?php echo __('Edit') ?></span></a>
+                                    <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>
-                                    <th class="col price" scope="col"><?php echo __('Price') ?></th>
-                                    <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
-                                    <th class="col subtotal" scope="col"><?php echo __('Subtotal') ?></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>
                                 </tr>
                                 </thead>
                                 <tbody>
@@ -101,7 +101,7 @@
                                 <?php endforeach; ?>
                                 </tbody>
                                 <tfoot>
-                                    <?php echo $block->renderTotals($block->getShippingAddressTotals($_address)); ?>
+                                    <?php /* @escapeNotVerified */ echo $block->renderTotals($block->getShippingAddressTotals($_address)); ?>
                                 </tfoot>
                             </table>
                         </div>
@@ -113,22 +113,22 @@
 
     <?php if ($block->getQuote()->hasVirtualItems()): ?>
     <div class="block block-other">
-        <div class="block-title"><strong><?php echo __('Other items in your order') ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Other items in your order') ?></strong></div>
         <div class="block-content">
             <strong class="subtitle">
-                <span><?php echo __('Items') ?></span>
-                <a href="<?php echo $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a>
+                <span><?php /* @escapeNotVerified */ echo __('Items') ?></span>
+                <a href="<?php /* @escapeNotVerified */ echo $block->getVirtualProductEditUrl() ?>" class="action edit"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Items') ?></caption>
+                    <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items') ?></caption>
                     <thead>
                         <tr>
-                            <th class="col item" scope="col"><?php echo __('Product Name') ?></th>
-                            <th class="col price" scope="col"><?php echo __('Price') ?></th>
-                            <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
-                            <th class="col subtotal" scope="col"><?php echo __('Subtotal') ?></th>
+                            <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>
                         </tr>
                     </thead>
                     <tbody>
@@ -137,7 +137,7 @@
                         <?php endforeach; ?>
                     </tbody>
                     <tfoot>
-                    <?php echo $block->renderTotals($block->getBillinAddressTotals()); ?>
+                    <?php /* @escapeNotVerified */ echo $block->renderTotals($block->getBillinAddressTotals()); ?>
                     </tfoot>
                 </table>
             </div>
@@ -150,18 +150,18 @@
     <div id="checkout-review-submit" class="checkout-review">
         <?php echo $block->getChildHtml('agreements') ?>
         <div class="grand totals">
-            <strong class="mark"><?php echo __('Grand Total:') ?></strong>
-            <strong class="amount"><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()) ?></strong>
+            <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>
         </div>
         <div class="actions-toolbar" id="review-buttons-container">
             <div class="primary">
-                <button type="submit" class="action primary submit" id="review-button"><span><?php echo __('Place Order') ?></span></button>
+                <button type="submit" class="action primary submit" id="review-button"><span><?php /* @escapeNotVerified */ echo __('Place Order') ?></span></button>
             </div>
             <div class="secondary">
-                <a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Billing Information') ?></span></a>
+                <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('Back to Billing Information') ?></span></a>
             </div>
-            <span id="review-please-wait" class="please-wait load indicator" style="display: none;" data-text="<?php echo __('Submitting order information...') ?>">
-                <span><?php echo __('Submitting order information...') ?></span>
+            <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>
         </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 ef6730abfb142..f72e0a6ded8df 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
@@ -37,7 +37,7 @@
         <?php /* end Excluding Tax */ ?>
     </td>
 
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><?php echo $_item->getQty()*1 ?></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 /* Including Tax Subtotal */ ?>
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayCartPriceInclTax() || $this->helper('Magento\Tax\Helper\Data')->displayCartBothPrices()): ?>
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 95f29ab40105d..b1bb87ae79d4e 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/shipping.phtml
@@ -14,27 +14,27 @@
  * @var $block \Magento\Multishipping\Block\Checkout\Shipping
  */
 ?>
-<form action="<?php echo $block->getPostActionUrl() ?>" method="post" id="shipping_method_form" class="form multicheckout shipping">
+<form action="<?php /* @escapeNotVerified */ echo $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 echo __('Address %1 <span>of %2</span>', ($_index+1), $block->getAddressCount()) ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('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 echo __('Shipping To') ?></span>
-                    <a href="<?php echo $block->getAddressEditUrl($_address) ?>" class="action edit"><span><?php echo __('Change') ?></span></a>
+                    <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>
                 </strong>
                 <div class="box-content">
-                    <address><?php echo $_address->format('html') ?></address>
+                    <address><?php /* @escapeNotVerified */ echo $_address->format('html') ?></address>
                 </div>
             </div>
             <div class="box box-shipping-method">
                 <strong class="box-title">
-                    <span><?php echo __('Shipping Method') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span>
                 </strong>
                 <div class="box-content">
                     <?php if (!($_shippingRateGroups = $block->getShippingRates($_address))): ?>
-                        <p><?php echo __('Sorry, no quotes are available for this order right now.') ?></p>
+                        <p><?php /* @escapeNotVerified */ echo __('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): ?>
@@ -51,23 +51,23 @@
                                     <?php else: ?>
                                         <div class="control">
                                             <?php if ($_sole) : ?>
-                                                <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $block->escapeHtml($_rate->getCode()) ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>" class="radio solo method" checked="checked"/>
+                                                <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"/>
                                             <?php else: ?>
-                                                <input type="radio" name="shipping_method[<?php echo $_address->getId() ?>]" value="<?php echo $_rate->getCode() ?>" id="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"<?php if($_rate->getCode()===$block->getAddressShippingMethod($_address)) echo ' checked="checked"' ?> class="radio" />
+                                                <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" />
                                             <?php endif; ?>
                                         </div>
-                                        <label for="s_method_<?php echo $_address->getId() ?>_<?php echo $_rate->getCode() ?>"><?php echo $block->escapeHtml($_rate->getMethodTitle()) ?>
+                                        <label for="s_method_<?php /* @escapeNotVerified */ echo $_address->getId() ?>_<?php /* @escapeNotVerified */ echo $_rate->getCode() ?>"><?php echo $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 echo __('Incl. Tax'); ?>">
+                                            <span class="price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>">
                                         <?php endif; ?>
-                                            <?php echo $_incl; ?>
+                                            <?php /* @escapeNotVerified */ echo $_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 echo __('Excl. Tax'); ?>"><?php echo $_excl; ?></span>
+                                            <span class="price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>"><?php /* @escapeNotVerified */ echo $_excl; ?></span>
                                         <?php endif; ?>
                                         </label>
                                     <?php endif ?>
@@ -78,29 +78,29 @@
                         <?php endforeach; ?>
                     </dl>
                     <?php endif; ?>
-                    <?php echo $block->getItemsBoxTextAfter($_address); ?>
+                    <?php /* @escapeNotVerified */ echo $block->getItemsBoxTextAfter($_address); ?>
                 </div>
             </div>
             <div class="box box-items">
                 <strong class="box-title">
-                    <span><?php echo __('Items') ?></span>
-                    <a href="<?php echo $block->getItemsEditUrl($_address) ?>" class="action edit"><span><?php echo __('Edit Items') ?></span></a>
+                    <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>
                 </strong>
                 <div class="box-content">
                     <div class="table-wrapper">
-                        <table class="items data table" id="shipping-table-<?php echo $_address->getId() ?>">
-                            <caption class="table-caption"><?php echo __('Items') ?></caption>
+                        <table class="items data table" id="shipping-table-<?php /* @escapeNotVerified */ echo $_address->getId() ?>">
+                            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items') ?></caption>
                             <thead>
                             <tr>
-                                <th class="col item" scope="col"><?php echo __('Product Name') ?></th>
-                                <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
+                                <th class="col item" scope="col"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+                                <th class="col qty" scope="col"><?php /* @escapeNotVerified */ echo __('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 echo $_item->getQty() ?></td>
+                                    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty'));?>"><?php /* @escapeNotVerified */ echo $_item->getQty() ?></td>
                                 </tr>
                             <?php endforeach; ?>
                             </tbody>
@@ -114,10 +114,10 @@
     <?php echo $block->getChildHtml('checkout_billing_items') ?>
     <div class="actions-toolbar">
         <div class="primary">
-            <button class="action primary continue" type="submit"><span><?php echo __('Continue to Billing Information') ?></span></button>
+            <button class="action primary continue" type="submit"><span><?php /* @escapeNotVerified */ echo __('Continue to Billing Information') ?></span></button>
         </div>
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Select Addresses') ?></span></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('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 75b0ca1329c94..1edce3fb82177 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 echo $_step->getLabel() ?>" class="item<?php echo($_step->getIsActive()) ? ' active' : ''?>"><span><?php echo $_step->getLabel() ?></span></li>
+        <li title="<?php /* @escapeNotVerified */ echo $_step->getLabel() ?>" class="item<?php echo($_step->getIsActive()) ? ' active' : ''?>"><span><?php /* @escapeNotVerified */ echo $_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 a2371c2b40efa..9366e7852cd74 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/success.phtml
@@ -8,17 +8,17 @@
 
 ?>
 <div class="multicheckout success">
-    <h2 class="subtitle"><?php echo __('Thank you for your purchase!') ?></h2>
-    <p><?php echo __('Thanks for your order. We\'ll email you order details and tracking information.') ?></p>
+    <h2 class="subtitle"><?php /* @escapeNotVerified */ echo __('Thank you for your purchase!') ?></h2>
+    <p><?php /* @escapeNotVerified */ echo __('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 echo __('Your order number is ') ?></span>
-        <?php foreach ($_orderIds as $orderId => $incrementId): ?><?php if ($flag): ?><?php echo ', ' ?><?php endif; ?><?php $flag = true ?><a href="<?php echo $block->getViewOrderUrl($orderId) ?>"><?php echo $incrementId ?></a><?php endforeach; ?>
+        <span><?php /* @escapeNotVerified */ echo __('Your order number is ') ?></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; ?>
     </p>
     <?php endif; ?>
     <?php echo $block->getChildHtml() ?>
     <div class="actions">
-        <a class="action continue" title="<?php echo __('Continue Shopping') ?>" href="<?php echo $block->getContinueUrl() ?>"><span><?php echo __('Continue Shopping') ?></span></a>
+        <a class="action continue" title="<?php /* @escapeNotVerified */ echo __('Continue Shopping') ?>" href="<?php /* @escapeNotVerified */ echo $block->getContinueUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Continue Shopping') ?></span></a>
     </div>
 </div>
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 26c58f2516d1e..88745c8c2cdef 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 echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a></strong>
+    <strong class="product name"><a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $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>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
+                    <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
                         <dl class="item options tooltip content">
                             <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
-                            <dd><?php echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     <?php endif; ?>
                 </dd>
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 ae5927e089810..1bd1747a915b7 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -15,7 +15,7 @@
         </div>
         <?php endif;?>
     </div>
-    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?php echo __('Preview') ?>" width="100%"></iframe>
+    <iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?php /* @escapeNotVerified */ echo __('Preview') ?>" width="100%"></iframe>
     <?php echo $block->getChildHtml('preview_form'); ?>
 </div>
 
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 c01b65c0bdb7e..1e6876471f61c 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 __('Choose Store View:') ?></label>
+    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Choose Store View:') ?></label>
     <div class="control">
         <select name="store_switcher" id="store_switcher">
             <?php foreach ($websites as $website): ?>
@@ -20,13 +20,13 @@
                     <?php foreach ($block->getStores($group) as $store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                            <optgroup label="<?php echo $website->getName() ?>"></optgroup>
+                            <optgroup label="<?php /* @escapeNotVerified */ echo $website->getName() ?>"></optgroup>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <optgroup label="&nbsp;&nbsp;&nbsp;<?php echo $group->getName() ?>">
+                            <optgroup label="&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $group->getName() ?>">
                         <?php endif; ?>
-                        <option value="<?php echo $store->getId() ?>"<?php if ($block->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $store->getName() ?></option>
+                        <option value="<?php /* @escapeNotVerified */ echo $store->getId() ?>"<?php if ($block->getStoreId() == $store->getId()): ?> selected="selected"<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?php /* @escapeNotVerified */ echo $store->getName() ?></option>
                     <?php endforeach; ?>
                     <?php if ($showGroup): ?>
                         </optgroup>
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 2b4ede3c46ac5..3099bb4e6616a 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/edit.phtml
@@ -20,14 +20,14 @@
     <?php endif ?>
 </div>
 
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" id="queue_edit_form">
+<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="queue_edit_form">
     <?php echo $block->getBlockHtml('formkey')?>
     <?php echo $block->getChildHtml('form') ?>
 </form>
-<form action="<?php echo $block->getPreviewUrl() ?>" method="post" id="newsletter_queue_preview_form" target="_blank">
+<form action="<?php /* @escapeNotVerified */ echo $block->getPreviewUrl() ?>" method="post" id="newsletter_queue_preview_form" target="_blank">
     <?php echo $block->getBlockHtml('formkey')?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?php echo $block->getIsTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?php /* @escapeNotVerified */ echo $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/preview.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml
index 87ddffe92a992..6e3fdf341ee33 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/queue/preview.phtml
@@ -8,7 +8,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><?php echo __('Newsletter Message Preview'); ?></title>
+    <title><?php /* @escapeNotVerified */ echo __('Newsletter Message Preview'); ?></title>
 </head>
 <body>
     <?php echo $block->getChildHtml('content') ?>
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 9ff5ae3d09619..d3ed853f27219 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/subscriber/list.phtml
@@ -12,10 +12,10 @@
 <div class="form-buttons">
     <select id="queueList" name="queue">
     <?php foreach ($block->getQueueAsOptions() as $_queue): ?>
-        <option value="<?php echo $_queue['value'] ?>"><?php echo $_queue['label'] ?> #<?php echo $_queue['value'] ?></option>
+        <option value="<?php /* @escapeNotVerified */ echo $_queue['value'] ?>"><?php /* @escapeNotVerified */ echo $_queue['label'] ?> #<?php /* @escapeNotVerified */ echo $_queue['value'] ?></option>
     <?php endforeach; ?>
     </select>
-    <button type="button" class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?php echo __('Add to Queue'); ?></span></span></span></button>
+    <button type="button" class="scalable" onclick="subscriberController.addToQueue();"><span><span><span><?php /* @escapeNotVerified */ echo __('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 492fb15f6c0d5..84c07890a4efe 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/edit.phtml
@@ -10,18 +10,18 @@ use Magento\Framework\App\TemplateTypesInterface;
 
 /* @var $block \Magento\Newsletter\Block\Adminhtml\Template\Edit */
 ?>
-<form action="<?php echo $block->getSaveUrl() ?>" method="post" id="newsletter_template_edit_form">
+<form action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>" method="post" id="newsletter_template_edit_form">
     <?php echo $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->getSaveAsFlag() ?>" />
+        <input type="hidden" id="save_as_flag" name="_save_as_flag" value="<?php /* @escapeNotVerified */ echo $block->getSaveAsFlag() ?>" />
     </div>
-    <?php echo $block->getForm() ?>
+    <?php /* @escapeNotVerified */ echo $block->getForm() ?>
 </form>
-<form action="<?php echo $block->getPreviewUrl() ?>" method="post" id="newsletter_template_preview_form" target="_blank">
+<form action="<?php /* @escapeNotVerified */ echo $block->getPreviewUrl() ?>" method="post" id="newsletter_template_preview_form" target="_blank">
     <?php echo $block->getBlockHtml('formkey')?>
     <div class="no-display">
-        <input type="hidden" id="preview_type" name="type" value="<?php echo $block->isTextType() ? 1 : 2 ?>" />
+        <input type="hidden" id="preview_type" name="type" value="<?php /* @escapeNotVerified */ echo $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="" />
@@ -81,7 +81,7 @@ require([
         },
 
         stripTags: function () {
-            if(!window.confirm("<?php echo __('Are you sure that you want to strip all tags?') ?>")) {
+            if(!window.confirm("<?php /* @escapeNotVerified */ echo __('Are you sure that you want to strip all tags?') ?>")) {
                 return false;
             }
             if(this.isEditor()) {
@@ -128,7 +128,7 @@ require([
             }
 
             if($F('code').blank() || $F('code')==templateControl.templateName) {
-               value = prompt('<?php echo __('Please enter a new template name.') ?>', templateControl.templateName + '<?php echo __(' Copy') ?>');
+               value = prompt('<?php /* @escapeNotVerified */ echo __('Please enter a new template name.') ?>', templateControl.templateName + '<?php /* @escapeNotVerified */ echo __(' Copy') ?>');
                if(!value) {
                    if(value !== null) {
                        $('code').value = '';
@@ -153,9 +153,9 @@ require([
 
         preview: function() {
             if (this.typeChange) {
-                $('preview_type').value = <?php echo TemplateTypesInterface::TYPE_TEXT ?>;
+                $('preview_type').value = <?php /* @escapeNotVerified */ echo TemplateTypesInterface::TYPE_TEXT ?>;
             } else {
-                $('preview_type').value = <?php echo $block->getTemplateType() ?>;
+                $('preview_type').value = <?php /* @escapeNotVerified */ echo $block->getTemplateType() ?>;
             }
             if (this.isEditor() && tinyMCE.get(this.id)) {
                 tinyMCE.triggerSave();
@@ -176,8 +176,8 @@ require([
         },
 
         deleteTemplate: function() {
-            if(window.confirm("<?php echo __('Are you sure you want to delete this template?') ?>")) {
-                   window.location.href = '<?php echo $block->getDeleteUrl() ?>';
+            if(window.confirm("<?php /* @escapeNotVerified */ echo __('Are you sure you want to delete this template?') ?>")) {
+                   window.location.href = '<?php /* @escapeNotVerified */ echo $block->getDeleteUrl() ?>';
             }
         },
 
@@ -191,7 +191,7 @@ require([
     };
 
     templateControl.init();
-    templateControl.templateName = "<?php echo $block->getJsTemplateName() ?>";
+    templateControl.templateName = "<?php /* @escapeNotVerified */ echo $block->getJsTemplateName() ?>";
 //]]>
 
 });
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 87ddffe92a992..6e3fdf341ee33 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/template/preview.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/template/preview.phtml
@@ -8,7 +8,7 @@
 <html lang="en">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><?php echo __('Newsletter Message Preview'); ?></title>
+    <title><?php /* @escapeNotVerified */ echo __('Newsletter Message Preview'); ?></title>
 </head>
 <body>
     <?php echo $block->getChildHtml('content') ?>
diff --git a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
index b34713859afff..85d7f1633d41f 100644
--- a/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
+++ b/app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml
@@ -12,21 +12,21 @@
     <div class="content">
         <form class="form subscribe"
             novalidate
-            action="<?php echo $block->getFormActionUrl() ?>"
+            action="<?php /* @escapeNotVerified */ echo $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 __('Sign Up for Our Newsletter:') ?></span></label>
+                <label class="label" for="newsletter"><span><?php /* @escapeNotVerified */ echo __('Sign Up for Our Newsletter:') ?></span></label>
                 <div class="control">
                     <input name="email" type="email" id="newsletter"
-                                placeholder="<?php echo __('Enter your email address') ?>"
+                                placeholder="<?php /* @escapeNotVerified */ echo __('Enter your email address') ?>"
                                 data-validate="{required:true, 'validate-email':true}"/>
                 </div>
             </div>
             <div class="actions">
-                <button class="action subscribe primary" title="<?php echo __('Subscribe') ?>" type="submit">
-                    <span><?php echo __('Subscribe') ?></span>
+                <button class="action subscribe primary" title="<?php /* @escapeNotVerified */ echo __('Subscribe') ?>" type="submit">
+                    <span><?php /* @escapeNotVerified */ echo __('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 2cf95d3b3bd62..cfba3e69eb655 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/banktransfer.phtml
@@ -8,10 +8,10 @@
 
 ?>
 <?php if ($instructions = $block->getInstructions()): ?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none;">
+    <ul class="form-list checkout-agreements" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none;">
         <li>
-            <div class="<?php echo $block->getMethodCode() ?>-instructions-content agreement-content">
-                <?php echo nl2br($instructions) ?>
+            <div class="<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>-instructions-content agreement-content">
+                <?php /* @escapeNotVerified */ echo nl2br($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 553b2795e4ae7..0db71c7059735 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/cashondelivery.phtml
@@ -11,10 +11,10 @@
  */
 ?>
 <?php if ($block->getInstructions()): ?>
-    <ul class="form-list checkout-agreements" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none;">
+    <ul class="form-list checkout-agreements" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none;">
         <li>
-            <div class="<?php echo $block->getMethodCode() ?>-instructions-content agreement-content">
-                <?php echo nl2br($block->getInstructions()) ?>
+            <div class="<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>-instructions-content agreement-content">
+                <?php /* @escapeNotVerified */ echo nl2br($block->getInstructions()) ?>
             </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 9b69a59bd09de..14c944123d5d8 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/checkmo.phtml
@@ -7,13 +7,13 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none">
     <?php if ($block->getMethod()->getPayableTo()): ?>
         <?php echo __('<label class="label"><span>Make Check payable to:</span></label> %1', $block->escapeHtml($block->getMethod()->getPayableTo())) ?>
     <?php endif; ?>
     <?php if ($block->getMethod()->getMailingAddress()): ?>
         <div class="admin__field">
-            <label class="admin__field-label"><span><?php echo __('Send Check to:') ?></span></label>
+            <label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Send Check to:') ?></span></label>
             <div class="admin__field-control checkmo-mailing-address">
                 <?php echo nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
             </div>
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 f77ab6e1bec5c..ba678cacbebec 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/form/purchaseorder.phtml
@@ -7,13 +7,13 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display: none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display: none">
     <div class="admin__field _required">
-        <label for="po_number" class="admin__field-label"><span><?php echo __('Purchase Order Number') ?></span></label>
+        <label for="po_number" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Purchase Order Number') ?></span></label>
         <div class="admin__field-control">
             <input type="text" id="po_number" name="payment[po_number]"
-                   title="<?php echo __("Purchase Order Number") ?>" class="required-entry admin__control-text"
-                   value="<?php echo $block->getInfoData('po_number') ?>"/>
+                   title="<?php /* @escapeNotVerified */ echo __("Purchase Order Number") ?>" class="required-entry admin__control-text"
+                   value="<?php /* @escapeNotVerified */ echo $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 0ae21b19a6b8e..fc4ea4f267918 100644
--- a/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml
@@ -11,7 +11,7 @@
 <?php if ($block->getInfo()->getAdditionalData()): ?>
     <?php if ($block->getPayableTo()): ?><br /><?php echo __('Make Check payable to: %1', $block->escapeHtml($block->getPayableTo())) ?><?php endif; ?>
     <?php if ($block->getMailingAddress()): ?>
-        <label><?php echo __('Send Check to:') ?></label>
+        <label><?php /* @escapeNotVerified */ echo __('Send Check to:') ?></label>
         <div class="checkmo-mailing-address">
             <?php echo nl2br($block->escapeHtml($block->getMailingAddress())) ?>
         </div>
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 43e2a4465ff44..b891e4d6d7d60 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
@@ -16,7 +16,7 @@
         {{pdf_row_separator}}
     <?php endif; ?>
     <?php if ($block->getMailingAddress()): ?>
-        <?php echo __('Send Check to:') ?>
+        <?php /* @escapeNotVerified */ echo __('Send Check to:') ?>
         {{pdf_row_separator}}
         <?php echo nl2br($block->escapeHtml($block->getMailingAddress())) ?>
         {{pdf_row_separator}}
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 cb456c2ead452..411b4d733ff5f 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/banktransfer.phtml
@@ -8,7 +8,7 @@
 
 ?>
 <?php if ($instructions = $block->getInstructions()): ?>
-    <div class="items <?php echo $block->getMethodCode() ?> instructions agreement content" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display: none;">
-        <?php echo nl2br($instructions) ?>
+    <div class="items <?php /* @escapeNotVerified */ echo $block->getMethodCode() ?> instructions agreement content" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display: none;">
+        <?php /* @escapeNotVerified */ echo nl2br($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 ad3ac41e3a4c2..1d58d40402b79 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/cashondelivery.phtml
@@ -11,7 +11,7 @@
  */
 ?>
 <?php if ($block->getInstructions()): ?>
-    <div class="items <?php echo $block->getMethodCode() ?> instructions agreement" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display: none;">
-        <?php echo nl2br($block->getInstructions()) ?>
+    <div class="items <?php /* @escapeNotVerified */ echo $block->getMethodCode() ?> instructions agreement" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display: none;">
+        <?php /* @escapeNotVerified */ echo nl2br($block->getInstructions()) ?>
     </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 2ca54872a655a..83790b8e58e17 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/checkmo.phtml
@@ -8,13 +8,13 @@
 
 ?>
 <?php if ($block->getMethod()->getMailingAddress() || $block->getMethod()->getPayableTo()): ?>
-    <dl class="items check payable" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none;">
+    <dl class="items check payable" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none;">
         <?php if ($block->getMethod()->getPayableTo()): ?>
-            <dt class="title"><?php echo __('Make Check payable to:') ?></dt>
+            <dt class="title"><?php /* @escapeNotVerified */ echo __('Make Check payable to:') ?></dt>
             <dd class="content"><?php echo $block->escapeHtml($block->getMethod()->getPayableTo()) ?></dd>
         <?php endif; ?>
         <?php if ($block->getMethod()->getMailingAddress()): ?>
-            <dt class="title"><?php echo __('Send Check to:') ?></dt>
+            <dt class="title"><?php /* @escapeNotVerified */ echo __('Send Check to:') ?></dt>
             <dd class="content">
                 <address class="checkmo mailing address">
                     <?php echo nl2br($block->escapeHtml($block->getMethod()->getMailingAddress())) ?>
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 80c1bb6fa5ba2..1acccf685f9e6 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/form/purchaseorder.phtml
@@ -7,11 +7,11 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<fieldset class="fieldset items <?php echo $block->getMethodCode() ?>" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display: none">
+<fieldset class="fieldset items <?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display: none">
     <div class="field number required">
-        <label for="po_number" class="label"><span><?php echo __('Purchase Order Number') ?></span></label>
+        <label for="po_number" class="label"><span><?php /* @escapeNotVerified */ echo __('Purchase Order Number') ?></span></label>
         <div class="control">
-            <input type="text" id="po_number" name="payment[po_number]" title="<?php echo __('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $block->escapeHtml($block->getInfoData('po_number')) ?>" />
+            <input type="text" id="po_number" name="payment[po_number]" title="<?php /* @escapeNotVerified */ echo __('Purchase Order Number') ?>" class="input-text required-entry" value="<?php echo $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 0a3399d9a6a5f..252247579ba5b 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/checkmo.phtml
@@ -12,13 +12,13 @@
     <?php if ($block->getInfo()->getAdditionalData()): ?>
         <?php if ($block->getPayableTo()): ?>
             <dd class="content">
-                <strong><?php echo __('Make Check payable to') ?></strong>
+                <strong><?php /* @escapeNotVerified */ echo __('Make Check payable to') ?></strong>
                 <?php echo $block->escapeHtml($block->getPayableTo()) ?>
             </dd>
         <?php endif; ?>
         <?php if ($block->getMailingAddress()): ?>
             <dd class="content">
-                <strong><?php echo __('Send Check to') ?></strong>
+                <strong><?php /* @escapeNotVerified */ echo __('Send Check to') ?></strong>
                 <address class="checkmo mailing address">
                     <?php echo nl2br($block->escapeHtml($block->getMailingAddress())) ?>
                 </address>
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 ff4db2ca8ade2..cd92055a558be 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
+++ b/app/code/Magento/OfflinePayments/view/frontend/templates/info/purchaseorder.phtml
@@ -7,7 +7,7 @@
 <dl class="payment-method purchase order">
     <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
     <dd class="content">
-        <strong><?php echo __('Purchase Order Number') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Purchase Order Number') ?></strong>
         <span class="number"><?php echo $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 65fb746bd28e6..73704763fa22f 100644
--- a/app/code/Magento/PageCache/view/frontend/templates/javascript.phtml
+++ b/app/code/Magento/PageCache/view/frontend/templates/javascript.phtml
@@ -8,7 +8,7 @@
 <script type="text/x-magento-init">
     {
         "body": {
-            "pageCache": <?php echo $block->getScriptOptions(); ?>
+            "pageCache": <?php /* @escapeNotVerified */ echo $block->getScriptOptions(); ?>
         }
     }
 </script>
\ No newline at end of file
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 edb72d3ce144e..4e5abb08bcab7 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/form/cc.phtml
@@ -8,45 +8,45 @@
 
 ?>
 <?php $_code = $block->getMethodCode() ?>
-<fieldset class="admin__fieldset payment-method" id="payment_form_<?php echo $_code ?>" style="display:none">
+<fieldset class="admin__fieldset payment-method" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display:none">
     <div class="field-type admin__field _required">
-        <label class="admin__field-label" for="<?php echo $_code ?>_cc_type"><span><?php echo __('Credit Card Type') ?></span></label>
+        <label class="admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"><span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span></label>
         <div class="admin__field-control">
-            <select id="<?php echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry validate-cc-type-select admin__control-select">
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type" name="payment[cc_type]" class="required-entry validate-cc-type-select admin__control-select">
                 <?php $_ccType = $block->getInfoData('cc_type') ?>
                 <option value=""></option>
                 <?php foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                    <option value="<?php echo $_typeCode ?>" <?php if ($_typeCode == $_ccType): ?>selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>" <?php if ($_typeCode == $_ccType): ?>selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <div class="field-number admin__field _required">
-        <label class="admin__field-label" for="<?php echo $_code ?>_cc_number"><span><?php echo __('Credit Card Number') ?></span></label>
+        <label class="admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number"><span><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span></label>
         <div class="admin__field-control">
-            <input type="text" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]"
-                   title="<?php echo __('Credit Card Number') ?>" class="admin__control-text validate-cc-number"
-                   value="<?php echo $block->getInfoData('cc_number') ?>"/>
+            <input type="text" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number" name="payment[cc_number]"
+                   title="<?php /* @escapeNotVerified */ echo __('Credit Card Number') ?>" class="admin__control-text validate-cc-number"
+                   value="<?php /* @escapeNotVerified */ echo $block->getInfoData('cc_number') ?>"/>
         </div>
     </div>
     <div class="field-date admin__field _required">
         <label class="admin__field-label"
-               for="<?php echo $_code ?>_expiration"><span><?php echo __('Expiration Date') ?></span></label>
+               for="<?php /* @escapeNotVerified */ echo $_code ?>_expiration"><span><?php /* @escapeNotVerified */ echo __('Expiration Date') ?></span></label>
         <div class="admin__field-control">
-            <select id="<?php echo $_code ?>_expiration" name="payment[cc_exp_month]"
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" name="payment[cc_exp_month]"
                     class="admin__control-select admin__control-select-month validate-cc-exp required-entry">
                 <?php $_ccExpMonth = $block->getInfoData('cc_exp_month') ?>
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                    <option value="<?php echo $k ?>"
-                            <?php if ($k == $_ccExpMonth): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $k ?>"
+                            <?php if ($k == $_ccExpMonth): ?>selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                 <?php endforeach ?>
             </select>
             <?php $_ccExpYear = $block->getInfoData('cc_exp_year') ?>
-            <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]"
+            <select id="<?php /* @escapeNotVerified */ echo $_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 echo $k ? $k : '' ?>"
-                            <?php if ($k == $_ccExpYear): ?>selected="selected"<?php endif ?>><?php echo $v ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $k ? $k : '' ?>"
+                            <?php if ($k == $_ccExpYear): ?>selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                 <?php endforeach ?>
             </select>
         </div>
@@ -55,43 +55,43 @@
     <?php if ($block->hasVerification()): ?>
         <div class="field-number required admin__field _required">
             <label class="admin__field-label"
-                   for="<?php echo $_code ?>_cc_cid"><span><?php echo __('Card Verification Number') ?></span></label>
+                   for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid"><span><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?></span></label>
             <div class="admin__field-control">
-                <input type="text" title="<?php echo __('Card Verification Number') ?>"
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>"
                        class="required-entry validate-cc-cvn admin__control-cvn admin__control-text"
-                       id="<?php echo $_code ?>_cc_cid"
-                       name="payment[cc_cid]" value="<?php echo $block->getInfoData('cc_cid') ?>"/>
+                       id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid"
+                       name="payment[cc_cid]" value="<?php /* @escapeNotVerified */ echo $block->getInfoData('cc_cid') ?>"/>
             </div>
         </div>
     <?php endif; ?>
 
     <?php if ($block->hasSsCardType()): ?>
-        <div id="<?php echo $_code ?>_cc_type_ss_div">
+        <div id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_ss_div">
             <div class="field-type required admin__field _required">
                 <label class="admin__field-label"
-                       for="<?php echo $_code ?>_cc_issue"><span><?php echo __('Switch/Solo/Maestro Only') ?></span></label>
+                       for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_issue"><span><?php /* @escapeNotVerified */ echo __('Switch/Solo/Maestro Only') ?></span></label>
             </div>
             <div class="admin__field field-issue">
                 <label class="admin__field-label"
-                       for="<?php echo $_code ?>_cc_issue"><span><?php echo __('Issue Number') ?></span></label>
+                       for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_issue"><span><?php /* @escapeNotVerified */ echo __('Issue Number') ?></span></label>
 
                 <div class="admin__field-control">
-                    <input type="text" title="<?php echo __('Issue Number') ?>"
+                    <input type="text" title="<?php /* @escapeNotVerified */ echo __('Issue Number') ?>"
                            class="validate-cc-ukss cvv admin__control-cvv admin__control-text"
-                           id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value=""/>
+                           id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value=""/>
                 </div>
             </div>
             <div class="field field-date">
-                <label class="admin__field-label" for="<?php echo $_code ?>_start_month"><span><?php echo __('Start Date') ?></span></label>
+                <label class="admin__field-label" for="<?php /* @escapeNotVerified */ echo $_code ?>_start_month"><span><?php /* @escapeNotVerified */ echo __('Start Date') ?></span></label>
                 <div class="admin__field-control">
-                    <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="validate-cc-ukss admin__control-select admin__control-select-month">
+                    <select id="<?php /* @escapeNotVerified */ echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="validate-cc-ukss admin__control-select admin__control-select-month">
                         <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                            <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                            <option value="<?php /* @escapeNotVerified */ echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                         <?php endforeach ?>
                     </select>
-                    <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="validate-cc-ukss admin__control-select admin__control-select-year">
+                    <select id="<?php /* @escapeNotVerified */ echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="validate-cc-ukss admin__control-select admin__control-select-year">
                         <?php foreach ($block->getSsStartYears() as $k => $v): ?>
-                            <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                            <option value="<?php /* @escapeNotVerified */ echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                         <?php endforeach ?>
                     </select>
                 </div>
@@ -103,16 +103,16 @@
 require(['jquery', 'prototype'], function(jQuery){
 
     //<![CDATA[
-    SSChecked<?php echo $_code ?> = function() {
-        var elm = $('<?php echo $_code ?>_cc_type');
+    SSChecked<?php /* @escapeNotVerified */ echo $_code ?> = function() {
+        var elm = $('<?php /* @escapeNotVerified */ echo $_code ?>_cc_type');
         if (['SS','SM','SO'].indexOf(elm.value) != -1) {
-            jQuery('#' + '<?php echo $_code ?>_cc_type_ss_div').show().removeClass('ignore-validate');
+            jQuery('#' + '<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_ss_div').show().removeClass('ignore-validate');
         } else {
-            jQuery('#' + '<?php echo $_code ?>_cc_type_ss_div').hide().addClass('ignore-validate');
+            jQuery('#' + '<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_ss_div').hide().addClass('ignore-validate');
         }
     };
-    Event.observe($('<?php echo $_code ?>_cc_type'), 'change', SSChecked<?php echo $_code ?>);
-    SSChecked<?php echo $_code ?>();
+    Event.observe($('<?php /* @escapeNotVerified */ echo $_code ?>_cc_type'), 'change', SSChecked<?php /* @escapeNotVerified */ echo $_code ?>);
+    SSChecked<?php /* @escapeNotVerified */ echo $_code ?>();
     //]]>
 
 });
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 b9540f98df28b..2dc4078410ab4 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml
@@ -19,7 +19,7 @@
 <?php foreach ($_specificInfo as $_label => $_value):?>
     <tr>
         <th><?php echo $block->escapeHtml($_label)?>:</th>
-        <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
+        <td><?php /* @escapeNotVerified */ echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
     </tr>
 <?php endforeach; ?>
 </table>
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 7e12efff91a19..07e59ca0519df 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/info/instructions.phtml
@@ -17,7 +17,7 @@
 <table>
     <tbody>
         <tr>
-            <td><?php echo nl2br($block->getInstructions()) ?></td>
+            <td><?php /* @escapeNotVerified */ echo nl2br($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 db51c499e2835..c4b4f10fba2a7 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
@@ -16,8 +16,8 @@
 
 <?php if ($_specificInfo = $block->getSpecificInformation()):?>
 <?php foreach ($_specificInfo as $_label => $_value):?>
-<?php echo $_label ?>: <?php echo implode(' ', $block->getValueAsArray($_value))?>{{pdf_row_separator}}
+<?php /* @escapeNotVerified */ echo $_label ?>: <?php /* @escapeNotVerified */ echo implode(' ', $block->getValueAsArray($_value))?>{{pdf_row_separator}}
 <?php endforeach; ?>
 <?php endif;?>
 
-<?php echo implode('{{pdf_row_separator}}', $block->getChildPdfAsArray()) ?>
+<?php /* @escapeNotVerified */ echo implode('{{pdf_row_separator}}', $block->getChildPdfAsArray()) ?>
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 a2cf8e3a63833..90394f8fdaba7 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/form.phtml
@@ -12,105 +12,105 @@ $code = $block->getMethodCode();
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
-<iframe id="<?php echo $code ?>-transparent-iframe"
-        data-container="<?php echo $code ?>-transparent-iframe"
+<iframe id="<?php /* @escapeNotVerified */ echo $code ?>-transparent-iframe"
+        data-container="<?php /* @escapeNotVerified */ echo $code ?>-transparent-iframe"
         allowtransparency="true"
         frameborder="0"
         name="iframeTransparent"
         style="display: none; width: 100%; background-color: transparent;"
-        src="<?php echo $block->getViewFileUrl('blank.html') ?>"></iframe>
+        src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('blank.html') ?>"></iframe>
 <fieldset
-    id="payment_form_<?php echo $code ?>"
+    id="payment_form_<?php /* @escapeNotVerified */ echo $code ?>"
     class="admin__fieldset"
     data-mage-init='{
      "transparent":{
-        "controller":"<?php echo $block->getRequest()->getControllerName() ?>",
-        "gateway":"<?php echo $block->getMethodCode() ?>",
-        "dateDelim":"<?php echo $block->getDateDelim() ?>",
-        "cardFieldsMap":<?php echo $block->getCardFieldsMap() ?>,
-        "orderSaveUrl":"<?php echo $block->getOrderUrl() ?>",
-        "cgiUrl":"<?php echo $block->getCgiUrl() ?>",
-        "expireYearLength":"<?php echo $block->getMethodConfigData('cc_year_length') ?>",
-        "nativeAction":"<?php echo $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]) ?>"
+        "controller":"<?php /* @escapeNotVerified */ echo $block->getRequest()->getControllerName() ?>",
+        "gateway":"<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>",
+        "dateDelim":"<?php /* @escapeNotVerified */ echo $block->getDateDelim() ?>",
+        "cardFieldsMap":<?php /* @escapeNotVerified */ echo $block->getCardFieldsMap() ?>,
+        "orderSaveUrl":"<?php /* @escapeNotVerified */ echo $block->getOrderUrl() ?>",
+        "cgiUrl":"<?php /* @escapeNotVerified */ echo $block->getCgiUrl() ?>",
+        "expireYearLength":"<?php /* @escapeNotVerified */ echo $block->getMethodConfigData('cc_year_length') ?>",
+        "nativeAction":"<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/save', ['_secure' => $block->getRequest()->isSecure()]) ?>"
       }, "validation":[]}'
     style="display: none;">
     <div class="admin__field _required">
-        <label for="<?php echo $code ?>_cc_type" class="admin__field-label">
-            <span><?php echo __('Credit Card Type') ?></span>
+        <label for="<?php /* @escapeNotVerified */ echo $code ?>_cc_type" class="admin__field-label">
+            <span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php echo $code ?>_cc_type"
-                    data-container="<?php echo $code ?>-cc-type"
+            <select id="<?php /* @escapeNotVerified */ echo $code ?>_cc_type"
+                    data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-type"
                     name="payment[cc_type]"
-                    data-validate='{required:true, "validate-cc-type-select":"#<?php echo $code ?>_cc_number"}'
+                    data-validate='{required:true, "validate-cc-type-select":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_number"}'
                     class="admin__control-select">
-                <option value=""><?php echo __('Please Select') ?></option>
+                <option value=""><?php /* @escapeNotVerified */ echo __('Please Select') ?></option>
                 <?php $_ccType = $block->getInfoData('cc_type') ?>
                 <?php foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
                     <option
-                        value="<?php echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                        value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
 
     <div class="admin__field _required field-number">
-        <label for="<?php echo $code ?>_cc_number" class="admin__field-label">
-            <span><?php echo __('Credit Card Number') ?></span>
+        <label for="<?php /* @escapeNotVerified */ echo $code ?>_cc_number" class="admin__field-label">
+            <span><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span>
         </label>
 
         <div class="admin__field-control">
-            <input type="text" id="<?php echo $code ?>_cc_number" data-container="<?php echo $code ?>-cc-number"
-                   name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>"
+            <input type="text" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_number" data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-number"
+                   name="payment[cc_number]" title="<?php /* @escapeNotVerified */ echo __('Credit Card Number') ?>"
                    class="admin__control-text"
                    value=""
-                   data-validate='{"required-number":true, "validate-cc-number":"#<?php echo $code ?>_cc_type", "validate-cc-type":"#<?php echo $code ?>_cc_type"}'
+                   data-validate='{"required-number":true, "validate-cc-number":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_type", "validate-cc-type":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_type"}'
                    autocomplete="off"/>
         </div>
     </div>
 
-    <div class="admin__field _required field-date" id="<?php echo $code ?>_cc_type_exp_div">
-        <label for="<?php echo $code ?>_expiration" class="admin__field-label">
-            <span><?php echo __('Expiration Date') ?></span>
+    <div class="admin__field _required field-date" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_type_exp_div">
+        <label for="<?php /* @escapeNotVerified */ echo $code ?>_expiration" class="admin__field-label">
+            <span><?php /* @escapeNotVerified */ echo __('Expiration Date') ?></span>
         </label>
 
         <div class="admin__field-control">
-            <select id="<?php echo $code ?>_expiration" name="payment[cc_exp_month]"
-                    data-container="<?php echo $code ?>-cc-month"
+            <select id="<?php /* @escapeNotVerified */ echo $code ?>_expiration" name="payment[cc_exp_month]"
+                    data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-month"
                     class="admin__control-select admin__control-select-month"
-                    data-validate='{required:true, "validate-cc-exp":"#<?php echo $code ?>_expiration_yr"}'>
+                    data-validate='{required:true, "validate-cc-exp":"#<?php /* @escapeNotVerified */ echo $code ?>_expiration_yr"}'>
                 <?php $_ccExpMonth = $block->getInfoData('cc_exp_month') ?>
                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
                     <option
-                        value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                        value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpMonth): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                 <?php endforeach ?>
             </select>
 
             <?php $_ccExpYear = $block->getInfoData('cc_exp_year') ?>
-            <select id="<?php echo $code ?>_expiration_yr" name="payment[cc_exp_year]"
+            <select id="<?php /* @escapeNotVerified */ echo $code ?>_expiration_yr" name="payment[cc_exp_year]"
                     class="admin__control-select admin__control-select-year"
-                    data-container="<?php echo $code ?>-cc-year" data-validate='{required:true}'>
+                    data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-year" data-validate='{required:true}'>
                 <?php foreach ($block->getCcYears() as $k => $v): ?>
                     <option
-                        value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                        value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpYear): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                 <?php endforeach ?>
             </select>
         </div>
     </div>
     <?php if ($block->hasVerification()): ?>
-        <div class="admin__field _required field-cvv" id="<?php echo $code ?>_cc_type_cvv_div">
-            <label for="<?php echo $code ?>_cc_cid" class="admin__field-label">
-                <span><?php echo __('Card Verification Number') ?></span>
+        <div class="admin__field _required field-cvv" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_type_cvv_div">
+            <label for="<?php /* @escapeNotVerified */ echo $code ?>_cc_cid" class="admin__field-label">
+                <span><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?></span>
             </label>
 
             <div class="admin__field-control">
-                <input type="text" title="<?php echo __('Card Verification Number') ?>"
-                       data-container="<?php echo $code ?>-cc-cvv"
+                <input type="text" title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>"
+                       data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-cvv"
                        class="admin__control-text cvv"
-                       id="<?php echo $code ?>_cc_cid" name="payment[cc_cid]"
+                       id="<?php /* @escapeNotVerified */ echo $code ?>_cc_cid" name="payment[cc_cid]"
                        value=""
-                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?php echo $code ?>_cc_type"}'
+                       data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_type"}'
                        autocomplete="off"/>
             </div>
         </div>
@@ -123,6 +123,6 @@ $code = $block->getMethodCode();
      * Disable card server validation in admin
      */
     require(["Magento_Sales/order/create/form"], function () {
-        order.addExcludedPaymentMethod('<?php echo $code ?>');
+        order.addExcludedPaymentMethod('<?php /* @escapeNotVerified */ echo $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 d3d1a34f8bf75..51cae8aae3063 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml
@@ -17,9 +17,9 @@ $params = $block->getParams();
 <?php elseif (isset($params['redirect_parent'])): ?>
     window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']) ?>";
 <?php elseif (isset($params['error_msg'])): ?>
-    window.top.alert(<?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
+    window.top.alert(<?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
 <?php elseif (isset($params['order_success'])): ?>
-    window.top.location = "<?php echo $params['order_success'] ?>";
+    window.top.location = "<?php /* @escapeNotVerified */ echo $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 6eccac93aca2e..0219cd8891fdc 100644
--- a/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/adminhtml/templates/transparent/info.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @see \Magento\Payment\Block\Transparent\Info
  */
 ?>
-<fieldset id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none" class="fieldset items redirect">
-    <div><?php echo __('We\'ll ask for your payment details before you place an order.') ?></div>
+<fieldset id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none" class="fieldset items redirect">
+    <div><?php /* @escapeNotVerified */ echo __('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 80e10b86cb2e5..ffc0c51ef5383 100644
--- a/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/form/cc.phtml
@@ -8,37 +8,37 @@
 
 ?>
 <?php $_code = $block->getMethodCode() ?>
-<fieldset class="fieldset payment items ccard <?php echo $_code ?>" id="payment_form_<?php echo $_code ?>" style="display: none;">
+<fieldset class="fieldset payment items ccard <?php /* @escapeNotVerified */ echo $_code ?>" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display: none;">
     <div class="field type required">
-        <label for="<?php echo $_code ?>_cc_type" class="label"><span><?php echo __('Credit Card Type') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type" class="label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span></label>
         <div class="control">
-            <select id="<?php echo $_code ?>_cc_type"
-                    data-mage-init='{"creditCardType":{"creditCardTypeContainer":"#<?php echo $_code ?>_cc_type_ss_div"}}'
-                    name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $_code ?>_cc_number"}' class="select">
-                <option value=""><?php echo __('--Please Select--')?></option>
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"
+                    data-mage-init='{"creditCardType":{"creditCardTypeContainer":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_ss_div"}}'
+                    name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_number"}' class="select">
+                <option value=""><?php /* @escapeNotVerified */ echo __('--Please Select--')?></option>
             <?php $_ccType = $block->getInfoData('cc_type') ?>
             <?php foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                <option value="<?php echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
             <?php endforeach ?>
             </select>
         </div>
     </div>
     <div class="field number required">
-        <label for="<?php echo $_code ?>_cc_number" class="label"><span><?php echo __('Credit Card Number') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number" class="label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span></label>
         <div class="control">
-            <input type="number" id="<?php echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{"required-number":true, "validate-cc-number":"#<?php echo $_code ?>_cc_type", "validate-cc-type":"#<?php echo $_code ?>_cc_type"}'/>
+            <input type="number" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_number" name="payment[cc_number]" title="<?php /* @escapeNotVerified */ echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{"required-number":true, "validate-cc-number":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type", "validate-cc-type":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"}'/>
         </div>
     </div>
-    <div class="field date required" id="<?php echo $_code ?>_cc_type_exp_div">
-        <label for="<?php echo $_code ?>_expiration" class="label"><span><?php echo __('Expiration Date') ?></span></label>
+    <div class="field date required" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_exp_div">
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo $_code ?>_expiration" name="payment[cc_exp_month]" class="select month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $_code ?>_expiration_yr"}'>
+                        <select id="<?php /* @escapeNotVerified */ echo $_code ?>_expiration" name="payment[cc_exp_month]" class="select month" data-validate='{required:true, "validate-cc-exp":"#<?php /* @escapeNotVerified */ echo $_code ?>_expiration_yr"}'>
                             <?php $_ccExpMonth = $block->getInfoData('cc_exp_month') ?>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpMonth): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                             <?php endforeach ?>
                         </select>
                     </div>
@@ -46,9 +46,9 @@
                 <div class="field no-label year">
                     <div class="control">
                      <?php $_ccExpYear = $block->getInfoData('cc_exp_year') ?>
-                        <select id="<?php echo $_code ?>_expiration_yr" name="payment[cc_exp_year]" class="select year" data-validate='{required:true}'>
+                        <select id="<?php /* @escapeNotVerified */ echo $_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 echo $k ? $k : '' ?>"<?php if ($k == $_ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $_ccExpYear): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                             <?php endforeach ?>
                         </select>
                     </div>
@@ -57,48 +57,48 @@
         </div>
     </div>
     <?php if ($block->hasVerification()): ?>
-    <div class="field cvv required" id="<?php echo $_code ?>_cc_type_cvv_div">
-        <label for="<?php echo $_code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
+    <div class="field cvv required" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_cvv_div">
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" class="label"><span><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?></span></label>
         <div class="control">
-            <input type="number" title="<?php echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{"required-number":true, "validate-cc-cvn":"#<?php echo $_code ?>_cc_type"}' />
+            <input type="number" title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>" class="input-text cvv" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @escapeNotVerified */ echo $_code ?>_cc_type"}' />
             <?php $_content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' . __('Card Verification Number Visual Reference') . '\" title=\"' . __('Card Verification Number Visual Reference') . '\" />'; ?>
             <div class="note">
-                <a href="#" class="action cvv" title="<?php echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
+                <a href="#" class="action cvv" title="<?php /* @escapeNotVerified */ echo __('What is this?') ?>" data-mage-init='{"tooltip": {"content": "<?php /* @escapeNotVerified */ echo $_content ?>"}}'><span><?php /* @escapeNotVerified */ echo __('What is this?') ?></span></a>
             </div>
         </div>
     </div>
     <?php endif; ?>
     <?php if ($block->hasSsCardType()): ?>
-    <div class="field switch solo required" id="<?php echo $_code ?>_cc_type_ss_div">
+    <div class="field switch solo required" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_type_ss_div">
         <div class="nested">
             <div class="field switch solo required">
-                <label for="<?php echo $_code ?>_cc_issue" class="label"><span><?php echo __('Switch/Solo/Maestro Only') ?></span></label>
+                <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_issue" class="label"><span><?php /* @escapeNotVerified */ echo __('Switch/Solo/Maestro Only') ?></span></label>
             </div>
             <div class="field number required">
-                <label for="<?php echo $_code ?>_cc_issue" class="label"><span><?php echo __('Issue Number') ?></span></label>
+                <label for="<?php /* @escapeNotVerified */ echo $_code ?>_cc_issue" class="label"><span><?php /* @escapeNotVerified */ echo __('Issue Number') ?></span></label>
                 <div class="control">
-                    <input type="text" title="<?php echo __('Issue Number') ?>" class="input-text cvv" id="<?php echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
+                    <input type="text" title="<?php /* @escapeNotVerified */ echo __('Issue Number') ?>" class="input-text cvv" id="<?php /* @escapeNotVerified */ echo $_code ?>_cc_issue" name="payment[cc_ss_issue]" value="" data-validate='{"validate-cc-ukss":true}'/>
                 </div>
             </div>
 
             <div class="field date required">
-                <label for="<?php echo $_code ?>_start_month" class="label"><span><?php echo __('Start Date') ?></span></label>
+                <label for="<?php /* @escapeNotVerified */ echo $_code ?>_start_month" class="label"><span><?php /* @escapeNotVerified */ echo __('Start Date') ?></span></label>
                 <div class="control">
                     <div class="fields group group-2">
                         <div class="field no-label">
                             <div class="control">
-                                <select id="<?php echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="select month" data-validate='{"validate-cc-ukss":true}'>
+                                <select id="<?php /* @escapeNotVerified */ echo $_code ?>_start_month" name="payment[cc_ss_start_month]" class="select month" data-validate='{"validate-cc-ukss":true}'>
                                 <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                    <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                    <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_month')): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                                 <?php endforeach ?>
                                 </select>
                             </div>
                         </div>
                         <div class="field no-label">
                             <div class="control">
-                                <select id="<?php echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="select year" data-validate='{"validate-cc-ukss":true}'>
+                                <select id="<?php /* @escapeNotVerified */ echo $_code ?>_start_year" name="payment[cc_ss_start_year]" class="select year" data-validate='{"validate-cc-ukss":true}'>
                                 <?php foreach ($block->getSsStartYears() as $k => $v): ?>
-                                    <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                    <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $block->getInfoData('cc_ss_start_year')): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                                 <?php endforeach ?>
                                 </select>
                             </div>
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 ae2a9e0b712d7..49364c5bc10bc 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/default.phtml
@@ -21,7 +21,7 @@
             <?php foreach ($_specificInfo as $_label => $_value):?>
                 <tr>
                     <th scope="row"><?php echo $block->escapeHtml($_label)?></th>
-                    <td><?php echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
+                    <td><?php /* @escapeNotVerified */ echo nl2br(implode("\n", $block->getValueAsArray($_value, true)))?></td>
                 </tr>
             <?php endforeach; ?>
         </table>
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 d040a1a4b5b22..477f050bc7ebd 100644
--- a/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/info/instructions.phtml
@@ -15,6 +15,6 @@
 <dl class="payment-method">
     <dt class="title"><?php echo $block->escapeHtml($block->getMethod()->getTitle()) ?></dt>
 <?php if ($block->getInstructions()): ?>
-    <dd class="content"><?php echo nl2br($block->getInstructions()) ?></dd>
+    <dd class="content"><?php /* @escapeNotVerified */ echo nl2br($block->getInstructions()) ?></dd>
 <?php endif; ?>
 </dl>
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 5a4e8c63822a4..9580a3a2ff110 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/form.phtml
@@ -11,57 +11,57 @@ $code = $block->getMethodCode();
 ?>
 
 <!-- IFRAME for request to Payment Gateway -->
-<iframe width="0" height="0" id="<?php echo $code ?>-transparent-iframe" data-container="<?php echo $code ?>-transparent-iframe" allowtransparency="true" frameborder="0"  name="iframeTransparent" style="display:none;width:100%;background-color:transparent" src="<?php echo $block->getViewFileUrl('blank.html') ?>"></iframe>
+<iframe width="0" height="0" id="<?php /* @escapeNotVerified */ echo $code ?>-transparent-iframe" data-container="<?php /* @escapeNotVerified */ echo $code ?>-transparent-iframe" allowtransparency="true" frameborder="0"  name="iframeTransparent" style="display:none;width:100%;background-color:transparent" src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('blank.html') ?>"></iframe>
 <form class="form" id="co-transparent-form" action="#" method="post" data-mage-init='{
     "transparent":{
-        "controller":"<?php echo $block->getRequest()->getControllerName() ?>",
-        "gateway":"<?php echo $code ?>",
-        "orderSaveUrl":"<?php echo $block->getOrderUrl() ?>",
-        "cgiUrl":"<?php echo $block->getCgiUrl() ?>",
-        "dateDelim":"<?php echo $block->getDateDelim() ?>",
-        "cardFieldsMap":<?php echo $block->getCardFieldsMap() ?>,
-        "nativeAction":"<?php echo $block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()]) ?>"
+        "controller":"<?php /* @escapeNotVerified */ echo $block->getRequest()->getControllerName() ?>",
+        "gateway":"<?php /* @escapeNotVerified */ echo $code ?>",
+        "orderSaveUrl":"<?php /* @escapeNotVerified */ echo $block->getOrderUrl() ?>",
+        "cgiUrl":"<?php /* @escapeNotVerified */ echo $block->getCgiUrl() ?>",
+        "dateDelim":"<?php /* @escapeNotVerified */ echo $block->getDateDelim() ?>",
+        "cardFieldsMap":<?php /* @escapeNotVerified */ echo $block->getCardFieldsMap() ?>,
+        "nativeAction":"<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/onepage/saveOrder', ['_secure' => $block->getRequest()->isSecure()]) ?>"
     }, "validation":[]}'>
-    <fieldset class="fieldset ccard <?php echo $code ?>" id="payment_form_<?php echo $code ?>">
-        <legend class="legend"><span><?php echo __('Credit Card Information') ?></span></legend><br />
+    <fieldset class="fieldset ccard <?php /* @escapeNotVerified */ echo $code ?>" id="payment_form_<?php /* @escapeNotVerified */ echo $code ?>">
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Credit Card Information') ?></span></legend><br />
         <div class="field required type">
-            <label for="<?php echo $code ?>_cc_type" class="label"><span><?php echo __('Credit Card Type') ?></span></label>
+            <label for="<?php /* @escapeNotVerified */ echo $code ?>_cc_type" class="label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Type') ?></span></label>
             <div class="control">
-                <select id="<?php echo $code ?>_cc_type" data-container="<?php echo $code ?>-cc-type" name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php echo $code ?>_cc_number"}'>
-                    <option value=""><?php echo __('--Please Select--')?></option>
+                <select id="<?php /* @escapeNotVerified */ echo $code ?>_cc_type" data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-type" name="payment[cc_type]" data-validate='{required:true, "validate-cc-type-select":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_number"}'>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('--Please Select--')?></option>
                 <?php $_ccType = $block->getInfoData('cc_type') ?>
                 <?php foreach ($block->getCcAvailableTypes() as $_typeCode => $_typeName): ?>
-                    <option value="<?php echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php echo $_typeName ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_typeCode ?>"<?php if ($_typeCode == $_ccType): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $_typeName ?></option>
                 <?php endforeach ?>
                 </select>
             </div>
         </div>
         <div class="field required number">
-            <label for="<?php echo $code ?>_cc_number" class="label"><span><?php echo __('Credit Card Number') ?></span></label>
+            <label for="<?php /* @escapeNotVerified */ echo $code ?>_cc_number" class="label"><span><?php /* @escapeNotVerified */ echo __('Credit Card Number') ?></span></label>
             <div class="control">
-                <input type="number" id="<?php echo $code ?>_cc_number" data-container="<?php echo $code ?>-cc-number" name="payment[cc_number]" title="<?php echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{"required-number":true, "validate-cc-number":"#<?php echo $code ?>_cc_type", "validate-cc-type":"#<?php echo $code ?>_cc_type"}' autocomplete="off"/>
+                <input type="number" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_number" data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-number" name="payment[cc_number]" title="<?php /* @escapeNotVerified */ echo __('Credit Card Number') ?>" class="input-text" value="" data-validate='{"required-number":true, "validate-cc-number":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_type", "validate-cc-type":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_type"}' autocomplete="off"/>
             </div>
         </div>
-        <div class="field required date" id="<?php echo $code ?>_cc_type_exp_div">
-            <label for="<?php echo $code ?>_expiration" class="label"><span><?php echo __('Expiration Date') ?></span></label>
+        <div class="field required date" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_type_exp_div">
+            <label for="<?php /* @escapeNotVerified */ echo $code ?>_expiration" class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo $code ?>_expiration" name="payment[cc_exp_month]" data-container="<?php echo $code ?>-cc-month" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php echo $code ?>_expiration_yr"}'>
+                            <select id="<?php /* @escapeNotVerified */ echo $code ?>_expiration" name="payment[cc_exp_month]" data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-month" class="month" data-validate='{required:true, "validate-cc-exp":"#<?php /* @escapeNotVerified */ echo $code ?>_expiration_yr"}'>
                             <?php $ccExpMonth = $block->getInfoData('cc_exp_month') ?>
                             <?php foreach ($block->getCcMonths() as $k => $v): ?>
-                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $ccExpMonth): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                             <?php endforeach ?>
                             </select>
                         </div>
                     </div>
                     <div class="field no-label year">
                         <div class="control">
-                            <select id="<?php echo $code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-container="<?php echo $code ?>-cc-year" data-validate='{required:true}'>
+                            <select id="<?php /* @escapeNotVerified */ echo $code ?>_expiration_yr" name="payment[cc_exp_year]" class="year" data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-year" data-validate='{required:true}'>
                             <?php $ccExpYear = $block->getInfoData('cc_exp_year') ?>
                             <?php foreach ($block->getCcYears() as $k => $v): ?>
-                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>><?php echo $v ?></option>
+                                <option value="<?php echo $k ? $k : '' ?>"<?php if ($k == $ccExpYear): ?> selected="selected"<?php endif ?>><?php /* @escapeNotVerified */ echo $v ?></option>
                             <?php endforeach ?>
                             </select>
                         </div>
@@ -70,13 +70,13 @@ $code = $block->getMethodCode();
             </div>
         </div>
         <?php if ($block->hasVerification()): ?>
-        <div class="field required cvv" id="<?php echo $code ?>_cc_type_cvv_div">
-            <label for="<?php echo $code ?>_cc_cid" class="label"><span><?php echo __('Card Verification Number') ?></span></label>
+        <div class="field required cvv" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_type_cvv_div">
+            <label for="<?php /* @escapeNotVerified */ echo $code ?>_cc_cid" class="label"><span><?php /* @escapeNotVerified */ echo __('Card Verification Number') ?></span></label>
             <div class="control">
-                <input type="number" title="<?php echo __('Card Verification Number') ?>" data-container="<?php echo $code ?>-cc-cvv" class="input-text cvv" id="<?php echo $code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{"required-number":true, "validate-cc-cvn":"#<?php echo $code ?>_cc_type"}' autocomplete="off"/>
+                <input type="number" title="<?php /* @escapeNotVerified */ echo __('Card Verification Number') ?>" data-container="<?php /* @escapeNotVerified */ echo $code ?>-cc-cvv" class="input-text cvv" id="<?php /* @escapeNotVerified */ echo $code ?>_cc_cid" name="payment[cc_cid]" value="" data-validate='{"required-number":true, "validate-cc-cvn":"#<?php /* @escapeNotVerified */ echo $code ?>_cc_type"}' autocomplete="off"/>
                 <?php $_content = '<img src=\"' . $block->getViewFileUrl('Magento_Checkout::cvv.png') . '\" alt=\"' . __('Card Verification Number Visual Reference') . '\" title=\"' . __('Card Verification Number Visual Reference') . '\" />'; ?>
                 <div class="note">
-                    <a href="#" id="<?php echo $code ?>-cvv-what-is-this" class="action cvv" title="<?php echo $block->escapeHtml(__('What is this?'));?>" data-mage-init='{"tooltip": {"content": "<?php echo $_content ?>"}}'><span><?php echo __('What is this?') ?></span></a>
+                    <a href="#" id="<?php /* @escapeNotVerified */ echo $code ?>-cvv-what-is-this" class="action cvv" title="<?php echo $block->escapeHtml(__('What is this?'));?>" data-mage-init='{"tooltip": {"content": "<?php /* @escapeNotVerified */ echo $_content ?>"}}'><span><?php /* @escapeNotVerified */ echo __('What is this?') ?></span></a>
                 </div>
             </div>
         </div>
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 f71a9bdd9fa41..3a97da1da871b 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
@@ -17,13 +17,13 @@ $params = $block->getParams();
         <?php elseif (isset($params['redirect_parent'])): ?>
             window.top.location="<?php echo $block->escapeXssInUrl($params['redirect_parent']) ?>";
         <?php elseif (isset($params['error_msg'])): ?>
-            window.top.alert(<?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
+            window.top.alert(<?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
             var require = window.top.require;
             require(['jquery'], function($) {
                 $('#opc-review').trigger('hideAjaxLoader');
             });
         <?php elseif (isset($params['order_success'])): ?>
-            window.top.location = "<?php echo $params['order_success'] ?>";
+            window.top.location = "<?php /* @escapeNotVerified */ echo $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 6eccac93aca2e..0219cd8891fdc 100644
--- a/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
+++ b/app/code/Magento/Payment/view/frontend/templates/transparent/info.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @see \Magento\Payment\Block\Transparent\Info
  */
 ?>
-<fieldset id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none" class="fieldset items redirect">
-    <div><?php echo __('We\'ll ask for your payment details before you place an order.') ?></div>
+<fieldset id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none" class="fieldset items redirect">
+    <div><?php /* @escapeNotVerified */ echo __('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 1dba3e93ed92e..6be6500df521f 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,17 +8,17 @@
 
 ?>
 <?php $_code = $block->getMethodCode() ?>
-<fieldset class="form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
+<fieldset class="form-list" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display:none;">
     <div class="admin__field _required">
-        <label for="<?php echo $_code ?>_ba_agreement_id"
-               class="admin__field-label"><span><?php echo __('Billing Agreement') ?></span></label>
+        <label for="<?php /* @escapeNotVerified */ echo $_code ?>_ba_agreement_id"
+               class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Billing Agreement') ?></span></label>
         <div class="admin__field-control">
-            <select id="<?php echo $_code ?>_ba_agreement_id"
-                    name="payment[<?php echo $block->getTransportBAId(); ?>]"
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_ba_agreement_id"
+                    name="payment[<?php /* @escapeNotVerified */ echo $block->getTransportBAId(); ?>]"
                     class="required-entry admin__control-select">
-                <option value=""><?php echo __('Please Select') ?></option>
+                <option value=""><?php /* @escapeNotVerified */ echo __('Please Select') ?></option>
                 <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-                    <option value="<?php echo $id ?>"><?php echo $block->escapeHtml($referenceId) ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $id ?>"><?php echo $block->escapeHtml($referenceId) ?></option>
                 <?php endforeach ?>
             </select>
         </div>
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 d25c22c4767f0..d4dabc5a81fd0 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
@@ -6,34 +6,34 @@
 ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('General Information'); ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 __('Reference ID'); ?></th>
+                    <th><?php /* @escapeNotVerified */ echo __('Reference ID'); ?></th>
                     <td><?php echo $block->escapeHtml($block->getReferenceId()) ?></td>
                 </tr>
                 <tr>
-                    <th><?php echo __('Customer'); ?></th>
+                    <th><?php /* @escapeNotVerified */ echo __('Customer'); ?></th>
                     <td>
-                        <a href="<?php echo $block->getCustomerUrl(); ?>">
-                            <?php echo $block->getCustomerEmail() ?>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getCustomerUrl(); ?>">
+                            <?php /* @escapeNotVerified */ echo $block->getCustomerEmail() ?>
                         </a>
                     </td>
                 </tr>
                 <tr>
-                    <th><?php echo __('Status'); ?></th>
-                    <td><?php echo $block->getStatus() ?></td>
+                    <th><?php /* @escapeNotVerified */ echo __('Status'); ?></th>
+                    <td><?php /* @escapeNotVerified */ echo $block->getStatus() ?></td>
                 </tr>
                 <tr>
-                    <th><?php echo __('Created At'); ?></th>
-                    <td><?php echo $block->getCreatedAt(); ?></td>
+                    <th><?php /* @escapeNotVerified */ echo __('Created At'); ?></th>
+                    <td><?php /* @escapeNotVerified */ echo $block->getCreatedAt(); ?></td>
                 </tr>
                 <tr>
-                    <th><?php echo __('Updated At'); ?></th>
-                    <td><?php echo $block->getUpdatedAt(); ?></td>
+                    <th><?php /* @escapeNotVerified */ echo __('Updated At'); ?></th>
+                    <td><?php /* @escapeNotVerified */ echo $block->getUpdatedAt(); ?></td>
                 </tr>
             </tbody>
         </table>
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 6c3fbe05e4f82..dea408fd816b9 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,18 +9,18 @@
 ?>
 <?php /* @var $block \Magento\Paypal\Block\Payment\Form\Billing\Agreement */?>
 <?php $_code = $block->getMethodCode() ?>
-<fieldset class="admin__fieldset payment-method form-list" id="payment_form_<?php echo $_code ?>" style="display:none;">
+<fieldset class="admin__fieldset payment-method form-list" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display:none;">
     <div class="admin__field _required">
         <label class="admin__field-label"
-               for="<?php echo $_code ?>_ba_agreement_id"><span><?php echo __('Billing Agreement') ?></span></label>
+               for="<?php /* @escapeNotVerified */ echo $_code ?>_ba_agreement_id"><span><?php /* @escapeNotVerified */ echo __('Billing Agreement') ?></span></label>
         <div class="admin__field-control">
-            <select id="<?php echo $_code ?>_ba_agreement_id"
-                    name="payment[<?php echo $block->getTransportName(); ?>]"
+            <select id="<?php /* @escapeNotVerified */ echo $_code ?>_ba_agreement_id"
+                    name="payment[<?php /* @escapeNotVerified */ echo $block->getTransportName(); ?>]"
                     class="required-entry admin__control-select">
-                <option value=""><?php echo __('Please Select') ?></option>
+                <option value=""><?php /* @escapeNotVerified */ echo __('Please Select') ?></option>
                 <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
                     <option
-                        value="<?php echo $id ?>"<?php echo ($id == $block->getInfoData($block->getTransportName())) ? ' selected="selected"' : '' ?>><?php echo $block->escapeHtml($referenceId) ?></option>
+                        value="<?php /* @escapeNotVerified */ echo $id ?>"<?php echo ($id == $block->getInfoData($block->getTransportName())) ? ' selected="selected"' : '' ?>><?php echo $block->escapeHtml($referenceId) ?></option>
                 <?php endforeach ?>
             </select>
         </div>
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 3213fac9e4175..9472de6106dea 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
@@ -13,10 +13,10 @@
  */
 ?>
 <div class="pp-buttons-container">
-    <button onclick="javascript:window.open('<?php echo $block->getButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $block->getHtmlId() ?>">
+    <button onclick="javascript:window.open('<?php /* @escapeNotVerified */ echo $block->getButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $block->getHtmlId() ?>">
         <span><span><span><?php echo $block->escapeHtml($block->getButtonLabel()); ?></span></span></span>
     </button>
-    <button onclick="javascript:window.open('<?php echo $block->getSandboxButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $block->getSandboxHtmlId() ?>">
+    <button onclick="javascript:window.open('<?php /* @escapeNotVerified */ echo $block->getSandboxButtonUrl()?>', 'apiwizard','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=100, top=100, width=380, height=470'); return false;" class="scalable" type="button" id="<?php echo $block->getSandboxHtmlId() ?>">
         <span><span><span><?php echo $block->escapeHtml($block->getSandboxButtonLabel()); ?></span></span></span>
     </button>
 </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 3e93001007a0b..0c98667424423 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
@@ -13,7 +13,7 @@
  */
 ?>
 <div class="pp-buttons-container">
-    <button onclick="javascript:window.open('<?php echo $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->getHtmlId() ?>">
+    <button onclick="javascript:window.open('<?php /* @escapeNotVerified */ echo $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->getHtmlId() ?>">
         <span><span><span><?php echo $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 93da7852446f5..53da2d2720ed7 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
@@ -16,7 +16,7 @@
     if ($block->getHelpLink()):
 ?>
 <div class="paypal-payment-notice">
-    <?php echo __('Not sure what PayPal payment method to use? Click <a href="%1" target="_blank">here</a> to learn more.', $block->getHelpLink()); ?>
+    <?php /* @escapeNotVerified */ echo __('Not sure what PayPal payment method to use? Click <a href="%1" target="_blank">here</a> to learn more.', $block->getHelpLink()); ?>
 </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 b850b5e593692..839899ea73dfd 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
@@ -12,9 +12,9 @@
 ?>
 <div class="payflow-settings-notice">
     <p>
-        <strong class="important-label"><?php echo __('Important: ') ?></strong>
-        <?php echo __('To use PayPal Payments Advanced, you must configure  your PayPal Payments Advanced account on the PayPal website.'); ?>
-        <?php echo __('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"><?php /* @escapeNotVerified */ echo __('Important: ') ?></strong>
+        <?php /* @escapeNotVerified */ echo __('To use PayPal Payments Advanced, you must configure  your PayPal Payments Advanced account on the PayPal website.'); ?>
+        <?php /* @escapeNotVerified */ echo __('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 f7130d6e9ee07..10724969c353b 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
@@ -13,9 +13,9 @@
  */
 ?>
 <div class="payflow-settings-notice">
-    <strong class="important-label"><?php echo __('Important: ') ?></strong>
-    <?php echo __('To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.'); ?>
-    <?php echo __('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"><?php /* @escapeNotVerified */ echo __('Important: ') ?></strong>
+    <?php /* @escapeNotVerified */ echo __('To use PayPal Payflow Link, you must configure your PayPal Payflow Link account on the PayPal website.'); ?>
+    <?php /* @escapeNotVerified */ echo __('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 5dbf448c7234e..3f4f8b3c12355 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 echo $block->getJson(); ?>}});
+        var solutions = new Solutions({config: {solutions: <?php /* @escapeNotVerified */ echo $block->getJson(); ?>}});
     });
 </script>
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 2244c24632c1b..1723df9644029 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
@@ -12,25 +12,25 @@
         <div class="block-title">
             <strong><?php echo __('Billing Agreement # %1', $block->escapeHtml($block->getReferenceId())) ?></strong>
             <?php if ($block->getCanCancel()): ?>
-                <button type="button" title="<?php echo __('Cancel') ?>" class="secondary action cancel" onclick="if( confirm('<?php echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php echo $block->getCancelUrl() ?>'; } return false;">
-                    <span><?php echo __('Cancel') ?></span>
+                <button type="button" title="<?php /* @escapeNotVerified */ echo __('Cancel') ?>" class="secondary action cancel" onclick="if( confirm('<?php /* @escapeNotVerified */ echo __('Are you sure you want to do this?') ?>') ) { window.location.href = '<?php /* @escapeNotVerified */ echo $block->getCancelUrl() ?>'; } return false;">
+                    <span><?php /* @escapeNotVerified */ echo __('Cancel') ?></span>
                 </button>
             <?php endif; ?>
         </div>
-        <div class="block-title"><strong><?php echo __('Agreement Information') ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('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 __('Agreement Information') ?></caption>
+                    <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Agreement Information') ?></caption>
                     <thead>
                         <tr>
-                            <th scope="col" class="col id"><?php echo __('Reference ID:'); ?></th>
-                            <th scope="col" class="col status"><?php echo __('Status:'); ?></th>
-                            <th scope="col" class="col created"><?php echo __('Created:'); ?></th>
+                            <th scope="col" class="col id"><?php /* @escapeNotVerified */ echo __('Reference ID:'); ?></th>
+                            <th scope="col" class="col status"><?php /* @escapeNotVerified */ echo __('Status:'); ?></th>
+                            <th scope="col" class="col created"><?php /* @escapeNotVerified */ echo __('Created:'); ?></th>
                             <?php if ($block->getAgreementUpdatedAt()): ?>
-                                <th scope="col" class="col updated"><?php echo __('Updated:'); ?></th>
+                                <th scope="col" class="col updated"><?php /* @escapeNotVerified */ echo __('Updated:'); ?></th>
                             <?php endif; ?>
-                            <th scope="col" class="col payment"><?php echo __('Payment Method:'); ?></th>
+                            <th scope="col" class="col payment"><?php /* @escapeNotVerified */ echo __('Payment Method:'); ?></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -38,7 +38,7 @@
                         <td data-th="<?php echo $block->escapeHtml(__('Reference ID:')); ?>"
                             class="col id"><?php echo $block->escapeHtml($block->getReferenceId()); ?></td>
                         <td data-th="<?php echo $block->escapeHtml(__('Status:')); ?>"
-                            class="col status"><?php echo $block->getAgreementStatus() ?></td>
+                            class="col status"><?php /* @escapeNotVerified */ echo $block->getAgreementStatus() ?></td>
                         <td data-th="<?php echo $block->escapeHtml(__('Created:')); ?>"
                             class="col created"><?php echo $block->escapeHtml($block->getAgreementCreatedAt()) ?></td>
                         <?php if ($block->getAgreementUpdatedAt()): ?>
@@ -46,7 +46,7 @@
                                 class="col updated"><?php echo $block->escapeHtml($block->getAgreementUpdatedAt()); ?></td>
                         <?php endif; ?>
                         <td data-th="<?php echo $block->escapeHtml(__('Payment Method:')); ?>"
-                            class="col payment"><?php echo $block->getPaymentMethodTitle() ?></td>
+                            class="col payment"><?php /* @escapeNotVerified */ echo $block->getPaymentMethodTitle() ?></td>
                     </tr>
                     </tbody>
                 </table>
@@ -57,18 +57,18 @@
     <?php if (count($relatedOrders) > 0): ?>
     <div class="block block-billing-orders-view">
     <?php echo $block->getChildHtml('pager'); ?>
-        <div class="block-title"><span><?php echo __('Related Orders') ?></span></div>
+        <div class="block-title"><span><?php /* @escapeNotVerified */ echo __('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 __('Related Orders') ?></caption>
+                    <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Related Orders') ?></caption>
                     <thead>
                         <tr>
-                            <th scope="col" class="col id"><?php echo __('Order #') ?></th>
-                            <th scope="col" class="col date"><?php echo __('Date') ?></th>
-                            <th scope="col" class="col shipto"><?php echo __('Ship To') ?></th>
-                            <th scope="col" class="col total"><?php echo __('Order Total') ?></th>
-                            <th scope="col" class="col status"><?php echo __('Order Status') ?></th>
+                            <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 shipto"><?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 __('Order Status') ?></th>
                             <th scope="col" class="col actions">&nbsp;</th>
                         </tr>
                     </thead>
@@ -76,17 +76,17 @@
                     <?php foreach ($relatedOrders as $order): ?>
                         <tr>
                             <td data-th="<?php echo $block->escapeHtml(__('Order #')); ?>"
-                                class="col id"><?php echo $block->getOrderItemValue($order, 'order_increment_id') ?></td>
+                                class="col id"><?php /* @escapeNotVerified */ echo $block->getOrderItemValue($order, 'order_increment_id') ?></td>
                             <td data-th="<?php echo $block->escapeHtml(__('Date')); ?>"
-                                class="col date"><?php echo $block->getOrderItemValue($order, 'created_at') ?></td>
+                                class="col date"><?php /* @escapeNotVerified */ echo $block->getOrderItemValue($order, 'created_at') ?></td>
                             <td data-th="<?php echo $block->escapeHtml(__('Ship To')); ?>"
-                                class="col shipto"><?php echo $block->getOrderItemValue($order, 'shipping_address') ?></td>
+                                class="col shipto"><?php /* @escapeNotVerified */ echo $block->getOrderItemValue($order, 'shipping_address') ?></td>
                             <td data-th="<?php echo $block->escapeHtml(__('Order Total')); ?>"
-                                class="col total"><?php echo $block->getOrderItemValue($order, 'order_total') ?></td>
+                                class="col total"><?php /* @escapeNotVerified */ echo $block->getOrderItemValue($order, 'order_total') ?></td>
                             <td data-th="<?php echo $block->escapeHtml(__('Order Status')); ?>"
-                                class="col status"><?php echo $block->getOrderItemValue($order, 'status_label') ?></td>
+                                class="col status"><?php /* @escapeNotVerified */ echo $block->getOrderItemValue($order, 'status_label') ?></td>
                             <td data-th="" class="col actions">
-                                <a href="<?php echo $block->getOrderItemValue($order, 'view_url') ?>" class="action view"><span><?php echo __('View Order') ?></span></a>
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getOrderItemValue($order, 'view_url') ?>" class="action view"><span><?php /* @escapeNotVerified */ echo __('View Order') ?></span></a>
                             </td>
                         </tr>
                     <?php endforeach; ?>
@@ -99,6 +99,6 @@
 
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back"><?php echo __('Back to Billing Agreements') ?></a>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back"><?php /* @escapeNotVerified */ echo __('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 74864b64c6ab3..47034fd2a055e 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/billing/agreements.phtml
@@ -14,27 +14,27 @@
         <?php echo $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 __('Billing Agreements') ?></caption>
+                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Billing Agreements') ?></caption>
                 <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php echo __('Reference ID'); ?></th>
-                    <th scope="col" class="col status"><?php echo __('Status'); ?></th>
-                    <th scope="col" class="col created"><?php echo __('Created At'); ?></th>
-                    <th scope="col" class="col updated"><?php echo __('Updated At'); ?></th>
-                    <th scope="col" class="col payment"><?php echo __('Payment Method'); ?></th>
+                    <th scope="col" class="col id"><?php /* @escapeNotVerified */ echo __('Reference ID'); ?></th>
+                    <th scope="col" class="col status"><?php /* @escapeNotVerified */ echo __('Status'); ?></th>
+                    <th scope="col" class="col created"><?php /* @escapeNotVerified */ echo __('Created At'); ?></th>
+                    <th scope="col" class="col updated"><?php /* @escapeNotVerified */ echo __('Updated At'); ?></th>
+                    <th scope="col" class="col payment"><?php /* @escapeNotVerified */ echo __('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->getItemValue($item, 'reference_id') ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Status')); ?>" class="col status"><?php echo $block->getItemValue($item, 'status') ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Created At')); ?>" class="col created"><?php echo $block->getItemValue($item, 'created_at') ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Updated At')); ?>" class="col updated"><?php echo $block->getItemValue($item, 'updated_at') ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Payment Method')); ?>" class="col payment"><?php echo $block->getItemValue($item, 'payment_method_label') ?></td>
+                        <td data-th="<?php echo $block->escapeHtml(__('Reference ID')); ?>" class="col id"><?php /* @escapeNotVerified */ echo $block->getItemValue($item, 'reference_id') ?></td>
+                        <td data-th="<?php echo $block->escapeHtml(__('Status')); ?>" class="col status"><?php /* @escapeNotVerified */ echo $block->getItemValue($item, 'status') ?></td>
+                        <td data-th="<?php echo $block->escapeHtml(__('Created At')); ?>" class="col created"><?php /* @escapeNotVerified */ echo $block->getItemValue($item, 'created_at') ?></td>
+                        <td data-th="<?php echo $block->escapeHtml(__('Updated At')); ?>" class="col updated"><?php /* @escapeNotVerified */ echo $block->getItemValue($item, 'updated_at') ?></td>
+                        <td data-th="<?php echo $block->escapeHtml(__('Payment Method')); ?>" class="col payment"><?php /* @escapeNotVerified */ echo $block->getItemValue($item, 'payment_method_label') ?></td>
                         <td data-th="" class="col actions">
-                            <a href="<?php echo $block->getItemValue($item, 'edit_url') ?>" class="action view"><span><?php echo __('View') ?></span></a>
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getItemValue($item, 'edit_url') ?>" class="action view"><span><?php /* @escapeNotVerified */ echo __('View') ?></span></a>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -42,23 +42,23 @@
             </table>
         </div>
     <?php else: ?>
-        <div class="message info empty"><span><?php echo __('There are no billing agreements yet.') ?></span></div>
+        <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('There are no billing agreements yet.') ?></span></div>
     <?php endif; ?>
 
     <?php $paymentMethods = $block->getWizardPaymentMethodOptions() ?>
     <?php if ($paymentMethods): ?>
-        <form action="<?php echo $block->getCreateUrl() ?>" method="post" class="form form-new-agreement">
+        <form action="<?php /* @escapeNotVerified */ echo $block->getCreateUrl() ?>" method="post" class="form form-new-agreement">
             <fieldset class="fieldset">
-                <legend class="legend"><span><?php echo __('New Billing Agreement') ?></span></legend>
+                <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('New Billing Agreement') ?></span></legend>
                 <br />
-                <p class="note"><?php echo __('You will be redirected to the payment system website.') ?></p>
+                <p class="note"><?php /* @escapeNotVerified */ echo __('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 __('-- Please Select --') ?></option>
+                            <option value=""><?php /* @escapeNotVerified */ echo __('-- Please Select --') ?></option>
                             <?php foreach ($paymentMethods as $code => $title): ?>
-                                <option value="<?php echo $code ?>"><?php echo $title ?></option>
+                                <option value="<?php /* @escapeNotVerified */ echo $code ?>"><?php /* @escapeNotVerified */ echo $title ?></option>
                             <?php endforeach; ?>
                         </select>
                     </div>
@@ -66,12 +66,12 @@
                 <div class="actions-toolbar">
                     <div class="primary">
                         <button type="submit" class="primary action create">
-                            <span><?php echo __('Create...') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('Create...') ?></span>
                         </button>
                     </div>
                     <div class="secondary">
                         <a href="<?php echo $block->escapeHtml($block->getBackUrl()) ?>"
-                           class="action back"><span><?php echo __('Back') ?></span></a>
+                           class="action back"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
                     </div>
                 </div>
             </fieldset>
@@ -80,7 +80,7 @@
     <div class="actions-toolbar">
         <div class="secondary">
             <a href="<?php echo $block->escapeHtml($block->getBackUrl()) ?>"
-               class="action back"><span><?php echo __('Back') ?></span></a>
+               class="action back"><span><?php /* @escapeNotVerified */ echo __('Back') ?></span></a>
         </div>
     </div>
     <?php endif; ?>
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 17f99e48bd55e..a5a69a77b99f3 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
@@ -14,7 +14,7 @@
         <div class="block-content">
             <?php if ($block->getShippingAddress()): ?>
                 <div class="box box-order-shipping-method">
-                    <strong class="box-title"><span><?php echo __('Shipping Method') ?></span></strong>
+                    <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span></strong>
                     <div class="box-content">
                         <form method="post" id="shipping-method-form"
                               action="<?php echo $block->escapeHtml($block->getShippingMethodSubmitUrl()) ?>"
@@ -26,7 +26,7 @@
                                         <select name="shipping_method" id="shipping-method" class="select">
                                             <?php if (!$currentRate): ?>
                                                 <option value="">
-                                                    <?php echo __('Please select a shipping method...') ?>
+                                                    <?php /* @escapeNotVerified */ echo __('Please select a shipping method...') ?>
                                                 </option>
                                             <?php endif; ?>
                                             <?php foreach ($groups as $code => $rates): ?>
@@ -34,8 +34,8 @@
                                                     label="<?php echo $block->escapeHtml($block->getCarrierName($code)) ?>">
                                                     <?php foreach ($rates as $rate): ?>
                                                         <option
-                                                            value="<?php echo $block->renderShippingRateValue($rate) ?>"<?php echo($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
-                                                            <?php echo $block->renderShippingRateOption($rate) ?>
+                                                            value="<?php /* @escapeNotVerified */ echo $block->renderShippingRateValue($rate) ?>"<?php echo($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
+                                                            <?php /* @escapeNotVerified */ echo $block->renderShippingRateOption($rate) ?>
                                                         </option>
                                                     <?php endforeach; ?>
                                                 </optgroup>
@@ -46,42 +46,42 @@
                                         <div class="primary">
                                             <button id="update-shipping-method-submit" type="submit"
                                                     class="action update primary">
-                                                <span><?php echo __('Update Shipping Method') ?></span></button>
+                                                <span><?php /* @escapeNotVerified */ echo __('Update Shipping Method') ?></span></button>
                                         </div>
                                     </div>
                                 <?php else: ?>
-                                    <p><?php echo __('Sorry, no quotes are available for this order right now.') ?></p>
+                                    <p><?php /* @escapeNotVerified */ echo __('Sorry, no quotes are available for this order right now.') ?></p>
                                 <?php endif; ?>
                             <?php else: ?>
-                                <p><?php echo $block->renderShippingRateOption($block->getCurrentShippingRate()) ?></p>
+                                <p><?php /* @escapeNotVerified */ echo $block->renderShippingRateOption($block->getCurrentShippingRate()) ?></p>
                             <?php endif; ?>
                         </form>
                     </div>
                 </div>
                 <div class="box box-order-shipping-address">
-                    <strong class="box-title"><span><?php echo __('Shipping Address') ?></span></strong>
+                    <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></span></strong>
                     <div class="box-content">
-                        <address><?php echo $block->renderAddress($block->getShippingAddress()) ?></address>
+                        <address><?php /* @escapeNotVerified */ echo $block->renderAddress($block->getShippingAddress()) ?></address>
                     </div>
                     <?php if ($block->getCanEditShippingAddress()): ?>
                         <div class="box-actions">
-                            <a href="<?php echo $block->getEditUrl() ?>"
-                               class="action edit"><span><?php echo __('Edit') ?></span></a>
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>"
+                               class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit') ?></span></a>
                         </div>
                     <?php endif; ?>
                 </div>
             <?php endif; ?>
             <div class="box box-order-billing-address">
-                <strong class="box-title"><span><?php echo __('Payment Method') ?></span></strong>
+                <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span></strong>
                 <div class="box-content">
                     <?php echo $block->escapeHtml($block->getPaymentMethodTitle()) ?><br>
                     <?php echo $block->escapeHtml($block->getEmail()) ?> <br>
-                    <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png" alt="<?php echo __('Buy now with PayPal') ?>"/>
+                    <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png" alt="<?php /* @escapeNotVerified */ echo __('Buy now with PayPal') ?>"/>
                 </div>
             <?php if ($block->getEditUrl()): ?>
                 <div class="box-actions">
-                    <a href="<?php echo $block->getEditUrl() ?>" class="action edit">
-                        <span><?php echo __('Edit Payment Information') ?></span>
+                    <a href="<?php /* @escapeNotVerified */ echo $block->getEditUrl() ?>" class="action edit">
+                        <span><?php /* @escapeNotVerified */ echo __('Edit Payment Information') ?></span>
                     </a>
                 </div>
             <?php endif ?>
@@ -95,24 +95,24 @@
 
     <div class="paypal-review-items">
         <div class="paypal-review-title">
-            <strong><?php echo __('Items in Your Shopping Cart') ?></strong>
-            <a href="<?php echo $block->getUrl('checkout/cart') ?>"
-               class="action edit"><span><?php echo __('Edit Shopping Cart') ?></span></a>
+            <strong><?php /* @escapeNotVerified */ echo __('Items in Your Shopping Cart') ?></strong>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart') ?>"
+               class="action edit"><span><?php /* @escapeNotVerified */ echo __('Edit Shopping Cart') ?></span></a>
         </div>
 
         <?php echo $block->getChildHtml('details') ?>
 
-        <form method="post" id="order-review-form" action="<?php echo $block->getPlaceOrderUrl() ?>" class="form">
+        <form method="post" id="order-review-form" action="<?php /* @escapeNotVerified */ echo $block->getPlaceOrderUrl() ?>" class="form">
             <?php echo $block->getChildHtml('agreements'); ?>
             <div class="actions-toolbar" id="review-buttons-container">
                 <div class="primary">
-                    <button type="button" id="review-button" value="<?php echo __('Place Order') ?>"
-                            class="action checkout primary"><span><?php echo __('Place Order') ?></span></button>
-                    <button type="button" id="review-submit" value="<?php echo __('Place Order') ?>"
-                            class="action checkout primary"><span><?php echo __('Place Order') ?></span></button>
+                    <button type="button" id="review-button" value="<?php /* @escapeNotVerified */ echo __('Place Order') ?>"
+                            class="action checkout primary"><span><?php /* @escapeNotVerified */ echo __('Place Order') ?></span></button>
+                    <button type="button" id="review-submit" value="<?php /* @escapeNotVerified */ echo __('Place Order') ?>"
+                            class="action checkout primary"><span><?php /* @escapeNotVerified */ echo __('Place Order') ?></span></button>
                 </div>
-                <span class="please-wait load indicator" id="review-please-wait" style="display: none;" data-text="<?php echo __('Submitting order information...') ?>">
-                   <span><?php echo __('Submitting order information...') ?></span>
+                <span class="please-wait load indicator" id="review-please-wait" style="display: none;" data-text="<?php /* @escapeNotVerified */ echo __('Submitting order information...') ?>">
+                   <span><?php /* @escapeNotVerified */ echo __('Submitting order information...') ?></span>
                 </span>
             </div>
         </form>
@@ -126,7 +126,7 @@
                 "shippingSubmitFormSelector": "#shipping-method-form",
                 "shippingSelector": "#shipping-method",
                 "shippingMethodUpdateUrl": "<?php echo $block->escapeHtml($block->getUpdateShippingMethodsUrl()) ?>",
-                "isAjax": <?php echo $block->getUseAjax() ? 'true' : 'false' ?>
+                "isAjax": <?php /* @escapeNotVerified */ echo $block->getUseAjax() ? '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 2c64d277e9f85..b1347b28e98a6 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,13 +12,13 @@
 ?>
 <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 __('Items in Your Shopping Cart') ?></caption>
+        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Items in Your Shopping Cart') ?></caption>
         <thead>
         <tr>
-            <th class="col name" scope="col"><?php echo __('Item') ?></th>
-            <th class="col price" scope="col"><?php echo __('Price') ?></th>
-            <th class="col qty" scope="col"><?php echo __('Qty') ?></th>
-            <th class="col subtotal" scope="col"><?php echo __('Subtotal') ?></th>
+            <th class="col name" scope="col"><?php /* @escapeNotVerified */ echo __('Item') ?></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>
         </tr>
         </thead>
         <?php foreach ($block->getItems() as $_item): ?>
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 54b3f9649eb65..3757e741f3b73 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,27 +14,27 @@
             <?php $currentRate = $block->getCurrentShippingRate(); ?>
             <select name="shipping_method" id="shipping_method" class="required-entry">
                 <?php if (!$currentRate): ?>
-                    <option value=""><?php echo __('Please select a shipping method...') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Please select a shipping method...') ?></option>
                 <?php endif; ?>
                 <?php foreach ($groups as $code => $rates): ?>
                     <optgroup label="<?php echo $block->escapeHtml($block->getCarrierName($code)) ?>"
                               style="font-style:normal;">
                         <?php foreach ($rates as $rate): ?>
                             <option
-                                value="<?php echo $block->renderShippingRateValue($rate) ?>"<?php echo($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
-                                <?php echo $block->renderShippingRateOption($rate) ?>
+                                value="<?php /* @escapeNotVerified */ echo $block->renderShippingRateValue($rate) ?>"<?php echo($currentRate === $rate) ? ' selected="selected"' : ''; ?>>
+                                <?php /* @escapeNotVerified */ echo $block->renderShippingRateOption($rate) ?>
                             </option>
                         <?php endforeach; ?>
                     </optgroup>
                 <?php endforeach; ?>
             </select>
         <?php else: ?>
-            <p><strong><?php echo __('Sorry, no quotes are available for this order right now.') ?></strong></p>
+            <p><strong><?php /* @escapeNotVerified */ echo __('Sorry, no quotes are available for this order right now.') ?></strong></p>
         <?php endif; ?>
     <?php else: ?>
-        <p><strong><?php echo $block->renderShippingRateOption($block->getCurrentShippingRate()) ?></strong></p>
+        <p><strong><?php /* @escapeNotVerified */ echo $block->renderShippingRateOption($block->getCurrentShippingRate()) ?></strong></p>
     <?php endif; ?>
 </div>
 <div style="display: none" id="shipping_method_update">
-    <p><?php echo __('Please update order data to get shipping methods and rates') ?></p>
+    <p><?php /* @escapeNotVerified */ echo __('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 23e14b00ade35..195795a33ca60 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/express/shortcut.phtml
@@ -22,11 +22,11 @@ if ($block->isOrPositionBefore()) {
 ?>
 <?php $shortcutHtmlId = $block->getShortcutHtmlId() ?>
 <div data-label="<?php echo $block->escapeHtml(__('or')); ?>"
-     class="paypal checkout <?php echo $labelPosition ?> paypal-logo <?php echo $shortcutHtmlId ?>">
-    <input type="image" data-action="checkout-form-submit" data-checkout-url="<?php echo $block->getCheckoutUrl() ?>"
-           src="<?php echo $block->getImageUrl() ?>"
-           alt="<?php echo __('Checkout with PayPal'); ?>"
-           title="<?php echo __('Checkout with PayPal'); ?>"/>
+     class="paypal checkout <?php /* @escapeNotVerified */ echo $labelPosition ?> paypal-logo <?php /* @escapeNotVerified */ echo $shortcutHtmlId ?>">
+    <input type="image" data-action="checkout-form-submit" data-checkout-url="<?php /* @escapeNotVerified */ echo $block->getCheckoutUrl() ?>"
+           src="<?php /* @escapeNotVerified */ echo $block->getImageUrl() ?>"
+           alt="<?php /* @escapeNotVerified */ echo __('Checkout with PayPal'); ?>"
+           title="<?php /* @escapeNotVerified */ echo __('Checkout with PayPal'); ?>"/>
     <?php if ($block->getConfirmationUrl() || $block->getIsInCatalogProduct()): ?>
         <?php
         $confirmationUrl = $block->getConfirmationUrl();
@@ -34,17 +34,17 @@ if ($block->isOrPositionBefore()) {
     endif; ?>
     <?php if ($block->getAdditionalLinkImage()): ?>
         <?php $linkImage = $block->getAdditionalLinkImage() ?>
-        <a href="<?php echo $linkImage['href']?>"><img src="<?php echo $linkImage['src']?>" /></a>
+        <a href="<?php /* @escapeNotVerified */ echo $linkImage['href']?>"><img src="<?php /* @escapeNotVerified */ echo $linkImage['src']?>" /></a>
     <?php endif; ?>
 <script type="text/x-magento-init">
     {
-        ".paypal-logo.<?php echo $shortcutHtmlId ?>": {
+        ".paypal-logo.<?php /* @escapeNotVerified */ echo $shortcutHtmlId ?>": {
             "paypalCheckout": {
-                "confirmMessage": "<?php echo $block->escapeJsQuote($block->getConfirmationMessage())?>",
-                "confirmUrl": "<?php echo !empty($confirmationUrl) ? $confirmationUrl : false ?>",
-                "isCatalogProduct": "<?php echo !empty($isInCatalogProduct) ? $isInCatalogProduct : false ?>",
+                "confirmMessage": "<?php /* @escapeNotVerified */ echo $block->escapeJsQuote($block->getConfirmationMessage())?>",
+                "confirmUrl": "<?php /* @escapeNotVerified */ echo !empty($confirmationUrl) ? $confirmationUrl : false ?>",
+                "isCatalogProduct": "<?php /* @escapeNotVerified */ echo !empty($isInCatalogProduct) ? $isInCatalogProduct : false ?>",
                 "paypalCheckoutSelector": "#pp-checkout-url",
-                "shortcutContainerClass": "<?php echo "." . $shortcutHtmlId ?>"
+                "shortcutContainerClass": "<?php /* @escapeNotVerified */ echo "." . $shortcutHtmlId ?>"
             }
         }
     }
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 596199832d381..3cb8fd28a598a 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/form.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @see \Magento\Paypal\Block\Payflow\Link\Iframe
  */
@@ -12,10 +14,10 @@
 <head>
 </head>
 <body>
-<form id="token_form" method="POST" action="<?php echo $block->getTransactionUrl() ?>">
-    <input type="hidden" name="SECURETOKEN" value="<?php echo $block->getSecureToken(); ?>"/>
-    <input type="hidden" name="SECURETOKENID" value="<?php echo $block->getSecureTokenId(); ?>"/>
-    <input type="hidden" name="MODE" value="<?php echo $block->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+<form id="token_form" method="POST" action="<?php /* @escapeNotVerified */ echo $block->getTransactionUrl() ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?php /* @escapeNotVerified */ echo $block->getSecureToken(); ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?php /* @escapeNotVerified */ echo $block->getSecureTokenId(); ?>"/>
+    <input type="hidden" name="MODE" value="<?php /* @escapeNotVerified */ echo $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 1a44eb078bd10..b69d3964c3098 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/iframe.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/iframe.phtml
@@ -6,7 +6,7 @@
 
 ?>
 <div id="iframe-warning" class="message notice">
-    <div><?php echo __('Please do not refresh the page until you complete payment.') ?></div>
+    <div><?php /* @escapeNotVerified */ echo __('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->getFrameActionUrl() ?>" height="610" width="100%"></iframe>
+        src="<?php /* @escapeNotVerified */ echo $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 ef470bce0e241..cf48aff175ea6 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/info.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @see \Magento\Paypal\Block\Payflow\Link\Info
  */
 ?>
-<div id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none" class="hss items">
-    <?php echo __('You will be required to enter your payment details after you place an order.') ?>
+<div id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none" class="hss items">
+    <?php /* @escapeNotVerified */ echo __('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/redirect.phtml b/app/code/Magento/Paypal/view/frontend/templates/hss/redirect.phtml
index 2dedc5e3aed8b..8c3578989ae3b 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/hss/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/hss/redirect.phtml
@@ -18,13 +18,13 @@
     (function() {
         'use strict';
 
-        var cartUrl = '<?php echo $block->getUrl('checkout/cart') ?>',
-            successUrl = '<?php echo $block->getUrl('checkout/onepage/success') ?>',
-            goToSuccessPage = '<?php echo $block->getGotoSuccessPage() ?>',
+        var cartUrl = '<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart') ?>',
+            successUrl = '<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/onepage/success') ?>',
+            goToSuccessPage = '<?php /* @escapeNotVerified */ echo $block->getGotoSuccessPage() ?>',
             require = window.top.require,
             windowContext = window,
             errorMessage = {
-                message: '<?php echo $block->getErrorMsg() ?>'
+                message: '<?php /* @escapeNotVerified */ echo $block->getErrorMsg() ?>'
             };
 
         require([
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 25f9f228e9220..a2dd9d8a680bb 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,5 +7,5 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<button type="submit" data-role="review-save" title="<?php echo __('Continue') ?>" class="button action checkout primary">
-    <span><?php echo __('Continue') ?></span></button>
+<button type="submit" data-role="review-save" title="<?php /* @escapeNotVerified */ echo __('Continue') ?>" class="button action checkout primary">
+    <span><?php /* @escapeNotVerified */ echo __('Continue') ?></span></button>
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 3d1cfc2ae80f6..3d0f12c4a51ac 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/partner/logo.phtml
@@ -15,8 +15,8 @@
 
 <div class="block paypal acceptance">
     <div class="block-content">
-        <a href="#" title="<?php echo __('Additional Options') ?>"
-           onclick="javascript:window.open('<?php echo $block->getAboutPaypalPageUrl() ?>','paypal','width=600,height=350,left=0,top=0,location=no,status=yes,scrollbars=yes,resizable=yes'); return false;"
+        <a href="#" title="<?php /* @escapeNotVerified */ echo __('Additional Options') ?>"
+           onclick="javascript:window.open('<?php /* @escapeNotVerified */ echo $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->escapeHtml($block->getLogoImageUrl()) ?>"
                  alt="<?php echo $block->escapeHtml(__('Additional Options')) ?>"
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 b4db84eabe55a..479b7e4f875d5 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/form.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @var $block \Magento\Paypal\Block\Payflow\Advanced\Iframe
  */
@@ -12,10 +14,10 @@
 <head>
 </head>
 <body>
-<form id="token_form" method="GET" action="<?php echo $block->getTransactionUrl() ?>">
-    <input type="hidden" name="SECURETOKEN" value="<?php echo $block->getSecureToken(); ?>"/>
-    <input type="hidden" name="SECURETOKENID" value="<?php echo $block->getSecureTokenId(); ?>"/>
-    <input type="hidden" name="MODE" value="<?php echo $block->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+<form id="token_form" method="GET" action="<?php /* @escapeNotVerified */ echo $block->getTransactionUrl() ?>">
+    <input type="hidden" name="SECURETOKEN" value="<?php /* @escapeNotVerified */ echo $block->getSecureToken(); ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?php /* @escapeNotVerified */ echo $block->getSecureTokenId(); ?>"/>
+    <input type="hidden" name="MODE" value="<?php /* @escapeNotVerified */ echo $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 7fb10dabdfaea..9d1ca69c34cb6 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowadvanced/info.phtml
@@ -10,6 +10,6 @@
  * @var $block \Magento\Paypal\Block\Payflow\Advanced\Form
  */
 ?>
-<fieldset id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none" class="fieldset payflowadvanced items redirect">
-    <div><?php echo __('You will be required to enter your payment details after you place an order.') ?></div>
+<fieldset id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none" class="fieldset payflowadvanced items redirect">
+    <div><?php /* @escapeNotVerified */ echo __('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 09916b8293f98..cf8431c60bcd9 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/form.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @see \Magento\Paypal\Block\Payflow\Link\Iframe
  */
@@ -12,10 +14,10 @@
 <head>
 </head>
 <body>
-<form id="token_form" method="GET" action="<?php echo $block->getTransactionUrl()?>">
-    <input type="hidden" name="SECURETOKEN" value="<?php echo $block->getSecureToken(); ?>"/>
-    <input type="hidden" name="SECURETOKENID" value="<?php echo $block->getSecureTokenId(); ?>"/>
-    <input type="hidden" name="MODE" value="<?php echo $block->isTestMode() ? 'TEST' : 'LIVE'; ?>"/>
+<form id="token_form" method="GET" action="<?php /* @escapeNotVerified */ echo $block->getTransactionUrl()?>">
+    <input type="hidden" name="SECURETOKEN" value="<?php /* @escapeNotVerified */ echo $block->getSecureToken(); ?>"/>
+    <input type="hidden" name="SECURETOKENID" value="<?php /* @escapeNotVerified */ echo $block->getSecureTokenId(); ?>"/>
+    <input type="hidden" name="MODE" value="<?php /* @escapeNotVerified */ echo $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 2c76ecf0bf38a..74b5a1c709917 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payflowlink/info.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @var $block \Magento\Paypal\Block\Payflow\Link\Form
  */
 ?>
-<div class="payflowlink items" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none">
-    <?php echo __('You will be required to enter your payment details after you place an order.') ?>
+<div class="payflowlink items" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none">
+    <?php /* @escapeNotVerified */ echo __('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 bb30f863ef4ec..ee6a1b4ba5d5f 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->getUrl('checkout/cart') ?>',
-            successUrl = '<?php echo $block->getUrl('checkout/onepage/success') ?>',
-            goToSuccessPage = '<?php echo $block->getGotoSuccessPage() ?>',
+        var cartUrl = '<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/cart') ?>',
+            successUrl = '<?php /* @escapeNotVerified */ echo $block->getUrl('checkout/onepage/success') ?>',
+            goToSuccessPage = '<?php /* @escapeNotVerified */ echo $block->getGotoSuccessPage() ?>',
             require = window.top.require,
             windowContext = window,
             errorMessage = {
-                message: '<?php echo $block->getErrorMsg() ?>'
+                message: '<?php /* @escapeNotVerified */ echo $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 9871ba45669f4..9e13c69f0d7be 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
@@ -9,13 +9,13 @@
 ?>
 <?php /* @var $block \Magento\Paypal\Block\Payment\Form\Billing\Agreement */?>
 <?php $_code = $block->getMethodCode() ?>
-<div class="field items required" id="payment_form_<?php echo $_code ?>" style="display:none;">
-    <label for="<?php echo $_code ?>_ba_agreement_id" class="label"><span><?php echo __('Billing Agreement') ?></span></label>
+<div class="field items required" id="payment_form_<?php /* @escapeNotVerified */ echo $_code ?>" style="display:none;">
+    <label for="<?php /* @escapeNotVerified */ echo $_code ?>_ba_agreement_id" class="label"><span><?php /* @escapeNotVerified */ echo __('Billing Agreement') ?></span></label>
     <div class="control">
-        <select id="<?php echo $_code ?>_ba_agreement_id" name="payment[<?php echo $block->getTransportName(); ?>]" class="select">
-            <option value=""><?php echo __('-- Please Select Billing Agreement--') ?></option>
+        <select id="<?php /* @escapeNotVerified */ echo $_code ?>_ba_agreement_id" name="payment[<?php /* @escapeNotVerified */ echo $block->getTransportName(); ?>]" class="select">
+            <option value=""><?php /* @escapeNotVerified */ echo __('-- Please Select Billing Agreement--') ?></option>
         <?php foreach ($block->getBillingAgreements() as $id => $referenceId): ?>
-            <option value="<?php echo $id ?>"><?php echo $block->escapeHtml($referenceId) ?></option>
+            <option value="<?php /* @escapeNotVerified */ echo $id ?>"><?php echo $block->escapeHtml($referenceId) ?></option>
         <?php endforeach ?>
         </select>
     </div>
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 4d7934f1e8c05..e6d1eda536e21 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/mark.phtml
@@ -15,14 +15,14 @@
 ?>
 <!-- PayPal Logo -->
 <img src="<?php echo $block->escapeHtml($block->getPaymentAcceptanceMarkSrc()) ?>"
-     alt="<?php echo __('Acceptance Mark') ?>" class="paypal icon"/>
-<a href="<?php echo $block->getPaymentAcceptanceMarkHref() ?>"
-   onclick="javascript:window.open('<?php echo $block->getPaymentAcceptanceMarkHref() ?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;"
+     alt="<?php /* @escapeNotVerified */ echo __('Acceptance Mark') ?>" class="paypal icon"/>
+<a href="<?php /* @escapeNotVerified */ echo $block->getPaymentAcceptanceMarkHref() ?>"
+   onclick="javascript:window.open('<?php /* @escapeNotVerified */ echo $block->getPaymentAcceptanceMarkHref() ?>','olcwhatispaypal','toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=yes, resizable=yes, ,left=0, top=0, width=400, height=350'); return false;"
    class="action paypal about">
     <?php if ($block->getPaymentWhatIs()) {
-    echo __($block->getPaymentWhatIs());
+    /* @escapeNotVerified */ echo __($block->getPaymentWhatIs());
 } else {
-    echo __('What is PayPal?');
+    /* @escapeNotVerified */ echo __('What is PayPal?');
 } ?>
 </a>
 <!-- PayPal Logo -->
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 080c93f381823..32879e4575f32 100644
--- a/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
+++ b/app/code/Magento/Paypal/view/frontend/templates/payment/redirect.phtml
@@ -12,13 +12,13 @@
  * @see \Magento\PayPal\Block\Express\Form
  */
 ?>
-<fieldset class="fieldset paypal items redirect" id="payment_form_<?php echo $block->getMethodCode() ?>" style="display:none;">
-    <div><?php echo $block->getRedirectMessage(); ?></div>
+<fieldset class="fieldset paypal items redirect" id="payment_form_<?php /* @escapeNotVerified */ echo $block->getMethodCode() ?>" style="display:none;">
+    <div><?php /* @escapeNotVerified */ echo $block->getRedirectMessage(); ?></div>
     <?php $code = $block->getBillingAgreementCode(); ?>
     <?php if ($code): ?>
-        <input type="checkbox" id="<?php echo $code ?>" value="1" name="payment[<?php echo $code ?>]" class="checkbox">
-        <label for="<?php echo $code ?>" class="label">
-            <span><?php echo __('Sign a billing agreement to streamline further purchases with PayPal.') ?></span>
+        <input type="checkbox" id="<?php /* @escapeNotVerified */ echo $code ?>" value="1" name="payment[<?php /* @escapeNotVerified */ echo $code ?>]" class="checkbox">
+        <label for="<?php /* @escapeNotVerified */ echo $code ?>" class="label">
+            <span><?php /* @escapeNotVerified */ echo __('Sign a billing agreement to streamline further purchases with PayPal.') ?></span>
         </label>
     <?php endif; ?>
 </fieldset>
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 24542d32a06ec..2e301649a5346 100644
--- a/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
+++ b/app/code/Magento/Persistent/view/frontend/templates/remember_me.phtml
@@ -16,12 +16,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 $rememberMeId; ?>"<?php if ($block->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php echo __('Remember Me') ?>" />
-    <label for="<?php echo $rememberMeId; ?>" class="label"><span><?php echo __('Remember Me') ?></span></label>
+    <input type="checkbox" name="persistent_remember_me" class="checkbox" id="<?php /* @escapeNotVerified */ echo $rememberMeId; ?>"<?php if ($block->isRememberMeChecked()): ?> checked="checked"<?php endif; ?> title="<?php /* @escapeNotVerified */ echo __('Remember Me') ?>" />
+    <label for="<?php /* @escapeNotVerified */ echo $rememberMeId; ?>" class="label"><span><?php /* @escapeNotVerified */ echo __('Remember Me') ?></span></label>
     <span class="tooltip wrapper">
-        <a class="link tooltip toggle" href="#"><?php echo __('What\'s this?') ?></a>
+        <a class="link tooltip toggle" href="#"><?php /* @escapeNotVerified */ echo __('What\'s this?') ?></a>
         <span class="tooltip content">
-            <?php echo __('Check &quot;Remember Me&quot; to access your shopping cart on this computer even if you are not signed in.')?>
+            <?php /* @escapeNotVerified */ echo __('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 2d64e39f43ae6..6282fc4ebb7ba 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/price.phtml
@@ -9,24 +9,24 @@
 /** @var $block \Magento\ProductAlert\Block\Email\Price */
 ?>
 <?php if ($_products = $block->getProducts()): ?>
-<p><?= __('Price change alert! We wanted you to know that prices have changed for these products:') ?></p>
+<p><?= /* @escapeNotVerified */  __('Price change alert! We wanted you to know that prices have changed for these products:') ?></p>
 <table>
 <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
 <?php foreach ($_products as $_product): ?>
     <tr>
         <td class="col photo">
-            <a href="<?= $_product->getProductUrl() ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product 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(); ?>
             </a>
         </td>
         <td class="col item">
             <p>
                 <strong class="product name">
-                    <a href="<?= $_product->getProductUrl() ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
+                    <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
                 </strong>
             </p>
             <?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())): ?>
-                <p><small><?= $shortDescription ?></small></p>
+                <p><small><?= /* @escapeNotVerified */  $shortDescription ?></small></p>
             <?php endif; ?>
             <?= $block->getProductPriceHtml(
                     $_product,
@@ -37,10 +37,10 @@
                     ]
                 );
                 ?>
-            <p><small><a href="<?= $block->getProductUnsubscribeUrl($_product->getId()) ?>"><?= __('Click here to stop alerts for this product.') ?></a></small></p>
+            <p><small><a href="<?= /* @escapeNotVerified */  $block->getProductUnsubscribeUrl($_product->getId()) ?>"><?= /* @escapeNotVerified */  __('Click here to stop alerts for this product.') ?></a></small></p>
         </td>
     </tr>
 <?php endforeach; ?>
 </table>
-<p><a href="<?= $block->getUnsubscribeUrl() ?>"><?= __('Unsubscribe from all price alerts') ?></a></p>
+<p><a href="<?= /* @escapeNotVerified */  $block->getUnsubscribeUrl() ?>"><?= /* @escapeNotVerified */  __('Unsubscribe from all price alerts') ?></a></p>
 <?php endif; ?>
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 1648167d34674..2ae2fe6eb3a03 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/email/stock.phtml
@@ -9,23 +9,23 @@
 /** @var $block \Magento\ProductAlert\Block\Email\Stock */
 ?>
 <?php if ($_products = $block->getProducts()): ?>
-<p><?= __('In stock alert! We wanted you to know that these products are now available:') ?></p>
+<p><?= /* @escapeNotVerified */  __('In stock alert! We wanted you to know that these products are now available:') ?></p>
 <table>
 <?php foreach ($_products as $_product): ?>
     <tr>
         <td class="col photo">
-            <a href="<?= $_product->getProductUrl() ?>" title="<?= $block->escapeHtml($_product->getName()) ?>" class="product 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(); ?>
             </a>
         </td>
         <td class="col item">
             <p>
                 <strong class="product name">
-                    <a href="<?= $_product->getProductUrl() ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
+                    <a href="<?= /* @escapeNotVerified */  $_product->getProductUrl() ?>"><?= $block->escapeHtml($_product->getName()) ?></a>
                 </strong>
             </p>
             <?php if ($shortDescription = $block->getFilteredContent($_product->getShortDescription())): ?>
-                <p><small><?= $shortDescription ?></small></p>
+                <p><small><?= /* @escapeNotVerified */  $shortDescription ?></small></p>
             <?php endif; ?>
             <?= $block->getProductPriceHtml(
                     $_product,
@@ -36,10 +36,10 @@
                     ]
                 );
                 ?>
-            <p><small><a href="<?= $block->getProductUnsubscribeUrl($_product->getId()) ?>"><?= __('Click here to stop alerts for this product.') ?></a></small></p>
+            <p><small><a href="<?= /* @escapeNotVerified */  $block->getProductUnsubscribeUrl($_product->getId()) ?>"><?= /* @escapeNotVerified */  __('Click here to stop alerts for this product.') ?></a></small></p>
         </td>
     </tr>
 <?php endforeach; ?>
 </table>
-<p><a href="<?= $block->getUnsubscribeUrl() ?>"><?= __('Unsubscribe from all stock alerts') ?></a></p>
+<p><a href="<?= /* @escapeNotVerified */  $block->getUnsubscribeUrl() ?>"><?= /* @escapeNotVerified */  __('Unsubscribe from all stock alerts') ?></a></p>
 <?php endif; ?>
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 c3bdfb26f4422..cd7c08e08ac59 100644
--- a/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
+++ b/app/code/Magento/ProductAlert/view/frontend/templates/product/view.phtml
@@ -6,7 +6,7 @@
 ?>
 <?php /* @var $block \Magento\ProductAlert\Block\Product\View */?>
 <div class="product alert <?php echo $block->getHtmlClass() ?>">
-    <a href="#" data-post='<?php echo $block->getPostAction(); ?>'
+    <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getPostAction(); ?>'
        title="<?php echo $block->escapeHtml(__($block->getSignupLabel())); ?>" class="action alert">
         <?php echo $block->escapeHtml(__($block->getSignupLabel())); ?>
     </a>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index 82eede5495e95..3cd80bdbcd371 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -13,7 +13,7 @@ $numColumns = sizeof($block->getColumns());
 ?>
 <?php if ($block->getCollection()): ?>
     <?php if ($block->canDisplayContainer()): ?>
-    <div id="<?php echo $block->getId() ?>">
+    <div id="<?php /* @escapeNotVerified */ echo $block->getId() ?>">
         <?php else: ?>
             <?php echo $block->getLayout()->getMessagesBlock()->getGroupedHtml() ?>
         <?php endif; ?>
@@ -21,41 +21,41 @@ $numColumns = sizeof($block->getColumns());
             <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 echo $block->getSuffixId('period_date_range')?>">
+                        <div class="admin__filter-actions" data-role="filter-form" id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_range')?>">
                             <span class="field-row">
-                                <label for="<?php echo $block->getSuffixId('period_date_from') ?>"
+                                <label for="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from') ?>"
                                        class="admin__control-support-text">
-                                    <span><?php echo __('From') ?>:</span>
+                                    <span><?php /* @escapeNotVerified */ echo __('From') ?>:</span>
                                 </label>
                                 <input class="input-text no-changes required-entry admin__control-text"
                                        type="text"
-                                       id="<?php echo $block->getSuffixId('period_date_from') ?>"
+                                       id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from') ?>"
                                        name="report_from"
-                                       value="<?php echo $block->getFilter('report_from') ?>">
-                                <span id="<?php echo $block->getSuffixId('period_date_from_advice')?>"></span>
+                                       value="<?php /* @escapeNotVerified */ echo $block->getFilter('report_from') ?>">
+                                <span id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from_advice')?>"></span>
                             </span>
 
                             <span class="field-row">
-                                <label for="<?php echo $block->getSuffixId('period_date_to') ?>"
+                                <label for="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to') ?>"
                                        class="admin__control-support-text">
-                                    <span><?php echo __('To') ?>:</span>
+                                    <span><?php /* @escapeNotVerified */ echo __('To') ?>:</span>
                                 </label>
                                 <input class="input-text no-changes required-entry admin__control-text"
                                        type="text"
-                                       id="<?php echo $block->getSuffixId('period_date_to') ?>"
+                                       id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to') ?>"
                                        name="report_to"
-                                       value="<?php echo $block->getFilter('report_to') ?>"/>
-                                <span id="<?php echo $block->getSuffixId('period_date_to_advice')?>"></span>
+                                       value="<?php /* @escapeNotVerified */ echo $block->getFilter('report_to') ?>"/>
+                                <span id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to_advice')?>"></span>
                             </span>
 
                             <span class="field-row">
-                                 <label for="<?php echo $block->getSuffixId('report_period')?>"
+                                 <label for="<?php /* @escapeNotVerified */ echo $block->getSuffixId('report_period')?>"
                                         class="admin__control-support-text">
-                                     <span><?php echo __('Show By') ?>:</span>
+                                     <span><?php /* @escapeNotVerified */ echo __('Show By') ?>:</span>
                                  </label>
-                                <select name="report_period" id="<?php echo $block->getSuffixId('report_period')?>" class="select">
+                                <select name="report_period" id="<?php /* @escapeNotVerified */ echo $block->getSuffixId('report_period')?>" class="select">
                                     <?php foreach ($block->getPeriods() as $_value => $_label): ?>
-                                        <option value="<?php echo $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?php echo $_label ?></option>
+                                        <option value="<?php /* @escapeNotVerified */ echo $_value ?>" <?php if ($block->getFilter('report_period') == $_value): ?> selected<?php endif; ?>><?php /* @escapeNotVerified */ echo $_label ?></option>
                                     <?php endforeach; ?>
                                 </select>
                                 <?php echo $block->getRefreshButtonHtml() ?>
@@ -66,14 +66,14 @@ $numColumns = sizeof($block->getColumns());
                                     "mage/calendar"
                                 ], function($){
 
-                                    $("#<?php echo $block->getSuffixId('period_date_range') ?>").dateRange({
-                                        dateFormat:"<?php echo $block->getDateFormat() ?>",
-                                        buttonText:"<?php echo __('Select Date') ?>",
+                                    $("#<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_range') ?>").dateRange({
+                                        dateFormat:"<?php /* @escapeNotVerified */ echo $block->getDateFormat() ?>",
+                                        buttonText:"<?php /* @escapeNotVerified */ echo __('Select Date') ?>",
                                         from:{
-                                            id:"<?php echo $block->getSuffixId('period_date_from')?>"
+                                            id:"<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_from')?>"
                                         },
                                         to:{
-                                            id:"<?php echo $block->getSuffixId('period_date_to')?>"
+                                            id:"<?php /* @escapeNotVerified */ echo $block->getSuffixId('period_date_to')?>"
                                         }
                                     });
                                 });
@@ -87,7 +87,7 @@ $numColumns = sizeof($block->getColumns());
             </div>
         <?php endif; ?>
         <div class="admin__data-grid-wrap admin__data-grid-wrap-static">
-            <table class="data-grid" id="<?php echo $block->getId() ?>_table">
+            <table class="data-grid" id="<?php /* @escapeNotVerified */ echo $block->getId() ?>_table">
                 <?php echo $block->getChildHtml('grid.columnSet'); ?>
             </table>
         </div>
@@ -102,14 +102,14 @@ $numColumns = sizeof($block->getColumns());
             ], function(jQuery){
 
                 //<![CDATA[
-                <?php echo $block->getJsObjectName() ?> = new varienGrid('<?php echo $block->getId() ?>', '<?php echo $block->getGridUrl() ?>', '<?php echo $block->getVarNamePage() ?>', '<?php echo $block->getVarNameSort() ?>', '<?php echo $block->getVarNameDir() ?>', '<?php echo $block->getVarNameFilter() ?>');
-                <?php echo $block->getJsObjectName() ?>.useAjax = '<?php if ($block->getUseAjax()): echo $block->getUseAjax(); 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 if ($block->getUseAjax()): /* @escapeNotVerified */ echo $block->getUseAjax(); endif; ?>';
                 <?php if ($block->getDateFilterVisibility()): ?>
-                <?php echo $block->getJsObjectName() ?>.doFilterCallback = validateFilterDate;
-                var period_date_from = $('<?php echo $block->getSuffixId('period_date_from')?>');
-                var period_date_to = $('<?php echo $block->getSuffixId('period_date_to')?>');
-                period_date_from.adviceContainer = $('<?php echo $block->getSuffixId('period_date_from_advice')?>');
-                period_date_to.adviceContainer = $('<?php echo $block->getSuffixId('period_date_to_advice')?>');
+                <?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')?>');
 
                 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 echo $block->getSuffixId('period_date_from')?>', '<?php echo $block->getSuffixId('period_date_to')?>', '<?php echo $block->getSuffixId('report_period')?>');
+                    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 paramURL = '';
-                    var switchURL = '<?php echo $block->getAbsoluteGridUrl(['_current' => false]); ?>'.replace(/(store|group|website)\/\d+\//, '');
+                    var switchURL = '<?php /* @escapeNotVerified */ echo $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 48dad5ae310af..c9d802fce180d 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
@@ -30,7 +30,7 @@ require([
             if(filters[i].value && filters[i].value.length && !filters[i].disabled) elements.push(filters[i]);
         }
         if (jQuery('#filter_form').valid()) {
-            setLocation('<?php echo $block->getFilterUrl(); ?>filter/'+Base64.encode(Form.serializeElements(elements))+'/');
+            setLocation('<?php /* @escapeNotVerified */ echo $block->getFilterUrl(); ?>filter/'+Base64.encode(Form.serializeElements(elements))+'/');
         }
     }
 //]]>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
index 2c1822789c812..12508cd9e178f 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/report/wishlist.phtml
@@ -3,26 +3,28 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php echo $block->getChildHtml('grid') ?>
 
 <div class="switcher f-left" style="margin: 10px 10px 10px 0px; padding:15px;">
 <?php
-    echo __('Customers that have Wish List: %1%', $block->getCustomerWithWishlist())
+    /* @escapeNotVerified */ echo __('Customers that have Wish List: %1%', $block->getCustomerWithWishlist())
 ?>
 </div>
 
 <div class="switcher" style="float: right; margin: 10px 0px 10px 10px; padding:15px;">
     <?php
-        echo __('Number of Wish Lists: %1', $block->getWishlistsCount())
+        /* @escapeNotVerified */ echo __('Number of Wish Lists: %1', $block->getWishlistsCount())
     ?><br />
     <?php
-        echo __('Number of items bought from a Wish List: %1', $block->getItemsBought())
+        /* @escapeNotVerified */ echo __('Number of items bought from a Wish List: %1', $block->getItemsBought())
     ?><br />
-    <?php echo __('Number of times Wish Lists have been shared (emailed): %1', $block->getSharedCount())
+    <?php /* @escapeNotVerified */ echo __('Number of times Wish Lists have been shared (emailed): %1', $block->getSharedCount())
     ?><br />
-    <?php echo __('Number of Wish List referrals: %1', $block->getReferralsCount())
+    <?php /* @escapeNotVerified */ echo __('Number of Wish List referrals: %1', $block->getReferralsCount())
     ?><br />
-    <?php echo __('Number of Wish List conversions: %1', $block->getConversionsCount())
+    <?php /* @escapeNotVerified */ echo __('Number of Wish List conversions: %1', $block->getConversionsCount())
     ?><br />
 </div>
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
index c1928f1464d35..54ef28d8a556f 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/store/switcher.phtml
@@ -14,10 +14,10 @@
 ?>
 <?php if ($block->isShow()): ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?php echo __('Show Report For:') ?></label>
+    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Show Report For:') ?></label>
     <div class="control">
         <select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
-            <option value=""><?php echo __('All Websites') ?></option>
+            <option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
             <?php foreach ($block->getWebsiteCollection() as $_website): ?>
                 <?php $showWebsite = false; ?>
                 <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
@@ -25,15 +25,15 @@
                     <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                                <option website="true" value="<?php echo $_website->getId() ?>"<?php if ($block->getRequest()->getParam('website') == $_website->getId()): ?> selected<?php endif; ?>>
-                                    <?php echo $_website->getName() ?>
+                                <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>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <option group="true" value="<?php echo $_group->getId() ?>"<?php if ($block->getRequest()->getParam('group') == $_group->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;<?php echo $_group->getName() ?></option>
+                            <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>
                         <?php endif; ?>
-                        <option value="<?php echo $_store->getId() ?>"<?php if ($block->getStoreId() == $_store->getId()): ?> selected<?php endif; ?>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo $_store->getName() ?></option>
+                        <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>
                     <?php endforeach; ?>
                 <?php endforeach; ?>
             <?php endforeach; ?>
@@ -56,7 +56,7 @@ require(['prototype'], function(){
         if(obj.switchParams){
             storeParam+= obj.switchParams;
         }
-        setLocation('<?php echo $block->getSwitchUrl() ?>'+storeParam);
+        setLocation('<?php /* @escapeNotVerified */ echo $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 1b31c6fc03eb3..ea4885877c6c4 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,10 +19,10 @@
 
 <?php if ($block->isShow()): ?>
 <div class="field field-store-switcher">
-    <label class="label" for="store_switcher"><?php echo __('Show Report For:') ?></label>
+    <label class="label" for="store_switcher"><?php /* @escapeNotVerified */ echo __('Show Report For:') ?></label>
     <div class="control">
         <select name="store_switcher" id="store_switcher" onchange="return switchStore(this);">
-            <option value=""><?php echo __('All Websites') ?></option>
+            <option value=""><?php /* @escapeNotVerified */ echo __('All Websites') ?></option>
             <?php foreach ($block->getWebsiteCollection() as $_website): ?>
                 <?php $showWebsite = false; ?>
                 <?php foreach ($block->getGroupCollection($_website) as $_group): ?>
@@ -30,13 +30,13 @@
                     <?php foreach ($block->getStoreCollection($_group) as $_store): ?>
                         <?php if ($showWebsite == false): ?>
                             <?php $showWebsite = true; ?>
-                            <option website="true" value="<?php 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="<?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>
                         <?php endif; ?>
                         <?php if ($showGroup == false): ?>
                             <?php $showGroup = true; ?>
-                            <option group="true" value="<?php 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="<?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>
                         <?php endif; ?>
-                        <option value="<?php 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="<?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>
                     <?php endforeach; ?>
                     <?php if ($showGroup): ?>
                         </optgroup>
@@ -55,7 +55,7 @@ require(['prototype'], function(){
         if(obj.switchParams){
             storeParam+= obj.switchParams;
         }
-        setLocation('<?php echo $block->getSwitchUrl() ?>'+storeParam);
+        setLocation('<?php /* @escapeNotVerified */ echo $block->getSwitchUrl() ?>'+storeParam);
     }
 
 });
diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed.phtml
index 8134dcbfcbfab..ec1ad3e614f7d 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 echo $class; ?>" id="recently_viewed_container" data-mage-init='{"recentlyViewedProducts":{}}' data-count="<?php echo $block->getCount(); ?>" style="display: none;">
+<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="title">
-        <strong><?php echo $title; ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
     </div>
     <div class="content">
-        <ol class="products list items <?php echo $type; ?>">
+        <ol class="products list items <?php /* @escapeNotVerified */ echo $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 dbe4455d68ad1..5e63cfa2b8465 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,19 +17,19 @@ $item = $block->getProduct();
 $image = $block->getImageType();
 $rating = 'short';
 ?>
-<div class="block" id="widget_viewed_item" data-sku="<?php echo $item->getSku(); ?>" style="display: none;">
+<div class="block" id="widget_viewed_item" data-sku="<?php /* @escapeNotVerified */ echo $item->getSku(); ?>" style="display: none;">
     <li class="item product">
         <div class="product">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <a href="<?php echo $block->getProductUrl($item) ?>" class="product photo">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>" class="product photo">
                 <?php echo $block->getImage($item, $image)->toHtml(); ?>
             </a>
             <div class="product details">
-                <strong class="product name"><a title="<?php echo $block->escapeHtml($item->getName()) ?>" href="<?php echo $block->getProductUrl($item) ?>">
+                <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>
 
-                <?php echo $block->getProductPriceHtml(
+                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                     $item,
                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -46,32 +46,32 @@ $rating = 'short';
                     <div class="primary">
                         <?php if ($item->isSaleable()): ?>
                             <?php if ($item->getTypeInstance()->hasRequiredOptions($item)): ?>
-                                <button class="action tocart" data-mage-init='{"redirectUrl": {"url": "<?php echo $block->getAddToCartUrl($item) ?>"}}' type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
+                                <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>
                             <?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 echo $postData; ?>'
-                                        type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
+                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                 </button>
                             <?php endif; ?>
                         <?php else: ?>
                             <?php if ($item->getIsSalable()): ?>
-                                <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                             <?php else: ?>
-                                <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($item); ?>'  class="action towishlist" data-action="add-to-wishlist" title="<?php echo __('Add to Wish List') ?>">
-                                <span><?php echo __('Add to Wish List') ?></span>
+                            <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>
                         <?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 echo $compareHelper->getPostDataParams($item);?>'
+                               data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($item);?>'
                                data-role="add-to-links"
-                               title="<?php echo __('Add to Compare'); ?>">
-                                <span><?php echo __('Add to Compare') ?></span>
+                               title="<?php /* @escapeNotVerified */ echo __('Add to Compare'); ?>">
+                                <span><?php /* @escapeNotVerified */ echo __('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 28161d99100c1..20d065e4ae6bc 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,29 +26,29 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 }
 ?>
 <?php if ($exist): ?>
-<div class="block widget block-compared-products-<?php echo $mode; ?>">
+<div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
     <div class="block-title">
-        <strong><?php echo $title; ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-compared-<?php echo $suffix; ?>">
+        <ol class="product-items" id="widget-compared-<?php /* @escapeNotVerified */ echo $suffix; ?>">
             <?php $iterator = 1; ?>
             <?php foreach ($items as $_product): ?>
-                <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                 <div class="product-item-info">
-                    <a class="product-item-photo" href="<?php echo $_product->getProductUrl() ?>"
-                       title="<?php echo $block->stripTags($_product->getName(), null, true) ?>">
+                    <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>
                     <div class="product-item-details">
                         <strong class="product-item-name">
-                            <a href="<?php echo $_product->getProductUrl() ?>"
-                               title="<?php echo $block->stripTags($_product->getName(), null, true) ?>)">
-                                <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), '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>
                         </strong>
-                        <?php echo $block->getProductPriceHtml(
+                        <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                             $_product,
                             \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                             \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -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 echo $block->getAddToCartUrl($_product) ?>"}}'
-                                        type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
+                                        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>
                                 </button>
                             <?php else: ?>
                                 <?php
@@ -71,17 +71,17 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_product), ['product' => $_product->getEntityId()])
                                 ?>
                                 <button class="action tocart primary"
-                                        data-post='<?php echo $postData; ?>'
-                                        type="button" title="<?php echo __('Add to Cart') ?>">
-                                    <span><?php echo __('Add to Cart') ?></span>
+                                        data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                        type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                    <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                 </button>
                             <?php endif; ?>
                             </div>
                         <?php else: ?>
                             <?php if ($_product->getIsSalable()): ?>
-                                <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                             <?php else: ?>
-                                <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                             <?php endif; ?>
                         <?php endif; ?>
                         </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 72f9c8df371bb..609d65aa65567 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,15 +25,15 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 <?php if ($exist): ?>
 <div class="block widget block-compared-products-images">
     <div class="block-title">
-        <strong><?php echo $title; ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-compared-<?php echo $suffix; ?>" class="product-items product-items-images">
+        <ol id="widget-compared-<?php /* @escapeNotVerified */ echo $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 echo $_product->getProductUrl() ?>"
-                    title="<?php echo $block->stripTags($_product->getName(), null, true) ?>">
+                <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>
             </li>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/column/compared_names_list.phtml
index 19488534551e0..41d0251e96bcb 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 echo __('Recently Compared') ?></span></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Recently Compared') ?></span></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-compared-<?php echo $suffix; ?>" class="product-items product-items-names">
+        <ol id="widget-compared-<?php /* @escapeNotVerified */ echo $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 echo $_product->getProductUrl() ?>" class="product-item-link">
-                        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), '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>
                 </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 3f0ac70882260..a0a55074c206f 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,29 +29,29 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-compared-products-<?php echo $mode; ?>">
+    <div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>" class="product-item-link">
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php echo $block->getProductPriceHtml(
+                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                                     $_item,
                                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -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 echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?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 echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
                                                        data-action="add-to-wishlist"
                                                        class="action towishlist"
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('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 echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php echo __('Add to Compare') ?>">
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
index afb76beccf0f3..5db2d3d4405be 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,29 +30,29 @@ if ($exist = $block->getRecentlyComparedProducts()) {
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-compared-products-<?php echo $mode; ?>">
+    <div class="block widget block-compared-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>" class="product-item-link">
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php echo $block->getProductPriceHtml(
+                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                                     $_item,
                                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -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 echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?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 echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>'
+                                                       data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($_item); ?>'
                                                        data-action="add-to-wishlist"
                                                        class="action towishlist"
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Wish List') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('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 echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php echo __('Add to Compare') ?>">
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -120,10 +120,10 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 <?php endif; ?>
                                 <?php if ($description):?>
                                     <div class="product-item-description">
-                                        <?php echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
                                         <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php echo __('Learn More') ?></a>
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
index 67209d0f33b24..a3f3a6ca822dc 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,30 +31,30 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 <?php if ($exist): ?>
-<div class="block widget block-viewed-products-<?php echo $mode; ?>">
+<div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
     <div class="block-title">
-        <strong><?php echo $title; ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol class="product-items" id="widget-viewed-<?php echo $suffix; ?>">
+        <ol class="product-items" id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>">
             <?php $iterator = 1; ?>
             <?php foreach ($items as $_product): ?>
-                <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                 <div class="product-item-info">
-                    <a class="product-item-photo" href="<?php echo $_product->getProductUrl() ?>"
-                       title="<?php echo $block->stripTags($_product->getName(), null, true) ?>">
+                    <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>
                     <div class="product-item-details">
                         <strong class="product-item-name">
-                            <a href="<?php echo $_product->getProductUrl() ?>"
-                               title="<?php echo $block->stripTags($_product->getName(), null, true) ?>"
+                            <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>"
+                               title="<?php /* @escapeNotVerified */ echo $block->stripTags($_product->getName(), null, true) ?>"
                                class="product-item-link">
-                                <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
+                                <?php /* @escapeNotVerified */ echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), 'name') ?>
                             </a>
                         </strong>
-                        <?php echo $block->getProductPriceHtml(
+                        <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                             $_product,
                             \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                             \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -67,25 +67,25 @@ 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 echo $block->getAddToCartUrl($_product) ?>"}}'
-                                            type="button" title="<?php echo __('Add to Cart') ?>">
-                                        <span><?php echo __('Add to Cart') ?></span>
+                                            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>
                                     </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 echo $postData; ?>'>
-                                        <span><?php echo __('Add to Cart') ?></span>
+                                    <button type="button" class="action tocart primary" data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'>
+                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                     </button>
                                 <?php endif; ?>
                             </div>
                             <?php else: ?>
                                 <?php if ($_product->getIsSalable()): ?>
-                                    <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                    <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                 <?php else: ?>
-                                    <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                    <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('Out of stock') ?></span></div>
                                 <?php endif; ?>
                             <?php endif; ?>
                         </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 60ae65426161c..064686ce293f6 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,15 +30,15 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 <?php if ($exist): ?>
     <div class="block widget block-viewed-products-images">
         <div class="block-title">
-            <strong><?php echo $title; ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
             <?php $suffix = $block->getNameInLayout(); ?>
-            <ol id="widget-viewed-<?php echo $suffix; ?>" class="product-items product-items-images">
+            <ol id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-images">
                 <?php $iterator = 1; ?>
                 <?php foreach ($items as $_product): ?>
-                    <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
-                        <a class="product-item-photo" href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $block->stripTags($_product->getName(), null, true) ?>">
+                    <?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(); ?>
                         </a>
                     <?php echo($iterator == count($items)+1) ? '</li>' : '' ?>
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 7be175efd9032..d726c3c22d5ba 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 echo __('Recently Viewed') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Recently Viewed') ?></strong>
     </div>
     <div class="block-content">
         <?php $suffix = $block->getNameInLayout(); ?>
-        <ol id="widget-viewed-<?php echo $suffix; ?>" class="product-items product-items-names">
+        <ol id="widget-viewed-<?php /* @escapeNotVerified */ echo $suffix; ?>" class="product-items product-items-names">
         <?php foreach ($_products as $_product): ?>
             <li class="product-item">
                 <strong class="product-item-name">
-                    <a href="<?php echo $_product->getProductUrl() ?>" class="product-item-link">
-                        <?php echo $this->helper('Magento\Catalog\Helper\Output')->productAttribute($_product, $_product->getName(), '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>
                 </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 7a86f1b9bab16..f477ed23f48bd 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,29 +31,29 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 }
 ?>
 <?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?php echo $mode; ?>">
+    <div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>" class="product-item-link">
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php echo $block->getProductPriceHtml(
+                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                                     $_item,
                                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -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 echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?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 echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>'
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       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>
                                                     </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 echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php echo __('Add to Compare') ?>">
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
index bd2b4e81ae669..45949049f238f 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,29 +33,29 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
 ?>
 
 <?php if ($exist):?>
-    <div class="block widget block-viewed-products-<?php echo $mode; ?>">
+    <div class="block widget block-viewed-products-<?php /* @escapeNotVerified */ echo $mode; ?>">
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?php echo $title; ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo $title; ?></strong>
         </div>
         <div class="block-content">
-            <?php echo '<!-- ' . $image . '-->' ?>
-            <div class="products-<?php echo $mode; ?> <?php echo $mode; ?>">
-                <ol class="product-items <?php echo $type; ?>">
+            <?php /* @escapeNotVerified */ echo '<!-- ' . $image . '-->' ?>
+            <div class="products-<?php /* @escapeNotVerified */ echo $mode; ?> <?php /* @escapeNotVerified */ echo $mode; ?>">
+                <ol class="product-items <?php /* @escapeNotVerified */ echo $type; ?>">
                     <?php $iterator = 1; ?>
                     <?php foreach ($items as $_item): ?>
-                        <?php echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
+                        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
                         <div class="product-item-info">
-                            <a href="<?php echo $block->getProductUrl($_item) ?>" class="product-item-photo">
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-photo">
                                 <?php echo $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->getProductUrl($_item) ?>" class="product-item-link">
+                                       href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>" class="product-item-link">
                                         <?php echo $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </strong>
-                                <?php echo $block->getProductPriceHtml(
+                                <?php /* @escapeNotVerified */ echo $block->getProductPriceHtml(
                                     $_item,
                                     \Magento\Catalog\Pricing\Price\FinalPrice::PRICE_CODE,
                                     \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST,
@@ -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 echo $block->getAddToCartUrl($_item) ?>"}}'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                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>
                                                     <?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 echo $postData; ?>'
-                                                                type="button" title="<?php echo __('Add to Cart') ?>">
-                                                            <span><?php echo __('Add to Cart') ?></span>
+                                                                data-post='<?php /* @escapeNotVerified */ echo $postData; ?>'
+                                                                type="button" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>">
+                                                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                                         </button>
                                                         <?php endif; ?>
                                                 <?php else: ?>
                                                     <?php if ($_item->getIsSalable()): ?>
-                                                        <div class="stock available"><span><?php echo __('In stock') ?></span></div>
+                                                        <div class="stock available"><span><?php /* @escapeNotVerified */ echo __('In stock') ?></span></div>
                                                     <?php else: ?>
-                                                        <div class="stock unavailable"><span><?php echo __('Out of stock') ?></span></div>
+                                                        <div class="stock unavailable"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getAddToWishlistParams($_item); ?>'
-                                                       title="<?php echo __('Add to Wish List') ?>">
-                                                        <span><?php echo __('Add to Wish List') ?></span>
+                                                       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>
                                                     </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 echo $compareHelper->getPostDataParams($_item);?>'
-                                                       title="<?php echo __('Add to Compare') ?>">
-                                                        <span><?php echo __('Add to Compare') ?></span>
+                                                       data-post='<?php /* @escapeNotVerified */ echo $compareHelper->getPostDataParams($_item);?>'
+                                                       title="<?php /* @escapeNotVerified */ echo __('Add to Compare') ?>">
+                                                        <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
                                                     </a>
                                                 <?php endif; ?>
                                             </div>
@@ -122,10 +122,10 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                 <?php endif; ?>
                                 <?php if ($description):?>
                                     <div class="product-item-description">
-                                        <?php echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
+                                        <?php /* @escapeNotVerified */ echo $_helper->productAttribute($_item, $_item->getShortDescription(), 'short_description') ?>
                                         <a title="<?php echo $block->escapeHtml($_item->getName()) ?>"
-                                           href="<?php echo $block->getProductUrl($_item) ?>"
-                                           class="action more"><?php echo __('Learn More') ?></a>
+                                           href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($_item) ?>"
+                                           class="action more"><?php /* @escapeNotVerified */ echo __('Learn More') ?></a>
                                     </div>
                                 <?php endif; ?>
                             </div>
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 9bdf756149585..959ce7cdb0611 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/detailed.phtml
@@ -16,8 +16,8 @@
             <?php $_options = ($_rating->getRatingOptions()) ? $_rating->getRatingOptions() : $_rating->getOptions() ?>
             <div class="control" data-widget="ratingControl">
             <?php foreach (array_reverse($_options) as $_option): ?>
-                <input type="radio" name="ratings[<?php echo($_rating->getVoteId()) ? $_rating->getVoteId() : $_rating->getId() ?>]" id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>" value="<?php echo $_option->getId() ?>" <?php if ($block->isSelected($_option, $_rating)): ?>checked="checked"<?php endif; ?> />
-                <label for="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>">&#9733;</label>
+                <input type="radio" name="ratings[<?php /* @escapeNotVerified */ echo($_rating->getVoteId()) ? $_rating->getVoteId() : $_rating->getId() ?>]" id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php /* @escapeNotVerified */ echo $_option->getValue() ?>" value="<?php /* @escapeNotVerified */ echo $_option->getId() ?>" <?php if ($block->isSelected($_option, $_rating)): ?>checked="checked"<?php endif; ?> />
+                <label for="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php /* @escapeNotVerified */ echo $_option->getValue() ?>">&#9733;</label>
             <?php $_iterator++ ?>
             <?php endforeach; ?>
             </div>
@@ -37,5 +37,5 @@ require([
 });
 </script>
 <?php else: ?>
-    <?php echo __("Rating isn't Available") ?>
+    <?php /* @escapeNotVerified */ echo __("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 23c88259d8c25..31f2a6e5852de 100644
--- a/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
+++ b/app/code/Magento/Review/view/adminhtml/templates/rating/form.phtml
@@ -9,7 +9,7 @@
 ?>
 <div class="messages">
     <div class="message message-notice message-in-rating-edit">
-        <div><?php echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
+        <div><?php /* @escapeNotVerified */ echo __('Please specify a rating title for a store, or we\'ll just use the default value.'); ?></div>
     </div>
 </div>
 
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 3d5a039bebe17..c32bdc0ec4e05 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 @@
 
 ?>
 <div class="entry-edit-head">
-    <h4 class="icon-head head-edit-form fieldset-legend"><?php echo __('Assigned Options') ?></h4>
+    <h4 class="icon-head head-edit-form fieldset-legend"><?php /* @escapeNotVerified */ echo __('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 echo $_i ?>"><?php echo __('Option Title:') ?></label>
-            <input id="option_<?php echo $_i ?>" name="option[<?php echo $_i ?>][code]" value="<?php echo $_i ?>" class="input-text" type="text" />
+            <label for="option_<?php /* @escapeNotVerified */ echo $_i ?>"><?php /* @escapeNotVerified */ echo __('Option Title:') ?></label>
+            <input id="option_<?php /* @escapeNotVerified */ echo $_i ?>" name="option[<?php /* @escapeNotVerified */ echo $_i ?>][code]" value="<?php /* @escapeNotVerified */ echo $_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 $_item->getId() ?>"><?php echo __('Option Title:') ?></label>
-            <input id="option_<?php echo $_item->getId() ?>" name="option[<?php echo $_item->getId() ?>][code]" value="<?php echo $_item->getCode() ?>" class="input-text" type="text" />
+            <label for="option_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"><?php /* @escapeNotVerified */ echo __('Option Title:') ?></label>
+            <input id="option_<?php /* @escapeNotVerified */ echo $_item->getId() ?>" name="option[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][code]" value="<?php /* @escapeNotVerified */ echo $_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 57f5545640b6a..0ce628aa17c4d 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
@@ -14,12 +14,12 @@
             <div class="ratings">
                <?php echo $block->escapeHtml($_rating->getRatingCode()) ?>
                 <div class="rating-box">
-                    <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
+                    <div class="rating" style="width:<?php /* @escapeNotVerified */ echo ceil($_rating->getPercent()) ?>%;"></div>
                 </div>
             </div>
         <?php endif; ?>
         <?php endforeach; ?>
     </div>
 <?php else: ?>
-    <?php echo __("Rating isn't Available") ?>
+    <?php /* @escapeNotVerified */ echo __("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 01a3a1d35c1c4..c231fad22fac7 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
@@ -9,8 +9,8 @@
 ?>
 <?php if ($block->getRatingSummary()->getCount()): ?>
     <div class="rating-box">
-        <div class="rating" style="width:<?php echo ceil($block->getRatingSummary()->getSum() / ($block->getRatingSummary()->getCount())) ?>%;"></div>
+        <div class="rating" style="width:<?php /* @escapeNotVerified */ echo ceil($block->getRatingSummary()->getSum() / ($block->getRatingSummary()->getCount())) ?>%;"></div>
     </div>
 <?php else: ?>
-    <?php echo __("Rating isn't Available") ?>
+    <?php /* @escapeNotVerified */ echo __("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 7fc5e243fb9fd..cb9a6e770186a 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->getLink() ?>" class="link-feed"><?php echo $block->getLabel() ?></a>
+<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="link-feed"><?php /* @escapeNotVerified */ echo $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 4bd18e568a214..85ba247700fc3 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/list.phtml
@@ -10,31 +10,31 @@
 <?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 __('Product Reviews') ?></caption>
+            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Product Reviews') ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col date"><?php echo __('Created') ?></th>
-                    <th scope="col" class="col item"><?php echo __('Product Name') ?></th>
-                    <th scope="col" class="col summary"><?php echo __('Rating') ?></th>
-                    <th scope="col" class="col description"><?php echo __('Review') ?></th>
+                    <th scope="col" class="col date"><?php /* @escapeNotVerified */ echo __('Created') ?></th>
+                    <th scope="col" class="col item"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+                    <th scope="col" class="col summary"><?php /* @escapeNotVerified */ echo __('Rating') ?></th>
+                    <th scope="col" class="col description"><?php /* @escapeNotVerified */ echo __('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->dateFormat($_review->getReviewCreatedAt()); ?></td>
+                    <td data-th="<?php echo $block->escapeHtml(__('Created')) ?>" class="col date"><?php /* @escapeNotVerified */ echo $block->dateFormat($_review->getReviewCreatedAt()); ?></td>
                     <td data-th="<?php echo $block->escapeHtml(__('Product Name')) ?>" class="col item">
                         <strong class="product-name">
-                            <a href="<?php echo $block->getProductLink() ?>id/<?php echo $_review->getEntityPkValue() ?>"><?php echo $block->escapeHtml($_review->getName()) ?></a>
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getProductLink() ?>id/<?php /* @escapeNotVerified */ echo $_review->getEntityPkValue() ?>"><?php echo $block->escapeHtml($_review->getName()) ?></a>
                         </strong>
                     </td>
                     <td data-th="<?php echo $block->escapeHtml(__('Rating')) ?>" class="col summary">
                     <?php if ($_review->getSum()): ?>
                         <div class="rating-summary">
-                            <span class="label"><span><?php echo __('Rating') ?>:</span></span>
-                            <div class="rating-result" title="<?php echo($_review->getSum() / $_review->getCount()) ?>%">
-                                <span style="width:<?php echo($_review->getSum() / $_review->getCount()) ?>%;"><span><?php echo($_review->getSum() / $_review->getCount()) ?>%</span></span>
+                            <span class="label"><span><?php /* @escapeNotVerified */ echo __('Rating') ?>:</span></span>
+                            <div class="rating-result" title="<?php /* @escapeNotVerified */ echo($_review->getSum() / $_review->getCount()) ?>%">
+                                <span style="width:<?php /* @escapeNotVerified */ echo($_review->getSum() / $_review->getCount()) ?>%;"><span><?php /* @escapeNotVerified */ echo($_review->getSum() / $_review->getCount()) ?>%</span></span>
                             </div>
                         </div>
                     <?php endif; ?>
@@ -43,8 +43,8 @@
                         <?php echo $this->helper('Magento\Review\Helper\Data')->getDetailHtml($_review->getDetail()) ?>
                     </td>
                     <td data-th="<?php echo $block->escapeHtml(__('Actions')) ?>" class="col actions">
-                        <a href="<?php echo $block->getReviewLink() ?>id/<?php echo $_review->getReviewId() ?>" class="action more">
-                            <span><?php echo __('See Details') ?></span>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getReviewLink() ?>id/<?php /* @escapeNotVerified */ echo $_review->getReviewId() ?>" class="action more">
+                            <span><?php /* @escapeNotVerified */ echo __('See Details') ?></span>
                         </a>
                     </td>
                 </tr>
@@ -58,12 +58,12 @@
         </div>
     <?php endif; ?>
 <?php else: ?>
-    <div class="message info empty"><span><?php echo __('You have submitted no reviews.') ?></span></div>
+    <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('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 __('Back') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('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 6bb7aa429fcef..b03be258b9bee 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/recent.phtml
@@ -15,20 +15,20 @@
 <?php if ($block->getReviews() && count($block->getReviews())): ?>
 <div class="block block-reviews-dashboard">
     <div class="block-title">
-        <strong><?php echo __('My Recent Reviews') ?></strong>
-        <a class="action view" href="<?php echo $block->getAllReviewsUrl() ?>"><span><?php echo __('View All') ?></span></a>
+        <strong><?php /* @escapeNotVerified */ echo __('My Recent Reviews') ?></strong>
+        <a class="action view" href="<?php /* @escapeNotVerified */ echo $block->getAllReviewsUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('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->getReviewUrl($_review->getReviewId()) ?>"><?php echo $block->escapeHtml($_review->getName()) ?></a></strong>
+                <strong class="product-name"><a href="<?php /* @escapeNotVerified */ echo $block->getReviewUrl($_review->getReviewId()) ?>"><?php echo $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 __('Rating') ?>:</span></span>
-                         <div class="rating-result" title="<?php echo $rating; ?>%">
-                             <span style="width:<?php echo $rating; ?>%"><span><?php echo $rating; ?>%</span></span>
+                         <span class="label"><span><?php /* @escapeNotVerified */ echo __('Rating') ?>:</span></span>
+                         <div class="rating-result" title="<?php /* @escapeNotVerified */ echo $rating; ?>%">
+                             <span style="width:<?php /* @escapeNotVerified */ echo $rating; ?>%"><span><?php /* @escapeNotVerified */ echo $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 706d371366aa1..cf260dc0e0100 100644
--- a/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/customer/view.phtml
@@ -14,7 +14,7 @@ $product = $block->getProductData();
 <div class="customer-review view">
     <div class="product-details">
         <div class="product-media">
-            <a class="product-photo" href="<?php echo $product->getProductUrl() ?>">
+            <a class="product-photo" href="<?php /* @escapeNotVerified */ echo $product->getProductUrl() ?>">
                 <?php /* customer_account_product_review_page */ ?>
                 <?php echo $block->getImage($block->getProductData(), 'customer_account_product_review_page')->toHtml() ?>
             </a>
@@ -22,7 +22,7 @@ $product = $block->getProductData();
         <div class="product-info">
             <h2 class="product-name"><?php echo $block->escapeHtml($product->getName()) ?></h2>
             <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-                <span class="rating-average-label"><?php echo __('Average Customer Rating:') ?></span>
+                <span class="rating-average-label"><?php /* @escapeNotVerified */ echo __('Average Customer Rating:') ?></span>
                 <?php echo $block->getReviewsSummaryHtml($product) ?>
             <?php endif; ?>
         </div>
@@ -31,7 +31,7 @@ $product = $block->getProductData();
     <div class="review-details">
         <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
             <div class="title">
-                <strong><?php echo __('Your Review'); ?></strong>
+                <strong><?php /* @escapeNotVerified */ echo __('Your Review'); ?></strong>
             </div>
             <div class="customer-review-rating">
                 <?php foreach ($block->getRating() as $_rating): ?>
@@ -39,9 +39,9 @@ $product = $block->getProductData();
                     <?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 echo $rating; ?>%">
-                            <span style="width:<?php echo $rating; ?>%">
-                                <span><?php echo $rating; ?>%</span>
+                        <div class="rating-result" title="<?php /* @escapeNotVerified */ echo $rating; ?>%">
+                            <span style="width:<?php /* @escapeNotVerified */ echo $rating; ?>%">
+                                <span><?php /* @escapeNotVerified */ echo $rating; ?>%</span>
                             </span>
                         </div>
                     </div>
@@ -53,13 +53,13 @@ $product = $block->getProductData();
         <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-date">
-            <?php echo __('Submitted on %1', '<time class="date">' . $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>') ?>
+            <?php /* @escapeNotVerified */ echo __('Submitted on %1', '<time class="date">' . $block->dateFormat($block->getReviewData()->getCreatedAt()) . '</time>') ?>
         </div>
     </div>
 </div>
 <div class="actions-toolbar">
     <div class="secondary">
-        <a class="action back" href="<?php echo $block->getBackUrl() ?>"><span><?php echo __('Back to My Reviews') ?></span></a>
+        <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('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 985b579dcd7e7..bdfc0053b261e 100644
--- a/app/code/Magento/Review/view/frontend/templates/detailed.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/detailed.phtml
@@ -10,7 +10,7 @@
 <?php if (!empty($collection) && $collection->getSize()): ?>
     <div class="table-wrapper">
         <table class="data table ratings review summary">
-            <caption class="table-caption"><?php echo __('Ratings Review Summary'); ?></caption>
+            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Ratings Review Summary'); ?></caption>
             <tbody>
             <?php foreach ($collection as $_rating): ?>
                 <?php if ($_rating->getSummary()): ?>
@@ -18,7 +18,7 @@
                         <th class="label" scope="row"><?php echo __($block->escapeHtml($_rating->getRatingCode())) ?></th>
                         <td class="value">
                             <div class="rating box">
-                                <div class="rating" style="width:<?php echo ceil($_rating->getSummary()) ?>%;"></div>
+                                <div class="rating" style="width:<?php /* @escapeNotVerified */ echo 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 e0e1d0c3e8d7b..60f42febcc7c9 100644
--- a/app/code/Magento/Review/view/frontend/templates/empty.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/empty.phtml
@@ -3,5 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
-<p class="no-rating"><a href="#review-form"><?php echo __('Be the first to review this product') ?></a></p>
+<p class="no-rating"><a href="#review-form"><?php /* @escapeNotVerified */ echo __('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 2c1f9f44dcfc5..47970d332b883 100644
--- a/app/code/Magento/Review/view/frontend/templates/form.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/form.phtml
@@ -11,18 +11,18 @@
  */
 ?>
 <div class="block review-add">
-    <div class="block-title"><strong><?php echo __('Write Your Own Review') ?></strong></div>
+    <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('Write Your Own Review') ?></strong></div>
 <div class="block-content">
 <?php if ($block->getAllowWriteReviewFlag()): ?>
-<form action="<?php echo $block->getAction() ?>" class="review-form" method="post" id="review-form" data-role="product-review-form" data-bind="scope: 'review-form'">
+<form action="<?php /* @escapeNotVerified */ echo $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 __('* Required Fields'); ?>">
-        <legend class="legend review-legend"><span><?php echo __("You're reviewing:"); ?></span><strong><?php echo $block->escapeHtml($block->getProductInfo()->getName()) ?></strong></legend><br />
+        <legend class="legend review-legend"><span><?php /* @escapeNotVerified */ echo __("You're reviewing:"); ?></span><strong><?php echo $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 __('Your Rating') ?><span></legend><br/>
+            <legend class="label"><span><?php /* @escapeNotVerified */ echo __('Your Rating') ?><span></legend><br/>
             <div class="control">
                 <div class="nested" id="product-review-table">
                     <?php foreach ($block->getRatings() as $_rating): ?>
@@ -33,18 +33,18 @@
                             <?php $iterator = 1; foreach ($options as $_option): ?>
                                 <input
                                     type="radio"
-                                    name="ratings[<?php echo $_rating->getId() ?>]"
-                                    id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>"
-                                    value="<?php echo $_option->getId() ?>"
+                                    name="ratings[<?php /* @escapeNotVerified */ echo $_rating->getId() ?>]"
+                                    id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php /* @escapeNotVerified */ echo $_option->getValue() ?>"
+                                    value="<?php /* @escapeNotVerified */ echo $_option->getId() ?>"
                                     class="radio"
                                     data-validate="{required:true, messages:{required:'Please select one of each of the ratings above.'}}"
-                                    aria-labelledby="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_rating_label <?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>_label" />
+                                    aria-labelledby="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_rating_label <?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php /* @escapeNotVerified */ echo $_option->getValue() ?>_label" />
                                 <label
-                                    class="rating-<?php echo $iterator; ?>"
-                                    for="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>"
-                                    title="<?php echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?>"
-                                    id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php echo $_option->getValue() ?>_label">
-                                    <span><?php echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?></span>
+                                    class="rating-<?php /* @escapeNotVerified */ echo $iterator; ?>"
+                                    for="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php /* @escapeNotVerified */ echo $_option->getValue() ?>"
+                                    title="<?php /* @escapeNotVerified */ echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?>"
+                                    id="<?php echo $block->escapeHtml($_rating->getRatingCode()) ?>_<?php /* @escapeNotVerified */ echo $_option->getValue() ?>_label">
+                                    <span><?php /* @escapeNotVerified */ echo __('%1 %2', $iterator, $iterator > 1 ? 'stars' : 'star') ?></span>
                                 </label>
                             <?php $iterator++; ?>
                             <?php endforeach; ?>
@@ -57,19 +57,19 @@
         </fieldset>
     <?php endif ?>
         <div class="field review-field-nickname required">
-            <label for="nickname_field" class="label"><span><?php echo __('Nickname') ?></span></label>
+            <label for="nickname_field" class="label"><span><?php /* @escapeNotVerified */ echo __('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 __('Summary') ?></span></label>
+            <label for="summary_field" class="label"><span><?php /* @escapeNotVerified */ echo __('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 __('Review') ?></span></label>
+            <label for="review_field" class="label"><span><?php /* @escapeNotVerified */ echo __('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>
@@ -77,14 +77,14 @@
     </fieldset>
     <div class="actions-toolbar review-form-actions">
         <div class="primary actions-primary">
-            <button type="submit" class="action submit primary"><span><?php echo __('Submit Review') ?></span></button>
+            <button type="submit" class="action submit primary"><span><?php /* @escapeNotVerified */ echo __('Submit Review') ?></span></button>
         </div>
     </div>
 </form>
 <script type="text/x-magento-init">
 {
     "[data-role=product-review-form]": {
-        "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?>
+        "Magento_Ui/js/core/app": <?php /* @escapeNotVerified */ echo $block->getJsLayout();?>
     },
     "#review-form": {
         "Magento_Review/js/error-placement": {}
@@ -94,7 +94,7 @@
 <?php else: ?>
     <div class="message info notlogged" id="review-form">
         <div>
-            <?php echo __('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()) ?>
+            <?php /* @escapeNotVerified */ echo __('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()) ?>
         </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 4899f749d376d..ab9ae0d36ba8b 100644
--- a/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/helper/summary.phtml
@@ -14,22 +14,22 @@
 <div class="product-reviews-summary<?php echo !$rating ? ' no-rating' : ''?>" itemprop="aggregateRating" itemscope itemtype="http://schema.org/AggregateRating">
     <?php if ($rating):?>
     <div class="rating-summary">
-         <span class="label"><span><?php echo __('Rating') ?>:</span></span>
-         <div class="rating-result" title="<?php echo $rating; ?>%">
-             <span style="width:<?php echo $rating; ?>%"><span><span itemprop="ratingValue"><?php echo $rating; ?></span>% of <span itemprop="bestRating">100</span></span></span>
+         <span class="label"><span><?php /* @escapeNotVerified */ echo __('Rating') ?>:</span></span>
+         <div class="rating-result" title="<?php /* @escapeNotVerified */ echo $rating; ?>%">
+             <span style="width:<?php /* @escapeNotVerified */ echo $rating; ?>%"><span><span itemprop="ratingValue"><?php /* @escapeNotVerified */ echo $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 $url ?>"><span itemprop="reviewCount"><?php echo $block->getReviewsCount() ?></span>&nbsp;<span><?php echo($block->getReviewsCount() == 1) ? __('Review') : __('Reviews') ?></span></a>
-        <a class="action add" href="<?php echo $urlForm ?>"><?php echo __('Add Your Review') ?></a>
+        <a class="action view" href="<?php /* @escapeNotVerified */ echo $url ?>"><span itemprop="reviewCount"><?php /* @escapeNotVerified */ echo $block->getReviewsCount() ?></span>&nbsp;<span><?php /* @escapeNotVerified */ echo($block->getReviewsCount() == 1) ? __('Review') : __('Reviews') ?></span></a>
+        <a class="action add" href="<?php /* @escapeNotVerified */ echo $urlForm ?>"><?php /* @escapeNotVerified */ echo __('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 $urlForm; ?>">
-            <?php echo __('Be the first to review this product') ?>
+        <a class="action add" href="<?php /* @escapeNotVerified */ echo $urlForm; ?>">
+            <?php /* @escapeNotVerified */ echo __('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 eeb1ff7aa2e66..63f6e3b238cbb 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
@@ -14,21 +14,21 @@
 <div class="product-reviews-summary short<?php echo !$rating ? ' no-rating' : ''?>">
     <?php if ($rating):?>
     <div class="rating-summary">
-        <span class="label"><span><?php echo __('Rating') ?>:</span></span>
-        <div class="rating-result" title="<?php echo $rating; ?>%">
-            <span style="width:<?php echo $rating; ?>%"><span><?php echo $rating; ?>%</span></span>
+        <span class="label"><span><?php /* @escapeNotVerified */ echo __('Rating') ?>:</span></span>
+        <div class="rating-result" title="<?php /* @escapeNotVerified */ echo $rating; ?>%">
+            <span style="width:<?php /* @escapeNotVerified */ echo $rating; ?>%"><span><?php /* @escapeNotVerified */ echo $rating; ?>%</span></span>
         </div>
     </div>
     <?php endif;?>
     <div class="reviews-actions">
-        <a class="action view" href="<?php echo $url ?>"><?php echo $block->getReviewsCount() ?>&nbsp;<span><?php echo($block->getReviewsCount() == 1) ? __('Review') : __('Reviews') ?></span></a>
+        <a class="action view" href="<?php /* @escapeNotVerified */ echo $url ?>"><?php /* @escapeNotVerified */ echo $block->getReviewsCount() ?>&nbsp;<span><?php /* @escapeNotVerified */ echo($block->getReviewsCount() == 1) ? __('Review') : __('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 $urlForm; ?>">
-            <?php echo __('Be the first to review this product') ?>
+        <a class="action add" href="<?php /* @escapeNotVerified */ echo $urlForm; ?>">
+            <?php /* @escapeNotVerified */ echo __('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 9e6b13665e145..f39dfc4ee46d8 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 @@
 
 ?>
 <?php if (!empty($count)):?>
-    <a href="#customer-reviews" class="nobr"><?php echo __('%1 Review(s)', $count) ?></a>
+    <a href="#customer-reviews" class="nobr"><?php /* @escapeNotVerified */ echo __('%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 431dcf446e66e..8ec7d58b7dbbc 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
@@ -20,7 +20,7 @@
 <?php if (count($_items)):?>
 <div class="block review-list" id="customer-reviews">
     <div class="block-title">
-        <strong><?php echo __('Customer Reviews') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Customer Reviews') ?></strong>
     </div>
     <div class="block-content">
         <div class="toolbar review-toolbar">
@@ -35,11 +35,11 @@
                     <?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 $_vote->getPercent() ?>%">
+                        <div class="rating-result" title="<?php /* @escapeNotVerified */ echo $_vote->getPercent() ?>%">
 	                        <meta itemprop="worstRating" content = "1"/>
 	                        <meta itemprop="bestRating" content = "100"/>
-                            <span style="width:<?php echo $_vote->getPercent() ?>%">
-                                <span itemprop="ratingValue"><?php echo $_vote->getPercent() ?>%</span>
+                            <span style="width:<?php /* @escapeNotVerified */ echo $_vote->getPercent() ?>%">
+                                <span itemprop="ratingValue"><?php /* @escapeNotVerified */ echo $_vote->getPercent() ?>%</span>
                             </span>
                         </div>
                     </div>
@@ -51,12 +51,12 @@
                 </div>
                 <div class="review-details">
                     <p class="review-author">
-                        <span class="review-details-label"><?php echo __('Review by')?></span>
+                        <span class="review-details-label"><?php /* @escapeNotVerified */ echo __('Review by')?></span>
                         <strong class="review-details-value" itemprop="author"><?php echo $block->escapeHtml($_review->getNickname()) ?></strong>
                     </p>
                     <p class="review-date">
-                        <span class="review-details-label"><?php echo __('Posted on') ?></span>
-                        <time class="review-details-value" itemprop="datePublished" datetime="<?php echo $block->formatDate($_review->getCreatedAt(), $format) ?>"><?php echo $block->formatDate($_review->getCreatedAt(), $format) ?></time>
+                        <span class="review-details-label"><?php /* @escapeNotVerified */ echo __('Posted on') ?></span>
+                        <time class="review-details-value" itemprop="datePublished" datetime="<?php /* @escapeNotVerified */ echo $block->formatDate($_review->getCreatedAt(), $format) ?>"><?php /* @escapeNotVerified */ echo $block->formatDate($_review->getCreatedAt(), $format) ?></time>
                     </p>
                 </div>
             </li>
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 32c3be7caace3..55e570421fc57 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
@@ -11,5 +11,5 @@
 <?php /** @var $block \Magento\Review\Block\Product\View\Other */ ?>
 <?php $_product = $block->getProduct(); ?>
 <div class="actions">
-    <a href="<?php echo $_product->getProductUrl() ?>" class="action back"><span><?php echo __('Back to Main Product Info') ?></span></a>
+    <a href="<?php /* @escapeNotVerified */ echo $_product->getProductUrl() ?>" class="action back"><span><?php /* @escapeNotVerified */ echo __('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 71ab63d17ab47..17223f9117f7b 100644
--- a/app/code/Magento/Review/view/frontend/templates/review.phtml
+++ b/app/code/Magento/Review/view/frontend/templates/review.phtml
@@ -12,7 +12,7 @@
     {
         "*": {
             "Magento_Review/js/process-reviews": {
-                "productReviewUrl": "<?php echo $block->getProductReviewUrl();?>"
+                "productReviewUrl": "<?php /* @escapeNotVerified */ echo $block->getProductReviewUrl();?>"
             }
         }
     }
diff --git a/app/code/Magento/Review/view/frontend/templates/view.phtml b/app/code/Magento/Review/view/frontend/templates/view.phtml
index a9db18bdfb9c3..89bf98e410d85 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 __('Review Details') ?></h1>
+        <h1><?php /* @escapeNotVerified */ echo __('Review Details') ?></h1>
     </div>
     <div class="product-img-box">
-        <a href="<?php echo $block->getProductData()->getProductUrl() ?>">
+        <a href="<?php /* @escapeNotVerified */ echo $block->getProductData()->getProductUrl() ?>">
             <?php echo $block->getImage($block->getProductData(), 'product_base_image', ['class' => 'product-image'])->toHtml(); ?>
         </a>
         <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-          <p><?php echo __('Average Customer Rating') ?>:</p>
+          <p><?php /* @escapeNotVerified */ echo __('Average Customer Rating') ?>:</p>
           <?php echo $block->getReviewsSummaryHtml($block->getProductData()) ?>
         <?php endif; ?>
     </div>
     <div class="details">
         <h3 class="product-name"><?php echo $block->escapeHtml($block->getProductData()->getName()) ?></h3>
         <?php if ($block->getRating() && $block->getRating()->getSize()): ?>
-            <h4><?php echo __('Product Rating:') ?></h4>
+            <h4><?php /* @escapeNotVerified */ echo __('Product Rating:') ?></h4>
             <div class="table-wrapper">
                 <table class="data-table review-summary-table">
-                    <caption class="table-caption"><?php echo __('Product Rating'); ?></caption>
+                    <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('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="value">
                                     <div class="rating-box">
-                                        <div class="rating" style="width:<?php echo ceil($_rating->getPercent()) ?>%;"></div>
+                                        <div class="rating" style="width:<?php /* @escapeNotVerified */ echo ceil($_rating->getPercent()) ?>%;"></div>
                                     </div></td>
                             </tr>
                         <?php endif; ?>
@@ -43,13 +43,13 @@
                 </table>
             </div>
         <?php endif; ?>
-        <p class="date"><?php echo __('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt())) ?></p>
+        <p class="date"><?php /* @escapeNotVerified */ echo __('Product Review (submitted on %1):', $block->dateFormat($block->getReviewData()->getCreatedAt())) ?></p>
         <p><?php echo nl2br($block->escapeHtml($block->getReviewData()->getDetail())) ?></p>
     </div>
     <div class="actions">
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->getBackUrl() ?>">
-                <span><?php echo __('Back to Product Reviews') ?></a></span>
+            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>">
+                <span><?php /* @escapeNotVerified */ echo __('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 85ae8055ac25f..0f05af264db0b 100644
--- a/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
+++ b/app/code/Magento/Rss/view/frontend/templates/feeds.phtml
@@ -8,24 +8,24 @@
 
 ?>
 <table class="data table rss">
-    <caption class="table-caption"><?php echo __('Feed'); ?></caption>
+    <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Feed'); ?></caption>
     <tbody>
-        <th colspan="2" scope="col"><?php echo __('Miscellaneous Feeds') ?></th>
+        <th colspan="2" scope="col"><?php /* @escapeNotVerified */ echo __('Miscellaneous Feeds') ?></th>
     <?php foreach ($block->getFeeds() as $feed): ?>
         <?php if (!isset($feed['group'])): ?>
         <tr>
-            <td class="col feed"><?php echo $feed['label'] ?></td>
+            <td class="col feed"><?php /* @escapeNotVerified */ echo $feed['label'] ?></td>
             <td class="col action">
-                <a href="<?php echo $feed['link'] ?>" class="action get"><span><?php echo __('Get Feed'); ?></span></a>
+                <a href="<?php /* @escapeNotVerified */ echo $feed['link'] ?>" class="action get"><span><?php /* @escapeNotVerified */ echo __('Get Feed'); ?></span></a>
             </td>
         </tr>
         <?php else: ?>
-            <th colspan="2" scope="col"><?php echo $feed['group'] ?></th>
+            <th colspan="2" scope="col"><?php /* @escapeNotVerified */ echo $feed['group'] ?></th>
             <?php foreach ($feed['feeds'] as $item) :?>
                 <tr>
-                    <td class="col feed"><?php echo $item['label'] ?></td>
+                    <td class="col feed"><?php /* @escapeNotVerified */ echo $item['label'] ?></td>
                     <td class="col action">
-                        <a href="<?php echo $item['link'] ?>" class="action get"><span><?php echo __('Get Feed'); ?></span></a>
+                        <a href="<?php /* @escapeNotVerified */ echo $item['link'] ?>" class="action get"><span><?php /* @escapeNotVerified */ echo __('Get Feed'); ?></span></a>
                     </td>
                 </tr>
             <?php endforeach; ?>
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 d8e8c8eda4262..a8aeccd5dc076 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 echo $_item->getId() ?>_title"
+    <div id="order_item_<?php /* @escapeNotVerified */ echo $_item->getId() ?>_title"
          class="product-title">
         <?php echo $block->escapeHtml($_item->getName()) ?>
     </div>
 
     <div class="product-sku-block">
-        <span><?php echo __('SKU') ?>:</span> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getSku()))); ?>
+        <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span> <?php echo 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 echo $_option['label'] ?>:</dt>
+                <dt><?php /* @escapeNotVerified */ echo $_option['label'] ?>:</dt>
                 <dd>
                     <?php if (isset($_option['custom_view']) && $_option['custom_view']): ?>
-                        <?php echo $block->getCustomizedOptionValue($_option); ?>
+                        <?php /* @escapeNotVerified */ echo $block->getCustomizedOptionValue($_option); ?>
                     <?php else: ?>
                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
-                        <?php echo $_option['value']; ?><?php if (isset($_option['remainder']) && $_option['remainder']): ?><span id="<?php echo $_dots = 'dots' . uniqid()?>"> ...</span><span id="<?php echo $_id = 'id' . uniqid()?>"><?php echo $_option['remainder'] ?></span>
+                        <?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>
                             <script>
                                 require(['prototype'], function() {
-                                    $('<?php echo $_id ?>').hide();
-                                    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_id ?>').show();});
-                                    $('<?php echo $_id ?>').up().observe('mouseover', function(){$('<?php echo $_dots?>').hide();});
-                                    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_id ?>').hide();});
-                                    $('<?php echo $_id ?>').up().observe('mouseout',  function(){$('<?php echo $_dots ?>').show();});
+                                    $('<?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();});
                                 });
                             </script>
                         <?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 5cf772879bed1..910b3ee53a08d 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 echo __('Ordered') ?></th>
-        <td><?php echo $_item->getQtyOrdered()*1 ?></td>
+        <th><?php /* @escapeNotVerified */ echo __('Ordered') ?></th>
+        <td><?php /* @escapeNotVerified */ echo $_item->getQtyOrdered()*1 ?></td>
     </tr>
 
     <?php if ((float) $_item->getQtyInvoiced()): ?>
         <tr>
-            <th><?php echo __('Invoiced') ?></th>
-            <td><?php echo $_item->getQtyInvoiced()*1 ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Invoiced') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $_item->getQtyInvoiced()*1 ?></td>
         </tr>
     <?php endif; ?>
 
     <?php if ((float) $_item->getQtyShipped()): ?>
         <tr>
-            <th><?php echo __('Shipped') ?></th>
-            <td><?php echo $_item->getQtyShipped()*1 ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Shipped') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $_item->getQtyShipped()*1 ?></td>
         </tr>
     <?php endif; ?>
 
     <?php if ((float) $_item->getQtyRefunded()): ?>
         <tr>
-            <th><?php echo __('Refunded') ?></th>
-            <td><?php echo $_item->getQtyRefunded()*1 ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Refunded') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $_item->getQtyRefunded()*1 ?></td>
         </tr>
     <?php endif; ?>
 
     <?php if ((float) $_item->getQtyCanceled()): ?>
         <tr>
-            <th><?php echo __('Canceled') ?></th>
-            <td><?php echo $_item->getQtyCanceled()*1 ?></td>
+            <th><?php /* @escapeNotVerified */ echo __('Canceled') ?></th>
+            <td><?php /* @escapeNotVerified */ echo $_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 5b00bf64e509c..e59a25a7cd2f4 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 echo $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+    <?php /* @escapeNotVerified */ echo $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 a03f2698c20a9..f07f30f4964a8 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 echo $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?php /* @escapeNotVerified */ echo $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 529d8af64cd08..b3b20000171aa 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 echo $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+<?php /* @escapeNotVerified */ echo $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 1703cf668ee4f..85e4124fa8cea 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,12 +8,12 @@
 
 ?>
 
-<?php echo $block->getItem()->getName() ?>
-<div><strong><?php echo __('SKU') ?>:</strong> <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($block->getItem()->getSku()))); ?></div>
+<?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>
 <?php if ($block->getOrderOptions()): ?>
     <ul class="item-options">
     <?php foreach ($block->getOrderOptions() as $option): ?>
-        <li><strong><?php echo $option['label'] ?>:</strong><br />
+        <li><strong><?php /* @escapeNotVerified */ echo $option['label'] ?>:</strong><br />
         <?php if (is_array($option['value'])): ?>
         <?php foreach ($option['value'] as $item): ?>
             <?php echo $block->getValueHtml($item) ?><br />
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 863c6d69b1d29..d105a7cd912b7 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,13 +9,13 @@
 ?>
 <div class="message message-notice">
     <div class="message-inner">
-        <div class="message-content"><?php echo __('Changing address information will not recalculate shipping, tax or other order amount.') ?></div>
+        <div class="message-content"><?php /* @escapeNotVerified */ echo __('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 echo $block->getHeaderText() ?></span>
+        <span><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
     </legend>
     <br>
     <div class="form-inline">
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 1d3eb30bd03bd..6d8acd1fe2842 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 echo __('Comment Text') ?></label>
+                   for="history_comment"><?php /* @escapeNotVerified */ echo __('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 echo __('Notify Customer by Email') ?></label>
+                               for="history_notify"><?php /* @escapeNotVerified */ echo __('Notify Customer by Email') ?></label>
                     </div>
                 <?php endif; ?>
                 <div class="admin__field admin__field-option">
@@ -41,7 +41,7 @@
                            class="admin__control-checkbox"
                            value="1" />
                     <label class="admin__field-label"
-                           for="history_visible"> <?php echo __('Visible on Storefront') ?></label>
+                           for="history_visible"> <?php /* @escapeNotVerified */ echo __('Visible on Storefront') ?></label>
                 </div>
             </div>
             <div class="order-history-comments-actions">
@@ -53,14 +53,14 @@
     <ul class="note-list">
         <?php foreach ($_entity->getCommentsCollection(true) as $_comment): ?>
             <li>
-                <span class="note-list-date"><?php echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-                <span class="note-list-time"><?php echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+                <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_comment->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
                 <span class="note-list-customer">
-                    <?php echo __('Customer') ?>
+                    <?php /* @escapeNotVerified */ echo __('Customer') ?>
                     <?php if ($_comment->getIsCustomerNotified()): ?>
-                        <span class="note-list-customer-notified"><?php echo __('Notified') ?></span>
+                        <span class="note-list-customer-notified"><?php /* @escapeNotVerified */ echo __('Notified') ?></span>
                     <?php else: ?>
-                        <span class="note-list-customer-not-notified"><?php echo __('Not Notified') ?></span>
+                        <span class="note-list-customer-not-notified"><?php /* @escapeNotVerified */ echo __('Not Notified') ?></span>
                     <?php endif; ?>
                 </span>
                 <div class="note-list-comment"><?php echo $block->escapeHtml($_comment->getComment(), ['b', 'br', 'strong', 'i', 'u', 'a']) ?></div>
@@ -72,7 +72,7 @@
 require(['prototype'], function(){
 
 submitComment = function() {
-    submitAndReloadArea($('comments_block').parentNode, '<?php echo $block->getSubmitUrl() ?>')
+    submitAndReloadArea($('comments_block').parentNode, '<?php /* @escapeNotVerified */ echo $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 4364258410ba4..49975c6bbfd87 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,7 +9,7 @@
 ?>
 
 <div class="admin__page-section-title">
-    <span class="title"><?php echo $block->getHeaderText() ?></span>
+    <span class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
     <?php if($block->getButtonsHtml()): ?>
         <div class="actions"><?php echo $block->getButtonsHtml() ?></div>
     <?php endif; ?>
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 54990665e4e09..14c65994565ad 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,31 +18,31 @@
     <?php foreach ($_methods as $_method): $_code = $_method->getCode(); $_counter++; ?>
         <dt class="admin__field-option">
         <?php if ($_methodsCount > 1): ?>
-            <input id="p_method_<?php echo $_code ?>" value="<?php echo $_code ?>" type="radio" name="payment[method]"
+            <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 echo $_code ?>')"<?php if ($block->getSelectedMethodCode() == $_code): ?> checked="checked"<?php endif; ?>
+                   onclick="payment.switchMethod('<?php /* @escapeNotVerified */ echo $_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 echo $_code ?>" value="<?php echo $_code ?>" type="radio"
+                <input id="p_method_<?php /* @escapeNotVerified */ echo $_code ?>" value="<?php /* @escapeNotVerified */ echo $_code ?>" type="radio"
                        name="payment[method]" class="admin__control-radio"
                        checked="checked"/>
             </span>
         <?php endif;?>
 
-            <label class="admin__field-label" for="p_method_<?php echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
+            <label class="admin__field-label" for="p_method_<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_method->getTitle()) ?></label>
         </dt>
         <dd class="admin__payment-method-wapper">
-            <?php echo $block->getChildHtml('payment.method.' . $_code) ?>
+            <?php /* @escapeNotVerified */ echo $block->getChildHtml('payment.method.' . $_code) ?>
         </dd>
     <?php endforeach; ?>
     </dl>
 </div>
 <script>
     require(["Magento_Sales/order/create/form"], function(){
-        order.setPaymentMethod('<?php echo $block->getSelectedMethodCode() ?>')
+        order.setPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode() ?>')
     });
 </script>
 <?php else: ?>
-    <div class="admin__message-empty"><?php echo __('No Payment Methods') ?></div>
+    <div class="admin__message-empty"><?php /* @escapeNotVerified */ echo __('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 4163d1ad7890d..4c8960e92ad8d 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
@@ -10,12 +10,12 @@
 
 <?php /* <h4 class="icon-head fieldset-legend <?php echo $block->getHeaderCssClass() ?>"><?php echo $block->getHeaderText() ?></h4> */ ?>
 <div class="admin__field field-comment">
-    <label for="order-comment" class="admin__field-label"><span><?php echo __('Order Comments') ?></span></label>
+    <label for="order-comment" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Order Comments') ?></span></label>
     <div class="admin__field-control">
         <textarea
             id="order-comment"
             name="order[comment][customer_note]"
-            class="admin__control-textarea"><?php echo $block->getCommentNote() ?></textarea>
+            class="admin__control-textarea"><?php /* @escapeNotVerified */ echo $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 74511acdd3e81..d6de0c9de382a 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 echo __('Apply Coupon Code') ?></span></label>
+    <label class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('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\'))') ?>
         <?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 echo __('Remove Coupon Code') ?>"
-               class="action-remove"><span><?php echo __('Remove') ?></span></a>
+            <a href="#" onclick="order.applyCoupon(''); return false;" title="<?php /* @escapeNotVerified */ echo __('Remove Coupon Code') ?>"
+               class="action-remove"><span><?php /* @escapeNotVerified */ echo __('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 7ba8e8a79394a..78f84dbbb1e25 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,7 +10,7 @@
 <div class="page-create-order">
     <script>
     require(["Magento_Sales/order/create/form"], function(){
-        order.setCurrencySymbol('<?php echo $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
+        order.setCurrencySymbol('<?php /* @escapeNotVerified */ echo $block->getCurrencySymbol($block->getCurrentCurrencyCode()) ?>')
     });
 </script>
     <div class="order-details<?php if ($block->getCustomerId()): ?> order-details-existing-customer<?php endif; ?>">
@@ -35,7 +35,7 @@
 
         <section id="order-addresses" class="admin__page-section order-addresses">
             <div class="admin__page-section-title">
-                <span class="title"><?php echo __('Address Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Address Information') ?></span>
             </div>
             <div class="admin__page-section-content">
                 <div id="order-billing_address" class="admin__page-section-item order-billing-address">
@@ -49,7 +49,7 @@
 
         <section id="order-methods" class="admin__page-section order-methods">
             <div class="admin__page-section-title">
-                <span class="title"><?php echo __('Payment &amp; Shipping Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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">
@@ -71,11 +71,11 @@
 
         <section class="admin__page-section order-summary">
             <div class="admin__page-section-title">
-                <span class="title"><?php echo __('Order Total') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Order History') ?></span></legend>
+                    <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Order History') ?></span></legend>
                     <br>
                     <?php echo $block->getChildHtml('comment') ?>
                 </fieldset>
@@ -90,15 +90,15 @@
         <div class="order-sidebar">
             <div class="store-switcher order-currency">
                 <label class="admin__field-label" for="currency_switcher">
-                    <?php echo __('Order Currency:') ?>
+                    <?php /* @escapeNotVerified */ echo __('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 echo $_code ?>"<?php if ($_code == $block->getCurrentCurrencyCode()): ?> selected="selected"<?php endif; ?> symbol="<?php echo $block->getCurrencySymbol($_code) ?>">
-                            <?php echo $block->getCurrencyName($_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>
                     <?php endforeach; ?>
                 </select>
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 afbac47fed0cc..8e631a87ac3c6 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->getOrderDataJson() ?>' data-load-base-url="<?php echo $block->getLoadBlockUrl() ?>" action="<?php echo $block->getSaveUrl() ?>" method="post" enctype="multipart/form-data">
+<form id="edit_form" data-order-config='<?php /* @escapeNotVerified */ echo $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')?>
     <div id="order-message">
         <?php echo $block->getChildHtml('message') ?>
     </div>
-    <div id="order-customer-selector" class="fieldset-wrapper order-customer-selector" style="display:<?php echo $block->getCustomerSelectorDisplay() ?>">
+    <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>
-    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?php echo $block->getStoreSelectorDisplay() ?>">
+    <div id="order-store-selector" class="fieldset-wrapper" style="display:<?php /* @escapeNotVerified */ echo $block->getStoreSelectorDisplay() ?>">
         <?php echo $block->getChildHtml('store') ?>
     </div>
-    <div id="order-data" style="display:<?php echo $block->getDataSelectorDisplay() ?>">
+    <div id="order-data" style="display:<?php /* @escapeNotVerified */ echo $block->getDataSelectorDisplay() ?>">
         <?php echo $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 8fa45617a3a04..81ef33adfd83a 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,8 +5,8 @@
  */
  ?>
 
-<div class="admin__page-section-title <?php echo $block->getHeaderCssClass() ?>">
-    <span class="title"><?php echo $block->getHeaderText() ?></span>
+<div class="admin__page-section-title <?php /* @escapeNotVerified */ echo $block->getHeaderCssClass() ?>">
+    <span class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
     <div class="actions"></div>
 </div>
 <div id="customer_account_fieds" class="admin__page-section-content">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index 7db94eab68f48..8eba804877b5f 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 echo $_fieldsContainerId ?>';
-        order.setAddresses(<?php echo $block->getAddressCollectionJson() ?>);
+        order.shippingAddressContainer = '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>';
+        order.setAddresses(<?php /* @escapeNotVerified */ echo $block->getAddressCollectionJson() ?>);
 
     });
     </script>
@@ -28,42 +28,42 @@ else:
     ?>
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-            order.billingAddressContainer = '<?php echo $_fieldsContainerId ?>';
+            order.billingAddressContainer = '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>';
         });
     </script>
     <?php
 endif; ?>
 
 <fieldset class="admin__fieldset">
-    <legend class="admin__legend <?php echo $block->getHeaderCssClass() ?>">
-        <span><?php echo $block->getHeaderText() ?></span>
+    <legend class="admin__legend <?php /* @escapeNotVerified */ echo $block->getHeaderCssClass() ?>">
+        <span><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></span>
     </legend><br>
 
-    <fieldset id="<?php echo $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
+    <fieldset id="<?php /* @escapeNotVerified */ echo $_addressChoiceContainerId ?>" class="admin__fieldset order-choose-address">
     <?php if ($block->getIsShipping()): ?>
         <div class="admin__field admin__field-option">
             <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 echo __('Same As Billing Address') ?>
+                <?php /* @escapeNotVerified */ echo __('Same As Billing Address') ?>
             </label>
         </div>
     <?php endif; ?>
         <div class="admin__field">
-            <label class="admin__field-label"><?php echo __('Select from existing customer addresses:') ?></label>
+            <label class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Select from existing customer addresses:') ?></label>
             <?php $_id = $block->getForm()->getHtmlIdPrefix() . 'customer_address_id' ?>
             <div class="admin__field-control">
-                <select id="<?php echo $_id ?>"
+                <select id="<?php /* @escapeNotVerified */ echo $_id ?>"
                         name="<?php echo $block->getForm()->getHtmlNamePrefix() ?>[customer_address_id]"
-                        style="width: 97.5%;" onchange="order.selectAddress(this, '<?php echo $_fieldsContainerId ?>')"
+                        style="width: 97.5%;" onchange="order.selectAddress(this, '<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>')"
                         class="admin__control-select">
-                    <option value=""><?php echo __('Add New Address') ?></option>
+                    <option value=""><?php /* @escapeNotVerified */ echo __('Add New Address') ?></option>
                     <?php foreach ($block->getAddressCollection() as $_address): ?>
                         <?php //if($block->getAddressAsString($_address)!=$block->getAddressAsString($block->getAddress())): ?>
                         <option
-                            value="<?php echo $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
-                            <?php echo $block->getAddressAsString($_address) ?>
+                            value="<?php /* @escapeNotVerified */ echo $_address->getId() ?>"<?php if ($_address->getId() == $block->getAddressId()): ?> selected="selected"<?php endif; ?>>
+                            <?php /* @escapeNotVerified */ echo $block->getAddressAsString($_address) ?>
                         </option>
                         <?php //endif; ?>
                     <?php endforeach; ?>
@@ -72,7 +72,7 @@ endif; ?>
         </div>
     </fieldset>
 
-    <div class="order-address admin__fieldset" id="<?php echo $_fieldsContainerId ?>">
+    <div class="order-address admin__fieldset" id="<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>">
         <?php echo $block->getForm()->toHtml() ?>
 
         <div class="admin__field admin__field-option order-save-in-address-book">
@@ -82,18 +82,18 @@ endif; ?>
                    <?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 echo __('Save in address book') ?></label>
+                   class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Save in address book') ?></label>
         </div>
     </div>
     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
-    <div style="display: none;" id="<?php echo $hideElement ?>" class="order-methods-overlay">
-        <span><?php echo __('You don\'t need to select a shipping address.') ?></span>
+    <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>
 
     <script>
         require(["Magento_Sales/order/create/form"], function(){
-                order.bindAddressFields('<?php echo $_fieldsContainerId ?>');
-                order.bindAddressFields('<?php echo $_addressChoiceContainerId ?>');
+                order.bindAddressFields('<?php /* @escapeNotVerified */ echo $_fieldsContainerId ?>');
+                order.bindAddressFields('<?php /* @escapeNotVerified */ echo $_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 bc1ee98518a0d..fba4d6714ee5f 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,10 +11,10 @@
 <?php $_items = $block->getItems(); ?>
 <div id="order-giftmessage" class="giftmessage-order-create">
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php echo __('Gift Message for the Entire Order') ?></span></legend>
+        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Leave this box blank if you don\'t want to leave a gift message for the entire order.') ?></p>
+            <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') ?>
         <?php endif; ?>
     </fieldset>
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 bb7e4b3597c6e..d004b90cdbaba 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,7 +9,7 @@
 ?>
 
 <div class="admin__page-section-title">
-    <strong class="title"><?php echo $block->getHeaderText() ?></strong>
+    <strong class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></strong>
     <div class="actions">
         <?php echo $block->getButtonsHtml() ?>
     </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/items/grid.phtml
index 35000ce39f112..74022dd73ad1f 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 echo __('Product') ?></span></th>
-                        <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                        <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
-                        <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                        <th class="col-discount"><span><?php echo __('Discount') ?></span></th>
-                        <th class="col-row-total"><span><?php echo __('Row Subtotal') ?></span></th>
-                        <th class="col-action"><span><?php echo __('Action') ?></span></th>
+                        <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>
                     </tr>
                 </thead>
                 <tbody>
                     <tr class="even">
-                        <td class="empty-text" colspan="100"><?php echo __('No ordered items') ?></td>
+                        <td class="empty-text" colspan="100"><?php /* @escapeNotVerified */ echo __('No ordered items') ?></td>
                     </tr>
                 </tbody>
             </table>
@@ -47,36 +47,36 @@
         <table class="data-table admin__table-primary order-tables">
             <thead>
                 <tr class="headings">
-                    <th class="col-product"><span><?php echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                    <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
-                    <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                    <th class="col-discount"><span><?php echo __('Discount') ?></span></th>
-                    <th class="col-row-total"><span><?php echo __('Row Subtotal') ?></span></th>
-                    <th class="col-action"><span><?php echo __('Action') ?></span></th>
+                    <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>
                 </tr>
             </thead>
             <tfoot>
                 <tr>
-                    <td class="col-total"><?php echo __('Total %1 product(s)', count($_items)) ?></td>
-                    <td colspan="2" class="col-subtotal"><?php echo __('Subtotal:') ?></td>
-                    <td class="col-price"><strong><?php echo $block->formatPrice($block->getSubtotal()) ?></strong></td>
-                    <td class="col-price"><strong><?php echo $block->formatPrice($block->getDiscountAmount()) ?></strong></td>
+                    <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-price"><strong>
                     <?php
-                        echo $block->formatPrice($block->getSubtotalWithDiscount());
+                        /* @escapeNotVerified */ echo $block->formatPrice($block->getSubtotalWithDiscount());
                     ?></strong></td>
                     <td colspan="2">&nbsp;</td>
                 </tr>
             </tfoot>
                 <?php $i = 0 ?>
                 <?php foreach ($_items as $_item):$i++ ?>
-                <tbody class="<?php echo($i%2) ? 'even' : 'odd' ?>">
+                <tbody class="<?php /* @escapeNotVerified */ echo($i%2) ? 'even' : 'odd' ?>">
                     <tr>
                         <td class="col-product">
-                            <span id="order_item_<?php echo $_item->getId() ?>_title"><?php echo $block->escapeHtml($_item->getName()) ?></span>
+                            <span id="order_item_<?php /* @escapeNotVerified */ echo $_item->getId() ?>_title"><?php echo $block->escapeHtml($_item->getName()) ?></span>
                             <div class="product-sku-block">
-                                <span><?php echo __('SKU') ?>:</span>
+                                <span><?php /* @escapeNotVerified */ echo __('SKU') ?>:</span>
                                 <?php echo implode('<br />', $this->helper('Magento\Catalog\Helper\Data')->splitSku($block->escapeHtml($_item->getSku()))); ?>
                             </div>
                             <div class="product-configure-block">
@@ -89,27 +89,27 @@
 
                             <?php $_isCustomPrice = $block->usedCustomPriceForItem($_item) ?>
                             <?php if ($_tier = $block->getTierHtml($_item)): ?>
-                            <div id="item_tier_block_<?php echo $_item->getId() ?>"<?php if ($_isCustomPrice): ?> style="display:none"<?php endif; ?>>
-                                <a href="#" onclick="$('item_tier_<?php echo $_item->getId() ?>').toggle();return false;"><?php echo __('Tier Pricing') ?></a>
-                                <div style="display:none" id="item_tier_<?php echo $_item->getId() ?>"><?php echo $_tier ?></div>
+                            <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>
                             <?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 echo $_item->getId() ?>"
+                                           id="item_use_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
                                            <?php if ($_isCustomPrice): ?> checked="checked"<?php endif; ?>
-                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?php echo $_item->getId() ?>', 'item_tier_block_<?php echo $_item->getId() ?>');"/>
+                                           onclick="order.toggleCustomPrice(this, 'item_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>', 'item_tier_block_<?php /* @escapeNotVerified */ echo $_item->getId() ?>');"/>
                                     <label
                                         class="normal admin__field-label"
-                                        for="item_use_custom_price_<?php echo $_item->getId() ?>">
-                                        <span><?php echo __('Custom Price') ?>*</span></label>
+                                        for="item_use_custom_price_<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
+                                        <span><?php /* @escapeNotVerified */ echo __('Custom Price') ?>*</span></label>
                                 </div>
                             <?php endif; ?>
-                            <input id="item_custom_price_<?php echo $_item->getId() ?>"
-                                   name="item[<?php echo $_item->getId() ?>][custom_price]"
-                                   value="<?php echo sprintf("%.2f", $block->getOriginalEditablePrice($_item))?>"
+                            <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))?>"
                                    <?php if (!$_isCustomPrice): ?>
                                    style="display:none"
                                    disabled="disabled"
@@ -117,27 +117,27 @@
                                    class="input-text item-price admin__control-text"/>
                         </td>
                         <td class="col-qty">
-                            <input name="item[<?php echo $_item->getId() ?>][qty]"
+                            <input name="item[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][qty]"
                                    class="input-text item-qty admin__control-text"
-                                   value="<?php echo $_item->getQty()*1 ?>"
+                                   value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"
                                    maxlength="12" />
                         </td>
                         <td class="col-subtotal col-price">
                             <?php echo $block->getItemRowTotalHtml($_item); ?>
                         </td>
                         <td class="col-discount col-price">
-                            <?php echo $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
+                            <?php /* @escapeNotVerified */ echo $block->formatPrice(-$_item->getTotalDiscountAmount()) ?>
                             <div class="discount-price-block">
-                                <input id="item_use_discount_<?php echo $_item->getId() ?>"
+                                <input id="item_use_discount_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
                                        class="admin__control-checkbox"
-                                       name="item[<?php echo $_item->getId() ?>][use_discount]"
+                                       name="item[<?php /* @escapeNotVerified */ echo $_item->getId() ?>][use_discount]"
                                        <?php if (!$_item->getNoDiscount()): ?>checked="checked"<?php endif; ?>
                                        value="1"
                                        type="checkbox" />
                                 <label
-                                    for="item_use_discount_<?php echo $_item->getId() ?>"
+                                    for="item_use_discount_<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
                                     class="normal admin__field-label">
-                                    <span><?php echo __('Apply') ?></span></label>
+                                    <span><?php /* @escapeNotVerified */ echo __('Apply') ?></span></label>
                             </div>
 
                         </td>
@@ -145,19 +145,19 @@
                             <?php echo $block->getItemRowTotalWithDiscountHtml($_item); ?>
                         </td>
                         <td class="col-actions last">
-                            <select class="admin__control-select" name="item[<?php echo $_item->getId() ?>][action]">
-                                <option value=""><?php echo __('Please select') ?></option>
-                                <option value="remove"><?php echo __('Remove') ?></option>
+                            <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>
                                 <?php if ($block->getCustomerId() && $block->getMoveToCustomerStorage()): ?>
-                                    <option value="cart"><?php echo __('Move to Shopping Cart') ?></option>
+                                    <option value="cart"><?php /* @escapeNotVerified */ echo __('Move to Shopping Cart') ?></option>
                                     <?php if ($block->isMoveToWishlistAllowed($_item)): ?>
                                         <?php $wishlists = $block->getCustomerWishlists();?>
                                         <?php if (count($wishlists) <= 1):?>
-                                            <option value="wishlist"><?php echo __('Move to Wish List') ?></option>
+                                            <option value="wishlist"><?php /* @escapeNotVerified */ echo __('Move to Wish List') ?></option>
                                         <?php else: ?>
-                                            <optgroup label="<?php echo __('Move to Wish List') ?>">
+                                            <optgroup label="<?php /* @escapeNotVerified */ echo __('Move to Wish List') ?>">
                                                 <?php foreach ($wishlists as $wishlist):?>
-                                                    <option value="wishlist_<?php echo $wishlist->getId();?>"><?php echo $block->escapeHtml($wishlist->getName());?></option>
+                                                    <option value="wishlist_<?php /* @escapeNotVerified */ echo $wishlist->getId();?>"><?php echo $block->escapeHtml($wishlist->getName());?></option>
                                                 <?php endforeach;?>
                                             </optgroup>
                                         <?php endif; ?>
@@ -195,7 +195,7 @@
                 </tbody>
                 <?php endforeach; ?>
         </table>
-        <p><small><?php echo $block->getInclExclTaxMessage(); ?></small></p>
+        <p><small><?php /* @escapeNotVerified */ echo $block->getInclExclTaxMessage(); ?></small></p>
     </div>
 
     <div class="order-discounts">
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 95a4d6637d6a8..1f7bc2ed8799f 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 echo $block->formatPrice($_item->getRowTotal()) ?>
+    <?php /* @escapeNotVerified */ echo $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 501aa7a480d61..f94e36cd982c4 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 echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+<?php /* @escapeNotVerified */ echo $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 bda8ee4b95e01..46d4bb94841bc 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 echo $block->formatPrice($_item->getCalculationPrice()) ?>
+<?php /* @escapeNotVerified */ echo $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 92f150d7cf344..4f58a4c403036 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/js.phtml
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
  ?>
 <script>
 require([
@@ -15,10 +17,10 @@ require([
     Event.observe(window, 'load',  function() {
         if (window.productConfigure) {
             productConfigure.addListType('product_to_add', {
-                urlFetch: '<?php echo $block->getUrl('sales/order_create/configureProductToAdd') ?>'
+                urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/configureProductToAdd') ?>'
             });
             productConfigure.addListType('quote_items', {
-                urlFetch: '<?php echo $block->getUrl('sales/order_create/configureQuoteItems') ?>'
+                urlFetch: '<?php /* @escapeNotVerified */ echo $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 5d1982e987dcc..e6784fc11431c 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 echo __('Subscribe to Newsletter'); ?></label><br/>
+<input type="checkbox" name="newsletter:subscribe"> <label for="newsletter:subscribe" style="width: 90%; float: none;"><?php /* @escapeNotVerified */ echo __('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 f1e4430c69ff5..416980d644136 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
@@ -28,18 +28,18 @@
                            </div>
                        <?php else: ?>
                             <?php $_checked = $block->isMethodActive($_code) ? 'checked="checked"' : '' ?>
-                            <input <?php echo $_radioProperty ?> value="<?php echo $_code ?>"
-                                                                 id="s_method_<?php echo $_code ?>" <?php echo $_checked ?>
+                            <input <?php /* @escapeNotVerified */ echo $_radioProperty ?> value="<?php /* @escapeNotVerified */ echo $_code ?>"
+                                                                 id="s_method_<?php /* @escapeNotVerified */ echo $_code ?>" <?php /* @escapeNotVerified */ echo $_checked ?>
                                                                  class="admin__control-radio"/>
-                            <label class="admin__field-label" for="s_method_<?php echo $_code ?>">
+                            <label class="admin__field-label" for="s_method_<?php /* @escapeNotVerified */ echo $_code ?>">
                                 <?php echo $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 echo $_excl; ?>
+                                    <?php /* @escapeNotVerified */ echo $_excl; ?>
                                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                                     <?php endif; ?>
                                 </strong>
                             </label>
@@ -63,9 +63,9 @@
                         <?php $_excl = $block->getShippingPrice($_rate->getPrice(), $this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()); ?>
                         <?php $_incl = $block->getShippingPrice($_rate->getPrice(), true); ?>
 
-                        <?php echo $_excl; ?>
+                        <?php /* @escapeNotVerified */ echo $_excl; ?>
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                            (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_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 echo __('Click to change shipping method') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 echo __('Sorry, no quotes are available for this order.') ?></strong>
+        <strong class="order-shipping-method-not-available"><?php /* @escapeNotVerified */ echo __('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 echo __('Get shipping methods and rates') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('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 echo __('You don\'t need to select a shipping method.') ?></span>
+    <span><?php /* @escapeNotVerified */ echo __('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 b3be7262a555d..a39c008f99348 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,13 +9,13 @@
 /** @var $block \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar */
 ?>
 <div class="customer-current-activity-inner">
-    <h4 class="customer-activity-title"><?php echo __('Customer\'s Activities') ?></h4>
+    <h4 class="customer-activity-title"><?php /* @escapeNotVerified */ echo __('Customer\'s Activities') ?></h4>
     <div class="create-order-sidebar-container">
     <?php echo $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 echo $_alias ?>">
+                <div class="order-sidebar-block" id="order-sidebar_<?php /* @escapeNotVerified */ echo $_alias ?>">
                     <?php echo $block->getChildHtml($_alias) ?>
                 </div>
             <?php endif; ?>
@@ -32,12 +32,12 @@ require([
 
     function addSidebarCompositeListType() {
         productConfigure.addListType('sidebar', {
-            urlFetch: '<?php echo $block->getUrl('sales/order_create/configureProductToAdd') ?>',
-            urlConfirm: '<?php echo $block->getUrl('sales/order_create/addConfigured') ?>'
+            urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/configureProductToAdd') ?>',
+            urlConfirm: '<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order_create/addConfigured') ?>'
         });
         productConfigure.addListType('sidebar_wishlist', {
-            urlFetch: '<?php echo $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
-            urlConfirm: '<?php echo $block->getUrl('sales/order_create/addConfigured') ?>'
+            urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
+            urlConfirm: '<?php /* @escapeNotVerified */ echo $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 9ae2ac048ef6a..dee8d13e2d8c8 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 echo $block->getDataId() ?>">
+<div class="create-order-sidebar-block" id="sidebar_data_<?php /* @escapeNotVerified */ echo $block->getDataId() ?>">
     <div class="head sidebar-title-block">
         <a href="#" class="action-refresh"
            title="<?php echo $block->escapeHtml(__('Refresh')); ?>"
-           onclick="order.loadArea('sidebar_<?php echo $block->getDataId() ?>', 'sidebar_data_<?php echo $block->getDataId() ?>');return false;">
-            <span><?php echo __('Refresh'); ?></span>
+           onclick="order.loadArea('sidebar_<?php /* @escapeNotVerified */ echo $block->getDataId() ?>', 'sidebar_data_<?php /* @escapeNotVerified */ echo $block->getDataId() ?>');return false;">
+            <span><?php /* @escapeNotVerified */ echo __('Refresh'); ?></span>
         </a>
         <h5 class="create-order-sidebar-label">
-            <?php echo $block->getHeaderText() ?>
-            <span class="normal">(<?php echo $block->getItemCount() ?>)</span>
+            <?php /* @escapeNotVerified */ echo $block->getHeaderText() ?>
+            <span class="normal">(<?php /* @escapeNotVerified */ echo $block->getItemCount() ?>)</span>
         </h5>
     </div>
     <div class="content">
@@ -26,21 +26,21 @@
         <table class="admin__table-primary">
             <thead>
                 <tr>
-                    <th class="col-item"><?php echo __('Item') ?></th>
+                    <th class="col-item"><?php /* @escapeNotVerified */ echo __('Item') ?></th>
 
                     <?php if ($block->canDisplayItemQty()): ?>
-                        <th class="col-qty"><?php echo __('Qty') ?></th>
+                        <th class="col-qty"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
                     <?php endif; ?>
 
                     <?php if ($block->canDisplayPrice()): ?>
-                        <th class="col-price"><?php echo __('Price') ?></th>
+                        <th class="col-price"><?php /* @escapeNotVerified */ echo __('Price') ?></th>
                     <?php endif; ?>
 
                     <?php if ($block->canRemoveItems()): ?>
                         <th class="col-remove">
                             <span title="<?php echo $block->escapeHtml(__('Remove')); ?>"
                                   class="icon icon-remove">
-                                <span><?php echo __('Remove') ?></span>
+                                <span><?php /* @escapeNotVerified */ echo __('Remove') ?></span>
                             </span>
                         </th>
                     <?php endif; ?>
@@ -48,7 +48,7 @@
                     <th class="col-add">
                         <span title="<?php echo $block->escapeHtml(__('Add To Order')); ?>"
                               class="icon icon-add">
-                            <span><?php echo __('Add To Order') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('Add To Order') ?></span>
                         </span>
                     </th>
                 </tr>
@@ -61,12 +61,12 @@
 
                         <?php if ($block->canDisplayItemQty()): ?>
                             <td class="col-qty">
-                                <?php echo $block->getItemQty($_item); ?>
+                                <?php /* @escapeNotVerified */ echo $block->getItemQty($_item); ?>
                             </td>
                         <?php endif; ?>
 
                         <?php if ($block->canDisplayPrice()): ?>
-                            <td class="col-price"><?php echo $block->convertPrice($_item->getPrice()) ?></td>
+                            <td class="col-price"><?php /* @escapeNotVerified */ echo $block->convertPrice($_item->getPrice()) ?></td>
                         <?php endif; ?>
 
                         <?php if ($block->canRemoveItems()): ?>
@@ -74,8 +74,8 @@
                                 <div class="admin__field-option">
                                     <input type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[remove][<?php echo $block->getItemId($_item) ?>]"
-                                           value="<?php echo $block->getDataId() ?>"
+                                           name="sidebar[remove][<?php /* @escapeNotVerified */ echo $block->getItemId($_item) ?>]"
+                                           value="<?php /* @escapeNotVerified */ echo $block->getDataId() ?>"
                                            title="<?php echo $block->escapeHtml(__('Remove')); ?>" />
                                     <label class="admin__field-label"></label>
                                 </div>
@@ -88,21 +88,21 @@
                                     <a href="#"
                                        class="icon icon-configure"
                                        title="<?php echo $block->escapeHtml(__('Configure and Add to Order')); ?>"
-                                       onclick="order.sidebarConfigureProduct('<?php echo 'sidebar_wishlist' ?>', <?php echo $block->getProductId($_item) ?>, <?php echo $block->getItemId($_item) ?>); return false;">
-                                        <span><?php echo __('Configure and Add to Order') ?></span>
+                                       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>
                                     </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 echo $block->getProductId($_item) ?>); return false;">
-                                        <span><?php echo __('Configure and Add to Order') ?></span>
+                                       onclick="order.sidebarConfigureProduct('<?php echo 'sidebar' ?>', <?php /* @escapeNotVerified */ echo $block->getProductId($_item) ?>); return false;">
+                                        <span><?php /* @escapeNotVerified */ echo __('Configure and Add to Order') ?></span>
                                     </a>
                                 <?php else: ?>
                                     <input type="checkbox"
                                            class="admin__control-checkbox"
-                                           name="sidebar[<?php echo $block->getSidebarStorageAction() ?>][<?php echo $block->getIdentifierId($_item) ?>]"
-                                           value="<?php echo $block->canDisplayItemQty() ? $_item->getQty()*1 : 1 ?>"
+                                           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')); ?>"/>
                                     <label class="admin__field-label"></label>
                                 <?php endif; ?>
@@ -113,7 +113,7 @@
             </tbody>
         </table>
         <?php else: ?>
-            <span class="no-items"><?php echo __('No items') ?></span>
+            <span class="no-items"><?php /* @escapeNotVerified */ echo __('No items') ?></span>
         <?php endif ?>
         </div>
         <?php if ($block->getItemCount() && $block->canRemoveItems()): ?>
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 86a81649ffe1e..96fd27280b346 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
@@ -46,8 +46,8 @@
                         <div class="admin__field-control">
                             <div class="nested">
                                 <div class="admin__field admin__field-option">
-                                    <input type="radio" id="store_<?php echo $_store->getId() ?>" class="admin__control-radio" onclick="order.setStoreId('<?php echo $_store->getId() ?>')"/>
-                                    <label class="admin__field-label" for="store_<?php echo $_store->getId() ?>">
+                                    <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()) ?>
                                     </label>
                                 </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 9bfa7eb2fe636..fcd0036003b04 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 echo __('Order Totals') ?></span></legend>
+<legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Order Totals') ?></span></legend>
 <br>
 
 <table class="admin__table-secondary data-table">
     <tbody>
-        <?php echo $block->renderTotals(); ?>
-        <?php echo $block->renderTotals('footer'); ?>
+        <?php /* @escapeNotVerified */ echo $block->renderTotals(); ?>
+        <?php /* @escapeNotVerified */ echo $block->renderTotals('footer'); ?>
     </tbody>
 </table>
 
@@ -22,13 +22,13 @@
         <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 echo __('Append Comments') ?></label>
+        <label for="notify_customer" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('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 echo __('Email Order Confirmation') ?></label>
+        <label for="send_confirmation" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Email Order Confirmation') ?></label>
     </div>
     <?php endif; ?>
     <div class="actions">
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/totals/default.phtml
index 94a4867b28739..8422450ffefac 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 echo $block->getTotal()->getCode(); ?> row-totals">
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
+<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(); ?>">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
             <?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?></strong><?php endif; ?>
     </td>
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-amount">
+    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-amount">
         <?php if ($block->getRenderingArea() == $block->getTotal()->getArea()): ?><strong><?php endif; ?>
-            <?php echo $block->formatPrice($block->getTotal()->getValue()) ?>
+            <?php /* @escapeNotVerified */ echo $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 076b419c5036f..48b4c0d58bcc6 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 echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <strong><?php echo __('Grand Total Excl. Tax')?></strong>
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?php echo $block->formatPrice($block->getTotalExclTax()) ?></strong>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotalExclTax()) ?></strong>
     </td>
 </tr>
-<?php echo $block->renderTotals('taxes', $block->getColspan()); ?>
+<?php /* @escapeNotVerified */ echo $block->renderTotals('taxes', $block->getColspan()); ?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <strong><?php echo __('Grand Total Incl. Tax')?></strong>
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <strong><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
     </td>
 </tr>
 <?php else:?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <strong><?php echo $block->getTotal()->getTitle() ?></strong>
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <strong><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <strong><?php /* @escapeNotVerified */ echo $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 0e4e6834a5ac7..7d37fed03bac4 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 echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <?php echo $block->getExcludeTaxLabel() ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+        <?php /* @escapeNotVerified */ echo $block->getExcludeTaxLabel() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getShippingExcludeTax()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingExcludeTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <?php echo $block->getIncludeTaxLabel() ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+        <?php /* @escapeNotVerified */ echo $block->getIncludeTaxLabel() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getShippingIncludeTax()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php elseif ($block->displayIncludeTax()) : ?>
 <tr>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <?php echo $block->getTotal()->getTitle() ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getShippingIncludeTax()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getShippingIncludeTax()) ?>
     </td>
 </tr>
 <?php else:?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getShippingExcludeTax()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $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 aa933a7adf2cb..3d81d9155ce00 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 echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <?php echo __('Subtotal (Excl. Tax)') ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+        <?php /* @escapeNotVerified */ echo __('Subtotal (Excl. Tax)') ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValueExclTax()) ?>
     </td>
 </tr>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <?php echo __('Subtotal (Incl. Tax)') ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+        <?php /* @escapeNotVerified */ echo __('Subtotal (Incl. Tax)') ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValueInclTax()) ?>
     </td>
 </tr>
 <?php else : ?>
 <tr class="row-totals">
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
-        <?php echo $block->getTotal()->getTitle() ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>">
+        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
     </td>
-    <td style="<?php echo $block->getStyle() ?>" class="admin__total-amount">
-        <?php echo $block->formatPrice($block->getTotal()->getValue()) ?>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="admin__total-amount">
+        <?php /* @escapeNotVerified */ echo $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 094021903235f..3f156e6ceaa73 100644
--- 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
@@ -20,8 +20,8 @@
                 <?php $isFirst = 1; ?>
 
                 <?php foreach ($rates as $rate): ?>
-                <tr class="summary-details-<?php echo $taxIter; ?> summary-details<?php if ($isTop): echo ' summary-details-first'; endif; ?>" style="display:none;">
-                    <td class="admin__total-mark" style="<?php echo $block->getTotal()->getStyle() ?>" colspan="<?php echo $block->getColspan(); ?>">
+                <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']); ?>
                         <?php if (!is_null($rate['percent'])): ?>
                             (<?php echo (float)$rate['percent']; ?>%)
@@ -29,8 +29,8 @@
                         <br />
                     </td>
                     <?php if ($isFirst): ?>
-                        <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?php echo count($rates); ?>">
-                            <?php echo $block->formatPrice($amount); ?>
+                        <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-amount" rowspan="<?php echo count($rates); ?>">
+                            <?php /* @escapeNotVerified */ echo $block->formatPrice($amount); ?>
                         </td>
                     <?php endif; ?>
                 </tr>
@@ -40,13 +40,13 @@
             <?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 echo $taxIter;?>')"<?php endif; ?> class="<?php echo $class;?> row-totals">
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-mark" colspan="<?php echo $block->getColspan(); ?>">
+<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(); ?>">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <div class="summary-collapse"><?php echo $block->getTotal()->getTitle() ?></div>
+            <div class="summary-collapse"><?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?></div>
         <?php else: ?>
-            <?php echo $block->getTotal()->getTitle() ?>
+            <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
         <?php endif;?>
     </td>
-    <td style="<?php echo $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?php echo $block->formatPrice($block->getTotal()->getValue()) ?></td>
+    <td style="<?php /* @escapeNotVerified */ echo $block->getTotal()->getStyle() ?>" class="admin__total-amount"><?php /* @escapeNotVerified */ echo $block->formatPrice($block->getTotal()->getValue()) ?></td>
 </tr>
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 f13fd7a04b50b..98f96ffb2e06e 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,7 +7,7 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form id="edit_form" method="post" action="<?php echo $block->getSaveUrl() ?>">
+<form id="edit_form" method="post" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
     <?php echo $block->getBlockHtml('formkey')?>
     <?php  $_order = $block->getCreditmemo()->getOrder() ?>
 
@@ -15,7 +15,7 @@
 
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
         </div>
         <div class="admin__page-section-content">
         <?php if (!$_order->getIsVirtual()): ?>
@@ -26,12 +26,12 @@
 
             <?php /* Billing Address */ ?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php echo __('Payment Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                    <?php /* @escapeNotVerified */ echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
                 </div>
                 <div class="order-payment-additional">
                     <?php echo $block->getChildHtml('order_payment_additional'); ?>
@@ -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 echo __('Shipping Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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-content">
-                    <?php echo __('Total Shipping Charges'); ?>:
+                    <?php /* @escapeNotVerified */ echo __('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 echo $_excl; ?>
+                    <?php /* @escapeNotVerified */ echo $_excl; ?>
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displaySalesBothPrices($block->getSource()->getStoreId()) && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                     <?php endif; ?>
                 </div>
             </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items.phtml
index 8fd259373f634..bf8b2163aa602 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 echo __('Items to Refund') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Product') ?></span></th>
-                    <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                    <th class="col-ordered-qty"><span><?php echo __('Qty') ?></span></th>
+                    <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>
                     <?php if ($block->canReturnToStock()) : ?>
-                    <th class="col-return-to-stock"><span><?php echo __('Return to Stock') ?></span></th>
+                    <th class="col-return-to-stock"><span><?php /* @escapeNotVerified */ echo __('Return to Stock') ?></span></th>
                     <?php endif; ?>
-                    <th class="col-refund"><span><?php echo __('Qty to Refund') ?></span></th>
-                    <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                    <th class="col-tax-amount"><span><?php echo __('Tax Amount') ?></span></th>
-                    <th class="col-discont"><span><?php echo __('Discount Amount') ?></span></th>
-                    <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                    <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>
                 </tr>
             </thead>
             <?php if ($block->canEditQty()): ?>
@@ -49,7 +49,7 @@
             } else {
                 $i++;
             } ?>
-                <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
+                <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
                     <?php echo $block->getItemHtml($_item) ?>
                     <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                 </tbody>
@@ -58,7 +58,7 @@
     </div>
     <?php else : ?>
     <div class="no-items">
-        <?php echo __('No Items To Refund') ?>
+        <?php /* @escapeNotVerified */ echo __('No Items To Refund') ?>
     </div>
     <?php endif; ?>
 </section>
@@ -67,38 +67,38 @@
 
 <?php if (!empty($orderTotalBar)): ?>
 <section class="fieldset-wrapper">
-    <?php echo $orderTotalBar; ?>
+    <?php /* @escapeNotVerified */ echo $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 echo __('Order Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Credit Memo Comments') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Comment Text') ?></span></label>
+                        <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getCreditmemo()->getCommentText(); ?></textarea>
+                                  cols="5"><?php /* @escapeNotVerified */ echo $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 echo __('Refund Totals') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Refund Totals') ?></span>
             </div>
             <?php echo $block->getChildHtml('creditmemo_totals') ?>
             <div class="order-totals-actions">
@@ -109,7 +109,7 @@
                            value="1"
                            type="checkbox" />
                     <label for="notify_customer" class="admin__field-label">
-                        <span><?php echo __('Append Comments') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Append Comments') ?></span>
                     </label>
                 </div>
                 <?php if ($block->canSendCreditmemoEmail()):?>
@@ -120,7 +120,7 @@
                            value="1"
                            type="checkbox" />
                     <label for="send_email" class="admin__field-label">
-                        <span><?php echo __('Email Copy of Credit Memo') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Email Copy of Credit Memo') ?></span>
                     </label>
                 </div>
                 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/items/renderer/default.phtml
index c238f2478bffa..f3c450360bdb7 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
@@ -21,7 +21,7 @@
         <?php if ($block->canReturnItemToStock($_item)) : ?>
             <input type="checkbox"
                    class="admin__control-checkbox"
-                   name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][back_to_stock]"
+                   name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][back_to_stock]"
                    value="1"<?php if ($_item->getBackToStock()):?> checked<?php endif;?>/>
             <label class="admin__field-label"></label>
         <?php endif; ?>
@@ -31,17 +31,17 @@
     <?php if ($block->canEditQty()) : ?>
         <input type="text"
                class="input-text admin__control-text qty-input"
-               name="creditmemo[items][<?php echo $_item->getOrderItemId() ?>][qty]"
-               value="<?php echo $_item->getQty()*1 ?>"/>
+               name="creditmemo[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>][qty]"
+               value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"/>
     <?php else : ?>
-        <?php echo $_item->getQty()*1 ?>
+        <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
         <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
     </td>
-    <td class="col-tax-amount"><?php echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discont"><?php echo $block->displayPriceAttribute('discount_amount') ?></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-total last">
         <?php echo $block->getColumnHtml($_item, 'total'); ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/create/totals/adjustments.phtml
index 8ae81b1a6d0c0..6817a870b6597 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 echo $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
+        <td class="label"><?php /* @escapeNotVerified */ echo $block->getShippingLabel() ?><div id="shipping_amount_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[shipping_amount]"
-                   value="<?php echo $block->getShippingAmount()?>"
+                   value="<?php /* @escapeNotVerified */ echo $block->getShippingAmount()?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="shipping_amount" />
         </td>
     </tr>
     <tr>
-        <td class="label"><?php echo __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
+        <td class="label"><?php /* @escapeNotVerified */ echo __('Adjustment Refund') ?><div id="adjustment_positive_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_positive]"
-                   value="<?php echo $_source->getBaseAdjustmentFeePositive()*1 ?>"
+                   value="<?php /* @escapeNotVerified */ echo $_source->getBaseAdjustmentFeePositive()*1 ?>"
                    class="input-text admin__control-text not-negative-amount"
                    id="adjustment_positive" />
         </td>
     </tr>
     <tr>
-        <td class="label"><?php echo __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
+        <td class="label"><?php /* @escapeNotVerified */ echo __('Adjustment Fee') ?><div id="adjustment_negative_adv"></div></td>
         <td>
             <input type="text"
                    name="creditmemo[adjustment_negative]"
-                   value="<?php echo $_source->getBaseAdjustmentFeeNegative()*1 ?>"
+                   value="<?php /* @escapeNotVerified */ echo $_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 echo __('Please enter a positive number in this field.') ?>', function(v) {
+                    ['not-negative-amount', '<?php /* @escapeNotVerified */ echo __('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 8302837baefff..29371fa1371cc 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
@@ -11,7 +11,7 @@
 <?php echo $block->getChildHtml('order_info') ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Payment &amp; Shipping Method') ?></span>
     </div>
     <div class="admin__page-section-content">
 
@@ -22,11 +22,11 @@
         <?php endif; ?>
             <?php /* Billing Address */?>
             <div class="admin__page-section-item-title">
-                <span class="title"><?php echo __('Payment Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></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>
         </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 echo __('Shipping Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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-content">
-                    <?php echo __('Total Shipping Charges'); ?>:
+                    <?php /* @escapeNotVerified */ echo __('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 echo $_excl; ?>
+                    <?php /* @escapeNotVerified */ echo $_excl; ?>
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                     <?php endif; ?>
                 </div>
             </div>
@@ -68,26 +68,26 @@
 <?php else: ?>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Items Refunded') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Refunded') ?></span>
     </div>
-    <div class="no-items admin__page-section-content"><?php echo __('No Items') ?></div>
+    <div class="no-items admin__page-section-content"><?php /* @escapeNotVerified */ echo __('No Items') ?></div>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Memo Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Credit Memo History') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Credit Memo History') ?></span>
             </div>
             <div class="admin__page-section-item-content"><?php echo $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 echo __('Credit Memo Totals') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Credit Memo Totals') ?></span>
             </div>
             <div class="admin__page-section-content"><?php echo $block->getChildHtml('creditmemo_totals') ?></div>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items.phtml
index 7cc0f0e5e4bd2..8a8817c799149 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 echo __('Items Refunded') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Product') ?></span></th>
-                        <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                        <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
-                        <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                        <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
-                        <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
-                        <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                        <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>
                     </tr>
                 </thead>
                 <?php $i = 0; foreach ($_items as $_item): ?>
@@ -32,7 +32,7 @@
                     } else {
                         $i++;
                     } ?>
-                    <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
+                    <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
                         <?php echo $block->getItemHtml($_item) ?>
                         <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                     </tbody>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/creditmemo/view/items/renderer/default.phtml
index a28c87d1cb847..6fac439be14bd 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
@@ -16,12 +16,12 @@
     <td class="col-price">
         <?php echo $block->getColumnHtml($_item, 'price'); ?>
     </td>
-    <td class="col-qty"><?php echo $_item->getQty()*1 ?></td>
+    <td class="col-qty"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
     <td class="col-subtotal">
         <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
     </td>
-    <td class="col-tax"><?php echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?php echo $block->displayPriceAttribute('discount_amount') ?></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-total last">
         <?php echo $block->getColumnHtml($_item, 'total'); ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
index 8a4bc29717609..05b39e3b9ff50 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml
@@ -31,14 +31,14 @@ store name = $_order->getStore()->getGroup()->getName()
         <tr <?php echo $i%2 ? 'bgcolor="#eeeded"' : '' ?>>
             <td align="left" valign="top" style="padding:3px 9px"><strong><?php echo $block->escapeHtml($_item->getName()) ?></strong>
             <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
-            <br /><strong><?php echo __('Gift Message') ?></strong>
-            <br /><?php echo __('From:'); ?> <?php echo $block->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><?php echo __('To:'); ?> <?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><?php echo __('Message:'); ?><br /> <?php echo $block->escapeHtml($_giftMessage->getMessage()) ?>
+            <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()) ?>
             <?php endif; ?>
             </td>
-            <td align="center" valign="top" style="padding:3px 9px"><?php echo $_item->getQtyOrdered()*1 ?></td>
-            <td align="right" valign="top" style="padding:3px 9px"><?php echo $_order->formatPrice($_item->getRowTotal()) ?></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>
         </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 echo __('Gift Message') ?></strong>
-            <br /><?php echo __('From:'); ?> <?php echo $block->escapeHtml($_giftMessage->getSender()) ?>
-            <br /><?php echo __('To:'); ?> <?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?>
-            <br /><?php echo __('Message:'); ?><br /> <?php echo $block->escapeHtml($_giftMessage->getMessage()) ?>
+            <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()) ?>
             </td>
         </tr>
      <?php endif; ?>
         <tr>
-            <td colspan="2" align="right" style="padding:3px 9px"><?php echo __('Subtotal') ?></td>
-            <td align="right" style="padding:3px 9px"><?php echo $_order->formatPrice($_order->getSubtotal()) ?></td>
+            <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>
         </tr>
         <?php if ($_order->getDiscountAmount() > 0): ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?php echo(($_order->getCouponCode()) ? __('Discount (%1)', $_order->getCouponCode()) : __('Discount')) ?></td>
-                <td align="right" style="padding:3px 9px"><?php echo $_order->formatPrice(0.00 - $_order->getDiscountAmount()) ?></td>
+                <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>
             </tr>
         <?php endif; ?>
         <?php if ($_order->getShippingAmount() || $_order->getShippingDescription()) : ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?php echo __('Shipping &amp; Handling') ?></td>
-                <td align="right" style="padding:3px 9px"><?php echo $_order->formatPrice($_order->getShippingAmount()) ?></td>
+                <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>
             </tr>
         <?php endif; ?>
         <?php if ($_order->getTaxAmount() > 0): ?>
             <tr>
-                <td colspan="2" align="right" style="padding:3px 9px"><?php echo __('Tax') ?></td>
-                <td align="right" style="padding:3px 9px"><?php echo $_order->formatPrice($_order->getTaxAmount()) ?></td>
+                <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>
             </tr>
         <?php endif; ?>
         <tr bgcolor="#DEE5E8">
-            <td colspan="2" align="right" style="padding:3px 9px"><strong><big><?php echo __('Grand Total') ?></big></strong></td>
-            <td align="right" style="padding:6px 9px"><strong><big><?php echo $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
+            <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>
         </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 bab344f25065b..cbbf22918d6ae 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 echo __('Gift Options') ?></strong></div>
+    <div class="admin__page-section-title"><strong class="title"><?php /* @escapeNotVerified */ echo __('Gift Options') ?></strong></div>
     <?php echo $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 4eb4ec12f1955..935e70ad7b4f3 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,23 +7,23 @@
 // @codingStandardsIgnoreFile
 
 ?>
-<form id="edit_form" class="order-invoice-edit" method="post" action="<?php echo $block->getSaveUrl() ?>">
+<form id="edit_form" class="order-invoice-edit" method="post" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
     <?php echo $block->getBlockHtml('formkey')?>
     <?php $_order = $block->getInvoice()->getOrder() ?>
     <?php echo $block->getChildHtml('order_info') ?>
 
     <section class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Payment Information') ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></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>
             </div>
@@ -31,13 +31,13 @@
             <div class="admin__page-section-item order-shipping-address">
                 <?php /*Shipping Address */ ?>
                 <div class="admin__page-section-item-title">
-                    <span class="title"><?php echo __('Shipping Information') ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('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-content">
-                            <?php echo __('Total Shipping Charges'); ?>:
+                            <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
 
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                                 <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -46,9 +46,9 @@
                             <?php endif; ?>
                             <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                            <?php echo $_excl; ?>
+                            <?php /* @escapeNotVerified */ echo $_excl; ?>
                             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                                (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                                (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                             <?php endif; ?>
                         </div>
                     </div>
@@ -57,10 +57,10 @@
                         <input type="checkbox" name="invoice[do_shipment]" id="invoice_do_shipment" value="1"
                                class="admin__control-checkbox" <?php echo $block->hasInvoiceShipmentTypeMismatch() ? ' disabled="disabled"' : '' ?> />
                         <label for="invoice_do_shipment"
-                               class="admin__field-label"><span><?php echo __('Create Shipment') ?></span></label>
+                               class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Create Shipment') ?></span></label>
                     </div>
                     <?php if ($block->hasInvoiceShipmentTypeMismatch()): ?>
-                        <small><?php 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><?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>
                         <?php endif; ?>
                     <?php endif; ?>
                     <div id="tracking" style="display:none;"><?php echo $block->getChildHtml('tracking', false) ?></div>
@@ -90,7 +90,7 @@ require(['prototype'], function(){
     }
 
     /*forced creating of shipment*/
-    var forcedShipmentCreate = <?php echo $block->getForcedShipmentCreate() ?>;
+    var forcedShipmentCreate = <?php /* @escapeNotVerified */ echo $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 332ab7c35188c..92061d5314f33 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,21 +11,21 @@
 <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 echo __('%1', $_itemsGridLabel) ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('%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 echo __('Product') ?></span></th>
-                        <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                        <th class="col-ordered-qty"><span><?php echo __('Qty') ?></span></th>
-                        <th class="col-qty-invoice"><span><?php echo __('Qty to Invoice') ?></span></th>
-                        <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                        <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
-                        <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
-                        <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                        <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>
                     </tr>
                 </thead>
                 <?php if ($block->canEditQty()): ?>
@@ -44,7 +44,7 @@
                 } else {
                     $_i++;
                 } ?>
-                    <tbody class="<?php echo $_i%2 ? 'even' : 'odd' ?>">
+                    <tbody class="<?php /* @escapeNotVerified */ echo $_i%2 ? 'even' : 'odd' ?>">
                         <?php echo $block->getItemHtml($_item) ?>
                         <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                     </tbody>
@@ -58,27 +58,27 @@
 
 <?php if (!empty($orderTotalBar)): ?>
 <section class="admin__page-section">
-    <?php echo $orderTotalBar; ?>
+    <?php /* @escapeNotVerified */ echo $orderTotalBar; ?>
 </section>
 <?php endif; ?>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Order Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Invoice History') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Invoice Comments') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getInvoice()->getCommentText(); ?></textarea>
+                                  rows="3" cols="5"><?php /* @escapeNotVerified */ echo $block->getInvoice()->getCommentText(); ?></textarea>
                     </div>
                 </div>
             </div>
@@ -86,7 +86,7 @@
 
         <div id="invoice_totals" class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php echo __('Invoice Totals') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice Totals') ?></span>
             </div>
             <div class="admin__page-section-item-content order-totals-actions">
                 <?php echo $block->getChildHtml('invoice_totals') ?>
@@ -99,28 +99,28 @@
                         <input type="checkbox" name="invoice[do_capture]" id="invoice_do_capture" value="1" checked/>
                         */
                         ?>
-                      <label for="invoice_do_capture" class="admin__field-label"><?php echo __('Amount') ?></label>
+                      <label for="invoice_do_capture" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('Amount') ?></label>
                       <select class="admin__control-select" name="invoice[capture_case]">
-                          <option value="online"><?php echo __('Capture Online') ?></option>
-                          <option value="offline"><?php echo __('Capture Offline') ?></option>
-                          <option value="not_capture"><?php echo __('Not Capture') ?></option>
+                          <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>
                       </select>
                     </div>
                 <?php elseif ($block->isGatewayUsed()):?>
                     <input type="hidden" name="invoice[capture_case]" value="offline"/>
-                    <div><?php echo __('The invoice will be created offline without the payment gateway.') ?></div>
+                    <div><?php /* @escapeNotVerified */ echo __('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 echo __('Append Comments') ?></label>
+                    <label class="admin__field-label" for="notify_customer"><?php /* @escapeNotVerified */ echo __('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 echo __('Email Copy of Invoice') ?></label>
+                    <label class="admin__field-label" for="send_email"><?php /* @escapeNotVerified */ echo __('Email Copy of Invoice') ?></label>
                 </div>
                 <?php endif; ?>
                 <?php echo $block->getChildHtml('submit_before') ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/create/items/renderer/default.phtml
index 45b53a6d05ea0..eb229e750f241 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
@@ -18,17 +18,17 @@
     <td class="col-qty-invoice">
     <?php if ($block->canEditQty()) : ?>
         <input type="text" class="input-text admin__control-text qty-input"
-               name="invoice[items][<?php echo $_item->getOrderItemId() ?>]"
-               value="<?php echo $_item->getQty()*1 ?>"/>
+               name="invoice[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
+               value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>"/>
     <?php else : ?>
-        <?php echo $_item->getQty()*1 ?>
+        <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
     <?php endif; ?>
     </td>
     <td class="col-subtotal">
         <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
     </td>
-    <td class="col-tax"><?php echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?php echo $block->displayPriceAttribute('discount_amount') ?></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-total last">
         <?php echo $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 e5a1f0617a49c..6db41b5ac8f2d 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
@@ -13,18 +13,18 @@
 
 <section class="admin__page-section order-view-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Payment Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?>
+                    <?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>
@@ -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 echo __('Shipping Information') ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('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-content">
-                        <?php echo __('Total Shipping Charges'); ?>:
+                        <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
 
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -50,9 +50,9 @@
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                        <?php echo $_excl; ?>
+                        <?php /* @escapeNotVerified */ echo $_excl; ?>
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                            (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                            (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                         <?php endif; ?>
                         <div><?php echo $block->getChildHtml('shipment_tracking') ?></div>
                     </div>
@@ -65,7 +65,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Items Invoiced') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Invoiced') ?></span>
     </div>
 
     <div id="invoice_item_container" class="admin__page-section-content">
@@ -75,12 +75,12 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Order Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Invoice History') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice History') ?></span>
             </div>
             <div class="admin__page-section-item-content">
                 <?php echo $block->getChildHtml('order_comments') ?>
@@ -89,7 +89,7 @@
 
         <div id="history_form" class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php echo __('Invoice Totals') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Invoice Totals') ?></span>
             </div>
             <?php echo $block->getChildHtml('invoice_totals') ?>
         </div>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items.phtml
index 7b4b17815992c..ca96e0829050d 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 echo __('Product') ?></span></th>
-                <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                <th class="col-qty"><span><?php echo __('Qty') ?></span></th>
-                <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                <th class="col-tax"><span><?php echo __('Tax Amount') ?></span></th>
-                <th class="col-discount"><span><?php echo __('Discount Amount') ?></span></th>
-                <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                <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>
             </tr>
         </thead>
         <?php $_items = $block->getInvoice()->getAllItems() ?>
@@ -27,7 +27,7 @@
         } else {
             $i++;
         } ?>
-            <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
+            <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
                 <?php echo $block->getItemHtml($_item) ?>
                 <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
             </tbody>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/invoice/view/items/renderer/default.phtml
index 4bdaa219bc9f9..8efbe0b1a9bde 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
@@ -16,12 +16,12 @@
     <td class="col-price">
         <?php echo $block->getColumnHtml($_item, 'price'); ?>
     </td>
-    <td class="col-qty"><?php echo $_item->getQty()*1 ?></td>
+    <td class="col-qty"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></td>
     <td class="col-subtotal">
         <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
     </td>
-    <td class="col-tax"><?php echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-discount"><?php echo $block->displayPriceAttribute('discount_amount') ?></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-total last">
         <?php echo $block->getColumnHtml($_item, 'total'); ?>
     </td>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totalbar.phtml
index 403402bee0a83..329a9659a3ebe 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 echo $_total['label'] ?><br />
-            <?php echo $_total['value'] ?>
+            <?php /* @escapeNotVerified */ echo $_total['label'] ?><br />
+            <?php /* @escapeNotVerified */ echo $_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 f0a58fdb85123..631dc5b9e1040 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/totals.phtml
@@ -24,12 +24,12 @@
                 <?php if ($_total->getBlockName()): ?>
                     <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
                 <?php else:?>
-                <tr class="col-<?php echo $_code?>">
-                    <td <?php echo $block->getLabelProperties()?> class="label">
+                <tr class="col-<?php /* @escapeNotVerified */ echo $_code?>">
+                    <td <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> class="label">
                         <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
                     </td>
-                    <td <?php echo $block->getValueProperties()?>>
-                        <strong><?php echo $block->formatValue($_total) ?></strong>
+                    <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?>>
+                        <strong><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></strong>
                     </td>
                 </tr>
                 <?php endif?>
@@ -44,8 +44,8 @@
                 <?php if ($_total->getBlockName()): ?>
                     <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
                 <?php else:?>
-                    <tr class="col-<?php echo $_code?>">
-                        <td <?php echo $block->getLabelProperties()?> class="label">
+                    <tr class="col-<?php /* @escapeNotVerified */ echo $_code?>">
+                        <td <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> class="label">
                             <?php if ($_total->getStrong()):?>
                             <strong><?php echo $block->escapeHtml($_total->getLabel()); ?></strong>
                             <?php else:?>
@@ -54,12 +54,12 @@
                         </td>
 
                         <?php if ($_total->getStrong()):?>
-                            <td <?php echo $block->getValueProperties()?>>
-                                <strong><?php echo $block->formatValue($_total) ?></strong>
+                            <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?>>
+                                <strong><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></strong>
                             </td>
                         <?php else:?>
-                            <td <?php echo $block->getValueProperties()?>>
-                                <span><?php echo $block->formatValue($_total) ?></span>
+                            <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?>>
+                                <span><?php /* @escapeNotVerified */ echo $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 e07c17adfd80d..e0603d5ca515b 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 echo __('Discount (%1)', $_order->getCouponCode()) ?>
+                <?php /* @escapeNotVerified */ echo __('Discount (%1)', $_order->getCouponCode()) ?>
             <?php else: ?>
-                <?php echo __('Discount') ?>
+                <?php /* @escapeNotVerified */ echo __('Discount') ?>
             <?php endif; ?>
         </td>
-        <td><?php echo $block->displayPriceAttribute('discount_amount') ?></td>
+        <td><?php /* @escapeNotVerified */ echo $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 700fa38d0e6e3..a4f69f76a7436 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 echo __('Total Due') ?></strong></big></td>
-    <td class="emph"><big><?php echo $block->displayPriceAttribute('total_due', true) ?></big></td>
+    <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>
 </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml
index b909610d88c97..ce88b254a7b3b 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 echo $block->getGrandTotalTitle() ?>
+            <?php /* @escapeNotVerified */ echo $block->getGrandTotalTitle() ?>
         <?php else: ?>
-            <?php echo __('Grand Total') ?>
+            <?php /* @escapeNotVerified */ echo __('Grand Total') ?>
         <?php endif; ?>
         </big></strong>
     </td>
-    <td class="emph"><big><?php echo $block->displayPriceAttribute('grand_total', true) ?></big></td>
+    <td class="emph"><big><?php /* @escapeNotVerified */ echo $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 d5633637f50ce..1340d0e40af1c 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 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 echo $block->displayPriceAttribute($block->getSourceField()) ?><?php if ($block->getStrong()) : ?></strong><?php endif; ?></td>
+        <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>
     </tr>
 <?php endif; ?>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/totals/paid.phtml
index a76a6b3908e9e..904b7fb702f16 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 echo __('Total Paid') ?></strong></td>
-    <td class="emph"><?php echo $block->displayPriceAttribute('total_paid', true) ?>
+    <td class="label"><strong><?php /* @escapeNotVerified */ echo __('Total Paid') ?></strong></td>
+    <td class="emph"><?php /* @escapeNotVerified */ echo $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 6a405de770272..7afaded149614 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 echo __('Total Refunded') ?></strong></td>
-    <td class="emph"><?php echo $block->displayPriceAttribute('total_refunded', true) ?></td>
+    <td class="label"><strong><?php /* @escapeNotVerified */ echo __('Total Refunded') ?></strong></td>
+    <td class="emph"><?php /* @escapeNotVerified */ echo $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 5a9b6fd3c793a..6d31e0725a7f0 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 echo __('Shipping &amp; Handling') ?></td>
-        <td><?php echo $block->displayPriceAttribute('shipping_amount') ?></td>
+        <td class="label"><?php /* @escapeNotVerified */ echo __('Shipping &amp; Handling') ?></td>
+        <td><?php /* @escapeNotVerified */ echo $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 36f7e07511970..a19a1d091900d 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 echo $rate['title']; ?> (<?php echo (float)$rate['percent']; ?>%)<br /></td>
+                    <td class="label"><?php /* @escapeNotVerified */ echo $rate['title']; ?> (<?php echo (float)$rate['percent']; ?>%)<br /></td>
                 <?php else: ?>
-                    <td class="label"><?php echo $rate['title']; ?><br /></td>
+                    <td class="label"><?php /* @escapeNotVerified */ echo $rate['title']; ?><br /></td>
                 <?php endif; ?>
                 <?php if ($isFirst): ?>
-                    <td rowspan="<?php echo count($rates); ?>"><?php echo $block->displayAmount($amount, $baseAmount); ?></td>
+                    <td rowspan="<?php echo count($rates); ?>"><?php /* @escapeNotVerified */ echo $block->displayAmount($amount, $baseAmount); ?></td>
                 <?php endif; ?>
             </tr>
             <?php
@@ -62,7 +62,7 @@ $_fullInfo  = $block->getFullTaxInfo();
                 <?php else: ?>
                     <td class="label"><?php echo $block->escapeHtml($info['title']); ?><br /></td>
                 <?php endif; ?>
-                    <td><?php echo $block->displayAmount($amount, $baseAmount); ?></td>
+                    <td><?php /* @escapeNotVerified */ echo $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 echo __('Total Tax') ?>
+            <?php /* @escapeNotVerified */ echo __('Total Tax') ?>
         <?php else: ?>
-            <?php echo __('Tax') ?>
+            <?php /* @escapeNotVerified */ echo __('Tax') ?>
         <?php endif;?>
         </div>
     </td>
     <td>
-        <?php echo $block->displayAmount($_source->getTaxAmount(), $_source->getBaseTaxAmount()); ?>
+        <?php /* @escapeNotVerified */ echo $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 25e385ab2c58e..584da27fc6451 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
@@ -10,45 +10,45 @@
 <?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 echo $block->getFieldId('form') ?>" action="<?php echo $block->getSaveUrl() ?>">
+    <form class="entry-edit form-inline" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('form') ?>" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
         <fieldset class="admin__fieldset">
-            <legend class="admin__legend"><span><?php echo __('Gift Message for the Entire Order'); ?></span></legend>
+            <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Gift Message for the Entire Order'); ?></span></legend>
             <br/>
 
-            <input type="hidden" id="<?php echo $block->getFieldId('type'); ?>"
-                   name="<?php echo $block->getFieldName('type'); ?>"
+            <input type="hidden" id="<?php /* @escapeNotVerified */ echo $block->getFieldId('type'); ?>"
+                   name="<?php /* @escapeNotVerified */ echo $block->getFieldName('type'); ?>"
                    value="order"/>
 
             <div class="admin__field field-from-name<?php echo $_required ? ' required' : ''; ?>">
                 <label class="admin__field-label"
-                       for="<?php echo $block->getFieldId('sender'); ?>"><span><?php echo __('From Name'); ?></span></label>
+                       for="<?php /* @escapeNotVerified */ echo $block->getFieldId('sender'); ?>"><span><?php /* @escapeNotVerified */ echo __('From Name'); ?></span></label>
 
                 <div class="admin__field-control">
                     <input class="admin__control-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text"
-                           id="<?php echo $block->getFieldId('sender'); ?>"
-                           name="<?php echo $block->getFieldName('sender'); ?>"
+                           id="<?php /* @escapeNotVerified */ echo $block->getFieldId('sender'); ?>"
+                           name="<?php /* @escapeNotVerified */ echo $block->getFieldName('sender'); ?>"
                            value="<?php echo $block->escapeHtml($block->getMessage()->getSender()); ?>"/>
                 </div>
             </div>
 
             <div class="admin__field field-to-name<?php echo $_required ? ' required' : ''; ?>">
                 <label class="admin__field-label"
-                       for="<?php echo $block->getFieldId('recipient'); ?>"><span><?php echo __('To Name'); ?></span></label>
+                       for="<?php /* @escapeNotVerified */ echo $block->getFieldId('recipient'); ?>"><span><?php /* @escapeNotVerified */ echo __('To Name'); ?></span></label>
 
                 <div class="admin__field-control">
                     <input class="admin__control-text <?php echo $_required ? 'required-entry' : ''; ?>" type="text"
-                           id="<?php echo $block->getFieldId('recipient'); ?>"
-                           name="<?php echo $block->getFieldName('recipient'); ?>"
+                           id="<?php /* @escapeNotVerified */ echo $block->getFieldId('recipient'); ?>"
+                           name="<?php /* @escapeNotVerified */ echo $block->getFieldName('recipient'); ?>"
                            value="<?php echo $block->escapeHtml($block->getMessage()->getRecipient()); ?>"/>
                 </div>
             </div>
 
             <div class="admin__field field-gift-message">
                 <label class="admin__field-label"
-                       for="<?php echo $block->getFieldId('message'); ?>"><span><?php echo __('Gift Message'); ?></span></label>
+                       for="<?php /* @escapeNotVerified */ echo $block->getFieldId('message'); ?>"><span><?php /* @escapeNotVerified */ echo __('Gift Message'); ?></span></label>
                 <div class="admin__field-control">
-                    <textarea id="<?php echo $block->getFieldId('message'); ?>"
-                              name="<?php echo $block->getFieldName('message') ?>"
+                    <textarea id="<?php /* @escapeNotVerified */ echo $block->getFieldId('message'); ?>"
+                              name="<?php /* @escapeNotVerified */ echo $block->getFieldName('message') ?>"
                               class="admin__control-textarea"
                               rows="2"
                               cols="15"><?php echo $block->escapeHtml($block->getMessage()->getMessage()); ?></textarea>
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 17d163c1f7d84..f7ffcf8d4068a 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 echo __('Status') ?></label>
+                <label for="history_status" class="admin__field-label"><?php /* @escapeNotVerified */ echo __('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 echo $_code ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?php echo $_label ?></option>
+                            <option value="<?php /* @escapeNotVerified */ echo $_code ?>"<?php if ($_code == $block->getOrder()->getStatus()): ?> selected="selected"<?php endif; ?>><?php /* @escapeNotVerified */ echo $_label ?></option>
                         <?php endforeach; ?>
                     </select>
                 </div>
@@ -24,7 +24,7 @@
 
             <div class="admin__field">
                 <label for="history_comment" class="admin__field-label">
-                    <?php echo __('Comment') ?>
+                    <?php /* @escapeNotVerified */ echo __('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 echo __('Notify Customer by Email') ?>
+                                <?php /* @escapeNotVerified */ echo __('Notify Customer by Email') ?>
                             </label>
                         <?php endif; ?>
                     </div>
@@ -57,7 +57,7 @@
                                class="admin__control-checkbox"
                                value="1" />
                         <label class="admin__field-label" for="history_visible">
-                            <?php echo __('Visible on Storefront') ?>
+                            <?php /* @escapeNotVerified */ echo __('Visible on Storefront') ?>
                         </label>
                     </div>
                 </div>
@@ -72,17 +72,17 @@
     <ul class="note-list">
     <?php foreach ($block->getOrder()->getStatusHistoryCollection(true) as $_item): ?>
         <li class="note-list-item">
-            <span class="note-list-date"><?php echo $block->formatDate($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-time"><?php echo $block->formatTime($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
-            <span class="note-list-status"><?php echo $_item->getStatusLabel() ?></span>
+            <span class="note-list-date"><?php /* @escapeNotVerified */ echo $block->formatDate($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-time"><?php /* @escapeNotVerified */ echo $block->formatTime($_item->getCreatedAtDate(), \IntlDateFormatter::MEDIUM) ?></span>
+            <span class="note-list-status"><?php /* @escapeNotVerified */ echo $_item->getStatusLabel() ?></span>
             <span class="note-list-customer">
-                <?php echo __('Customer') ?>
+                <?php /* @escapeNotVerified */ echo __('Customer') ?>
                 <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                    <span class="note-list-customer-notapplicable"><?php echo __('Notification Not Applicable') ?></span>
+                    <span class="note-list-customer-notapplicable"><?php /* @escapeNotVerified */ echo __('Notification Not Applicable') ?></span>
                 <?php elseif ($_item->getIsCustomerNotified()): ?>
-                    <span class="note-list-customer-notified"><?php echo __('Notified') ?></span>
+                    <span class="note-list-customer-notified"><?php /* @escapeNotVerified */ echo __('Notified') ?></span>
                 <?php else: ?>
-                    <span class="note-list-customer-not-notified"><?php echo __('Not Notified') ?></span>
+                    <span class="note-list-customer-not-notified"><?php /* @escapeNotVerified */ echo __('Not Notified') ?></span>
                 <?php endif; ?>
             </span>
             <?php if ($_item->getComment()): ?>
@@ -94,7 +94,7 @@
     <script>
 require(['prototype'], function(){
 
-        if($('order_status'))$('order_status').update('<?php echo $block->getOrder()->getStatusLabel() ?>');
+        if($('order_status'))$('order_status').update('<?php /* @escapeNotVerified */ echo $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 6a411c3170bfb..a74f957109625 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
@@ -24,7 +24,7 @@ $orderStoreDate = $block->formatDate(
 
 <section class="admin__page-section order-view-account-information">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Order & Account Information') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Order & Account Information') ?></span>
     </div>
     <div class="admin__page-section-content">
         <div class="admin__page-section-item order-information">
@@ -37,73 +37,73 @@ $orderStoreDate = $block->formatDate(
             <div class="admin__page-section-item-title">
                 <span class="title">
                     <?php if ($block->getNoUseOrderLink()): ?>
-                        <?php echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php echo $_email ?></span>)
+                        <?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?> (<span><?php /* @escapeNotVerified */ echo $_email ?></span>)
                     <?php else: ?>
-                        <a href="<?php echo $block->getViewUrl($_order->getId()) ?>"><?php echo __('Order # %1', $_order->getRealOrderId()) ?></a>
-                        <span>(<?php echo $_email ?>)</span>
+                        <a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order->getId()) ?>"><?php /* @escapeNotVerified */ echo __('Order # %1', $_order->getRealOrderId()) ?></a>
+                        <span>(<?php /* @escapeNotVerified */ echo $_email ?>)</span>
                     <?php endif; ?>
                 </span>
             </div>
             <div class="admin__page-section-item-content">
                 <table class="admin__table-secondary order-information-table">
                 <tr>
-                    <th><?php echo __('Order Date') ?></th>
-                    <td><?php echo $orderAdminDate ?></td>
+                    <th><?php /* @escapeNotVerified */ echo __('Order Date') ?></th>
+                    <td><?php /* @escapeNotVerified */ echo $orderAdminDate ?></td>
                 </tr>
                 <?php if ($orderAdminDate != $orderStoreDate):?>
                     <tr>
-                        <th><?php echo __(
+                        <th><?php /* @escapeNotVerified */ echo __(
                                 'Order Date (%1)',
                                 $block->getTimezoneForStore(
                                     $_order->getStore(),
                                     $_order->getCreatedAt()
                                 )
                             ) ?></th>
-                        <td><?php echo $orderStoreDate ?></td>
+                        <td><?php /* @escapeNotVerified */ echo $orderStoreDate ?></td>
                     </tr>
                 <?php endif;?>
                 <tr>
-                    <th><?php echo __('Order Status') ?></th>
-                    <td><span id="order_status"><?php echo $_order->getStatusLabel() ?></span></td>
+                    <th><?php /* @escapeNotVerified */ echo __('Order Status') ?></th>
+                    <td><span id="order_status"><?php /* @escapeNotVerified */ echo $_order->getStatusLabel() ?></span></td>
                 </tr>
                 <?php if ($block->isSingleStoreMode() == false):?>
                     <tr>
-                        <th><?php echo __('Purchased From') ?></th>
-                        <td><?php echo $block->getOrderStoreName() ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Purchased From') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $block->getOrderStoreName() ?></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRelationChildId()): ?>
                     <tr>
-                        <th><?php echo __('Link to the New Order') ?></th>
-                        <td><a href="<?php echo $block->getViewUrl($_order->getRelationChildId()) ?>">
-                                <?php echo $_order->getRelationChildRealId() ?>
+                        <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() ?>
                             </a></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRelationParentId()): ?>
                     <tr>
-                        <th><?php echo __('Link to the Previous Order') ?></th>
-                        <td><a href="<?php echo $block->getViewUrl($_order->getRelationParentId()) ?>">
-                                <?php echo $_order->getRelationParentRealId() ?>
+                        <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() ?>
                             </a></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getRemoteIp() && $block->shouldDisplayCustomerIp()): ?>
                     <tr>
-                        <th><?php echo __('Placed from IP') ?></th>
-                        <td><?php echo $_order->getRemoteIp(); echo($_order->getXForwardedFor()) ? ' (' . $block->escapeHtml($_order->getXForwardedFor()) . ')' : ''; ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Placed from IP') ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_order->getRemoteIp(); echo($_order->getXForwardedFor()) ? ' (' . $block->escapeHtml($_order->getXForwardedFor()) . ')' : ''; ?></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getGlobalCurrencyCode() != $_order->getBaseCurrencyCode()): ?>
                     <tr>
-                        <th><?php echo __('%1 / %2 rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
-                        <td><?php echo $_order->getBaseToGlobalRate() ?></td>
+                        <th><?php /* @escapeNotVerified */ echo __('%1 / %2 rate:', $_order->getGlobalCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
+                        <td><?php /* @escapeNotVerified */ echo $_order->getBaseToGlobalRate() ?></td>
                     </tr>
                 <?php endif; ?>
                 <?php if ($_order->getBaseCurrencyCode() != $_order->getOrderCurrencyCode()): ?>
                     <tr>
-                        <th><?php echo __('%1 / %2 rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
-                        <th><?php echo $_order->getBaseToOrderRate() ?></th>
+                        <th><?php /* @escapeNotVerified */ echo __('%1 / %2 rate:', $_order->getOrderCurrencyCode(), $_order->getBaseCurrencyCode()) ?></th>
+                        <th><?php /* @escapeNotVerified */ echo $_order->getBaseToOrderRate() ?></th>
                     </tr>
                 <?php endif; ?>
             </table>
@@ -113,16 +113,16 @@ $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 echo __('Account Information') ?></span>
-                <div class="actions"><?php echo $block->getAccountEditLink()?></div>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Account Information') ?></span>
+                <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAccountEditLink()?></div>
             </div>
             <div class="admin__page-section-item-content">
                 <table class="admin__table-secondary order-account-information-table">
                     <tr>
-                        <th><?php echo __('Customer Name') ?></th>
+                        <th><?php /* @escapeNotVerified */ echo __('Customer Name') ?></th>
                         <td>
                             <?php if ($_customerUrl = $block->getCustomerViewUrl()) : ?>
-                                <a href="<?php echo $_customerUrl ?>" target="_blank">
+                                <a href="<?php /* @escapeNotVerified */ echo $_customerUrl ?>" target="_blank">
                                     <span><?php echo $block->escapeHtml($_order->getCustomerName()) ?></span>
                                 </a>
                             <?php else: ?>
@@ -131,19 +131,19 @@ $orderStoreDate = $block->formatDate(
                         </td>
                     </tr>
                     <tr>
-                        <th><?php echo __('Email') ?></th>
-                        <td><a href="mailto:<?php echo $_order->getCustomerEmail() ?>"><?php echo $_order->getCustomerEmail() ?></a></td>
+                        <th><?php /* @escapeNotVerified */ echo __('Email') ?></th>
+                        <td><a href="mailto:<?php /* @escapeNotVerified */ echo $_order->getCustomerEmail() ?>"><?php /* @escapeNotVerified */ echo $_order->getCustomerEmail() ?></a></td>
                     </tr>
                     <?php if ($_groupName = $block->getCustomerGroupName()) : ?>
                         <tr>
-                            <th><?php echo __('Customer Group') ?></th>
-                            <td><?php echo $_groupName ?></td>
+                            <th><?php /* @escapeNotVerified */ echo __('Customer Group') ?></th>
+                            <td><?php /* @escapeNotVerified */ echo $_groupName ?></td>
                         </tr>
                     <?php endif; ?>
                     <?php foreach ($block->getCustomerAccountData() as $data):?>
                         <tr>
-                            <th><?php echo $data['label'] ?></th>
-                            <td><?php echo $data['value'] ?></td>
+                            <th><?php /* @escapeNotVerified */ echo $data['label'] ?></th>
+                            <td><?php /* @escapeNotVerified */ echo $data['value'] ?></td>
                         </tr>
                     <?php endforeach;?>
                 </table>
@@ -154,25 +154,25 @@ $orderStoreDate = $block->formatDate(
 
 <section class="admin__page-section order-addresses">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Address Information') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Billing Address') ?></span>
-                <div class="actions"><?php echo $block->getAddressEditLink($_order->getBillingAddress()); ?></div>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
+                <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAddressEditLink($_order->getBillingAddress()); ?></div>
             </div>
-            <address class="admin__page-section-item-content"><?php echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
+            <address class="admin__page-section-item-content"><?php /* @escapeNotVerified */ echo $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 echo __('Shipping Address') ?></span>
-                    <div class="actions"><?php echo $block->getAddressEditLink($_order->getShippingAddress()); ?></div>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></span>
+                    <div class="actions"><?php /* @escapeNotVerified */ echo $block->getAddressEditLink($_order->getShippingAddress()); ?></div>
                 </div>
-                <address class="admin__page-section-item-content"><?php echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
+                <address class="admin__page-section-item-content"><?php /* @escapeNotVerified */ echo $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 87cd90dca4c62..879872ee9271a 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
@@ -12,16 +12,16 @@
     <table class="data-table admin__table-primary edit-order-table">
         <thead>
             <tr class="headings">
-                <th class="col-product"><span><?php echo __('Product') ?></span></th>
-                <th class="col-status"><span><?php echo __('Item Status') ?></span></th>
-                <th class="col-price-original"><span><?php echo __('Original Price') ?></span></th>
-                <th class="col-price"><span><?php echo __('Price') ?></span></th>
-                <th class="col-ordered-qty"><span><?php echo __('Qty') ?></span></th>
-                <th class="col-subtotal"><span><?php echo __('Subtotal') ?></span></th>
-                <th class="col-tax-amount"><span><?php echo __('Tax Amount') ?></span></th>
-                <th class="col-tax-percent"><span><?php echo __('Tax Percent') ?></span></th>
-                <th class="col-discont"><span><?php echo __('Discount Amount') ?></span></th>
-                <th class="col-total last"><span><?php echo __('Row Total') ?></span></th>
+                <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
+                <th class="col-status"><span><?php /* @escapeNotVerified */ echo __('Item Status') ?></span></th>
+                <th class="col-price-original"><span><?php /* @escapeNotVerified */ echo __('Original Price') ?></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-subtotal"><span><?php /* @escapeNotVerified */ echo __('Subtotal') ?></span></th>
+                <th class="col-tax-amount"><span><?php /* @escapeNotVerified */ echo __('Tax Amount') ?></span></th>
+                <th class="col-tax-percent"><span><?php /* @escapeNotVerified */ echo __('Tax Percent') ?></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>
             </tr>
         </thead>
         <?php $_items = $block->getItemsCollection();?>
@@ -31,7 +31,7 @@
             } else {
                 $i++;
             }?>
-            <tbody class="<?php echo $i%2 ? 'even' : 'odd' ?>">
+            <tbody class="<?php /* @escapeNotVerified */ echo $i%2 ? 'even' : 'odd' ?>">
                 <?php echo $block->getItemHtml($_item) ?>
                 <?php echo $block->getItemExtraInfoHtml($_item) ?>
             </tbody>
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 6d8f2574a619c..da3367344c439 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
@@ -20,8 +20,8 @@
         </div>
         <?php endif ?>
     </td>
-    <td class="col-status"><?php echo $_item->getStatus() ?></td>
-    <td class="col-price-original"><?php echo $block->displayPriceAttribute('original_price') ?></td>
+    <td class="col-status"><?php /* @escapeNotVerified */ echo $_item->getStatus() ?></td>
+    <td class="col-price-original"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('original_price') ?></td>
     <td class="col-price">
         <?php echo $block->getColumnHtml($_item, 'price'); ?>
     </td>
@@ -30,9 +30,9 @@
     <td class="col-subtotal">
         <?php echo $block->getColumnHtml($_item, 'subtotal'); ?>
     </td>
-    <td class="col-tax-amount"><?php echo $block->displayPriceAttribute('tax_amount') ?></td>
-    <td class="col-tax-percent"><?php echo $block->displayTaxPercent($_item) ?></td>
-    <td class="col-discont"><?php echo $block->displayPriceAttribute('discount_amount') ?></td>
+    <td class="col-tax-amount"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('tax_amount') ?></td>
+    <td class="col-tax-percent"><?php /* @escapeNotVerified */ echo $block->displayTaxPercent($_item) ?></td>
+    <td class="col-discont"><?php /* @escapeNotVerified */ echo $block->displayPriceAttribute('discount_amount') ?></td>
     <td class="col-total last">
         <?php echo $block->getColumnHtml($_item, 'total'); ?>
     </td>
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 2e8eae106e6a9..07d798ed87ce1 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 echo $block->getItemCreatedAt($_item) ?></span>
-            <span class="note-list-time"><?php echo $block->getItemCreatedAt($_item, 'time') ?></span>
-            <span class="note-list-status"><?php echo $block->getItemTitle($_item) ?></span>
+            <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>
             <?php if ($block->isItemNotified($_item, false)): ?>
                 <span class="note-list-customer">
-                    <?php echo __('Customer') ?>
+                    <?php /* @escapeNotVerified */ echo __('Customer') ?>
                     <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                        <span class="note-list-customer-notapplicable"><?php echo __('Notification Not Applicable') ?></span>
+                        <span class="note-list-customer-notapplicable"><?php /* @escapeNotVerified */ echo __('Notification Not Applicable') ?></span>
                     <?php elseif ($block->isItemNotified($_item)): ?>
-                        <span class="note-list-customer-notified"><?php echo __('Notified') ?></span>
+                        <span class="note-list-customer-notified"><?php /* @escapeNotVerified */ echo __('Notified') ?></span>
                     <?php else: ?>
-                        <span class="note-list-customer-not-notified"><?php echo __('Not Notified') ?></span>
+                        <span class="note-list-customer-not-notified"><?php /* @escapeNotVerified */ echo __('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 echo __('Notes for this Order') ?>
+            <?php /* @escapeNotVerified */ echo __('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 echo $_comment ?>
+                        <?php /* @escapeNotVerified */ echo $_comment ?>
                     </div>
                     <span class="comments-block-item-date-time">
-                        <?php echo __('Comment added') ?>
-                        <?php echo $block->getItemCreatedAt($_item) ?>
-                        <?php echo $block->getItemCreatedAt($_item, 'time') ?>
+                        <?php /* @escapeNotVerified */ echo __('Comment added') ?>
+                        <?php /* @escapeNotVerified */ echo $block->getItemCreatedAt($_item) ?>
+                        <?php /* @escapeNotVerified */ echo $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 b4dbc4a8426d9..134cd6e50901b 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
@@ -15,21 +15,21 @@
 </div>
 
 <?php echo $block->getChildHtml('order_info') ?>
-<input type="hidden" name="order_id" value="<?php echo $_order->getId() ?>"/>
+<input type="hidden" name="order_id" value="<?php /* @escapeNotVerified */ echo $_order->getId() ?>"/>
 
 <section class="admin__page-section order-view-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Payment Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></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'); ?>
                     <?php echo $block->getChildHtml('payment_additional_info'); ?>
@@ -44,26 +44,26 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Items Ordered') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Ordered') ?></span>
     </div>
     <?php echo $block->getItemsHtml() ?>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Order Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Notes for this Order') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Notes for this Order') ?></span>
             </div>
             <?php echo $block->getChildHtml('order_history') ?>
         </div>
 
         <div class="admin__page-section-item order-totals">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php echo __('Order Totals') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Order Totals') ?></span>
             </div>
             <?php echo $block->getChildHtml('order_totals') ?>
         </div>
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 cdab3840e62c3..dca4d40bdf460 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 echo $block->getLink() ?>" class="link-feed"><?php echo $block->getLabel() ?></a>
+<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="link-feed"><?php /* @escapeNotVerified */ echo $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 26d231c994314..4fcbedb12216c 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/transactions/detail.phtml
@@ -10,29 +10,29 @@
 <div data-mage-init='{"floatingHeader": {}}' class="page-actions"><?php echo $block->getButtonsHtml() ?></div>
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Transaction Data'); ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Transaction ID'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Transaction ID'); ?></th>
                 <td><?php echo $block->getTxnIdHtml() ?></td>
             </tr>
             <tr>
-                <th><?php echo __('Parent Transaction ID'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Parent Transaction ID'); ?></th>
                 <td>
                     <?php if ($block->getParentTxnIdHtml()): ?>
                     <a href="<?php echo $block->getParentTxnIdUrlHtml() ?>">
                         <?php echo $block->getParentTxnIdHtml(); ?>
                     </a>
                     <?php else : ?>
-                    <?php echo __('N/A'); ?>
+                    <?php /* @escapeNotVerified */ echo __('N/A'); ?>
                     <?php endif; ?>
                 </td>
             </tr>
             <tr>
-                <th><?php echo __('Order ID'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Order ID'); ?></th>
                 <td>
                     <a href="<?php echo $block->getOrderIdUrlHtml(); ?>">
                         <?php echo $block->getOrderIncrementIdHtml() ?>
@@ -40,15 +40,15 @@
                 </td>
             </tr>
             <tr>
-                <th><?php echo __('Transaction Type'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Transaction Type'); ?></th>
                 <td><?php echo $block->getTxnTypeHtml() ?></td>
             </tr>
             <tr>
-                <th><?php echo __('Is Closed'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Is Closed'); ?></th>
                 <td><?php echo $block->getIsClosedHtml(); ?></td>
             </tr>
             <tr>
-                <th><?php echo __('Created At'); ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Created At'); ?></th>
                 <td><?php echo $block->getCreatedAtHtml(); ?></td>
             </tr>
             </tbody>
@@ -58,7 +58,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title""><?php echo __('Child Transactions'); ?></span>
+        <span class="title""><?php /* @escapeNotVerified */ echo __('Child Transactions'); ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
         <?php echo $block->getChildHtml('child_grid') ?>
@@ -67,7 +67,7 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Transaction Details'); ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Transaction Details'); ?></span>
     </div>
     <div class="admin__page-section-content log-details-grid">
         <?php echo $block->getChildHtml('detail_grid') ?>
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 1fbd7f5bf286e..5a5cd8080eeed 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">
-                    <?= __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items'); ?>
                 </th>
                 <th class="item-qty">
-                    <?= __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty'); ?>
                 </th>
                 <th class="item-subtotal">
-                    <?= __('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 9be510312600c..74bfe48ed58e5 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">
-                    <?= __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items'); ?>
                 </th>
                 <th class="item-qty">
-                    <?= __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty'); ?>
                 </th>
                 <th class="item-subtotal">
-                    <?= __('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 d40b4fbccfd20..43900f0dc0e00 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">
-                    <?= __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items'); ?>
                 </th>
                 <th class="item-qty">
-                    <?= __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty'); ?>
                 </th>
                 <th class="item-price">
-                    <?= __('Price'); ?>
+                    <?= /* @escapeNotVerified */  __('Price'); ?>
                 </th>
             </tr>
         </thead>
@@ -45,10 +45,10 @@
             <table class="message-gift">
                 <tr>
                     <td>
-                        <h3><?= __('Gift Message for this Order') ?></h3>
-                        <strong><?= __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                        <br /><strong><?= __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                        <br /><strong><?= __('Message:'); ?></strong>
+                        <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>
                         <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 7ddefe645b83f..a1e3dcf036532 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,13 +12,13 @@
 <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"><?= __('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): ?>
-                    <dt><strong><em><?= $option['label'] ?></em></strong></dt>
+                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
                     <dd>
-                        <?= nl2br($option['value']) ?>
+                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
                     </dd>
                 <?php endforeach; ?>
             </dl>
@@ -29,8 +29,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= $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 7ddefe645b83f..a1e3dcf036532 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,13 +12,13 @@
 <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"><?= __('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): ?>
-                    <dt><strong><em><?= $option['label'] ?></em></strong></dt>
+                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
                     <dd>
-                        <?= nl2br($option['value']) ?>
+                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
                     </dd>
                 <?php endforeach; ?>
             </dl>
@@ -29,8 +29,8 @@
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
     <td class="item-price">
-        <?= $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 dfea3dc103f62..aad32232c5fc3 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,13 +15,13 @@ $_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"><?= __('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): ?>
-                <dt><strong><em><?= $option['label'] ?></em></strong></dt>
+                <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
                 <dd>
-                    <?= nl2br($option['value']) ?>
+                    <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
                 </dd>
             <?php endforeach; ?>
             </dl>
@@ -32,9 +32,9 @@ $_order = $_item->getOrder();
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $_item->getQtyOrdered() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQtyOrdered() * 1 ?></td>
     <td class="item-price">
-        <?= $block->getItemPrice($_item); ?>
+        <?= /* @escapeNotVerified */  $block->getItemPrice($_item); ?>
     </td>
 </tr>
 <?php if ($_item->getGiftMessageId() && $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessage($_item->getGiftMessageId())): ?>
@@ -43,10 +43,10 @@ $_order = $_item->getOrder();
         <table class="message-gift">
             <tr>
                 <td>
-                    <h3><?= __('Gift Message') ?></h3>
-                    <strong><?= __('From:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getSender()) ?>
-                    <br /><strong><?= __('To:'); ?></strong> <?= $block->escapeHtml($_giftMessage->getRecipient()) ?>
-                    <br /><strong><?= __('Message:'); ?></strong>
+                    <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>
                     <br /><?= $block->escapeHtml($_giftMessage->getMessage()) ?>
                 </td>
             </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
index c070a67aecb55..4a39d4c9c7b5d 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/items/price/row.phtml
@@ -16,4 +16,4 @@ $_item = $block->getItem();
 $_order = $_item->getOrder();
 ?>
 
-<?= $_order->formatPrice($_item->getRowTotal()) ?>
+<?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml b/app/code/Magento/Sales/view/frontend/templates/email/items/shipment/default.phtml
index c2648c6921a23..c36718703c6ca 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,13 +11,13 @@ $_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"><?= __('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): ?>
-                    <dt><strong><em><?= $option['label'] ?></em></strong></dt>
+                    <dt><strong><em><?= /* @escapeNotVerified */  $option['label'] ?></em></strong></dt>
                     <dd>
-                        <?= nl2br($option['value']) ?>
+                        <?= /* @escapeNotVerified */  nl2br($option['value']) ?>
                     </dd>
                 <?php endforeach; ?>
             </dl>
@@ -28,5 +28,5 @@ $_item = $block->getItem() ?>
         <?php endif; ?>
         <?= $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="item-qty"><?= $_item->getQty() * 1 ?></td>
+    <td class="item-qty"><?= /* @escapeNotVerified */  $_item->getQty() * 1 ?></td>
 </tr>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/items.phtml
index df6f192b74a6a..427a8a8526715 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">
-                    <?= __('Items'); ?>
+                    <?= /* @escapeNotVerified */  __('Items'); ?>
                 </th>
                 <th class="item-qty">
-                    <?= __('Qty'); ?>
+                    <?= /* @escapeNotVerified */  __('Qty'); ?>
                 </th>
             </tr>
         </thead>
diff --git a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
index 5f8548c5fd17e..03b7408d743bc 100644
--- a/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/email/shipment/track.phtml
@@ -14,8 +14,8 @@
 <table class="shipment-track">
     <thead>
         <tr>
-            <th><?= __('Shipped By') ?></th>
-            <th><?= __('Tracking Number') ?></th>
+            <th><?= /* @escapeNotVerified */  __('Shipped By') ?></th>
+            <th><?= /* @escapeNotVerified */  __('Tracking Number') ?></th>
         </tr>
     </thead>
     <tbody>
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 ca1ec172f8e8e..07251f802fdb5 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 echo $block->getActionUrl() ?>"
+<form class="form form-orders-search" id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{}, "validation":{}}' action="<?php /* @escapeNotVerified */ echo $block->getActionUrl() ?>"
       method="post" name="guest_post">
     <fieldset class="fieldset">
-        <legend class="admin__legend"><span><?php echo __('Order Information') ?></span></legend>
+        <legend class="admin__legend"><span><?php /* @escapeNotVerified */ echo __('Order Information') ?></span></legend>
         <br>
 
         <div class="field id required">
-            <label class="label" for="oar-order-id"><span><?php echo __('Order ID') ?></span></label>
+            <label class="label" for="oar-order-id"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Billing Last Name') ?></span></label>
+            <label class="label" for="oar-billing-lastname"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Find Order By') ?></span></label>
+            <label class="label" for="quick-search-type-id"><span><?php /* @escapeNotVerified */ echo __('Find Order By') ?></span></label>
 
             <div class="control">
                 <select name="oar_type" id="quick-search-type-id" class="select">
-                    <option value="email"><?php echo __('Email'); ?></option>
-                    <option value="zip"><?php echo __('ZIP Code'); ?></option>
+                    <option value="email"><?php /* @escapeNotVerified */ echo __('Email'); ?></option>
+                    <option value="zip"><?php /* @escapeNotVerified */ echo __('ZIP Code'); ?></option>
                 </select>
             </div>
         </div>
         <div id="oar-email" class="field email required">
-            <label class="label" for="oar_email"><span><?php echo __('Email') ?></span></label>
+            <label class="label" for="oar_email"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Billing ZIP Code') ?></span></label>
+            <label class="label" for="oar_zip"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Continue') ?>" class="action submit primary">
-                <span><?php echo __('Continue') ?></span>
+            <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Continue') ?>" class="action submit primary">
+                <span><?php /* @escapeNotVerified */ echo __('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 bce53a201ed70..ac8c730fdc593 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
@@ -11,6 +11,6 @@ $_item = $block->getItem();
 ?>
 <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
     <span class="cart-price">
-        <?php echo $block->getOrder()->formatPrice($block->getItem()->getRowTotal()) ?>
+        <?php /* @escapeNotVerified */ echo $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 a8a33e2004faa..f7504fe778397 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 echo $_order->formatPrice($block->getTotalAmount($_item))?>
+<?php /* @escapeNotVerified */ echo $_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 f75b5f1da00c4..e019f211c4ad4 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
@@ -11,6 +11,6 @@ $_item = $block->getItem();
 ?>
 <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
     <span class="cart-price">
-        <?php echo $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
+        <?php /* @escapeNotVerified */ echo $block->getOrder()->formatPrice($block->getItem()->getPrice()) ?>
     </span>
 </span>
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 671a90b078929..477a36b8ddd77 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/comments.phtml
@@ -15,10 +15,10 @@
 ?>
 <?php if ($block->hasComments()):?>
     <div class="order additional details comments">
-        <h3 class="subtitle"><?php echo $block->getTitle() ?></h3>
+        <h3 class="subtitle"><?php /* @escapeNotVerified */ echo $block->getTitle() ?></h3>
         <dl class="order comments">
             <?php foreach ($block->getComments() as $_commentItem): ?>
-                <dt class="comment date"><?php echo $block->formatDate($_commentItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
+                <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>
             <?php endforeach; ?>
         </dl>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
index 3cc329aed0d71..34f9343cb9767 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/creditmemo.phtml
@@ -8,8 +8,8 @@
     <?php echo $block->getChildHtml('creditmemo_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back">
-                <span><?php echo $block->getBackTitle() ?></span>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back">
+                <span><?php /* @escapeNotVerified */ echo $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 8378295ad356b..ad074e34038ed 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 echo $block->getPrintAllCreditmemosUrl($_order) ?>"
+    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintAllCreditmemosUrl($_order) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php echo __('Print All Refunds') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Print All Refunds') ?></span>
     </a>
 </div>
 <?php foreach ($_order->getCreditmemosCollection() as $_creditmemo): ?>
 <div class="order-title">
-    <strong><?php echo __('Refund #') ?><?php echo $_creditmemo->getIncrementId(); ?> </strong>
-    <a href="<?php echo $block->getPrintCreditmemoUrl($_creditmemo) ?>"
+    <strong><?php /* @escapeNotVerified */ echo __('Refund #') ?><?php /* @escapeNotVerified */ echo $_creditmemo->getIncrementId(); ?> </strong>
+    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintCreditmemoUrl($_creditmemo) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php echo __('Print Refund') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 echo $_creditmemo->getId(); ?>">
-        <caption class="table-caption"><?php echo __('Items Refunded') ?></caption>
+    <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>
         <thead>
             <tr>
-                <th class="col name"><?php echo __('Product Name') ?></th>
-                <th class="col sku"><?php echo __('SKU') ?></th>
-                <th class="col price"><?php echo __('Price') ?></th>
-                <th class="col qty"><?php echo __('Qty') ?></th>
-                <th class="col subtotal"><?php echo __('Subtotal') ?></th>
-                <th class="col discount"><?php echo __('Discount Amount') ?></th>
-                <th class="col total"><?php echo __('Row Total') ?></th>
+                <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>
             </tr>
         </thead>
         <?php $_items = $_creditmemo->getAllItems(); ?>
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 480747ff3723b..def84c4bab9ff 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,7 +10,7 @@
 <?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 echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -20,12 +20,12 @@
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
+                    <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
@@ -40,7 +40,7 @@
         <?php /* downloadable */ ?>
         <?php if ($links = $block->getLinks()): ?>
             <dl class="item options">
-                <dt><?php echo $block->getLinksTitle() ?></dt>
+                <dt><?php /* @escapeNotVerified */ echo $block->getLinksTitle() ?></dt>
                 <?php foreach ($links->getPurchasedItems() as $link): ?>
                     <dd><?php echo $block->escapeHtml($link->getLinkTitle()); ?></dd>
                 <?php endforeach; ?>
@@ -54,15 +54,15 @@
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></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>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>"><?php echo $_item->getQty()*1 ?></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>
-    <td class="col discount" data-th="<?php echo $block->escapeHtml(__('Discount Amount')); ?>"><?php echo $_order->formatPrice(-$_item->getDiscountAmount()) ?></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>
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 ce572054fb822..78b2a2681b627 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/history.phtml
@@ -12,32 +12,32 @@
 <?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 echo __('Orders') ?></caption>
+            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Orders') ?></caption>
             <thead>
                 <tr>
-                    <th scope="col" class="col id"><?php echo __('Order #') ?></th>
-                    <th scope="col" class="col date"><?php echo __('Date') ?></th>
-                    <th scope="col" class="col shipping"><?php echo __('Ship To') ?></th>
-                    <th scope="col" class="col total"><?php echo __('Order Total') ?></th>
-                    <th scope="col" class="col status"><?php echo __('Status') ?></th>
+                    <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">&nbsp;</th>
                 </tr>
             </thead>
             <tbody>
                 <?php foreach ($_orders as $_order): ?>
                     <tr>
-                        <td data-th="<?php echo $block->escapeHtml(__('Order #')) ?>" class="col id"><?php echo $_order->getRealOrderId() ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php echo $block->formatDate($_order->getCreatedAt()) ?></td>
+                        <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 echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Status')) ?>" class="col status"><?php echo $_order->getStatusLabel() ?></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 echo $block->getViewUrl($_order) ?>" class="action view">
-                                <span><?php echo __('View Order') ?></span>
+                            <a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order) ?>" class="action view">
+                                <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
                             </a>
                             <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                <a href="<?php echo $block->getReorderUrl($_order) ?>" class="action order">
-                                    <span><?php echo __('Reorder') ?></span>
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
+                                    <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
                                 </a>
                             <?php endif ?>
                         </td>
@@ -50,5 +50,5 @@
         <div class="order-products-toolbar toolbar bottom"><?php echo $block->getPagerHtml(); ?></div>
     <?php endif ?>
 <?php else: ?>
-    <div class="message info empty"><span><?php echo __('You have placed no orders.'); ?></span></div>
+    <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('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 8ce77fbece849..1199034ec875a 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 echo __('Order Information') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('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 echo __('Shipping Address') ?></span></strong>
+            <strong class="box-title"><span><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></span></strong>
             <div class="box-content">
-                <address><?php echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
+                <address><?php /* @escapeNotVerified */ echo $block->getFormattedAddress($_order->getShippingAddress()); ?></address>
             </div>
         </div>
 
         <div class="box box-order-shipping-method">
             <strong class="box-title">
-                <span><?php echo __('Shipping Method') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></span>
             </strong>
             <div class="box-content">
             <?php if ($_order->getShippingDescription()): ?>
                 <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
             <?php else: ?>
-                <?php echo __('No shipping information available'); ?>
+                <?php /* @escapeNotVerified */ echo __('No shipping information available'); ?>
             <?php endif; ?>
             </div>
         </div>
@@ -38,15 +38,15 @@
 
         <div class="box box-order-billing-address">
             <strong class="box-title">
-                <span><?php echo __('Billing Address') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Billing Address') ?></span>
             </strong>
             <div class="box-content">
-                <address><?php echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
+                <address><?php /* @escapeNotVerified */ echo $block->getFormattedAddress($_order->getBillingAddress()); ?></address>
             </div>
         </div>
         <div class="box box-order-billing-method">
             <strong class="box-title">
-                <span><?php echo __('Payment Method') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Payment Method') ?></span>
             </strong>
             <div class="box-content">
                 <?php echo $block->getPaymentInfoHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml b/app/code/Magento/Sales/view/frontend/templates/order/info/buttons.phtml
index 10334a2909d8a..19fe46b7e083e 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
@@ -10,14 +10,14 @@
 <div class="actions">
     <?php  $_order = $block->getOrder() ?>
     <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-        <a class="action reorder" href="<?php echo $block->getReorderUrl($_order) ?>">
-            <span><?php echo __('Reorder') ?></span>
+        <a class="action reorder" href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>">
+            <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
         </a>
     <?php endif ?>
     <a class="action print"
-       href="<?php echo $block->getPrintUrl($_order) ?>"
+       href="<?php /* @escapeNotVerified */ echo $block->getPrintUrl($_order) ?>"
        onclick="this.target='_blank';">
-        <span><?php echo __('Print Order') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Print Order') ?></span>
     </a>
     <?php echo $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 bc224f33afaf8..d648c565281b7 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 echo $block->getLink() ?>" class="action rss">
-    <span><?php echo $block->getLabel() ?></span>
+<a href="<?php /* @escapeNotVerified */ echo $block->getLink() ?>" class="action rss">
+    <span><?php /* @escapeNotVerified */ echo $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 fdb160f3d7411..6d6e735768823 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/invoice.phtml
@@ -8,8 +8,8 @@
     <?php echo $block->getChildHtml('invoice_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back">
-                <span><?php echo $block->getBackTitle() ?></span>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back">
+                <span><?php /* @escapeNotVerified */ echo $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 7707361d29ad0..a9b3d631ef337 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 echo $block->getPrintAllInvoicesUrl($_order) ?>"
+    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintAllInvoicesUrl($_order) ?>"
        target="_blank"
        class="action print">
-        <span><?php echo __('Print All Invoices') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Print All Invoices') ?></span>
     </a>
 </div>
 <?php foreach ($_order->getInvoiceCollection() as $_invoice): ?>
 <div class="order-title">
-    <strong><?php echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?></strong>
-    <a href="<?php echo $block->getPrintInvoiceUrl($_invoice) ?>"
+    <strong><?php /* @escapeNotVerified */ echo __('Invoice #') ?><?php /* @escapeNotVerified */ echo $_invoice->getIncrementId(); ?></strong>
+    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintInvoiceUrl($_invoice) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php echo __('Print Invoice') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('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 echo $_invoice->getId(); ?>">
-        <caption class="table-caption"><?php echo __('Items Invoiced') ?></caption>
+    <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>
         <thead>
             <tr>
-                <th class="col name"><?php echo __('Product Name') ?></th>
-                <th class="col sku"><?php echo __('SKU') ?></th>
-                <th class="col price"><?php echo __('Price') ?></th>
-                <th class="col qty"><?php echo __('Qty Invoiced') ?></th>
-                <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+                <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>
             </tr>
         </thead>
         <?php $_items = $_invoice->getAllItems(); ?>
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 47267ce8ef6d7..3be6f0a1d645f 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,7 +10,7 @@
 <?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 echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -20,12 +20,12 @@
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
+                    <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
@@ -42,12 +42,12 @@
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></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>
     <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Invoiced')); ?>">
-        <span class="qty summary"><?php echo $_item->getQty()*1 ?></span>
+        <span class="qty summary"><?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?></span>
     </td>
     <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal')); ?>">
         <?php echo $block->getItemRowTotalHtml(); ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
index f5c27e01af6f7..f8c2c4af2a2dd 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/items.phtml
@@ -10,15 +10,15 @@
 <?php $_order = $block->getOrder() ?>
 <?php $_giftMessage; ?>
 <div class="table-wrapper order-items">
-    <table class="data table table-order-items" id="my-orders-table" summary="<?php echo __('Items Ordered') ?>">
-        <caption class="table-caption"><?php echo __('Items Ordered') ?></caption>
+    <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>
         <thead>
             <tr>
-                <th class="col name"><?php echo __('Product Name') ?></th>
-                <th class="col sku"><?php echo __('SKU') ?></th>
-                <th class="col price"><?php echo __('Price') ?></th>
-                <th class="col qty"><?php echo __('Qty') ?></th>
-                <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+                <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>
             </tr>
         </thead>
         <?php $_items = $_order->getItemsCollection(); ?>
@@ -36,25 +36,25 @@
                     <tr>
                         <td class="col options" colspan="5">
                             <a href="#"
-                               id="order-item-gift-message-link-<?php echo $_item->getId() ?>"
+                               id="order-item-gift-message-link-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
                                class="action show"
-                               aria-controls="order-item-gift-message-<?php echo $_item->getId() ?>"
-                               data-item-id="<?php echo $_item->getId() ?>">
-                                <?php echo __('Gift Message') ?>
+                               aria-controls="order-item-gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>"
+                               data-item-id="<?php /* @escapeNotVerified */ echo $_item->getId() ?>">
+                                <?php /* @escapeNotVerified */ echo __('Gift Message') ?>
                             </a>
                             <?php $_giftMessage = $this->helper('Magento\GiftMessage\Helper\Message')->getGiftMessageForEntity($_item); ?>
-                            <div class="order-gift-message" id="order-item-gift-message-<?php echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
+                            <div class="order-gift-message" id="order-item-gift-message-<?php /* @escapeNotVerified */ echo $_item->getId() ?>" role="region" aria-expanded="false" tabindex="-1">
                                 <a href="#"
-                                   title="<?php echo __('Close') ?>"
-                                   aria-controls="order-item-gift-message-<?php echo $_item->getId()?>"
-                                   data-item-id="<?php echo $_item->getId()?>"
+                                   title="<?php /* @escapeNotVerified */ echo __('Close') ?>"
+                                   aria-controls="order-item-gift-message-<?php /* @escapeNotVerified */ echo $_item->getId()?>"
+                                   data-item-id="<?php /* @escapeNotVerified */ echo $_item->getId()?>"
                                    class="action close">
-                                    <?php echo __('Close') ?>
+                                    <?php /* @escapeNotVerified */ echo __('Close') ?>
                                 </a>
                                 <dl class="item-options">
-                                    <dt class="item-sender"><strong class="label"><?php echo __('From') ?></strong><?php echo $block->escapeHtml($_giftMessage->getSender()) ?></dt>
-                                    <dt class="item-recipient"><strong class="label"><?php echo __('To') ?></strong><?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-                                    <dd class="item-message"><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_item) ?></dd>
+                                    <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>
                                 </dl>
                             </div>
                         </td>
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 921540423f5aa..5f55302f87876 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,7 +9,7 @@
 /** @var  $block \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer */
 $_item = $block->getItem();
 ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -20,9 +20,9 @@ $_item = $block->getItem();
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd>
                     <?php if (isset($_formatedOptionValue['full_view'])): ?>
-                        <?php echo $_formatedOptionValue['full_view'] ?>
+                        <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
                     <?php else: ?>
-                        <?php echo $_formatedOptionValue['value'] ?>
+                        <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
                     <?php endif; ?>
                 </dd>
             <?php else: ?>
@@ -39,7 +39,7 @@ $_item = $block->getItem();
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></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>
@@ -47,26 +47,26 @@ $_item = $block->getItem();
         <ul class="items-qty">
         <?php if ($block->getItem()->getQtyOrdered() > 0): ?>
             <li class="item">
-                <span class="title"><?php echo __('Ordered'); ?></span>
-                <span class="content"><?php echo $block->getItem()->getQtyOrdered()*1 ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Ordered'); ?></span>
+                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyOrdered()*1 ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyShipped() > 0): ?>
             <li class="item">
-                <span class="title"><?php echo __('Shipped'); ?></span>
-                <span class="content"><?php echo $block->getItem()->getQtyShipped()*1 ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipped'); ?></span>
+                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyShipped()*1 ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyCanceled() > 0): ?>
             <li class="item">
-                <span class="title"><?php echo __('Canceled'); ?></span>
-                <span class="content"><?php echo $block->getItem()->getQtyCanceled()*1 ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Canceled'); ?></span>
+                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyCanceled()*1 ?></span>
             </li>
         <?php endif; ?>
         <?php if ($block->getItem()->getQtyRefunded() > 0): ?>
             <li class="item">
-                <span class="title"><?php echo __('Refunded'); ?></span>
-                <span class="content"><?php echo $block->getItem()->getQtyRefunded()*1 ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Refunded'); ?></span>
+                <span class="content"><?php /* @escapeNotVerified */ echo $block->getItem()->getQtyRefunded()*1 ?></span>
             </li>
         <?php endif; ?>
         </ul>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
index 85c5aae6291b7..772cebbe3f8b7 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,11 +12,11 @@
 <?php $_history = $block->getOrder()->getVisibleStatusHistory() ?>
 <?php if (count($_history)): ?>
     <div class="block block-order-details-comments">
-        <div class="block-title"><strong><?php echo __('About Your Order') ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('About Your Order') ?></strong></div>
         <div class="block-content">
             <dl class="order-comments">
                 <?php foreach ($_history as $_historyItem): ?>
-                    <dt class="comment-date"><?php echo $block->formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?></dt>
+                    <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>
                 <?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 818bda658ecee..a6b7b4751d4bd 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
@@ -8,4 +8,4 @@
 
 ?>
 
-<div class="order-date"><?php echo __('<span class="label">Order Date:</span> %1', '<date>' . $block->formatDate($block->getOrder()->getCreatedAt(), \IntlDateFormatter::LONG) . '</date>') ?></div>
+<div class="order-date"><?php /* @escapeNotVerified */ echo __('<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 838d36f5000f7..49a1abe1fb4f8 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 echo $block->getOrder()->getStatusLabel() ?></span>
+<span class="order-status"><?php /* @escapeNotVerified */ echo $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 dddc81402d8fa..08bea166dbf9e 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 echo __('Refund #%1', $_creditmemo->getIncrementId()) ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('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 echo $_creditmemo->getId(); ?>">
-            <caption class="table-caption"><?php echo __('Items Refunded') ?></caption>
+        <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>
             <thead>
                 <tr>
-                    <th class="col name"><?php echo __('Product Name') ?></th>
-                    <th class="col sku"><?php echo __('SKU') ?></th>
-                    <th class="col price"><?php echo __('Price') ?></th>
-                    <th class="col qty"><?php echo __('Qty') ?></th>
-                    <th class="col subtotal"><?php echo __('Subtotal') ?></th>
-                    <th class="col discount"><?php echo __('Discount Amount') ?></th>
-                    <th class="col rowtotal"><?php echo __('Row Total') ?></th>
+                    <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>
                 </tr>
             </thead>
             <?php $_items = $_creditmemo->getAllItems(); ?>
@@ -50,22 +50,22 @@
     </div>
     <div class="block block-order-details-view">
         <div class="block-title">
-            <strong><?php echo __('Order Information') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('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 echo __('Shipping Address') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_shipping = $_creditmemo->getShippingAddress() ?>
-                    <address><?php echo $block->formatAddress($_shipping, 'html') ?></address>
+                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_shipping, 'html') ?></address>
                 </div>
             </div>
             <div class="box box-order-shipping-method">
                 <div class="box-title">
-                    <strong><?php echo __('Shipping Method') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
@@ -74,16 +74,16 @@
         <?php endif; ?>
             <div class="box box-order-billing-address">
                 <div class="box-title">
-                    <strong><?php echo __('Billing Address') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Billing Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_billing = $_creditmemo->getbillingAddress() ?>
-                    <address><?php echo $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
+                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
                 </div>
             </div>
             <div class="box box-order-billing-method">
                 <div class="box-title">
-                    <strong><?php echo __('Payment Method') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Payment Method') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php echo $block->getPaymentInfoHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/invoice.phtml
index 191dbdb8bdeba..a960d7088f202 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 echo __('Invoice #') ?><?php echo $_invoice->getIncrementId(); ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Invoice #') ?><?php /* @escapeNotVerified */ echo $_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 echo $_invoice->getId(); ?>">
-            <caption class="table-caption"><?php echo __('Items Invoiced') ?></caption>
+        <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>
             <thead>
             <tr>
-                <th class="col name"><?php echo __('Product Name') ?></th>
-                <th class="col sku"><?php echo __('SKU') ?></th>
-                <th class="col price"><?php echo __('Price') ?></th>
-                <th class="col qty"><?php echo __('Qty Invoiced') ?></th>
-                <th class="col subtotal"><?php echo __('Subtotal') ?></th>
+                <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>
             </tr>
             </thead>
             <?php $_items = $_invoice->getItemsCollection(); ?>
@@ -48,46 +48,46 @@
     </div>
     <div class="block block-order-details-view">
         <div class="block-title">
-            <strong><?php echo __('Order Information') ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('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 echo __('Shipping Address') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_shipping = $_invoice->getShippingAddress() ?>
-                    <address><?php echo $block->formatAddress($_shipping, 'html') ?></address>
+                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_shipping, 'html') ?></address>
                 </div>
             </div>
 
             <div class="box box-order-shipping-method">
                 <div class="box-title">
-                    <strong><?php echo __('Shipping Method') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php if ($_order->getShippingDescription()): ?>
                         <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
                     <?php else: ?>
-                        <?php echo __('No shipping information available'); ?>
+                        <?php /* @escapeNotVerified */ echo __('No shipping information available'); ?>
                     <?php endif; ?>
                 </div>
             </div>
         <?php endif; ?>
             <div class="box box-order-billing-address">
                 <div class="box-title">
-                    <strong><?php echo __('Billing Address') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Billing Address') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php $_billing = $_invoice->getbillingAddress() ?>
-                    <address><?php echo $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
+                    <address><?php /* @escapeNotVerified */ echo $block->formatAddress($_order->getBillingAddress(), 'html') ?></address>
                 </div>
             </div>
 
             <div class="box box-order-billing-method">
                 <div class="box-title">
-                    <strong><?php echo __('Payment Method') ?></strong>
+                    <strong><?php /* @escapeNotVerified */ echo __('Payment Method') ?></strong>
                 </div>
                 <div class="box-content">
                     <?php echo $block->getPaymentInfoHtml() ?>
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml b/app/code/Magento/Sales/view/frontend/templates/order/print/shipment.phtml
index e09c600219775..8c94b5b110d24 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,16 +13,16 @@
 <?php foreach ($block->getShipmentsCollection() as $shipment): ?>
     <div class="order-details-items shipments">
         <div class="order-title">
-            <strong><?php echo __('Shipment #%1', $block->getObjectData($shipment, 'increment_id')); ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo __('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 echo $block->getObjectData($shipment, 'id') ?>">
-                <caption class="table-caption"><?php echo __('Items Invoiced') ?></caption>
+            <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>
                 <thead>
                 <tr>
-                    <th class="col name"><?php echo __('Product Name') ?></th>
-                    <th class="col sku"><?php echo __('SKU') ?></th>
-                    <th class="col price"><?php echo __('Qty Shipped') ?></th>
+                    <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>
                 </tr>
                 </thead>
                 <?php foreach ($block->getShipmentItems($shipment) as $item): ?>
@@ -34,12 +34,12 @@
         </div>
         <div class="block block-order-details-view">
             <div class="block-title">
-                <strong><?php echo __('Order Information') ?></strong>
+                <strong><?php /* @escapeNotVerified */ echo __('Order Information') ?></strong>
             </div>
             <div class="block-content">
                 <div class="box box-order-shipping-address">
                     <div class="box-title">
-                        <strong><?php echo __('Shipping Address') ?></strong>
+                        <strong><?php /* @escapeNotVerified */ echo __('Shipping Address') ?></strong>
                     </div>
                     <div class="box-content">
                         <address><?php echo $block->getShipmentAddressFormattedHtml($shipment); ?></address>
@@ -48,7 +48,7 @@
 
                 <div class="box box-order-shipping-method">
                     <div class="box-title">
-                        <strong><?php echo __('Shipping Method') ?></strong>
+                        <strong><?php /* @escapeNotVerified */ echo __('Shipping Method') ?></strong>
                     </div>
                     <div class="box-content">
                     <?php echo $block->escapeHtml($block->getObjectData($order, 'shipping_description')); ?>
@@ -66,7 +66,7 @@
 
                 <div class="box box-order-billing-method">
                     <div class="box-title">
-                        <strong><?php echo __('Billing Address') ?></strong>
+                        <strong><?php /* @escapeNotVerified */ echo __('Billing Address') ?></strong>
                     </div>
                     <div class="box-content">
                         <address><?php echo $block->getBillingAddressFormattedHtml($order); ?></address>
@@ -75,7 +75,7 @@
 
                 <div class="box box-order-billing-method">
                     <div class="box-title">
-                        <strong><?php echo __('Payment Method') ?></strong>
+                        <strong><?php /* @escapeNotVerified */ echo __('Payment Method') ?></strong>
                     </div>
                     <div class="box-content">
                         <?php echo $block->getPaymentInfoHtml() ?>
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 332771ed62f4d..78d2a5a607f27 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/recent.phtml
@@ -10,10 +10,10 @@
 <div class="block block-dashboard-orders">
 <?php $_orders = $block->getOrders(); ?>
     <div class="block-title order">
-        <strong><?php echo __('Recent Orders') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Recent Orders') ?></strong>
         <?php if (sizeof($_orders->getItems()) > 0): ?>
-            <a class="action view" href="<?php echo $block->getUrl('sales/order/history') ?>">
-                <span><?php echo __('View All') ?></span>
+            <a class="action view" href="<?php /* @escapeNotVerified */ echo $block->getUrl('sales/order/history') ?>">
+                <span><?php /* @escapeNotVerified */ echo __('View All') ?></span>
             </a>
         <?php endif; ?>
     </div>
@@ -22,32 +22,32 @@
     <?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 echo __('Recent Orders') ?></caption>
+                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Recent Orders') ?></caption>
                 <thead>
                     <tr>
-                        <th scope="col" class="col id"><?php echo __('Order #') ?></th>
-                        <th scope="col" class="col date"><?php echo __('Date') ?></th>
-                        <th scope="col" class="col shipping"><?php echo __('Ship To') ?></th>
-                        <th scope="col" class="col total"><?php echo __('Order Total') ?></th>
-                        <th scope="col" class="col status"><?php echo __('Status') ?></th>
+                        <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">&nbsp;</th>
                     </tr>
                 </thead>
                 <tbody>
                     <?php foreach ($_orders as $_order): ?>
                         <tr>
-                            <td data-th="<?php echo $block->escapeHtml(__('Order #')) ?>" class="col id"><?php echo $_order->getRealOrderId() ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php echo $block->formatDate($_order->getCreatedAt()) ?></td>
+                            <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 echo $_order->formatPrice($_order->getGrandTotal()) ?></td>
-                            <td data-th="<?php echo $block->escapeHtml(__('Status')) ?>" class="col status"><?php echo $_order->getStatusLabel() ?></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 echo $block->getViewUrl($_order) ?>" class="action view">
-                                    <span><?php echo __('View Order') ?></span>
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getViewUrl($_order) ?>" class="action view">
+                                    <span><?php /* @escapeNotVerified */ echo __('View Order') ?></span>
                                 </a>
                                 <?php if ($this->helper('Magento\Sales\Helper\Reorder')->canReorder($_order->getEntityId())) : ?>
-                                    <a href="<?php echo $block->getReorderUrl($_order) ?>" class="action order">
-                                        <span><?php echo __('Reorder') ?></span>
+                                    <a href="<?php /* @escapeNotVerified */ echo $block->getReorderUrl($_order) ?>" class="action order">
+                                        <span><?php /* @escapeNotVerified */ echo __('Reorder') ?></span>
                                     </a>
                                 <?php endif ?>
                             </td>
@@ -57,7 +57,7 @@
             </table>
         </div>
     <?php else: ?>
-        <div class="message info empty"><span><?php echo __('You have placed no orders.'); ?></span></div>
+        <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('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 b1c70ae85239a..b5e9b8ebd7eae 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,7 +9,7 @@
 ?>
 <?php $_item = $block->getItem() ?>
 <?php $_order = $block->getItem()->getOrderItem()->getOrder() ?>
-<tr id="order-item-row-<?php echo $_item->getId() ?>">
+<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>
         <?php if ($_options = $block->getItemOptions()): ?>
@@ -19,12 +19,12 @@
             <?php if (!$block->getPrintStatus()): ?>
                 <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
                 <dd<?php if (isset($_formatedOptionValue['full_view'])): ?> class="tooltip wrapper"<?php endif; ?>>
-                    <?php echo $_formatedOptionValue['value'] ?>
+                    <?php /* @escapeNotVerified */ echo $_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 echo $_formatedOptionValue['full_view'] ?></dd>
+                            <dd><?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?></dd>
                         </dl>
                     </div>
                     <?php endif; ?>
@@ -41,6 +41,6 @@
         <?php endif; ?>
         <?php echo $block->escapeHtml($_item->getDescription()) ?>
     </td>
-    <td class="col sku" data-th="<?php echo $block->escapeHtml(__('SKU')); ?>"><?php echo $block->prepareSku($block->getSku()) ?></td>
-    <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty Shipped')); ?>"><?php echo $_item->getQty()*1 ?></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>
 </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 380e699a4b67e..2fb1e451df019 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/totals.phtml
@@ -15,19 +15,19 @@
     <?php if ($_total->getBlockName()): ?>
         <?php echo $block->getChildHtml($_total->getBlockName(), false); ?>
     <?php else:?>
-    <tr class="<?php echo $_code?>">
-        <th <?php echo $block->getLabelProperties()?> scope="row">
+    <tr class="<?php /* @escapeNotVerified */ echo $_code?>">
+        <th <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> scope="row">
             <?php if ($_total->getStrong()):?>
             <strong><?php echo $block->escapeHtml($_total->getLabel());?></strong>
             <?php else:?>
             <?php echo $block->escapeHtml($_total->getLabel());?>
             <?php endif?>
         </th>
-        <td <?php echo $block->getValueProperties()?> data-th="<?php echo $block->escapeHtml($_total->getLabel());?>">
+        <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?> data-th="<?php echo $block->escapeHtml($_total->getLabel());?>">
             <?php if ($_total->getStrong()):?>
-            <strong><?php echo $block->formatValue($_total) ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo $block->formatValue($_total) ?></strong>
             <?php else:?>
-            <?php echo $block->formatValue($_total) ?>
+            <?php /* @escapeNotVerified */ echo $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 64b84dacb490f..18c0d9a6e2c04 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/view.phtml
@@ -12,7 +12,7 @@
     <?php $_order = $block->getOrder() ?>
 
     <div class="order-title">
-        <strong><?php echo __('Items Ordered') ?></strong>
+        <strong><?php /* @escapeNotVerified */ echo __('Items Ordered') ?></strong>
         <?php if ($_order->getTracksCollection()->count()) : ?>
             <?php echo $block->getChildHtml('tracking-info-link') ?>
         <?php endif; ?>
@@ -22,13 +22,13 @@
 
     <?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 echo __('Gift Message for This Order') ?></strong></div>
+        <div class="block-title"><strong><?php /* @escapeNotVerified */ echo __('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 echo __('From') ?></strong><?php echo $block->escapeHtml($_giftMessage->getSender()) ?></dt>
-                <dt class="item-recipient"><strong class="label"><?php echo __('To') ?></strong><?php echo $block->escapeHtml($_giftMessage->getRecipient()) ?></dt>
-                <dd class="item-message"><?php echo $this->helper('Magento\GiftMessage\Helper\Message')->getEscapedGiftMessage($_order) ?></dd>
+                <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>
             </dl>
         </div>
     </div>
@@ -36,8 +36,8 @@
 
     <div class="actions-toolbar">
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->getBackUrl() ?>">
-                <span><?php echo $block->getBackTitle() ?></span>
+            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>">
+                <span><?php /* @escapeNotVerified */ echo $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 e00fe211f0b2e..21667ab1c986f 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 echo __('My Orders') ?></strong>
+        <strong id="block-reorder-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('My Orders') ?></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 echo $block->getFormActionUrl() ?>" id="reorder-validate-detail">
-            <strong class="subtitle"><?php echo __('Last Ordered Items') ?></strong>
+              action="<?php /* @escapeNotVerified */ echo $block->getFormActionUrl() ?>" id="reorder-validate-detail">
+            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('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 echo __('Add to Cart') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('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 echo __('Add to Cart') ?>"
+                                   title="<?php /* @escapeNotVerified */ echo __('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 echo __('Add to Cart') ?>" class="action tocart primary">
-                            <span><?php echo __('Add to Cart') ?></span>
+                        <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>" class="action tocart primary">
+                            <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                         </button>
                     </div>
                 <div class="secondary">
-                    <a class="action view" href="<?php echo $block->getUrl('customer/account') ?>">
-                        <span><?php echo __('View All'); ?></span>
+                    <a class="action view" href="<?php /* @escapeNotVerified */ echo $block->getUrl('customer/account') ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('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 113b1ad7495b9..b3f1e3431f43b 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 echo __('Orders and Returns') ?></strong>
+            <strong role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Orders and Returns') ?></strong>
         </div>
         <div class="block-content">
-            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?php echo $block->getActionUrl() ?>" method="post"
+            <form id="oar-widget-orders-and-returns-form" data-mage-init='{"ordersReturns":{},"validation":{}}' action="<?php /* @escapeNotVerified */ echo $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 echo __('Find Order By') ?></span></label>
+                        <label class="label"><span><?php /* @escapeNotVerified */ echo __('Find Order By') ?></span></label>
 
                         <div class="control">
                             <select name="oar_type" id="quick-search-type-id" class="select" title="">
-                                <option value="email"><?php echo __('Email') ?></option>
-                                <option value="zip"><?php echo __('ZIP Code') ?></option>
+                                <option value="email"><?php /* @escapeNotVerified */ echo __('Email') ?></option>
+                                <option value="zip"><?php /* @escapeNotVerified */ echo __('ZIP Code') ?></option>
                             </select>
                         </div>
                     </div>
                     <div class="field id required">
-                        <label for="oar-order-id" class="label"><span><?php echo __('Order ID') ?></span></label>
+                        <label for="oar-order-id" class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Billing Last Name') ?></span></label>
+                               class="label"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Email') ?></span></label>
+                        <label for="oar_email" class="label"><span><?php /* @escapeNotVerified */ echo __('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 required">
-                        <label for="oar_zip" class="label"><span><?php echo __('Billing ZIP Code') ?></span></label>
+                        <label for="oar_zip" class="label"><span><?php /* @escapeNotVerified */ echo __('Billing ZIP Code') ?></span></label>
 
                         <div class="control">
                             <input type="text" class="input-text" id="oar_zip" name="oar_zip"
@@ -64,7 +64,7 @@
                 <div class="actions-toolbar">
                     <div class="primary">
                         <button type="submit" title="<?php echo $block->escapeHtml(__('Search')) ?>" class="action search">
-                            <span><?php echo __('Search') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('Search') ?></span>
                         </button>
                     </div>
                 </div>
diff --git a/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml b/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
index 981ff86b8585d..f2a8fc4b3f058 100644
--- a/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
+++ b/app/code/Magento/SalesRule/view/adminhtml/templates/promo/salesrulejs.phtml
@@ -8,7 +8,7 @@
 require(['jquery', "prototype"], function(jQuery){
 
 //<![CDATA[
-var couponTypeSpecific = '<?php echo \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC ?>',
+var couponTypeSpecific = '<?php /* @escapeNotVerified */ echo \Magento\SalesRule\Model\Rule::COUPON_TYPE_SPECIFIC ?>',
     tmpButtonsActionsStorage = [];
 
 function disableEnableCouponsTabContent(disable) {
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 98d20287e9f4e..597e07cd37d6e 100644
--- a/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/form.mini.phtml
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /** @var $block \Magento\Framework\View\Element\Template */
@@ -10,26 +12,26 @@
 $helper = $this->helper('Magento\Search\Helper\Data');
 ?>
 <div class="block block-search">
-    <div class="block block-title"><strong><?php echo __('Search'); ?></strong></div>
+    <div class="block block-title"><strong><?php /* @escapeNotVerified */ echo __('Search'); ?></strong></div>
     <div class="block block-content">
-        <form class="form minisearch" id="search_mini_form" action="<?php echo $helper->getResultUrl() ?>" method="get">
+        <form class="form minisearch" id="search_mini_form" action="<?php /* @escapeNotVerified */ echo $helper->getResultUrl() ?>" method="get">
             <div class="field search">
                 <label class="label" for="search" data-role="minisearch-label">
-                    <span><?php echo __('Search'); ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Search'); ?></span>
                 </label>
                 <div class="control">
                     <input id="search"
                            data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
-                                "url":"<?php echo $block->getUrl('search/ajax/suggest'); ?>",
+                                "url":"<?php /* @escapeNotVerified */ echo $block->getUrl('search/ajax/suggest'); ?>",
                                 "destinationSelector":"#search_autocomplete"}
                            }'
                            type="text"
-                           name="<?php echo $helper->getQueryParamName() ?>"
-                           value="<?php echo $helper->getEscapedQueryText() ?>"
-                           placeholder="<?php echo __('Search entire store here...'); ?>"
+                           name="<?php /* @escapeNotVerified */ echo $helper->getQueryParamName() ?>"
+                           value="<?php /* @escapeNotVerified */ echo $helper->getEscapedQueryText() ?>"
+                           placeholder="<?php /* @escapeNotVerified */ echo __('Search entire store here...'); ?>"
                            class="input-text"
-                           maxlength="<?php echo $helper->getMaxQueryLength();?>"
+                           maxlength="<?php /* @escapeNotVerified */ echo $helper->getMaxQueryLength();?>"
                            role="combobox"
                            aria-haspopup="false"
                            aria-autocomplete="both"
@@ -42,7 +44,7 @@ $helper = $this->helper('Magento\Search\Helper\Data');
                 <button type="submit"
                         title="<?php echo $block->escapeHtml(__('Search')) ?>"
                         class="action search">
-                    <span><?php echo __('Search'); ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('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 14bfb1d873d6d..dd943b94b384c 100644
--- a/app/code/Magento/Search/view/frontend/templates/term.phtml
+++ b/app/code/Magento/Search/view/frontend/templates/term.phtml
@@ -11,8 +11,8 @@
     <ul class="search-terms">
         <?php foreach ($block->getTerms() as $_term): ?>
             <li class="item">
-                <a href="<?php echo $block->getSearchUrl($_term) ?>"
-                   style="font-size:<?php echo $_term->getRatio()*70+75 ?>%;">
+                <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>
             </li>
@@ -20,6 +20,6 @@
     </ul>
 <?php else: ?>
     <div class="message notice">
-        <div><?php echo __('There are no search terms available.'); ?></div>
+        <div><?php /* @escapeNotVerified */ echo __('There are no search terms available.'); ?></div>
     </div>
 <?php endif; ?>
diff --git a/app/code/Magento/SendFriend/view/frontend/templates/send.phtml b/app/code/Magento/SendFriend/view/frontend/templates/send.phtml
index 1d2d58723c88b..4f09b8eb636dc 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->escapeJsQuote(__('Remove Recipent')) ?>">
-               <span><?php echo $block->escapeJsQuote(__('Remove')) ?></span>
+               title="<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Remove Recipent')) ?>">
+               <span><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Remove')) ?></span>
             </button>
         </div>
     </div>
     <fieldset class="fieldset">
         <div class="field name required">
-            <label for="recipients-name<%- data._index_ %>" class="label"><span><?php echo __('Name')?></span></label>
+            <label for="recipients-name<%- data._index_ %>" class="label"><span><?php /* @escapeNotVerified */ echo __('Name')?></span></label>
             <div class="control">
-                <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?php echo __('Name') ?>" class="input-text"
+                <input name="recipients[name][<%- data._index_ %>]" type="text" title="<?php /* @escapeNotVerified */ echo __('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 __('Email') ?></span></label>
+            <label for="recipients-email<%- data._index_ %>" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
-                <input name="recipients[email][<%- data._index_ %>]" title="<?php echo __('Email') ?>"
+                <input name="recipients[email][<%- data._index_ %>]" title="<?php /* @escapeNotVerified */ echo __('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->getSendUrl() ?>" method="post" id="product-sendtofriend-form"
+<form action="<?php /* @escapeNotVerified */ echo $block->getSendUrl() ?>" method="post" id="product-sendtofriend-form"
       data-mage-init='{
         "rowBuilder":{
             "rowTemplate":"#add-recipient-tmpl",
@@ -49,36 +49,36 @@
             "rowParentElem":"<div></div>",
             "remEventSelector":"button",
             "btnRemoveSelector":".action.remove",
-            "maxRows":"<?php echo $block->getMaxRecipients() ?>",
+            "maxRows":"<?php /* @escapeNotVerified */ echo $block->getMaxRecipients() ?>",
             "maxRowsMsg":"#max-recipient-message",
             "addRowBtn":"#add-recipient-button",
             "additionalRowClass":"additional"},
         "validation":{}}'
-      class="form send friend" data-hasRequired="<?php echo __('* Required Fields') ?>">
+      class="form send friend" data-hasRequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>">
     <fieldset class="fieldset sender" id="sender_options">
         <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo __('Sender') ?></span></legend>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Sender') ?></span></legend>
         <br>
         <div class="field sender required">
-            <label for="sender-name" class="label"><span><?php echo __('Name') ?></span></label>
+            <label for="sender-name" class="label"><span><?php /* @escapeNotVerified */ echo __('Name') ?></span></label>
             <div class="control">
                 <input name="sender[name]" value="<?php echo $block->escapeHtml($block->getUserName()) ?>"
-                       title="<?php echo __('Name') ?>" id="sender-name" type="text" class="input-text"
+                       title="<?php /* @escapeNotVerified */ echo __('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 __('Email') ?></span></label>
+            <label for="sender-email" class="label"><span><?php /* @escapeNotVerified */ echo __('Email') ?></span></label>
             <div class="control">
                 <input name="sender[email]" value="<?php echo $block->escapeHtml($block->getEmail()) ?>"
-                       title="<?php echo __('Email') ?>" id="sender-email" type="text" class="input-text"
+                       title="<?php /* @escapeNotVerified */ echo __('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 __('Message') ?></span></label>
+            <label for="sender-message" class="label"><span><?php /* @escapeNotVerified */ echo __('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>
@@ -88,19 +88,19 @@
 
     <fieldset class="fieldset recipients">
         <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo __('Invitee') ?></span></legend>
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('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 __('Maximum %1 email addresses allowed.', $block->getMaxRecipients()) ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('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 __('Add Invitee') ?></span></button>
+                    <span><?php /* @escapeNotVerified */ echo __('Add Invitee') ?></span></button>
             <?php endif; ?>
             </div>
         </div>
@@ -109,10 +109,10 @@
         <div class="primary">
             <button type="submit"
                     class="action submit primary"<?php if (!$block->canSend()): ?> disabled="disabled"<?php endif ?>>
-                <span><?php echo __('Send Email') ?></span></button>
+                <span><?php /* @escapeNotVerified */ echo __('Send Email') ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="#" role="back"><span><?php echo __('Back') ?></span></a>
+            <a class="action back" href="#" role="back"><span><?php /* @escapeNotVerified */ echo __('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 46b4ab5ed56f6..ef8d69a5dd65c 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 echo $block->getSaveUrl() ?>">
+<form id="edit_form" method="post" action="<?php /* @escapeNotVerified */ echo $block->getSaveUrl() ?>">
     <?php echo $block->getBlockHtml('formkey')?>
     <?php  $_order = $block->getShipment()->getOrder() ?>
     <?php echo $block->getChildHtml('order_info') ?>
     <div class="admin__page-section">
         <div class="admin__page-section-title">
-            <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Payment Information') ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('Payment Information') ?></span>
                 </div>
                 <div class="admin__page-section-item-content">
                     <div><?php echo $block->getPaymentHtml() ?></div>
-                    <div class="order-payment-currency"><?php echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                    <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('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 echo __('Shipping Information') ?></span>
+                    <span class="title"><?php /* @escapeNotVerified */ echo __('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-content">
-                        <?php echo __('Total Shipping Charges'); ?>:
+                        <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
 
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                             <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -42,9 +42,9 @@
                             <?php $_excl = $block->displayPriceAttribute('shipping_amount', false, ' '); ?>
                         <?php endif; ?>
                         <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
-                        <?php echo $_excl; ?>
+                        <?php /* @escapeNotVerified */ echo $_excl; ?>
                         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                         <?php endif; ?>
                     </div>
                 </div>
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 f94db78338f9a..0aed9867ff650 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/create/items.phtml
@@ -10,25 +10,25 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Items to Ship') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Product') ?></span></th>
-                    <th class="col-ordered-qty"><span><?php echo __('Qty') ?></span></th>
+                    <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-qty<?php if ($block->isShipmentRegular()): ?> last<?php endif; ?>">
-                        <span><?php echo __('Qty to Ship') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Qty to Ship') ?></span>
                     </th>
                     <?php if (!$block->canShipPartiallyItem()): ?>
-                    <th class="col-ship last"><span><?php echo __('Ship') ?></span></th>
+                    <th class="col-ship last"><span><?php /* @escapeNotVerified */ echo __('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 echo $_i%2 ? 'odd' : 'even' ?>">
+                <tbody class="<?php /* @escapeNotVerified */ echo $_i%2 ? 'odd' : 'even' ?>">
                     <?php echo $block->getItemHtml($_item) ?>
                     <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
                 </tbody>
@@ -39,24 +39,24 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Shipment Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Shipment Comments') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Comment Text') ?></span></label>
+                        <span><?php /* @escapeNotVerified */ echo __('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 echo $block->getShipment()->getCommentText(); ?></textarea>
+                                  cols="5"><?php /* @escapeNotVerified */ echo $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 echo __('Shipment Options') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Create Shipping Label') ?></span></label>
+                        <span><?php /* @escapeNotVerified */ echo __('Create Shipping Label') ?></span></label>
                 </div>
             <?php endif ?>
 
@@ -89,7 +89,7 @@
                        type="checkbox"/>
                 <label class="admin__field-label"
                        for="notify_customer">
-                    <span><?php echo __('Append Comments') ?></span></label>
+                    <span><?php /* @escapeNotVerified */ echo __('Append Comments') ?></span></label>
             </div>
 
             <?php if ($block->canSendShipmentEmail()): ?>
@@ -101,7 +101,7 @@
                            type="checkbox"/>
                     <label class="admin__field-label"
                            for="send_email">
-                        <span><?php echo __('Email Copy of Shipment') ?></span></label>
+                        <span><?php /* @escapeNotVerified */ echo __('Email Copy of Shipment') ?></span></label>
                 </div>
             <?php endif; ?>
             <?php echo $block->getChildHtml('submit_before') ?>
@@ -145,7 +145,7 @@ window.toggleCreateLabelCheckbox = function() {
 }
 window.submitShipment = function(btn) {
     if (!validQtyItems()) {
-        alert('<?php echo __('Invalid value(s) for Qty to Ship') ?>');
+        alert('<?php /* @escapeNotVerified */ echo __('Invalid value(s) for Qty to Ship') ?>');
         return;
     }
     var checkbox = $(btn).up('.order-totals').select('#create_shipping_label')[0];
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 136612ef50ba9..3f171f7ae0c33 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
@@ -15,16 +15,16 @@
         <?php if ($block->canShipPartiallyItem()): ?>
             <input type="text"
                    class="input-text admin__control-text qty-item"
-                   name="shipment[items][<?php echo $_item->getOrderItemId() ?>]"
-                   value="<?php echo $_item->getQty()*1 ?>" />
+                   name="shipment[items][<?php /* @escapeNotVerified */ echo $_item->getOrderItemId() ?>]"
+                   value="<?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>" />
         <?php else: ?>
-            <?php echo $_item->getQty()*1 ?>
+            <?php /* @escapeNotVerified */ echo $_item->getQty()*1 ?>
         <?php endif; ?>
     </td>
     <?php if (!$block->canShipPartiallyItem()): ?>
     <td class="col-ship last">
-        <input type="hidden" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="0" />
-        <input type="checkbox" name="shipment[items][<?php echo $_item->getOrderItemId() ?>]" value="<?php echo $_item->getQty()*1 ?>" checked />
+        <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 />
     </td>
     <?php endif; ?>
 </tr>
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 1497b994f9acb..6d2db10076767 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 echo __('Carrier') ?></th>
-                <th class="col-title"><?php echo __('Title') ?></th>
-                <th class="col-number"><?php echo __('Number') ?></th>
-                <th class="col-delete last"><?php echo __('Action') ?></th>
+                <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>
             </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 echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
+                        <option value="<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
                         <?php endforeach; ?>
                     </select>
                 </td>
@@ -49,18 +49,18 @@
     <?php if ($_tracks = $block->getShipment()->getAllTracks()): ?>
         <tbody>
         <?php $i = 0; foreach ($_tracks as $_track):$i++ ?>
-            <tr class="<?php echo($i%2 == 0) ? 'even' : 'odd' ?>">
+            <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>
                 <td class="col-number">
                     <?php if ($_track->isCustom()): ?>
                     <?php echo $block->escapeHtml($_track->getNumber()) ?>
                     <?php else: ?>
-                    <a href="#" onclick="popWin('<?php 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 echo $_track->getId() ?>"></div>
+                    <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>
                     <?php endif; ?>
                 </td>
-                <td class="col-delete last"><a class="action-delete" href="#" onclick="deleteTrackingNumber('<?php echo $block->getRemoveUrl($_track) ?>'); return false;"><span><?php echo __('Delete') ?></span></a></td>
+                <td class="col-delete last"><a class="action-delete" href="#" onclick="deleteTrackingNumber('<?php /* @escapeNotVerified */ echo $block->getRemoveUrl($_track) ?>'); return false;"><span><?php /* @escapeNotVerified */ echo __('Delete') ?></span></a></td>
             </tr>
         <?php endforeach; ?>
         </tbody>
@@ -78,7 +78,7 @@ function selectCarrier(elem) {
 }
 
 function deleteTrackingNumber(url) {
-    if (confirm('<?php echo __('Are you sure?') ?>')) {
+    if (confirm('<?php /* @escapeNotVerified */ echo __('Are you sure?') ?>')) {
         submitAndReloadArea($('shipment_tracking_info').parentNode, url)
     }
 }
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 f696adb536c16..096a0a71184e0 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
@@ -12,10 +12,10 @@
         <table class="data-table admin__table-primary">
             <thead>
             <tr>
-                <th class="col-product no-link"><?php echo __('Product Name') ?></th>
-                <th class="col-weight no-link"><?php echo __('Weight') ?></th>
+                <th class="col-product no-link"><?php /* @escapeNotVerified */ echo __('Product Name') ?></th>
+                <th class="col-weight no-link"><?php /* @escapeNotVerified */ echo __('Weight') ?></th>
                 <th class="col-custom no-link" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                    <?php echo __('Customs Value') ?>
+                    <?php /* @escapeNotVerified */ echo __('Customs Value') ?>
                 </th>
                 <th class="col-select no-link">
                     <div class="admin__field admin__field-option">
@@ -23,12 +23,12 @@
                                name=""
                                onclick="packaging.checkAllItems(this);"
                                class="checkbox admin__control-checkbox"
-                               title="<?php echo __('Select All') ?>">
+                               title="<?php /* @escapeNotVerified */ echo __('Select All') ?>">
                         <label class="admin__field-label"></label>
                     </div>
                 </th>
-                <th class="col-qty no-link"><?php echo __('Qty Ordered') ?></th>
-                <th class="col-qty-edit no-link last"><?php echo __('Qty') ?></th>
+                <th class="col-qty no-link"><?php /* @escapeNotVerified */ echo __('Qty Ordered') ?></th>
+                <th class="col-qty-edit no-link last"><?php /* @escapeNotVerified */ echo __('Qty') ?></th>
             </tr>
             </thead>
 
@@ -43,10 +43,10 @@
                 <?php endif; ?>
                 <tr title="#" id="" class="">
                     <td class="col-product name">
-                        <?php echo $item->getName(); ?>
+                        <?php /* @escapeNotVerified */ echo $item->getName(); ?>
                     </td>
                     <td class="col-weight weight ">
-                        <?php echo $item->getWeight(); ?>
+                        <?php /* @escapeNotVerified */ echo $item->getWeight(); ?>
                     </td>
                     <?php
                     if ($block->displayCustomsValue()) {
@@ -57,11 +57,11 @@
                         $customsValueValidation = '';
                     }
                     ?>
-                    <td <?php echo $customsValueDisplay ?>>
+                    <td <?php /* @escapeNotVerified */ echo $customsValueDisplay ?>>
                         <input type="text"
                                name="customs_value"
-                               class="input-text admin__control-text <?php echo $customsValueValidation ?>"
-                               value="<?php echo $block->formatPrice($item->getPrice()); ?>"
+                               class="input-text admin__control-text <?php /* @escapeNotVerified */ echo $customsValueValidation ?>"
+                               value="<?php /* @escapeNotVerified */ echo $block->formatPrice($item->getPrice()); ?>"
                                size="10"
                                onblur="packaging.recalcContainerWeightAndCustomsValue(this);">
                     </td>
@@ -69,22 +69,22 @@
                         <div class="admin__field admin__field-option">
                             <input type="checkbox"
                                    name=""
-                                   value="<?php echo $item->getId() ? $item->getId() : $item->getOrderItemId(); ?>"
+                                   value="<?php /* @escapeNotVerified */ echo $item->getId() ? $item->getId() : $item->getOrderItemId(); ?>"
                                    class="checkbox admin__control-checkbox">
                             <label class="admin__field-label"></label>
                         </div>
                     </td>
                     <td class="col-qty">
-                        <?php echo $item->getOrderItem()->getQtyOrdered()*1; ?>
+                        <?php /* @escapeNotVerified */ echo $item->getOrderItem()->getQtyOrdered()*1; ?>
                     </td>
                     <td class="col-qty-edit last">
-                        <input type="hidden" name="price" value="<?php echo $item->getPrice(); ?>">
+                        <input type="hidden" name="price" value="<?php /* @escapeNotVerified */ echo $item->getPrice(); ?>">
                         <input type="text"
                                name="qty"
-                               value="<?php echo $item->getQty()*1; ?>"
+                               value="<?php /* @escapeNotVerified */ echo $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 delete icon-btn" onclick="packaging.deleteItem(this);" style="display:none;">
-                            <span><?php echo __('Delete') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo __('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 a910c139b04f6..821d5065ac63d 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
@@ -11,7 +11,7 @@
 <div id="packed_window" style="display:none;" class="packed-window">
     <div class="popup-window-wrapper">
         <div class="popup-window-title">
-            <span class="title"><?php echo __('Packages') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('Packages') ?></span>
         </div>
         <div class="packed-content">
             <div class="popup-window-content">
@@ -20,25 +20,25 @@
                     <?php $package = new \Magento\Framework\DataObject($package) ?>
                     <?php $params = new \Magento\Framework\DataObject($package->getParams()) ?>
                     <div class="package-number popup-fieldset-title">
-                        <div class="title"><?php echo __('Package') . ' ' . $packageId ?></div>
+                        <div class="title"><?php /* @escapeNotVerified */ echo __('Package') . ' ' . $packageId ?></div>
                     </div>
                     <div class="package-info">
                         <table class="package-options">
                             <tbody>
                                 <tr>
-                                    <th><?php echo __('Type') ?></th>
-                                    <td><?php echo $block->getContainerTypeByCode($params->getContainer()) ?></td>
-                                    <th><?php echo __('Length') ?></th>
+                                    <th><?php /* @escapeNotVerified */ echo __('Type') ?></th>
+                                    <td><?php /* @escapeNotVerified */ echo $block->getContainerTypeByCode($params->getContainer()) ?></td>
+                                    <th><?php /* @escapeNotVerified */ echo __('Length') ?></th>
                                     <td>
                                         <?php if ($params->getLength() != null): ?>
-                                            <?php echo $params->getLength() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
+                                            <?php /* @escapeNotVerified */ echo $params->getLength() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
                                         <?php else: ?>
                                             --
                                         <?php endif; ?>
                                     </td>
                                     <?php if ($params->getDeliveryConfirmation() != null): ?>
-                                        <th><?php echo __('Signature Confirmation') ?></th>
-                                        <td><?php echo $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation()) ?></td>
+                                        <th><?php /* @escapeNotVerified */ echo __('Signature Confirmation') ?></th>
+                                        <td><?php /* @escapeNotVerified */ echo $block->getDeliveryConfirmationTypeByCode($params->getDeliveryConfirmation()) ?></td>
                                     <?php else: ?>
                                         <th>&nbsp;</th>
                                         <td>&nbsp;</td>
@@ -46,26 +46,26 @@
                                 </tr>
                                 <tr>
                                     <?php if ($block->displayCustomsValue()): ?>
-                                        <th><?php echo __('Customs Value') ?></th>
-                                        <td><?php echo $block->displayCustomsPrice($params->getCustomsValue()) ?></td>
+                                        <th><?php /* @escapeNotVerified */ echo __('Customs Value') ?></th>
+                                        <td><?php /* @escapeNotVerified */ echo $block->displayCustomsPrice($params->getCustomsValue()) ?></td>
                                     <?php else: ?>
-                                        <th><?php echo __('Total Weight') ?></th>
-                                        <td><?php echo $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
+                                        <th><?php /* @escapeNotVerified */ echo __('Total Weight') ?></th>
+                                        <td><?php /* @escapeNotVerified */ echo $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
                                     <?php endif; ?>
-                                    <th><?php echo __('Width') ?></th>
+                                    <th><?php /* @escapeNotVerified */ echo __('Width') ?></th>
                                     <td>
                                         <?php if ($params->getWidth() != null): ?>
-                                            <?php echo $params->getWidth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
+                                            <?php /* @escapeNotVerified */ echo $params->getWidth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
                                         <?php else: ?>
                                             --
                                         <?php endif; ?>
                                     </td>
                                     <?php if ($params->getContentType() != null): ?>
-                                        <th><?php echo __('Contents') ?></th>
+                                        <th><?php /* @escapeNotVerified */ echo __('Contents') ?></th>
                                         <?php if ($params->getContentType() == 'OTHER'): ?>
                                             <td><?php echo $block->escapeHtml($params->getContentTypeOther()) ?></td>
                                         <?php else: ?>
-                                            <td><?php echo $block->getContentTypeByCode($params->getContentType()) ?></td>
+                                            <td><?php /* @escapeNotVerified */ echo $block->getContentTypeByCode($params->getContentType()) ?></td>
                                         <?php endif; ?>
                                     <?php else: ?>
                                         <th>&nbsp;</th>
@@ -74,16 +74,16 @@
                                 </tr>
                                 <tr>
                                     <?php if ($block->displayCustomsValue()): ?>
-                                        <th><?php echo __('Total Weight') ?></th>
-                                        <td><?php echo $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
+                                        <th><?php /* @escapeNotVerified */ echo __('Total Weight') ?></th>
+                                        <td><?php /* @escapeNotVerified */ echo $params->getWeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureWeightName($params->getWeightUnits()) ?></td>
                                     <?php else: ?>
                                         <th>&nbsp;</th>
                                         <td>&nbsp;</td>
                                     <?php endif; ?>
-                                    <th><?php echo __('Height') ?></th>
+                                    <th><?php /* @escapeNotVerified */ echo __('Height') ?></th>
                                     <td>
                                         <?php if ($params->getHeight() != null): ?>
-                                            <?php echo $params->getHeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
+                                            <?php /* @escapeNotVerified */ echo $params->getHeight() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getDimensionUnits()) ?>
                                         <?php else: ?>
                                             --
                                         <?php endif; ?>
@@ -93,15 +93,15 @@
                                 </tr>
                                 <tr>
                                     <?php if ($params->getSize()): ?>
-                                        <th><?php echo __('Size') ?></th>
-                                        <td><?php echo ucfirst(strtolower($params->getSize())) ?></td>
+                                        <th><?php /* @escapeNotVerified */ echo __('Size') ?></th>
+                                        <td><?php /* @escapeNotVerified */ echo ucfirst(strtolower($params->getSize())) ?></td>
                                     <?php else: ?>
                                         <th>&nbsp;</th>
                                         <td>&nbsp;</td>
                                     <?php endif; ?>
                                     <?php if ($params->getGirth()): ?>
-                                        <th><?php echo __('Girth') ?></th>
-                                        <td><?php echo $params->getGirth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getGirthDimensionUnits()) ?></td>
+                                        <th><?php /* @escapeNotVerified */ echo __('Girth') ?></th>
+                                        <td><?php /* @escapeNotVerified */ echo $params->getGirth() . ' ' . $this->helper('Magento\Shipping\Helper\Carrier')->getMeasureDimensionName($params->getGirthDimensionUnits()) ?></td>
                                     <?php else: ?>
                                         <th>&nbsp;</th>
                                         <td>&nbsp;</td>
@@ -113,19 +113,19 @@
                         </table>
                     </div>
                     <div class="package-number popup-fieldset-title">
-                        <div class="title"><?php echo __('Items in the Package') ?></div>
+                        <div class="title"><?php /* @escapeNotVerified */ echo __('Items in the Package') ?></div>
                     </div>
                     <div class="grid">
                         <table class="data">
                             <thead>
                             <tr class="headings">
-                                <th class="col-product no-link"><span><?php echo __('Product') ?></span></th>
-                                <th class="col-weight no-link"><span><?php echo __('Weight') ?></span></th>
+                                <th class="col-product no-link"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
+                                <th class="col-weight no-link"><span><?php /* @escapeNotVerified */ echo __('Weight') ?></span></th>
                                 <?php if ($block->displayCustomsValue()): ?>
-                                    <th class="col-custom no-link"><span><?php echo __('Customs Value') ?></span></th>
+                                    <th class="col-custom no-link"><span><?php /* @escapeNotVerified */ echo __('Customs Value') ?></span></th>
                                 <?php endif; ?>
-                                <th class="col-qty_ordered no-link"><span><?php echo __('Qty Ordered') ?></span></th>
-                                <th class="col-qty no-link last"><span><?php echo __('Qty') ?></span></th>
+                                <th class="col-qty_ordered no-link"><span><?php /* @escapeNotVerified */ echo __('Qty Ordered') ?></span></th>
+                                <th class="col-qty no-link last"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></th>
                             </tr>
                             </thead>
                             <tbody id="">
@@ -133,19 +133,19 @@
                                 <?php $item = new \Magento\Framework\DataObject($item) ?>
                                 <tr title="#" id="" class="">
                                     <td class="col-product name">
-                                        <?php echo $item->getName(); ?>
+                                        <?php /* @escapeNotVerified */ echo $item->getName(); ?>
                                     </td>
                                     <td class="col-weight weight ">
-                                        <?php echo $item->getWeight(); ?>
+                                        <?php /* @escapeNotVerified */ echo $item->getWeight(); ?>
                                     </td>
                                     <?php if ($block->displayCustomsValue()): ?>
-                                        <td class="col-custom "><?php echo $block->displayCustomsPrice($item->getCustomsValue()) ?></td>
+                                        <td class="col-custom "><?php /* @escapeNotVerified */ echo $block->displayCustomsPrice($item->getCustomsValue()) ?></td>
                                     <?php endif; ?>
                                     <td class="col-qty_ordered">
-                                        <?php echo $block->getQtyOrderedItem($item->getOrderItemId()); ?>
+                                        <?php /* @escapeNotVerified */ echo $block->getQtyOrderedItem($item->getOrderItemId()); ?>
                                     </td>
                                     <td class="col-qty last">
-                                        <?php echo $item->getQty()*1; ?>
+                                        <?php /* @escapeNotVerified */ echo $item->getQty()*1; ?>
                                     </td>
                                 </tr>
                             <?php endforeach; ?>
@@ -157,9 +157,9 @@
             </div>
         </div>
         <div class="popup-window-buttons-set">
-            <?php echo $block->getPrintButton() ?>
-            <button type="button" class="action-ok SavePackagesBtn save" onclick="hidePackedWindow();" title="<?php echo __('Products should be added to package(s)')?>">
-                <span><?php echo __('OK') ?></span>
+            <?php /* @escapeNotVerified */ echo $block->getPrintButton() ?>
+            <button type="button" class="action-ok SavePackagesBtn save" onclick="hidePackedWindow();" title="<?php /* @escapeNotVerified */ echo __('Products should be added to package(s)')?>">
+                <span><?php /* @escapeNotVerified */ echo __('OK') ?></span>
             </button>
         </div>
     </div>
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 359dde8e59b19..35acebc4af5c4 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
@@ -20,18 +20,18 @@ require([
     "Magento_Shipping/order/packaging"
 ], function(jQuery){
 
-    packaging = new Packaging(<?php echo $block->getConfigDataJson() ?>);
+    packaging = new Packaging(<?php /* @escapeNotVerified */ echo $block->getConfigDataJson() ?>);
     packaging.changeContainerType($$('select[name=package_container]')[0]);
     packaging.checkSizeAndGirthParameter(
             $$('select[name=package_container]')[0],
-    <?php echo $girthEnabled; ?>
+    <?php /* @escapeNotVerified */ echo $girthEnabled; ?>
     );
     packaging.setConfirmPackagingCallback(function(){
         packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
         packaging.sendCreateLabelRequest();
     });
     packaging.setLabelCreatedCallback(function(response){
-        setLocation("<?php echo $block->getUrl(
+        setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
                 'sales/order/view',
                 ['order_id' => $block->getShipment()->getOrderId()]
             ); ?>");
@@ -54,39 +54,39 @@ require([
         <div class="popup-window-title">
             <div class="actions">
                 <button type="button" class="action-add action-secondary AddPackageBtn" onclick="packaging.newPackage();">
-                    <span><?php echo __('Add Package') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Add Package') ?></span>
                 </button>
             </div>
-            <span class="title"><?php echo __('Create Packages') ?></span>
+            <span class="title"><?php /* @escapeNotVerified */ echo __('Create Packages') ?></span>
         </div>
         <div class="packaging-content popup-window-content">
             <div class="message message-warning" style="display: none"></div>
             <div id="package_template" style="display:none;">
                 <div class="package-number popup-fieldset-title">
                     <div class="title">
-                        <?php echo __('Package') ?>
+                        <?php /* @escapeNotVerified */ echo __('Package') ?>
                         <span></span>
                     </div>
                 </div>
                 <div class="admin__control-table-wrapper">
                     <table class="data-table admin__control-table">
                         <thead>
-                            <th class="col-type"><?php echo __('Type') ?></th>
+                            <th class="col-type"><?php /* @escapeNotVerified */ echo __('Type') ?></th>
                             <?php if ($girthEnabled == 1): ?>
-                            <th class="col-size"><?php echo __('Size') ?></th>
-                            <th class="col-girth"><?php echo __('Girth') ?></th>
+                            <th class="col-size"><?php /* @escapeNotVerified */ echo __('Size') ?></th>
+                            <th class="col-girth"><?php /* @escapeNotVerified */ echo __('Girth') ?></th>
                             <th>&nbsp;</th>
                                 <?php endif; ?>
                             <th class="col-custom" <?php echo $block->displayCustomsValue() ? '' : 'style="display: none;"' ?>>
-                                <?php echo __('Customs Value') ?>
+                                <?php /* @escapeNotVerified */ echo __('Customs Value') ?>
                             </th>
-                            <th class="col-total-weight"><?php echo __('Total Weight') ?></th>
-                            <th class="col-length"><?php echo __('Length') ?></th>
-                            <th class="col-width"><?php echo __('Width') ?></th>
-                            <th class="col-height"><?php echo __('Height') ?></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>&nbsp;</th>
                             <?php if ($block->getDeliveryConfirmationTypes()): ?>
-                            <th class="col-signature"><?php echo __('Signature Confirmation') ?></th>
+                            <th class="col-signature"><?php /* @escapeNotVerified */ echo __('Signature Confirmation') ?></th>
                                 <?php endif; ?>
                             <th class="col-actions">&nbsp;</th>
                         </thead>
@@ -94,17 +94,17 @@ require([
                             <td class="col-type">
                                 <?php $containers = $block->getContainers(); ?>
                                 <select name="package_container"
-                                        onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?php echo  $girthEnabled ?>);"
+                                        onchange="packaging.changeContainerType(this);packaging.checkSizeAndGirthParameter(this, <?php /* @escapeNotVerified */ echo  $girthEnabled ?>);"
                                         <?php if (empty($containers)):?>
-                                            title="<?php echo __('USPS domestic shipments don\'t use package types.') ?>"
+                                            title="<?php /* @escapeNotVerified */ echo __('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 echo $key ?>" >
-                                            <?php echo $value ?>
+                                        <option value="<?php /* @escapeNotVerified */ echo $key ?>" >
+                                            <?php /* @escapeNotVerified */ echo $value ?>
                                         </option>
                                     <?php endforeach; ?>
                                 </select>
@@ -113,10 +113,10 @@ require([
                             <td>
                                 <select name="package_size"
                                         class="admin__control-select"
-                                        onchange="packaging.checkSizeAndGirthParameter(this, <?php echo  $girthEnabled ?>);">
+                                        onchange="packaging.checkSizeAndGirthParameter(this, <?php /* @escapeNotVerified */ echo  $girthEnabled ?>);">
                                     <?php foreach ($sizeSource as $key => $value): ?>
-                                    <option value="<?php echo $sizeSource[$key]['value'] ?>">
-                                        <?php echo $sizeSource[$key]['label'] ?>
+                                    <option value="<?php /* @escapeNotVerified */ echo $sizeSource[$key]['value'] ?>">
+                                        <?php /* @escapeNotVerified */ echo $sizeSource[$key]['label'] ?>
                                     </option>
                                     <?php endforeach; ?>
                                 </select>
@@ -130,8 +130,8 @@ require([
                                 <select name="container_girth_dimension_units"
                                         class="options-units-dimensions measures admin__control-select"
                                         onchange="packaging.changeMeasures(this);">
-                                    <option value="<?php echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php echo __('in') ?></option>
-                                    <option value="<?php echo Zend_Measure_Length::CENTIMETER ?>" ><?php echo __('cm') ?></option>
+                                    <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>
                                 </select>
                             </td>
                                 <?php endif; ?>
@@ -144,11 +144,11 @@ require([
                                 $customsValueValidation = '';
                             }
                             ?>
-                            <td class="col-custom" <?php echo $customsValueDisplay ?>>
+                            <td class="col-custom" <?php /* @escapeNotVerified */ echo $customsValueDisplay ?>>
                                 <input type="text"
-                                       class="customs-value input-text admin__control-text <?php echo $customsValueValidation ?>"
+                                       class="customs-value input-text admin__control-text <?php /* @escapeNotVerified */ echo $customsValueValidation ?>"
                                        name="package_customs_value" />
-                                <span class="customs-value-currency">[<?php echo $block->getCustomValueCurrencyCode(); ?>]</span>
+                                <span class="customs-value-currency">[<?php /* @escapeNotVerified */ echo $block->getCustomValueCurrencyCode(); ?>]</span>
                             </td>
                             <td class="col-total-weight">
                                 <input type="text"
@@ -157,8 +157,8 @@ require([
                                 <select name="container_weight_units"
                                         class="options-units-weight measures admin__control-select"
                                         onchange="packaging.changeMeasures(this);">
-                                    <option value="<?php echo Zend_Measure_Weight::POUND ?>" selected="selected"  ><?php echo __('lb') ?></option>
-                                    <option value="<?php echo Zend_Measure_Weight::KILOGRAM ?>" ><?php echo __('kg') ?></option>
+                                    <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>
                                 </select>
                             </td>
                             <td class="col-length">
@@ -180,16 +180,16 @@ require([
                                 <select name="container_dimension_units"
                                         class="options-units-dimensions measures admin__control-select"
                                         onchange="packaging.changeMeasures(this);">
-                                    <option value="<?php echo Zend_Measure_Length::INCH ?>" selected="selected" ><?php echo __('in') ?></option>
-                                    <option value="<?php echo Zend_Measure_Length::CENTIMETER ?>" ><?php echo __('cm') ?></option>
+                                    <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>
                                 </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 echo $key ?>" >
-                                        <?php echo $value ?>
+                                    <option value="<?php /* @escapeNotVerified */ echo $key ?>" >
+                                        <?php /* @escapeNotVerified */ echo $value ?>
                                     </option>
                                     <?php endforeach; ?>
                                 </select>
@@ -197,10 +197,10 @@ require([
                                 <?php endif; ?>
                             <td class="col-actions">
                                 <button type="button" class="action-add AddItemsBtn" onclick="packaging.getItemsForPack(this);">
-                                    <span><?php echo __('Add') ?></span>
+                                    <span><?php /* @escapeNotVerified */ echo __('Add') ?></span>
                                 </button>
                                 <button type="button" class="action-delete DeletePackageBtn" onclick="packaging.deletePackage(this);">
-                                    <span><?php echo __('Delete Package') ?></span>
+                                    <span><?php /* @escapeNotVerified */ echo __('Delete Package') ?></span>
                                 </button>
                             </td>
                         </tbody>
@@ -210,8 +210,8 @@ require([
                 <?php if ($block->getContentTypes()): ?>
                     <table class="package-options package-options-contents data-table" cellspacing="0">
                         <thead>
-                            <th><?php echo __('Contents') ?></th>
-                            <th><?php echo __('Explanation') ?></th>
+                            <th><?php /* @escapeNotVerified */ echo __('Contents') ?></th>
+                            <th><?php /* @escapeNotVerified */ echo __('Explanation') ?></th>
                         </thead>
                         <tbody>
                             <td>
@@ -219,8 +219,8 @@ require([
                                         class="admin__control-select"
                                         onchange="packaging.changeContentTypes(this);">
                                     <?php foreach ($block->getContentTypes() as $key => $value): ?>
-                                    <option value="<?php echo $key ?>" >
-                                        <?php echo $value ?>
+                                    <option value="<?php /* @escapeNotVerified */ echo $key ?>" >
+                                        <?php /* @escapeNotVerified */ echo $value ?>
                                     </option>
                                     <?php endforeach; ?>
                                 </select>
@@ -239,10 +239,10 @@ require([
                         <div class="popup-fieldset-title">
                             <div class="actions">
                                 <button type="button" class="action-add AddSelectedBtn" onclick="packaging.packItems(this);">
-                                    <span><?php echo __('Add Selected Product(s) to Package') ?></span>
+                                    <span><?php /* @escapeNotVerified */ echo __('Add Selected Product(s) to Package') ?></span>
                                 </button>
                             </div>
-                            <div class="title"><?php echo __('Please select products.') ?></div>
+                            <div class="title"><?php /* @escapeNotVerified */ echo __('Please select products.') ?></div>
                         </div>
                         <div class="grid_prepare"></div>
                     </div>
@@ -255,11 +255,11 @@ require([
                     class="action-save action-secondary disabled SavePackagesBtn"
                     disabled="disabled"
                     onclick="packaging.confirmPackaging();"
-                    title="<?php echo __('Products should be added to package(s)')?>">
-                <span><?php echo __('OK') ?></span>
+                    title="<?php /* @escapeNotVerified */ echo __('Products should be added to package(s)')?>">
+                <span><?php /* @escapeNotVerified */ echo __('OK') ?></span>
             </button>
             <button type="button" class="action-close" onclick="packaging.cancelPackaging();">
-                <span><?php echo __('Cancel') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Cancel') ?></span>
             </button>
         </div>
     </div>
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 ed1580194287a..e757a862ebe15 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 echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_code ?>"><?php echo $block->escapeHtml($_name) ?></option>
                 <?php endforeach; ?>
             </select>
         </td>
@@ -93,7 +93,7 @@ require(['prototype'], function(){
             <a href="#"
                class="action-default action-delete"
                onclick="trackingControl.deleteRow(event);return false">
-                <span><?php echo __('Delete') ?></span>
+                <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
             </a>
         </td>
     </tr>
@@ -103,10 +103,10 @@ require(['prototype'], function(){
     <table class="data-table admin__control-table" id="tracking_numbers_table">
         <thead>
         <tr class="headings">
-            <th class="col-carrier"><?php echo __('Carrier') ?></th>
-            <th class="col-title"><?php echo __('Title') ?></th>
-            <th class="col-number"><?php echo __('Number') ?></th>
-            <th class="col-delete"><?php echo __('Action') ?></th>
+            <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>
         </tr>
         </thead>
         <tfoot>
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 53ce094103225..d3d637dda2474 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,11 +14,11 @@
 <?php /* Shipping Method */ ?>
 <div class="admin__page-section-item order-shipping-method">
     <div class="admin__page-section-item-title">
-        <span class="title"><?php echo __('Shipping &amp; Handling Information') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($order) ?>','trackorder','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo __('Track Order') ?>"><?php echo __('Track Order') ?></a></p>
+            <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>
         <?php endif; ?>
         <?php if ($order->getShippingDescription()): ?>
             <strong><?php echo $block->escapeHtml($order->getShippingDescription()) ?></strong>
@@ -30,12 +30,12 @@
             <?php endif; ?>
             <?php $_incl = $block->displayShippingPriceInclTax($order); ?>
 
-            <?php echo $_excl; ?>
+            <?php /* @escapeNotVerified */ echo $_excl; ?>
             <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
             <?php endif; ?>
         <?php else: ?>
-            <?php echo __('No shipping information available'); ?>
+            <?php /* @escapeNotVerified */ echo __('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 16dc0556a52a2..34fee23455bfa 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/form.phtml
@@ -11,38 +11,38 @@
 <?php echo $block->getChildHtml('order_info') ?>
 <section class="admin__page-section order-shipment-billing-shipping">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Payment &amp; Shipping Method') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('Payment Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo __('The order was placed using %1.', $_order->getOrderCurrencyCode()) ?></div>
+                <div class="order-payment-currency"><?php /* @escapeNotVerified */ echo __('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 echo __('Shipping and Tracking Information') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('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 echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($block->getShipment()) ?>','trackshipment','width=800,height=600,resizable=yes,scrollbars=yes')" title="<?php echo __('Track this shipment') ?>"><?php echo __('Track this shipment') ?></a>
+                            <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>
                         </p>
                     <?php endif; ?>
                     <div class="shipping-description-title">
                         <?php echo $block->escapeHtml($_order->getShippingDescription()) ?>
                     </div>
 
-                    <?php echo __('Total Shipping Charges'); ?>:
+                    <?php /* @escapeNotVerified */ echo __('Total Shipping Charges'); ?>:
 
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingPriceIncludingTax()): ?>
                         <?php $_excl = $block->displayShippingPriceInclTax($_order); ?>
@@ -51,19 +51,19 @@
                     <?php endif; ?>
                     <?php $_incl = $block->displayShippingPriceInclTax($_order); ?>
 
-                    <?php echo $_excl; ?>
+                    <?php /* @escapeNotVerified */ echo $_excl; ?>
                     <?php if ($this->helper('Magento\Tax\Helper\Data')->displayShippingBothPrices() && $_incl != $_excl): ?>
-                        (<?php echo __('Incl. Tax'); ?> <?php echo $_incl; ?>)
+                        (<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?> <?php /* @escapeNotVerified */ echo $_incl; ?>)
                     <?php endif; ?>
                 </div>
                 <?php if ($block->canCreateShippingLabel()): ?>
                 <p>
-                    <?php echo $block->getCreateLabelButton()?>
+                    <?php /* @escapeNotVerified */ echo $block->getCreateLabelButton()?>
                     <?php if ($block->getShipment()->getShippingLabel()): ?>
-                        <?php echo $block->getPrintLabelButton() ?>
+                        <?php /* @escapeNotVerified */ echo $block->getPrintLabelButton() ?>
                     <?php endif ?>
                     <?php if ($block->getShipment()->getPackages()): ?>
-                        <?php echo $block->getShowPackagesButton() ?>
+                        <?php /* @escapeNotVerified */ echo $block->getShowPackagesButton() ?>
                     <?php endif ?>
                 </p>
                 <?php endif ?>
@@ -80,7 +80,7 @@
                 packaging.sendCreateLabelRequest();
             });
             packaging.setLabelCreatedCallback(function (response) {
-                setLocation("<?php echo $block->getUrl(
+                setLocation("<?php /* @escapeNotVerified */ echo $block->getUrl(
 'adminhtml/order_shipment/view',
 ['shipment_id' => $block->getShipment()->getId()]
 ); ?>");
@@ -96,21 +96,21 @@
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Items Shipped') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Items Shipped') ?></span>
     </div>
     <?php echo $block->getChildHtml('shipment_items') ?>
 </section>
 
 <section class="admin__page-section">
     <div class="admin__page-section-title">
-        <span class="title"><?php echo __('Order Total') ?></span>
+        <span class="title"><?php /* @escapeNotVerified */ echo __('Order Total') ?></span>
     </div>
     <div class="admin__page-section-content">
         <?php echo $block->getChildHtml('shipment_packed') ?>
 
         <div class="admin__page-section-item order-comments-history">
             <div class="admin__page-section-item-title">
-                <span class="title"><?php echo __('Shipment History') ?></span>
+                <span class="title"><?php /* @escapeNotVerified */ echo __('Shipment History') ?></span>
             </div>
             <div class="admin__page-section-item-content"><?php echo $block->getChildHtml('order_comments') ?></div>
         </div>
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 07e9a9876f358..6372d5c44ffbc 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/view/items.phtml
@@ -11,13 +11,13 @@
     <table class="data-table admin__table-primary order-shipment-table">
         <thead>
             <tr class="headings">
-                <th class="col-product"><span><?php echo __('Product') ?></span></th>
-                <th class="col-qty last"><span><?php echo __('Qty Shipped') ?></span></th>
+                <th class="col-product"><span><?php /* @escapeNotVerified */ echo __('Product') ?></span></th>
+                <th class="col-qty last"><span><?php /* @escapeNotVerified */ echo __('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 echo $_i%2 ? 'odd' : 'even' ?>">
+            <tbody class="<?php /* @escapeNotVerified */ echo $_i%2 ? 'odd' : 'even' ?>">
                 <?php echo $block->getItemHtml($_item) ?>
                 <?php echo $block->getItemExtraInfoHtml($_item->getOrderItem()) ?>
             </tbody>
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 84df5ee63279a..44bf0c5435255 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
@@ -10,5 +10,5 @@
 <?php $_item = $block->getItem() ?>
 <tr class="border">
     <td class="col-product"><?php echo $block->getColumnHtml($_item, 'name') ?></td>
-    <td class="col-qty last"><?php echo $_item->getQty()*1 ?></td>
+    <td class="col-qty last"><?php /* @escapeNotVerified */ echo $_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 7c5cc15e6521b..6240e6f3ab126 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/items.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/items.phtml
@@ -13,32 +13,32 @@
     <?php if ($_order->getTracksCollection()->count()) : ?>
         <?php echo $block->getChildHtml('track-all-link') ?>
     <?php endif; ?>
-    <a href="<?php echo $block->getPrintAllShipmentsUrl($_order) ?>"
+    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintAllShipmentsUrl($_order) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php echo __('Print All Shipments') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Print All Shipments') ?></span>
     </a>
 </div>
 <?php foreach ($_order->getShipmentsCollection() as $_shipment): ?>
 <div class="order-title">
-    <strong><?php echo __('Shipment #') ?><?php echo $_shipment->getIncrementId(); ?></strong>
-    <a href="<?php echo $block->getPrintShipmentUrl($_shipment) ?>"
+    <strong><?php /* @escapeNotVerified */ echo __('Shipment #') ?><?php /* @escapeNotVerified */ echo $_shipment->getIncrementId(); ?></strong>
+    <a href="<?php /* @escapeNotVerified */ echo $block->getPrintShipmentUrl($_shipment) ?>"
        onclick="this.target='_blank'"
        class="action print">
-        <span><?php echo __('Print Shipment') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Print Shipment') ?></span>
     </a>
     <a href="#"
-       data-mage-init='{"popupWindow": {"windowURL":"<?php 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 echo __('Track this shipment') ?>"
+       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') ?>"
        class="action track">
-        <span><?php echo __('Track this shipment') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Track this shipment') ?></span>
     </a>
 </div>
 <?php $tracks = $_shipment->getTracksCollection(); ?>
 <?php  if ($tracks->count()): ?>
-    <dl class="order-tracking" id="my-tracking-table-<?php echo $_shipment->getId(); ?>">
+    <dl class="order-tracking" id="my-tracking-table-<?php /* @escapeNotVerified */ echo $_shipment->getId(); ?>">
         <dt class="tracking-title">
-            <?php echo __('Tracking Number(s):') ?>
+            <?php /* @escapeNotVerified */ echo __('Tracking Number(s):') ?>
         </dt>
         <dd class="tracking-content">
             <?php
@@ -47,7 +47,7 @@
             foreach ($tracks as $track): ?>
                 <?php if ($track->isCustom()): ?><?php echo $block->escapeHtml($track->getNumber()) ?><?php else: ?><a
                     href="#"
-                    data-mage-init='{"popupWindow": {"windowURL":"<?php echo $this->helper('Magento\Shipping\Helper\Data')->getTrackingPopupUrlBySalesModel($track) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'
+                    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>
                     </a><?php endif; ?><?php if ($i != $_size): ?>, <?php endif; ?>
                 <?php $i++;
@@ -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 echo $_shipment->getId(); ?>">
-        <caption class="table-caption"><?php echo __('Items Shipped') ?></caption>
+    <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>
         <thead>
             <tr>
-                <th class="col name"><?php echo __('Product Name') ?></th>
-                <th class="col sku"><?php echo __('SKU') ?></th>
-                <th class="col qty"><?php echo __('Qty Shipped') ?></th>
+                <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>
             </tr>
         </thead>
         <?php $_items = $_shipment->getAllItems(); ?>
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 af1dd8bd54181..3b525d31ad8f3 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/order/shipment.phtml
@@ -8,8 +8,8 @@
     <?php echo $block->getChildHtml('shipment_items') ?>
     <div class="actions-toolbar">
         <div class="secondary">
-            <a href="<?php echo $block->getBackUrl() ?>" class="action back">
-                <span><?php echo $block->getBackTitle() ?></span>
+            <a href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>" class="action back">
+                <span><?php /* @escapeNotVerified */ echo $block->getBackTitle() ?></span>
             </a>
         </div>
     </div>
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 454c52959ee08..c8517ad74ed19 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 echo $block->getLabel() ?>"
-   data-mage-init='{"popupWindow": {"windowURL":"<?php echo $block->getWindowUrl($order) ?>","windowName":"trackorder","width":800,"height":600,"left":0,"top":0,"resizable":1,"scrollbars":1}}'>
-    <span><?php echo $block->getLabel()?></span>
+<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>
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 4d231fa7c7b0c..987f7ef286056 100644
--- a/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
+++ b/app/code/Magento/Shipping/view/frontend/templates/tracking/popup.phtml
@@ -13,88 +13,88 @@
     <?php if (sizeof($_results)>0): ?>
     <?php foreach ($_results as $shipid => $_result): ?>
         <?php if ($shipid): ?>
-        <div class="order subtitle caption"><?php echo __('Shipment #') . $shipid; ?></div>
+        <div class="order subtitle caption"><?php /* @escapeNotVerified */ echo __('Shipment #') . $shipid; ?></div>
         <?php endif; ?>
         <?php if (sizeof($_result)>0): ?>
             <?php $rowCount = sizeof($_result); $counter = 1; ?>
             <?php $_id = 0; foreach ($_result as $track): ?>
                 <div class="table-wrapper">
-                    <table class="data table order tracking" id="tracking-table-popup-<?php echo $_id ?>">
-                        <caption class="table-caption"><?php echo __('Order tracking'); ?></caption>
+                    <table class="data table order tracking" id="tracking-table-popup-<?php /* @escapeNotVerified */ echo $_id ?>">
+                        <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Order tracking'); ?></caption>
                         <tbody>
                         <?php if (is_object($track)): ?>
                             <tr>
-                                <th class="col label" scope="row"><?php echo __('Tracking Number:'); ?></th>
+                                <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Tracking Number:'); ?></th>
                                 <td class="col value"><?php echo $block->escapeHtml($track->getTracking()); ?></td>
                             </tr>
                             <?php if ($track->getCarrierTitle()): ?>
                                 <tr>
-                                    <th class="col label" scope="row"><?php echo __('Carrier:'); ?></th>
+                                    <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Carrier:'); ?></th>
                                     <td class="col value"><?php echo $block->escapeHtml($track->getCarrierTitle()); ?></td>
                                 </tr>
                             <?php endif; ?>
                             <?php if ($track->getErrorMessage()): ?>
                                 <tr>
-                                    <th class="col label" scope="row"><?php echo __('Error:'); ?></th>
-                                    <td class="col error"><?php echo __('Tracking information is currently not available. Please '); if ($block->getContactUsEnabled()) : ?><a href="<?php echo $block->getContactUs() ?>" title="<?php echo __('contact us') ?>" onclick="this.target='_blank'"><?php echo __('contact us') ?></a><?php echo __(' for more information or '); endif; echo __('email us at '); ?><a href="mailto:<?php echo $block->getStoreSupportEmail() ?>"><?php echo $block->getStoreSupportEmail() ?></a></td>
+                                    <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Error:'); ?></th>
+                                    <td class="col error"><?php /* @escapeNotVerified */ echo __('Tracking information is currently not available. Please '); if ($block->getContactUsEnabled()) : ?><a href="<?php /* @escapeNotVerified */ echo $block->getContactUs() ?>" title="<?php /* @escapeNotVerified */ echo __('contact us') ?>" onclick="this.target='_blank'"><?php /* @escapeNotVerified */ echo __('contact us') ?></a><?php /* @escapeNotVerified */ echo __(' for more information or '); endif; /* @escapeNotVerified */ echo __('email us at '); ?><a href="mailto:<?php /* @escapeNotVerified */ echo $block->getStoreSupportEmail() ?>"><?php /* @escapeNotVerified */ echo $block->getStoreSupportEmail() ?></a></td>
                                 </tr>
                             <?php elseif ($track->getTrackSummary()): ?>
                                 <tr>
-                                    <th class="col label" scope="row"><?php echo __('Info:'); ?></th>
-                                    <td class="col value"><?php echo $track->getTrackSummary(); ?></td>
+                                    <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Info:'); ?></th>
+                                    <td class="col value"><?php /* @escapeNotVerified */ echo $track->getTrackSummary(); ?></td>
                                 </tr>
                             <?php elseif ($track->getUrl()): ?>
                                 <tr>
-                                    <th class="col label" scope="row"><?php echo __('Track:'); ?></th>
+                                    <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Track:'); ?></th>
                                     <td class="col value"><a href="<?php echo $block->escapeHtml($track->getUrl()); ?>" onclick="this.target='_blank'"><?php echo $block->escapeHtml($track->getUrl()); ?></a></td>
                                 </tr>
                             <?php else: ?>
                                 <?php if ($track->getStatus()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Status:'); ?></th>
-                                        <td class="col value"><?php echo $track->getStatus(); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Status:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $track->getStatus(); ?></td>
                                     </tr>
                                 <?php endif; ?>
 
                                 <?php if ($track->getDeliverydate()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Delivered on:'); ?></th>
-                                        <td class="col value"><?php echo $block->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Delivered on:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $block->formatDeliveryDateTime($track->getDeliverydate(), $track->getDeliverytime()); ?></td>
                                     </tr>
                                 <?php endif; ?>
 
                                 <?php if ($track->getSignedby()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Signed by:'); ?></th>
-                                        <td class="col value"><?php echo $track->getSignedby(); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Signed by:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $track->getSignedby(); ?></td>
                                     </tr>
                                 <?php endif; ?>
 
                                 <?php if ($track->getDeliveryLocation()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Delivered to:'); ?></th>
-                                        <td class="col value"><?php echo $track->getDeliveryLocation(); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Delivered to:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $track->getDeliveryLocation(); ?></td>
                                     </tr>
                                 <?php endif; ?>
 
                                 <?php if ($track->getShippedDate()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Shipped or billed on:'); ?></th>
-                                        <td class="col value"><?php echo $track->getShippedDate(); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Shipped or billed on:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $track->getShippedDate(); ?></td>
                                     </tr>
                                 <?php endif; ?>
 
                                 <?php if ($track->getService()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Service Type:'); ?></th>
-                                        <td class="col value"><?php echo $track->getService(); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Service Type:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $track->getService(); ?></td>
                                     </tr>
                                 <?php endif; ?>
 
                                 <?php if ($track->getWeight()): ?>
                                     <tr>
-                                        <th class="col label" scope="row"><?php echo __('Weight:'); ?></th>
-                                        <td class="col value"><?php echo $track->getWeight(); ?></td>
+                                        <th class="col label" scope="row"><?php /* @escapeNotVerified */ echo __('Weight:'); ?></th>
+                                        <td class="col value"><?php /* @escapeNotVerified */ echo $track->getWeight(); ?></td>
                                     </tr>
                                 <?php endif; ?>
                             <?php endif; ?>
@@ -110,14 +110,14 @@
                 </div>
                 <?php if (is_object($track) && sizeof($track->getProgressdetail())>0): ?>
                     <div class="table-wrapper">
-                        <table class="data table order tracking" id="track-history-table-<?php echo $track->getTracking(); ?>">
-                            <caption class="table-caption"><?php echo __('Track history'); ?></caption>
+                        <table class="data table order tracking" id="track-history-table-<?php /* @escapeNotVerified */ echo $track->getTracking(); ?>">
+                            <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Track history'); ?></caption>
                             <thead>
                             <tr>
-                                <th class="col location" scope="col"><?php echo __('Location') ?></th>
-                                <th class="col date" scope="col"><?php echo __('Date') ?></th>
-                                <th class="col time" scope="col"><?php echo __('Local Time') ?></th>
-                                <th class="col description" scope="col"><?php echo __('Description') ?></th>
+                                <th class="col location" scope="col"><?php /* @escapeNotVerified */ echo __('Location') ?></th>
+                                <th class="col date" scope="col"><?php /* @escapeNotVerified */ echo __('Date') ?></th>
+                                <th class="col time" scope="col"><?php /* @escapeNotVerified */ echo __('Local Time') ?></th>
+                                <th class="col description" scope="col"><?php /* @escapeNotVerified */ echo __('Description') ?></th>
                             </tr>
                             </thead>
                             <tbody>
@@ -126,8 +126,8 @@
                                 <?php $_detailTime = (isset($_detail['deliverytime']) ? $block->formatDeliveryTime($_detail['deliverytime'], $_detail['deliverydate']) : '') ?>
                                 <tr>
                                     <td data-th="<?php echo $block->escapeHtml(__('Location')) ?>" class="col location"><?php echo(isset($_detail['deliverylocation']) ? $_detail['deliverylocation'] : ''); ?></td>
-                                    <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php echo $_detailDate ?></td>
-                                    <td data-th="<?php echo $block->escapeHtml(__('Local Time')) ?>" class="col time"><?php echo $_detailTime ?></td>
+                                    <td data-th="<?php echo $block->escapeHtml(__('Date')) ?>" class="col date"><?php /* @escapeNotVerified */ echo $_detailDate ?></td>
+                                    <td data-th="<?php echo $block->escapeHtml(__('Local Time')) ?>" class="col time"><?php /* @escapeNotVerified */ echo $_detailTime ?></td>
                                     <td data-th="<?php echo $block->escapeHtml(__('Description')) ?>" class="col description"><?php echo(isset($_detail['activity']) ? $_detail['activity'] : '') ?></td>
                                 </tr>
                             <?php endforeach; ?>
@@ -141,19 +141,19 @@
             <?php /* end for each tracking information */ ?>
             <?php endforeach; ?>
         <?php else: ?>
-            <div class="message info empty"><div><?php echo __('There is no tracking available for this shipment.'); ?></div></div>
+            <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('There is no tracking available for this shipment.'); ?></div></div>
         <?php endif; ?>
 
     <?php endforeach; ?>
     <?php else: ?>
-        <div class="message info empty"><div><?php echo __('There is no tracking available.'); ?></div></div>
+        <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('There is no tracking available.'); ?></div></div>
     <?php endif; ?>
     <div class="actions">
         <button type="button"
-                title="<?php echo __('Close Window') ?>"
+                title="<?php /* @escapeNotVerified */ echo __('Close Window') ?>"
                 class="action close"
                 onclick="window.close(); window.opener.focus();">
-            <span><?php echo __('Close Window') ?></span>
+            <span><?php /* @escapeNotVerified */ echo __('Close Window') ?></span>
         </button>
     </div>
 </div>
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 82e2d1cc95838..b03ff2a0ba89a 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/flags.phtml
@@ -9,11 +9,11 @@
 ?>
 <?php if (count($block->getStores())>1): ?>
 <div class="form-language">
-    <label for="select-language"><?php echo __('Your Language:') ?></label>
-    <select id="select-language" title="<?php echo __('Your Language') ?>" onchange="window.location.href=this.value" class="flags">
+    <label for="select-language"><?php /* @escapeNotVerified */ echo __('Your Language:') ?></label>
+    <select id="select-language" title="<?php /* @escapeNotVerified */ echo __('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 $_lang->getCurrentUrl() ?>" style="background-image:url('<?php echo $block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif') ?>');"<?php echo $_selected ?>><?php echo $block->escapeHtml($_lang->getName()) ?></option>
+        <option value="<?php /* @escapeNotVerified */ echo $_lang->getCurrentUrl() ?>" style="background-image:url('<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/flags/flag_' . $_lang->getCode() . '.gif') ?>');"<?php /* @escapeNotVerified */ echo $_selected ?>><?php echo $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 a8a29b62725f9..e6979775c4b5f 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/languages.phtml
@@ -15,18 +15,18 @@
 
 <?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 $id?>">
-    <strong class="label switcher-label"><span><?php echo __('Language') ?></span></strong>
+<div class="switcher language switcher-language" data-ui-id="language-switcher" id="switcher-language<?php /* @escapeNotVerified */ echo $id?>">
+    <strong class="label switcher-label"><span><?php /* @escapeNotVerified */ echo __('Language') ?></span></strong>
     <div class="actions dropdown options switcher-options">
-        <div class="action toggle switcher-trigger" id="switcher-language-trigger<?php echo $id?>">
+        <div class="action toggle switcher-trigger" id="switcher-language-trigger<?php /* @escapeNotVerified */ echo $id?>">
             <strong class="view-<?php echo $block->escapeHtml($block->getCurrentStoreCode()) ?>">
                 <span><?php echo $block->escapeHtml($block->getStoreName()) ?></span>
             </strong>
         </div>
         <ul class="dropdown switcher-dropdown"
             data-mage-init='{"dropdownDialog":{
-                "appendTo":"#switcher-language<?php echo $id ?> > .options",
-                "triggerTarget":"#switcher-language-trigger<?php echo $id ?>",
+                "appendTo":"#switcher-language<?php /* @escapeNotVerified */ echo $id ?> > .options",
+                "triggerTarget":"#switcher-language-trigger<?php /* @escapeNotVerified */ echo $id ?>",
                 "closeOnMouseLeave": false,
                 "triggerClass":"active",
                 "parentClass":"active",
@@ -34,7 +34,7 @@
             <?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 echo $block->getTargetStorePostData($_lang); ?>'>
+                        <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getTargetStorePostData($_lang); ?>'>
                             <?php echo $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 275053c77bac3..652e978879a5e 100644
--- a/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
+++ b/app/code/Magento/Store/view/frontend/templates/switch/stores.phtml
@@ -16,7 +16,7 @@
 ?>
 <?php if (count($block->getGroups())>1): ?>
 <div class="switcher store switcher-store" id="switcher-store">
-    <strong class="label switcher-label"><span><?php echo __('Select Store') ?></span></strong>
+    <strong class="label switcher-label"><span><?php /* @escapeNotVerified */ echo __('Select Store') ?></span></strong>
     <div class="actions dropdown options switcher-options">
         <?php foreach ($block->getGroups() as $_group): ?>
         <?php if ($_group->getId() == $block->getCurrentGroupId()): ?>
@@ -37,7 +37,7 @@
             <?php foreach ($block->getGroups() as $_group): ?>
             <?php if (!($_group->getId() == $block->getCurrentGroupId())): ?>
                 <li class="switcher-option">
-                    <a href="#" data-post='<?php echo $block->getTargetStorePostData($_group->getDefaultStore()); ?>'>
+                    <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getTargetStorePostData($_group->getDefaultStore()); ?>'>
                         <?php echo $block->escapeHtml($_group->getName()) ?>
                     </a>
                 </li>
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 b847b929a25e4..b9c6e924b3dc9 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
@@ -24,7 +24,7 @@ $schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/default/schema?services=a
         if (url && url.length > 1) {
             url = decodeURIComponent(url[1]);
         } else {
-            url = '<?php echo $schemaUrl ?>';
+            url = '<?php /* @escapeNotVerified */ echo $schemaUrl ?>';
         }
 
         // Pre load translate...
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 c0ed0e898ecf2..b1951c3f2ae9d 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
@@ -240,7 +240,7 @@ function switchDefaultValueField()
 
         <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
         <?php if (in_array($type, array('swatch_visual', 'swatch_text'))) continue ?>
-            case '<?php echo $type; ?>':
+            case '<?php /* @escapeNotVerified */ echo $type; ?>':
                 <?php foreach ($fields as $one): ?>
                     <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
@@ -252,7 +252,7 @@ function switchDefaultValueField()
                     <?php elseif ($one == '_scope'): ?>
                         scopeVisibility = false;
                     <?php else: ?>
-                        setRowVisibility('<?php echo $one; ?>', false);
+                        setRowVisibility('<?php /* @escapeNotVerified */ echo $one; ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>
             break;
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 4736eaf6aa8f0..e521b1e260382 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
@@ -9,23 +9,23 @@
 /** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Text */
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php echo __('Manage Swatch (values of your attribute)') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (values of your attribute)') ?></span></legend>
     <div id="swatch-text-options-panel">
         <?php //@todo move style to css file ?>
         <table class="data-table" style="clear: both;" cellspacing="0">
             <thead>
             <tr id="swatch-text-options-table">
                 <th class="col-draggable"></th>
-                <th class="col-default"><?php echo __('Is Default') ?></th>
+                <th class="col-default"><?php /* @escapeNotVerified */ echo __('Is Default') ?></th>
                 <?php
                 $storelist = $block->getStores();
                 foreach ($storelist as $_store):
                     ?>
                     <?php if ($_store->getCode() == 'admin') : ?>
                         <th class="col-<%- data.id %>" style="width: 50px;">Swatch</th>
-                        <th><?php echo $_store->getName() ?></th>
+                        <th><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
                     <?php else : ?>
-                        <th colspan="2"><?php echo $_store->getName() ?></th>
+                        <th colspan="2"><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
                     <?php endif; ?>
                 <?php endforeach;
                 $storetotal = count($storelist) + 3;
@@ -35,11 +35,11 @@
             </thead>
             <tbody data-role="swatch-text-options-container"></tbody>
             <tfoot>
-            <th colspan="<?php echo $storetotal; ?>" class="col-actions-add">
+            <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button id="add_new_swatch_text_option_button" title="<?php echo __('Add Swatch'); ?>"
+                    <button id="add_new_swatch_text_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Swatch'); ?>"
                             type="button" class="action- scalable add">
-                        <span><?php echo __('Add Swatch'); ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Add Swatch'); ?></span>
                     </button>
                 <?php endif; ?>
             </th>
@@ -51,7 +51,7 @@
         <tr>
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-                    <div data-role="draggable-handle" class="draggable-handle" title="<?php echo __('Sort Option'); ?>"></div>
+                    <div data-role="draggable-handle" class="draggable-handle" title="<?php /* @escapeNotVerified */ echo __('Sort Option'); ?>"></div>
                 <?php endif; ?>
                 <input data-role="order" type="hidden" name="optiontext[order][<%- data.id %>]"  value="<%- data.sort_order %>" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()): ?> disabled="disabled"<?php endif; ?>/>
             </td>
@@ -60,19 +60,19 @@
             </td>
             <?php foreach ($block->getStores() as $_store): ?>
                 <td class="col-<%- data.id %>" style="width: 50px;">
-                    <input class="input-text swatch-text-field-<?php echo $_store->getId() ?> <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?>required-option<?php endif; ?>" name="swatchtext[value][<%- data.id %>][<?php echo $_store->getId() ?>]" type="text" value="<%- data.swatch<?php echo $_store->getId() ?> %>" />
+                    <input class="input-text swatch-text-field-<?php /* @escapeNotVerified */ echo $_store->getId() ?> <?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?>required-option<?php endif; ?>" name="swatchtext[value][<%- data.id %>][<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" type="text" value="<%- data.swatch<?php /* @escapeNotVerified */ echo $_store->getId() ?> %>" />
                 </td>
                 <td class="swatch-col-<%- data.id %>">
-                    <input name="optiontext[value][<%- data.id %>][<?php echo $_store->getId() ?>]" value="<%- data.store<?php echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/>
+                    <input name="optiontext[value][<%- data.id %>][<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<%- data.store<?php /* @escapeNotVerified */ echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/>
                 </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 __('Delete') ?>" type="button"
+                    <button title="<?php /* @escapeNotVerified */ echo __('Delete') ?>" type="button"
                             class="action- scalable delete delete-option"
                         >
-                        <span><?php echo __('Delete') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -172,7 +172,7 @@
                 Event.observe('add_new_swatch_text_option_button', 'click', swatchTextOption.add.bind(swatchTextOption));
             }
             <?php foreach ($block->getOptionValues() as $_value): ?>
-            swatchTextOption.add(<?php echo $_value->toJson() ?>);
+            swatchTextOption.add(<?php /* @escapeNotVerified */ echo $_value->toJson() ?>);
             <?php endforeach; ?>
             <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
             jQuery(function($) {
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 e6d481f87984e..1098414c9cdd3 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
@@ -9,20 +9,20 @@
 /** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual */
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php echo __('Manage Swatch (values of your attribute)') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (values of your attribute)') ?></span></legend>
     <div id="swatch-visual-options-panel">
         <?php //@todo move style to css file ?>
         <table class="data-table" style="clear: both;" cellspacing="0">
             <thead>
             <tr id="swatch-visual-options-table">
                 <th class="col-draggable"></th>
-                <th class="col-default"><?php echo __('Is Default') ?></th>
-                <th><?php echo __('Swatch') ?></th>
+                <th class="col-default"><?php /* @escapeNotVerified */ echo __('Is Default') ?></th>
+                <th><?php /* @escapeNotVerified */ echo __('Swatch') ?></th>
                 <?php
                 $storelist = $block->getStores();
                 foreach ($storelist as $_store):
                     ?>
-                    <th><?php echo $_store->getName() ?></th>
+                    <th><?php /* @escapeNotVerified */ echo $_store->getName() ?></th>
                 <?php endforeach;
                 $storetotal = count($storelist) + 3;
                 ?>
@@ -31,11 +31,11 @@
             </thead>
             <tbody data-role="swatch-visual-options-container"></tbody>
             <tfoot>
-            <th colspan="<?php echo $storetotal; ?>" class="col-actions-add">
+            <th colspan="<?php /* @escapeNotVerified */ echo $storetotal; ?>" class="col-actions-add">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button id="add_new_swatch_visual_option_button" title="<?php echo __('Add Swatch'); ?>"
+                    <button id="add_new_swatch_visual_option_button" title="<?php /* @escapeNotVerified */ echo __('Add Swatch'); ?>"
                             type="button" class="action- scalable add">
-                        <span><?php echo __('Add Swatch'); ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Add Swatch'); ?></span>
                     </button>
                 <?php endif; ?>
             </th>
@@ -47,7 +47,7 @@
         <tr>
             <td class="col-draggable">
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()): ?>
-                    <div data-role="draggable-handle" class="draggable-handle" title="<?php echo __('Sort Option'); ?>"></div>
+                    <div data-role="draggable-handle" class="draggable-handle" title="<?php /* @escapeNotVerified */ echo __('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>
@@ -67,8 +67,8 @@
                     </div>
                     <div class="swatch_row" style="border:1px solid black;">
                         <form class="ignore-validate">
-                            <input type="hidden" name="form_key" value="<?php echo $block->getFormKey(); ?>" />
-                            <input type="file" name="datafile" id="swatch_file_option_<%- data.id %>" onchange="fileUpload(this.previous('input'), this.form,'<?php echo $block->getUrl('swatches/iframe/show'); ?>','swatch_window_option_<%- data.id %>'); return false;"><br />
+                            <input type="hidden" name="form_key" value="<?php /* @escapeNotVerified */ echo $block->getFormKey(); ?>" />
+                            <input type="file" name="datafile" id="swatch_file_option_<%- data.id %>" onchange="fileUpload(this.previous('input'), this.form,'<?php /* @escapeNotVerified */ echo $block->getUrl('swatches/iframe/show'); ?>','swatch_window_option_<%- data.id %>'); return false;"><br />
                         </form>
                         <div class="swatch_row_name" onclick="$('swatch_file_option_<%- data.id %>').click();">
                             <p>Upload a file</p>
@@ -83,16 +83,16 @@
             </td>
             <?php foreach ($block->getStores() as $_store): ?>
                 <td class="swatch-col-<%- data.id %>">
-                    <input name="optionvisual[value][<%- data.id %>][<?php echo $_store->getId() ?>]" value="<%- data.store<?php echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/>
+                    <input name="optionvisual[value][<%- data.id %>][<?php /* @escapeNotVerified */ echo $_store->getId() ?>]" value="<%- data.store<?php /* @escapeNotVerified */ echo $_store->getId() ?> %>" class="input-text<?php if ($_store->getId() == \Magento\Store\Model\Store::DEFAULT_STORE_ID): ?> required-option<?php endif; ?>" type="text" <?php if ($block->getReadOnly() || $block->canManageOptionDefaultOnly()):?> disabled="disabled"<?php endif;?>/>
                 </td>
             <?php endforeach; ?>
             <td id="delete_button_swatch_container_<%- data.id %>" class="col-delete">
                 <input type="hidden" class="delete-flag" name="optionvisual[delete][<%- data.id %>]" value="" />
                 <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
-                    <button title="<?php echo __('Delete') ?>" type="button"
+                    <button title="<?php /* @escapeNotVerified */ echo __('Delete') ?>" type="button"
                             class="action- scalable delete delete-option"
                         >
-                        <span><?php echo __('Delete') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('Delete') ?></span>
                     </button>
                 <?php endif;?>
             </td>
@@ -287,7 +287,7 @@
                 Event.observe('add_new_swatch_visual_option_button', 'click', swatchVisualOption.add.bind(swatchVisualOption));
             }
             <?php foreach ($block->getOptionValues() as $_value): ?>
-            swatchVisualOption.add(<?php echo $_value->toJson() ?>);
+            swatchVisualOption.add(<?php /* @escapeNotVerified */ echo $_value->toJson() ?>);
             <?php endforeach; ?>
             <?php if (!$block->getReadOnly() && !$block->canManageOptionDefaultOnly()):?>
             jQuery(function($) {
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 710dcdbd75941..58b3bfc0741fe 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,19 +9,19 @@
 /** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
 ?>
 <?php $swatchData = $block->getSwatchData(); ?>
-<div class="swatch-attribute swatch-layered <?php echo $swatchData['attribute_code'] ?>"
-     attribute-code="<?php echo $swatchData['attribute_code'] ?>" attribute-id="174">
+<div class="swatch-attribute swatch-layered <?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>"
+     attribute-code="<?php /* @escapeNotVerified */ echo $swatchData['attribute_code'] ?>" attribute-id="174">
     <div class="swatch-attribute-options clearfix">
         <?php foreach ($swatchData['options'] as $option => $label): ?>
-            <a href="<?php echo $label['link'] ?>" class="swatch-option-link-layered">
+            <a href="<?php /* @escapeNotVerified */ echo $label['link'] ?>" 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 echo $label['custom_style'] ?>"
+                            <div class="swatch-option <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
                                  option-type="3"
-                                 option-id="<?php echo $option ?>"
-                                 option-label="<?php echo $label['label'] ?>"
+                                 option-id="<?php /* @escapeNotVerified */ echo $option ?>"
+                                 option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
                                  option-tooltip-thumb=""
                                  option-tooltip-value=""
                                 ></div>
@@ -32,34 +32,34 @@
                             $swatchData['swatches'][$option]['value']); ?>
                             <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
                             $swatchData['swatches'][$option]['value']); ?>
-                            <div class="swatch-option image <?php echo $label['custom_style'] ?>"
+                            <div class="swatch-option image <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
                                  option-type="2"
-                                 option-id="<?php echo $option ?>"
-                                 option-label="<?php echo $label['label'] ?>"
-                                 option-tooltip-thumb="<?php echo $swatchThumbPath ?>"
+                                 option-id="<?php /* @escapeNotVerified */ echo $option ?>"
+                                 option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
+                                 option-tooltip-thumb="<?php /* @escapeNotVerified */ echo $swatchThumbPath ?>"
                                  option-tooltip-value=""
-                                 style="background: url(<?php echo $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
+                                 style="background: url(<?php /* @escapeNotVerified */ echo $swatchImagePath ?>) no-repeat center; background-size: initial;"></div>
                             <?php    break;
                         case '1':
                             ?>
-                            <div class="swatch-option color <?php echo $label['custom_style'] ?>"
+                            <div class="swatch-option color <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
                                  option-type="1"
-                                 option-id="<?php echo $option ?>"
-                                 option-label="<?php echo $label['label'] ?>"
+                                 option-id="<?php /* @escapeNotVerified */ echo $option ?>"
+                                 option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
                                  option-tooltip-thumb=""
-                                 option-tooltip-value="<?php echo $swatchData['swatches'][$option]['value'] ?>"
-                                 style="background: <?php echo $swatchData['swatches'][$option]['value'] ?> no-repeat center; background-size: initial;"></div>
+                                 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>
                             <?php    break;
                         case '0':
                         default:
                             ?>
-                                <div class="swatch-option text <?php echo $label['custom_style'] ?>"
+                                <div class="swatch-option text <?php /* @escapeNotVerified */ echo $label['custom_style'] ?>"
                                      option-type="0"
-                                     option-id="<?php echo $option ?>"
-                                     option-label="<?php echo $label['label'] ?>"
+                                     option-id="<?php /* @escapeNotVerified */ echo $option ?>"
+                                     option-label="<?php /* @escapeNotVerified */ echo $label['label'] ?>"
                                      option-tooltip-thumb=""
                                      option-tooltip-value=""
-                                    ><?php echo $swatchData['swatches'][$option]['value'] ?></div>
+                                    ><?php /* @escapeNotVerified */ echo $swatchData['swatches'][$option]['value'] ?></div>
                             <?php    break;
                     } ?>
                 <?php } ?>
@@ -70,7 +70,7 @@
 
 <script>
     require(["jquery", "jquery/ui", "swatchRenderer"], function ($) {
-        $('.swatch-layered.<?php echo $swatchData['attribute_code'] ?>')
+        $('.swatch-layered.<?php /* @escapeNotVerified */ echo $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 4f6d50bdaa786..95d030ddfa392 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,17 +5,17 @@
  */
 ?>
 <?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
-<div class="swatch-opt-<?php echo $block->getProduct()->getId() ?>"></div>
+<div class="swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>"></div>
 <script>
     require(["jquery", "jquery/ui", "swatchRenderer"], function ($) {
-        $('.swatch-opt-<?php echo $block->getProduct()->getId() ?>').SwatchRenderer({
+        $('.swatch-opt-<?php /* @escapeNotVerified */ echo $block->getProduct()->getId() ?>').SwatchRenderer({
             selectorProduct: '.product-item-details',
             onlySwatches: true,
             enableControlLabel: false,
-            numberToShow: <?php echo $block->getNumberSwatchesPerProduct(); ?>,
-            jsonConfig: <?php echo $swatchOptions = $block->getJsonConfig(); ?>,
-            jsonSwatchConfig: <?php echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
-            mediaCallback: '<?php echo $block->getMediaCallback() ?>'
+            numberToShow: <?php /* @escapeNotVerified */ echo $block->getNumberSwatchesPerProduct(); ?>,
+            jsonConfig: <?php /* @escapeNotVerified */ echo $swatchOptions = $block->getJsonConfig(); ?>,
+            jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
+            mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
         });
     });
 </script>
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 bedbcd025e320..f3fff8e081c3d 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
@@ -9,9 +9,9 @@
 <script>
     require(["jquery", "jquery/ui", "swatchRenderer"], function ($) {
         $('.swatch-opt').SwatchRenderer({
-            jsonConfig: <?php echo $swatchOptions = $block->getJsonConfig(); ?>,
-            jsonSwatchConfig: <?php echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
-            mediaCallback: '<?php echo $block->getMediaCallback() ?>'
+            jsonConfig: <?php /* @escapeNotVerified */ echo $swatchOptions = $block->getJsonConfig(); ?>,
+            jsonSwatchConfig: <?php /* @escapeNotVerified */ echo $swatchOptions = $block->getJsonSwatchConfig(); ?>,
+            mediaCallback: '<?php /* @escapeNotVerified */ echo $block->getMediaCallback() ?>'
         });
     });
 </script>
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 a4f05c2b0041c..c3f1c4834dde2 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
@@ -14,7 +14,7 @@
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php echo $block->getRenameFormId() ?>').mage('form').mage('validation');
+    jQuery('#<?php /* @escapeNotVerified */ echo $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 fd9a5ccf77a40..53652a833af82 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 echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
         <?php endif; ?>
-        <?php echo $block->displayPrices($_item->getBaseRowTotal(), $_item->getRowTotal()) ?>
+        <?php /* @escapeNotVerified */ echo $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 echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('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 echo $block->displayPrices($_baseIncl, $_incl) ?>
+        <?php /* @escapeNotVerified */ echo $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 8f595a09cb794..38ab28a7e574d 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 echo $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?php /* @escapeNotVerified */ echo $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 53efb102e2800..8f9bb28af18b9 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 echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
         <?php endif; ?>
 
-        <?php echo $block->displayPrices($_item->getBasePrice(), $_item->getPrice()) ?>
+        <?php /* @escapeNotVerified */ echo $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 echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('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 echo $block->displayPrices($_baseIncl, $_incl) ?>
+        <?php /* @escapeNotVerified */ echo $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 da4325f70a28d..d99ac722416aa 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 echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice($_item->getRowTotal()) ?>
+    <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?php echo $block->formatPrice($_incl) ?>
+    <?php /* @escapeNotVerified */ echo $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 28b22c6a4b9ff..94cf2446a12f8 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 echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?php /* @escapeNotVerified */ echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices($block->getStore())): ?>
-        <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?php echo $block->formatPrice($_incl) ?>
+    <?php /* @escapeNotVerified */ echo $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 85eaa9b5290c7..48ad390616883 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 echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice($_item->getCalculationPrice()) ?>
+    <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getCalculationPrice()) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getPriceInclTax($_item); ?>
-    <?php echo $block->formatPrice($_incl) ?>
+    <?php /* @escapeNotVerified */ echo $block->formatPrice($_incl) ?>
 <?php endif; ?>
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 dca9643affa6a..2fea249bf6b0c 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 echo $this->helper('Magento\Directory\Helper\Data')->getRegionJson() ?>, 'disable');
+    var updater = new RegionUpdater('tax_country_id', 'tax_region', 'tax_region_id', <?php /* @escapeNotVerified */ echo $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 6fa5065229e59..24234fc58e891 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="field">
-            <label class="label"><span><?php echo $_store->getName() ?></span></label>
+            <label class="label"><span><?php /* @escapeNotVerified */ echo $_store->getName() ?></span></label>
             <div class="control">
-                <input class="input-text<?php if ($_store->getId() == 0): ?> required-entry<?php endif; ?>" type="text" name="title[<?php echo $_store->getId() ?>]" value="<?php echo $_labels[$_store->getId()] ?>"/>
+                <input class="input-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()] ?>"/>
             </div>
         </div>
     <?php endforeach; ?>
     <div class="tax-rate-titles-note-td">
-        <strong><?php echo __('Note:'); ?></strong> <?php echo __('Leave this field empty if you wish to use the tax identifier.'); ?>
+        <strong><?php /* @escapeNotVerified */ echo __('Note:'); ?></strong> <?php /* @escapeNotVerified */ echo __('Leave this field empty if you wish to use the tax identifier.'); ?>
     </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 843c57903ca79..c2fa7a5543d56 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/rule/edit.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /** @var $block \Magento\Tax\Block\Adminhtml\Rule\Edit\Form */
 ?>
 <script>
@@ -77,7 +79,7 @@ require([
             $.ajax({
                 type: "POST",
                 data: {id:id},
-                url: '<?php echo $block->getTaxRateLoadUrl()?>',
+                url: '<?php /* @escapeNotVerified */ echo $block->getTaxRateLoadUrl()?>',
                 success: function(result, status) {
                     $('body').trigger('processStop');
                     if (result.success) {
@@ -91,12 +93,12 @@ require([
                         if (result.error_message)
                             alert(result.error_message);
                         else
-                            alert('<?php echo __('An error occurred'); ?>');
+                            alert('<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>');
                     }
                 },
                 error: function () {
                     $('body').trigger('processStop');
-                    alert('<?php echo __('An error occurred'); ?>');
+                    alert('<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>');
                 },
                 dataType: "json"
             });
@@ -105,7 +107,7 @@ require([
         TaxRateEditableMultiselect.prototype.init = function () {
             var options = {
                 toggleAddButton:false,
-                addText: '<?php echo __('Add New Tax Rate'); ?>',
+                addText: '<?php /* @escapeNotVerified */ echo __('Add New Tax Rate'); ?>',
                 parse: null,
                 mselectInputSubmitCallback: function (value, options) {
                     var select = $('#tax_rate');
@@ -127,7 +129,7 @@ require([
             var taxRate = $('#tax_rate'),
                 taxRateField = taxRate.parent(),
                 taxRateForm = $('#tax-rate-form'),
-                taxRateFormElement = $('#<?php echo \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
+                taxRateFormElement = $('#<?php /* @escapeNotVerified */ echo \Magento\Tax\Block\Adminhtml\Rate\Form::FORM_ELEMENT_ID ?>');
 
             if (!this.isEntityEditable) {
                 // Override default layout of editable multiselect
@@ -151,7 +153,7 @@ require([
             taxRateField.find('.mselect-list')
                     .on('click.mselect-edit', '.mselect-edit', this.edit)
                     .on("click.mselect-delete", ".mselect-delete", function () {
-                        if (!confirm('<?php echo __('Do you really want to delete this tax rate?'); ?>')) {
+                        if (!confirm('<?php /* @escapeNotVerified */ echo __('Do you really want to delete this tax rate?'); ?>')) {
                             return;
                         }
 
@@ -167,7 +169,7 @@ require([
                                 form_key: $('input[name="form_key"]').val()
                             },
                             dataType: 'json',
-                            url: '<?php echo $block->getTaxRateDeleteUrl()?>',
+                            url: '<?php /* @escapeNotVerified */ echo $block->getTaxRateDeleteUrl()?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -177,12 +179,12 @@ require([
                                     if (result.error_message)
                                         alert(result.error_message);
                                     else
-                                        alert('<?php echo __('An error occurred'); ?>');
+                                        alert('<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>');
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
-                                alert('<?php echo __('An error occurred'); ?>');
+                                alert('<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>');
                             }
                         };
                         $.ajax(ajaxOptions);
@@ -202,9 +204,9 @@ require([
             taxRateFormElement.mage('form').mage('validation');
 
             taxRateForm.dialogRates({
-                title: '<?php echo __('Tax Rate'); ?>',
+                title: '<?php /* @escapeNotVerified */ echo __('Tax Rate'); ?>',
                 autoOpen: false,
-                id: '<?php echo $block->getJsId() ?>',
+                id: '<?php /* @escapeNotVerified */ echo $block->getJsId() ?>',
                 minWidth: 560,
                 modal: true,
                 dialogClass: 'tax-rate-popup',
@@ -232,8 +234,8 @@ require([
                     $(this).closest('.ui-dialog').removeClass('ui-dialog-active');
                 },
                 buttons: [{
-                    text: '<?php echo __('Save'); ?>',
-                    id: '<?php echo $block->getJsId('apply-button') ?>',
+                    text: '<?php /* @escapeNotVerified */ echo __('Save'); ?>',
+                    id: '<?php /* @escapeNotVerified */ echo $block->getJsId('apply-button') ?>',
                     'class': 'action-save action-primary',
                     click: function() {
                         $(this).dialogRates('updateItemRate');
@@ -252,7 +254,7 @@ require([
                             type: 'POST',
                             data: itemRateData,
                             dataType: 'json',
-                            url: '<?php echo $block->getTaxRateSaveUrl()?>',
+                            url: '<?php /* @escapeNotVerified */ echo $block->getTaxRateSaveUrl()?>',
                             success: function(result, status) {
                                 $('body').trigger('processStop');
                                 if (result.success) {
@@ -275,19 +277,19 @@ require([
                                     if (result.error_message)
                                         alert(result.error_message);
                                     else
-                                        alert('<?php echo __('An error occurred'); ?>');
+                                        alert('<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>');
                                 }
                             },
                             error: function () {
                                 $('body').trigger('processStop');
-                                alert('<?php echo __('An error occurred'); ?>');
+                                alert('<?php /* @escapeNotVerified */ echo __('An error occurred'); ?>');
                             }
                         };
                         $.ajax(ajaxOptions);
                     }
                 }, {
-                    text: '<?php echo __('Cancel'); ?>',
-                    id: '<?php echo $block->getJsId('close-button') ?>',
+                    text: '<?php /* @escapeNotVerified */ echo __('Cancel'); ?>',
+                    id: '<?php /* @escapeNotVerified */ echo $block->getJsId('close-button') ?>',
                     'class': 'action-close',
                     click: function() {
                         $(this).dialogRates("close");
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 d5c0d8aee3b6a..61cb9ace88806 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,7 +10,7 @@
     <div class="grid-loader"></div>
 </div>
 
-<div class="form-inline" id="<?php echo $block->getNameInLayout() ?>" style="display:none">
+<div class="form-inline" id="<?php /* @escapeNotVerified */ echo $block->getNameInLayout() ?>" style="display:none">
     <?php echo $block->getFormHtml();?>
     <?php echo $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 001010bd79146..3e277bd4a4289 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 echo $createUrl ?>'">
-        <?php echo __('Add New Class') ?>
+    <button type="button" onclick="window.location.href='<?php /* @escapeNotVerified */ echo $createUrl ?>'">
+        <?php /* @escapeNotVerified */ echo __('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 911ea345eec12..aa60e9a911eac 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
@@ -17,7 +17,7 @@
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php echo $form->getForm()->getId() ?>').mage('form').mage('validation');
+    jQuery('#<?php /* @escapeNotVerified */ echo $form->getForm()->getId() ?>').mage('form').mage('validation');
 
 });
 </script>
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 ffef43a1956cd..2011ff5bde2e9 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
@@ -16,7 +16,7 @@ require([
     "mage/mage"
 ], function($){
 
-    $('#<?php echo $form->getForm()->getId() ?>').mage('form').mage('validation');
+    $('#<?php /* @escapeNotVerified */ echo $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 cea646fb84537..9011ba50f3981 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 echo $createUrl ?>'">
-        <?php echo __('Add New Tax Rule') ?>
+    <button type="button" onclick="window.location.href='<?php /* @escapeNotVerified */ echo $createUrl ?>'">
+        <?php /* @escapeNotVerified */ echo __('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 419aac45f91fb..4247717787934 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
@@ -18,7 +18,7 @@
 <script>
 require(['jquery', "mage/mage"], function(jQuery){
 
-    jQuery('#<?php echo $form->getForm()->getId() ?>').mage('form').mage('validation');
+    jQuery('#<?php /* @escapeNotVerified */ echo $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 0916d9ee69ae5..7b36a19ffb66f 100644
--- a/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Tax/view/base/templates/pricing/adjustment.phtml
@@ -15,10 +15,10 @@
 ?>
 
 <?php if ($block->displayBothPrices()): ?>
-    <span id="<?php echo $block->buildIdWithPrefix('price-excluding-tax-') ?>"
+    <span id="<?php /* @escapeNotVerified */ echo $block->buildIdWithPrefix('price-excluding-tax-') ?>"
           data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>"
-          data-price-amount="<?php echo $block->getRawAmount() ?>"
+          data-price-amount="<?php /* @escapeNotVerified */ echo $block->getRawAmount() ?>"
           data-price-type="basePrice"
           class="price-wrapper price-excluding-tax">
-        <span class="price"><?php echo $block->getDisplayAmountExclTax() ?></span></span>
+        <span class="price"><?php /* @escapeNotVerified */ echo $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 30b5ed2fd918f..f1525361372cc 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 echo $block->getDisplayAmount() ?>
+    <?php /* @escapeNotVerified */ echo $block->getDisplayAmount() ?>
 <?php elseif ($block->displayPriceExcludingTax()): ?>
-    <?php echo $block->getDisplayAmountExclTax() ?>
+    <?php /* @escapeNotVerified */ echo $block->getDisplayAmountExclTax() ?>
 <?php elseif ($block->displayBothPrices()): ?>
-    <?php echo $block->getDisplayAmount() ?>
+    <?php /* @escapeNotVerified */ echo $block->getDisplayAmount() ?>
     <?php if ($block->getDisplayAmountExclTax() !== $block->getDisplayAmount()): ?>
-        (+<?php echo $block->getDisplayAmountExclTax() ?> Excl. Tax)
+        (+<?php /* @escapeNotVerified */ echo $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 aacf7ef670496..d27b5d84c0a36 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 echo __('Incl. Tax')?>">
+        <span class="price-wrapper price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax')?>">
             <?php $_incl = $_item->getPriceInclTax(); ?>
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_incl) ?>
+            <?php /* @escapeNotVerified */ echo $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 echo __('Excl. Tax')?>">
-            <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_item->getCalculationPrice()) ?>
+        <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>
     <?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 edecadc4a81d1..8420ee5075f36 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 echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <strong><?php echo __('Grand Total Excl. Tax')?></strong>
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Grand Total Excl. Tax')); ?>">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotalExclTax()) ?></strong>
+    <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>
 </tr>
-<?php echo $block->renderTotals('taxes', $block->getColspan()); ?>
+<?php /* @escapeNotVerified */ echo $block->renderTotals('taxes', $block->getColspan()); ?>
 <tr class="grand totals incl">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <strong><?php echo __('Grand Total Incl. Tax')?></strong>
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Grand Total Incl. Tax')); ?>">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <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>
 </tr>
 <?php else:?>
 <tr class="grand totals">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <strong><?php echo $block->getTotal()->getTitle() ?></strong>
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <strong><?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?></strong>
+    <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>
 </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 15edeb3288f7d..605fd43d1b1c3 100644
--- a/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/checkout/shipping.phtml
@@ -13,37 +13,37 @@
 ?>
 <?php if ($block->displayBoth()):?>
 <tr class="totals shipping excl">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <?php echo $block->getExcludeTaxLabel() ?>
+    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+        <?php /* @escapeNotVerified */ echo $block->getExcludeTaxLabel() ?>
     </th>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getExcludeTaxLabel()); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+    <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>
 </tr>
 <tr class="totals shipping incl">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <?php echo $block->getIncludeTaxLabel() ?>
+    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+        <?php /* @escapeNotVerified */ echo $block->getIncludeTaxLabel() ?>
     </th>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getIncludeTaxLabel()); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+    <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>
 </tr>
 <?php elseif ($block->displayIncludeTax()) : ?>
 <tr class="totals shipping incl">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <?php echo $block->getTotal()->getTitle() ?>
+    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
     </th>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingIncludeTax()) ?>
+    <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>
 </tr>
 <?php else:?>
 <tr class="totals shipping excl">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
+    <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>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getShippingExcludeTax()) ?>
+    <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>
 </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 3032874d71d48..8215044071336 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 echo $_excl; ?></span>
+    <span class="price"><?php /* @escapeNotVerified */ echo $_excl; ?></span>
 <?php else: ?>
 <?php if ($block->displayShippingBothPrices() && $_incl != $_excl): ?>
-    <span class="price-including-tax" data-label="<?php echo __('Incl. Tax'); ?>">
+    <span class="price-including-tax" data-label="<?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>">
 <?php endif; ?>
-    <span class="price"><?php echo $_incl; ?></span>
+    <span class="price"><?php /* @escapeNotVerified */ echo $_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 echo __('Excl. Tax'); ?>"><span class="price"><?php echo $_excl; ?></span></span>
+    <span class="price-excluding-tax" data-label="<?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>"><span class="price"><?php /* @escapeNotVerified */ echo $_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 7b5fe4375630b..42b3a80f471fd 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 echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <?php echo __('Subtotal (Excl. Tax)') ?>
+    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+        <?php /* @escapeNotVerified */ echo __('Subtotal (Excl. Tax)') ?>
     </th>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Subtotal (Excl. Tax)')); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueExclTax()) ?>
+    <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>
 </tr>
 <tr class="totals sub incl">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <?php echo __('Subtotal (Incl. Tax)') ?>
+    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+        <?php /* @escapeNotVerified */ echo __('Subtotal (Incl. Tax)') ?>
     </th>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml(__('Subtotal (Incl. Tax)')); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValueInclTax()) ?>
+    <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>
 </tr>
 <?php else : ?>
 <tr class="totals sub">
-    <th style="<?php echo $block->getStyle() ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
-        <?php echo $block->getTotal()->getTitle() ?>
+    <th style="<?php /* @escapeNotVerified */ echo $block->getStyle() ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
+        <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
     </th>
-    <td style="<?php echo $block->getStyle() ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($block->getTotal()->getValue()) ?>
+    <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>
 </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 1d47c6cd07917..5961f8abd0643 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 echo $attributes; ?>>
-    <th style="<?php echo $_style ?>" class="mark" colspan="<?php echo $block->getColspan(); ?>" scope="row">
+<tr <?php /* @escapeNotVerified */ echo $attributes; ?>>
+    <th style="<?php /* @escapeNotVerified */ echo $_style ?>" class="mark" colspan="<?php /* @escapeNotVerified */ echo $block->getColspan(); ?>" scope="row">
         <?php if ($this->helper('Magento\Tax\Helper\Data')->displayFullSummary()): ?>
-            <span class="detailed"><?php echo $block->getTotal()->getTitle() ?></span>
+            <span class="detailed"><?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?></span>
         <?php else: ?>
-            <?php echo $block->getTotal()->getTitle() ?>
+            <?php /* @escapeNotVerified */ echo $block->getTotal()->getTitle() ?>
         <?php endif;?>
     </th>
-    <td style="<?php echo $_style ?>" class="amount" data-th="<?php echo $block->escapeHtml($block->getTotal()->getTitle()); ?>">
-        <?php echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($_value) ?>
+    <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>
 </tr>
 
@@ -49,17 +49,17 @@
         <?php $isFirst = 1; ?>
 
         <?php foreach ($rates as $rate): ?>
-            <tr class="totals-tax-details details-<?php echo $taxIter; ?>">
-                <th class="mark" style="<?php echo $_style ?>" colspan="<?php echo $block->getColspan(); ?>" scope="row">
+            <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']); ?>
                     <?php if (!is_null($rate['percent'])): ?>
                         (<?php echo (float)$rate['percent']; ?>%)
                     <?php endif; ?>
                 </th>
                 <?php if ($isFirst): ?>
-                    <td style="<?php echo $_style ?>" class="amount" rowspan="<?php echo count($rates); ?>"
+                    <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 echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
+                        <?php /* @escapeNotVerified */ echo $this->helper('Magento\Checkout\Helper\Data')->formatPrice($amount); ?>
                     </td>
                 <?php endif; ?>
             </tr>
diff --git a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
index 35dddc6cad5cc..0c42d2fddb761 100644
--- a/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Tax/view/frontend/templates/email/items/price/row.phtml
@@ -17,16 +17,16 @@ $_order = $_item->getOrder();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= __('Excl. Tax') ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?= $_order->formatPrice($_item->getRowTotal()) ?>
+    <?= /* @escapeNotVerified */  $_order->formatPrice($_item->getRowTotal()) ?>
 <?php endif; ?>
 
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
     <?php endif; ?>
     <?php $_incl = $this->helper('Magento\Checkout\Helper\Data')->getSubtotalInclTax($_item); ?>
-    <?= $_order->formatPrice($_incl) ?>
+    <?= /* @escapeNotVerified */  $_order->formatPrice($_incl) ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Tax/view/frontend/templates/item/price/row.phtml
index 4c5c8b4243d07..0da6aa819df91 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
@@ -13,7 +13,7 @@ $_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="cart-price">
-            <?php echo $block->formatPrice($_item->getRowTotalInclTax()) ?>
+            <?php /* @escapeNotVerified */ echo $block->formatPrice($_item->getRowTotalInclTax()) ?>
         </span>
     </span>
 <?php endif; ?>
@@ -21,7 +21,7 @@ $_item = $block->getItem();
 <?php if (($block->displayPriceExclTax() || $block->displayBothPrices()) && !$_item->getNoSubtotal()): ?>
     <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax'));?>">
         <span class="cart-price">
-            <?php echo $block->formatPrice($_item->getRowTotal()) ?>
+            <?php /* @escapeNotVerified */ echo $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 a5779add72dad..71a477083a721 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 echo $_order->formatPrice($block->getTotalAmount($_item))?>
+<?php /* @escapeNotVerified */ echo $_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 0e900f635e10f..ecb965935b11c 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
@@ -15,7 +15,7 @@ $_item = $block->getItem();
     <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
         <?php $_incl = $_item->getPriceInclTax(); ?>
         <span class="cart-price">
-            <?php echo $block->formatPrice($_incl) ?>
+            <?php /* @escapeNotVerified */ echo $block->formatPrice($_incl) ?>
         </span>
     </span>
 <?php endif; ?>
@@ -23,7 +23,7 @@ $_item = $block->getItem();
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
         <span class="cart-price">
-            <?php echo $block->formatPrice($block->getItemDisplayPriceExclTax()) ?>
+            <?php /* @escapeNotVerified */ echo $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 36b0d9abe758d..bd09b8d651ec3 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 echo $taxIter; ?> <?php echo($block->getIsPlaneMode()) ? ' plane' : '';?>">
-                <td <?php echo $block->getLabelProperties()?>>
+            <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); ?>
                     <?php if (!is_null($percent)): ?>
                         (<?php echo (float)$percent; ?>%)
                     <?php endif; ?>
                     <br />
                 </td>
-                <td <?php echo $block->getValueProperties()?> rowspan="1">
-                    <?php echo $_order->formatPrice($amount); ?>
+                <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?> rowspan="1">
+                    <?php /* @escapeNotVerified */ echo $_order->formatPrice($amount); ?>
                 </td>
             </tr>
         <?php endforeach; ?>
@@ -44,14 +44,14 @@
 <?php else: ?>
 <tr class="totals-tax">
 <?php endif; ?>
-    <th <?php echo $block->getLabelProperties()?> scope="row">
+    <th <?php /* @escapeNotVerified */ echo $block->getLabelProperties()?> scope="row">
         <?php if ($block->displayFullSummary()): ?>
-            <div class="detailed"><?php echo __('Tax'); ?></div>
+            <div class="detailed"><?php /* @escapeNotVerified */ echo __('Tax'); ?></div>
         <?php else: ?>
-            <?php echo __('Tax'); ?>
+            <?php /* @escapeNotVerified */ echo __('Tax'); ?>
         <?php endif;?>
     </th>
-    <td <?php echo $block->getValueProperties()?> data-th="<?php echo $block->escapeHtml(__('Tax')); ?>">
-        <?php echo $_order->formatPrice($_source->getTaxAmount()) ?>
+    <td <?php /* @escapeNotVerified */ echo $block->getValueProperties()?> data-th="<?php echo $block->escapeHtml(__('Tax')); ?>">
+        <?php /* @escapeNotVerified */ echo $_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 07f32389d58ab..c2391cccaf92b 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -11,11 +11,11 @@
     <?php if (!$block->getIsReadonly()): ?>
     <div class="import-tax-rates">
         <?php if ($block->getUseContainer()): ?>
-        <form id="import-form" action="<?php echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
+        <form id="import-form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
         <?php endif; ?>
             <?php echo $block->getBlockHtml('formkey')?>
             <fieldset class="fieldset">
-                <legend class="legend"><span><?php echo __('Import Tax Rates') ?></span></legend>
+                <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Import Tax Rates') ?></span></legend>
                 <input type="file" name="import_rates_file" class="input-file required-entry"/>
                 <?php echo $block->getButtonHtml('Import Tax Rates', '', 'import-submit') ?>
             </fieldset>
@@ -44,11 +44,11 @@ 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" action="<?php echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
+        <form id="export_form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
         <?php endif; ?>
             <?php echo $block->getBlockHtml('formkey')?>
             <fieldset class="fieldset">
-                <legend class="legend"><span><?php echo __('Export Tax Rates') ?></span></legend>
+                <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Export Tax Rates') ?></span></legend>
                 <?php echo $block->getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
             </fieldset>
         <?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 771617e828629..1d1a41632209d 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml
@@ -16,7 +16,7 @@
 <div class="content-header skip-header" id="content_header">
     <table>
         <tr>
-            <td><h3 id="content_header_text"><?php echo $block->getHeaderText() ?></h3></td>
+            <td><h3 id="content_header_text"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></h3></td>
             <td class="form-buttons">
                 <?php echo $block->getButtonsHtml() ?>
             </td>
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 00d1c60a5a90f..43c8ccc5b3a54 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 echo $file['id'] ?>">
+        <div class="filecnt file-font" id="<?php /* @escapeNotVerified */ echo $file['id'] ?>">
             <p class="nm">
-                <?php echo $file['text'] ?>
+                <?php /* @escapeNotVerified */ echo $file['text'] ?>
                 <?php if (isset($file['thumbnailParams'])): ?>
-                    <img src="<?php echo $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
+                    <img src="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
                 <?php endif; ?>
             </p>
         </div>
     <?php endforeach; ?>
 <?php else: ?>
-    <?php echo __('We found no files.') ?>
+    <?php /* @escapeNotVerified */ echo __('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 abf12c73a6175..36b092a2628e5 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
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
@@ -10,9 +12,9 @@
 
 <div id="<?php echo $block->getHtmlId() ?>" class="uploader">
     <span class="fileinput-button form-buttons">
-        <span><?php echo __('Browse Files') ?></span>
-        <input id="fileupload" type="file" name="<?php echo $block->getConfig()->getFileField() ?>"
-            data-url="<?php echo $block->getConfig()->getUrl() ?>" multiple>
+        <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>
     <div class="clear"></div>
     <script id="<?php echo $block->getHtmlId() ?>-template" type="text/x-magento-template">
@@ -41,7 +43,7 @@ require([
             form_key: FORM_KEY
         },
         sequentialUploads: true,
-        maxFileSize: <?php echo $block->getFileSizeService()->getMaxFileSize() ?> ,
+        maxFileSize: <?php /* @escapeNotVerified */ echo $block->getFileSizeService()->getMaxFileSize() ?> ,
         add: function (e, data) {
             var progressTmpl = mageTemplate('#<?php echo $block->getHtmlId(); ?>-template'),
                 fileSize,
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 a6af3ddbab27e..4fe1d1b1aec25 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml
@@ -19,7 +19,7 @@ require([
     $( '#css_file_uploader' ).fileupload({
         dataType: 'json',
         replaceFileInput: false,
-        url : '<?php echo $block->getUrl('*/system_design_theme/uploadcss') ?>',
+        url : '<?php /* @escapeNotVerified */ echo $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 65788230276d5..fe422a6824742 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
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php /** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */ ?>
 
@@ -30,7 +32,7 @@
                 id="remove_js_files_<%- data.id %>"
                 name="js_removed_files[]"
                 value="<%- data.id %>" />
-            <label for="remove_js_files_<%- data.id %>"><?php echo __('Remove') ?></label>
+            <label for="remove_js_files_<%- data.id %>"><?php /* @escapeNotVerified */ echo __('Remove') ?></label>
         </div>
     </div>
 
@@ -58,7 +60,7 @@ jQuery(function($) {
     });
     $('body').trigger(
         'refreshJsList',
-        {jsList: <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>}
+        {jsList: <?php /* @escapeNotVerified */ echo $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 f8d938075e972..8c7e677ceeb20 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml
@@ -20,7 +20,7 @@ require([
         dataType: 'json',
         replaceFileInput: false,
         sequentialUploads: true,
-        url: '<?php echo $block->getJsUploadUrl(); ?>',
+        url: '<?php /* @escapeNotVerified */ echo $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 986a01292f44d..96c7e231dc531 100644
--- a/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
+++ b/app/code/Magento/Theme/view/adminhtml/templates/title.phtml
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+// @codingStandardsIgnoreFile
+
 /**
  * @var $block \Magento\Theme\Block\Html\Title
  */
@@ -12,7 +14,7 @@ $titleClass = ($block->getTitleClass()) ? ' ' . $block->getTitleClass() : '';
 $title = $block->escapeHtml($block->getPageTitle());
 ?>
 
-<div class="page-title-wrapper<?php echo $titleClass; ?>">
-    <h1 class="page-title"<?php echo $titleId?>><?php echo $title ?></h1>
+<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>
diff --git a/app/code/Magento/Theme/view/base/templates/root.phtml b/app/code/Magento/Theme/view/base/templates/root.phtml
index df0de42938530..d1c06948cf384 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 echo $htmlAttributes ?>>
-    <head <?php echo $headAttributes ?>>
-        <?php echo $requireJs ?>
-        <?php echo $headContent ?>
-        <?php echo $headAdditional ?>
+<html <?php /* @escapeNotVerified */ echo $htmlAttributes ?>>
+    <head <?php /* @escapeNotVerified */ echo $headAttributes ?>>
+        <?php /* @escapeNotVerified */ echo $requireJs ?>
+        <?php /* @escapeNotVerified */ echo $headContent ?>
+        <?php /* @escapeNotVerified */ echo $headAdditional ?>
     </head>
-    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?php echo $loaderIcon; ?>"}}' <?php echo $bodyAttributes ?>>
-        <?php echo $layoutContent ?>
+    <body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?php /* @escapeNotVerified */ echo $loaderIcon; ?>"}}' <?php /* @escapeNotVerified */ echo $bodyAttributes ?>>
+        <?php /* @escapeNotVerified */ echo $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 4dde3b81f9f3d..870a9d1adfca4 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 echo $block->getLinkUrl() ?>" title="<?php echo __($block->getImgAlt()) ?>">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getLinkUrl() ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
         <?php elseif ($block->getLinkUrl()): ?>
-            <a href="<?php echo $block->getUrl($block->getLinkUrl()) ?>" title="<?php echo __($block->getImgAlt()) ?>">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl($block->getLinkUrl()) ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
         <?php endif; ?>
-            <img src="<?php echo $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?php echo __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?php echo __($block->getImgAlt()) ?>" />
+            <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()) ?>" />
         <?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 4dde3b81f9f3d..870a9d1adfca4 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 echo $block->getLinkUrl() ?>" title="<?php echo __($block->getImgAlt()) ?>">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getLinkUrl() ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
         <?php elseif ($block->getLinkUrl()): ?>
-            <a href="<?php echo $block->getUrl($block->getLinkUrl()) ?>" title="<?php echo __($block->getImgAlt()) ?>">
+            <a href="<?php /* @escapeNotVerified */ echo $block->getUrl($block->getLinkUrl()) ?>" title="<?php /* @escapeNotVerified */ echo __($block->getImgAlt()) ?>">
         <?php endif; ?>
-            <img src="<?php echo $block->getViewFileUrl($block->getImgSrc()) ?>"<?php if (!$block->getLinkUrl()): ?> title="<?php echo __($block->getImgAlt()) ?>"<?php endif; ?> alt="<?php echo __($block->getImgAlt()) ?>" />
+            <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()) ?>" />
         <?php if ($block->getLinkUrl()): ?>
         </a>
         <?php endif ?>
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 73516b8dc6aa3..6e99452de82ad 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 echo $block->getBlockCss(); ?>">
-    <div class="block-title <?php echo $block->getBlockCss(); ?>-title"><strong><?php echo $block->getBlockTitle(); ?></strong></div>
-    <div class="block-content <?php echo $block->getBlockCss(); ?>-content">
+<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>
 </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 593de2d84fd23..34836aaddef2c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/breadcrumbs.phtml
@@ -11,9 +11,9 @@
 <div class="breadcrumbs">
     <ul class="items">
         <?php foreach ($crumbs as $crumbName => $crumbInfo) : ?>
-            <li class="item <?php echo $crumbName ?>">
+            <li class="item <?php /* @escapeNotVerified */ echo $crumbName ?>">
             <?php if ($crumbInfo['link']) : ?>
-                <a href="<?php echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>">
+                <a href="<?php /* @escapeNotVerified */ echo $crumbInfo['link'] ?>" title="<?php echo $block->escapeHtml($crumbInfo['title']) ?>">
                     <?php echo $block->escapeHtml($crumbInfo['label']) ?>
                 </a>
             <?php elseif ($crumbInfo['last']) : ?>
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 1b984b454f0a5..3432cc0f6e150 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 echo __('Help Us Keep Magento Healthy') ?></span>
+    <span><?php /* @escapeNotVerified */ echo __('Help Us Keep Magento Healthy') ?></span>
     <a href="http://www.magentocommerce.com/bug-tracking"
        target="_blank">
-        <?php echo __('Report All Bugs') ?>
+        <?php /* @escapeNotVerified */ echo __('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 f15df62881a89..d213aa3427f0f 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 echo $block->getBlockCss(); ?>">
-    <div class="title <?php echo $block->getBlockCss();?>-title" data-mage-init='{"toggleAdvanced": {"toggleContainers": "#<?php echo $block->getBlockCss(); ?>", "selectorsToggleClass": "active"}}'>
-        <strong><?php echo $block->getBlockTitle(); ?></strong>
+<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>
-    <div class="content <?php echo $block->getBlockCss(); ?>-content" id="<?php echo $block->getBlockCss(); ?>">
+    <div class="content <?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>-content" id="<?php /* @escapeNotVerified */ echo $block->getBlockCss(); ?>">
         <?php echo $block->getChildHtml(); ?>
     </div>
 </div>
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 f00f3df13748d..9679d6ffb0d32 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 echo $block->getCopyright() ?></span>
+    <span><?php /* @escapeNotVerified */ echo $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 f158afa5e9c95..5116ede854133 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/footer.phtml
@@ -10,10 +10,10 @@
 <div class="footer-container">
     <div class="footer">
         <?php echo $block->getChildHtml() ?>
-        <p class="bugs"><?php echo __('Help Us Keep Magento Healthy') ?> - <a
+        <p class="bugs"><?php /* @escapeNotVerified */ echo __('Help Us Keep Magento Healthy') ?> - <a
             href="http://www.magentocommerce.com/bug-tracking"
-            target="_blank"><strong><?php echo __('Report All Bugs') ?></strong></a>
+            target="_blank"><strong><?php /* @escapeNotVerified */ echo __('Report All Bugs') ?></strong></a>
         </p>
-        <address><?php echo $block->getCopyright() ?></address>
+        <address><?php /* @escapeNotVerified */ echo $block->getCopyright() ?></address>
     </div>
 </div>
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 117702ec31208..904abbc5905b8 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,14 +11,14 @@
  */
 ?>
 <?php $storeName = $block->getThemeName() ? $block->getThemeName() : $block->getLogoAlt();?>
-<span data-action="toggle-nav" class="action nav-toggle"><span><?php echo __('Toggle Nav') ?></span></span>
+<span data-action="toggle-nav" class="action nav-toggle"><span><?php /* @escapeNotVerified */ echo __('Toggle Nav') ?></span></span>
 <?php if ($block->isHomePage()):?>
     <strong class="logo">
 <?php else: ?>
-    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php echo $storeName ?>">
+    <a class="logo" href="<?php echo $block->getUrl(''); ?>" title="<?php /* @escapeNotVerified */ echo $storeName ?>">
 <?php endif ?>
-        <img src="<?php echo $block->getLogoSrc() ?>"
-             alt="<?php echo $block->getLogoAlt() ?>"
+        <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() . '"' : '' ?>
         />
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 673fb830b5a4f..9dfa06cdb6eb4 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 echo __('JavaScript seems to be disabled in your browser.'); ?></strong>
-                    <span><?php echo __('For the best experience on our site, be sure to turn on Javascript in your browser.'); ?></span>
+                    <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>
                 </p>
             </div>
         </div>
@@ -28,8 +28,8 @@
     <div class="notice global site local_storage" style="display: none;">
         <div class="content">
             <p>
-                <strong><?php echo __('Local Storage seems to be disabled in your browser.'); ?></strong><br />
-                <?php echo __('For the best experience on our site, be sure to turn on Local Storage in your browser.'); ?>
+                <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.'); ?>
             </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 echo __('This is demo store. No orders will be fulfilled.') ?></p>
+            <p><?php /* @escapeNotVerified */ echo __('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 d38a7f72de14b..e7835bee90cc6 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 echo __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum()) ?>
+                <?php /* @escapeNotVerified */ echo __('Items %1 to %2 of %3 total', $block->getFirstNum(), $block->getLastNum(), $block->getTotalNum()) ?>
             <?php elseif ($block->getTotalNum() == 1): ?>
-                <?php echo __('%1 Item', $block->getTotalNum()) ?>
+                <?php /* @escapeNotVerified */ echo __('%1 Item', $block->getTotalNum()) ?>
             <?php else: ?>
-                <?php echo __('%1 Item(s)', $block->getTotalNum()) ?>
+                <?php /* @escapeNotVerified */ echo __('%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 echo __('Page') ?></strong>
+            <strong class="label pages-label" id="paging-label"><?php /* @escapeNotVerified */ echo __('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 echo $text ? 'link ' : 'action '?> previous" href="<?php echo $block->getPreviousPageUrl() ?>" title="<?php echo $text ? $text : __('Previous') ?>">
-                        <span class="label"><?php echo __('Page') ?></span>
-                        <span><?php echo $text ? $text : __('Previous') ?></span>
+                    <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>
                 </li>
             <?php endif;?>
 
             <?php if ($block->canShowFirst()): ?>
                 <li class="item">
-                    <a class="page first" href="<?php echo $block->getFirstPageUrl() ?>">
-                        <span class="label"><?php echo __('Page') ?></span>
+                    <a class="page first" href="<?php /* @escapeNotVerified */ echo $block->getFirstPageUrl() ?>">
+                        <span class="label"><?php /* @escapeNotVerified */ echo __('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 echo $block->getPreviousJumpUrl() ?>">
+                    <a class="page previous jump" title="" href="<?php /* @escapeNotVerified */ echo $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 echo __('You\'re currently reading page') ?></span>
-                            <span><?php echo $_page ?></span>
+                            <span class="label"><?php /* @escapeNotVerified */ echo __('You\'re currently reading page') ?></span>
+                            <span><?php /* @escapeNotVerified */ echo $_page ?></span>
                         </strong>
                     </li>
                 <?php else: ?>
                     <li class="item">
-                        <a href="<?php echo $block->getPageUrl($_page) ?>" class="page">
-                            <span class="label"><?php echo __('Page') ?></span>
-                            <span><?php echo $_page ?></span>
+                        <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>
                     </li>
                 <?php endif;?>
@@ -85,7 +85,7 @@
 
             <?php if ($block->canShowNextJump()): ?>
                 <li class="item">
-                    <a class="page next jump" title="" href="<?php echo $block->getNextJumpUrl() ?>">
+                    <a class="page next jump" title="" href="<?php /* @escapeNotVerified */ echo $block->getNextJumpUrl() ?>">
                         <span>...</span>
                     </a>
                 </li>
@@ -93,9 +93,9 @@
 
             <?php if ($block->canShowLast()): ?>
               <li class="item">
-                  <a class="page last" href="<?php echo $block->getLastPageUrl() ?>">
-                      <span class="label"><?php echo __('Page') ?></span>
-                      <span><?php echo $block->getLastPageNum() ?></span>
+                  <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>
               </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 echo $text ? 'link ' : 'action '?> next" href="<?php echo $block->getNextPageUrl() ?>" title="<?php echo $text ? $text : __('Next') ?>">
-                        <span class="label"><?php echo __('Page') ?></span>
-                        <span><?php echo $text ? $text : __('Next') ?></span>
+                    <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>
                 </li>
             <?php endif;?>
@@ -115,16 +115,16 @@
 
     <?php if ($block->isShowPerPage()): ?>
         <div class="limiter">
-            <strong class="limiter-label"><?php echo __('Show') ?></strong>
+            <strong class="limiter-label"><?php /* @escapeNotVerified */ echo __('Show') ?></strong>
             <select id="limiter" data-mage-redirect="{'event':'change'}" class="limiter-options">
                 <?php foreach ($block->getAvailableLimit() as $_key => $_limit): ?>
-                    <option value="<?php echo $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
+                    <option value="<?php /* @escapeNotVerified */ echo $block->getLimitUrl($_key) ?>"<?php if ($block->isLimitCurrent($_key)): ?>
                         selected="selected"<?php endif ?>>
-                        <?php echo $_limit ?>
+                        <?php /* @escapeNotVerified */ echo $_limit ?>
                     </option>
                 <?php endforeach; ?>
             </select>
-            <span class="limiter-text"><?php echo __('per page') ?></span>
+            <span class="limiter-text"><?php /* @escapeNotVerified */ echo __('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 2d7aba1a02bb5..f44f7f1c29fc0 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 echo $groupCss ?>">
+    <div class="sections <?php /* @escapeNotVerified */ echo $groupCss ?>">
         <?php $layout = $block->getLayout(); ?>
-        <div class="section-items <?php echo $groupCss ?>-items" data-mage-init='<?php echo $groupBehavior ?>'>
+        <div class="section-items <?php /* @escapeNotVerified */ echo $groupCss ?>-items" data-mage-init='<?php /* @escapeNotVerified */ echo $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 echo $groupCss ?>-item-title" data-role="collapsible">
-                    <a class="<?php echo $groupCss ?>-item-switch" data-toggle="switch" href="#<?php echo $alias; ?>"><?php echo $label; ?></a>
+                <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>
-                <div class="section-item-content <?php echo $groupCss ?>-item-content" id="<?php echo $alias; ?>" data-role="content"><?php echo $html; ?></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>
             <?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 b58dd7019b60a..72ad559d8e24c 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/skip.phtml
@@ -3,7 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 $target = $block->getTarget();
 $label = $block->getLabel();
 ?>
-<a class="action skip <?php echo $target?>" href="#<?php echo $target?>"><span><?php echo $label ?></span></a>
+<a class="action skip <?php /* @escapeNotVerified */ echo $target?>" href="#<?php /* @escapeNotVerified */ echo $target?>"><span><?php /* @escapeNotVerified */ echo $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 4d676a2b5ac8c..1b2abc0fcfa87 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 echo $target_id?>" name="<?php echo $target_id?>" tabindex="-1"></a>
+<a id="<?php /* @escapeNotVerified */ echo $target_id?>" name="<?php /* @escapeNotVerified */ echo $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 a7ee310ea0d86..1b9fb45d47c1d 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/title.phtml
@@ -17,13 +17,13 @@ if (trim($block->getPageTitle())) {
 }
 ?>
 <?php if ($title): ?>
-<div class="page-title-wrapper<?php echo $cssClass; ?>">
+<div class="page-title-wrapper<?php /* @escapeNotVerified */ echo $cssClass; ?>">
     <h1 class="page-title"
-        <?php if ($block->getId()): ?> id="<?php echo $block->getId();?>" <?php endif; ?>
+        <?php if ($block->getId()): ?> id="<?php /* @escapeNotVerified */ echo $block->getId();?>" <?php endif; ?>
         <?php if ($block->getAddBaseAttributeAria()): ?>
-            aria-labelledby="<?php echo $block->getAddBaseAttributeAria(); ?>"
+            aria-labelledby="<?php /* @escapeNotVerified */ echo $block->getAddBaseAttributeAria(); ?>"
         <?php endif; ?>>
-        <?php echo $title ?>
+        <?php /* @escapeNotVerified */ echo $title ?>
     </h1>
     <?php echo $block->getChildHtml(); ?>
 </div>
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 807fc101d1849..c0aa755546bff 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml
@@ -19,6 +19,6 @@
 
 <nav class="navigation" role="navigation">
     <ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
-        <?php echo $_menu; ?>
+        <?php /* @escapeNotVerified */ echo $_menu; ?>
     </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 8a276e8af760b..ae9cb39db395b 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 echo $days['wide']?>,
-            dayNamesMin: <?php echo $days['abbreviated']?>,
-            monthNames: <?php echo $months['wide']?>,
-            monthNamesShort: <?php echo $months['abbreviated']?>,
-            infoTitle: "<?php echo __('About the calendar');?>",
-            firstDay: <?php echo $firstDay?>,
-            closeText: "<?php echo __('Close');?>",
-            currentText: "<?php echo __('Go Today'); ?>",
-            prevText: "<?php echo __('Previous');?>",
-            nextText: "<?php echo __('Next');?>",
-            weekHeader: "<?php echo __('WK'); ?>",
-            timeText: "<?php echo __('Time');?>",
-            hourText: "<?php echo __('Hour');?>",
-            minuteText: "<?php echo __('Minute');?>",
+            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');?>",
             dateFormat: $.datepicker.RFC_2822,
             showOn: "button",
             showAnim: "",
@@ -51,7 +51,7 @@ require([
         }
     });
 
-    enUS = <?php echo $enUS?>; // en_US locale reference
+    enUS = <?php /* @escapeNotVerified */ echo $enUS?>; // en_US locale reference
 //]]>
 
 });
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 f7342d636c1aa..892bc2a502baa 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 echo $block->getPath()?>",
-                "domain": "<?php echo $block->getDomain()?>",
+                "path": "<?php /* @escapeNotVerified */ echo $block->getPath()?>",
+                "domain": "<?php /* @escapeNotVerified */ echo $block->getDomain()?>",
                 "secure": false,
-                "lifetime": "<?php echo $block->getLifetime()?>"
+                "lifetime": "<?php /* @escapeNotVerified */ echo $block->getLifetime()?>"
             }
         }
     }
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 a9c176068e08e..b465efbdbf68c 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 @@
 
 ?>
 
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('mage/translate-inline.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php /* @escapeNotVerified */ echo $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">
@@ -54,7 +54,7 @@
 </script>
 
 <div data-role="translate-dialog"
-     data-mage-init='{"translateInline":{"ajaxUrl":"<?php echo $block->getAjaxUrl() ?>"},"loader":{}}'></div>
+     data-mage-init='{"translateInline":{"ajaxUrl":"<?php /* @escapeNotVerified */ echo $block->getAjaxUrl() ?>"},"loader":{}}'></div>
 <script>
 require([
     "jquery",
@@ -63,7 +63,7 @@ require([
 ], function($){
         $('body').editTrigger(
             {
-                img: '<?php echo $block->getViewFileUrl('Magento_Theme::fam_book_open.png') ?>',
+                img: '<?php /* @escapeNotVerified */ echo $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 70706e924c3e4..d95988f1b0dfa 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -11,7 +11,7 @@
         {
             "*": {
                 "Magento_Translation/js/add-to-translate": {
-                    "config": "text!<?php echo Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME?>"
+                    "config": "text!<?php /* @escapeNotVerified */ echo Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME?>"
                 }
             }
         }
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 0a0cf523de1e1..a0540dfb90367 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 @@
 
 ?>
 
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Theme::prototype/magento.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('mage/translate-inline.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('Magento_Theme::prototype/magento.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php /* @escapeNotVerified */ echo $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->getAjaxUrl() ?>"},"loader":{}}'></div>
+     data-mage-init='{"translateInline":{"ajaxUrl":"<?php /* @escapeNotVerified */ echo $block->getAjaxUrl() ?>"},"loader":{}}'></div>
 <script type="text/x-magento-init">
     {
         "body": {
             "editTrigger": {
-                "img": "<?php echo $block->getViewFileUrl('Magento_Theme::fam_book_open.png') ?>",
+                "img": "<?php /* @escapeNotVerified */ echo $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 382b98dfc0a63..734d179f7b9b9 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
@@ -13,7 +13,7 @@
  */
 ?>
 <?php echo $block->getBeforeHtml(); ?>
-<button <?php echo $block->getAttributesHtml(), $block->getUiId(); ?>>
-    <span><?php echo $block->getLabel(); ?></span>
+<button <?php /* @escapeNotVerified */ echo $block->getAttributesHtml(), $block->getUiId(); ?>>
+    <span><?php /* @escapeNotVerified */ echo $block->getLabel(); ?></span>
 </button>
 <?php echo $block->getAfterHtml(); ?>
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 3f42ae4317286..b6a65f03091b1 100644
--- a/app/code/Magento/Ui/view/base/templates/form/default.phtml
+++ b/app/code/Magento/Ui/view/base/templates/form/default.phtml
@@ -3,15 +3,17 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 /**
  * @var \Magento\Ui\Component\Form $block
  */
-echo $block->renderChildComponent('before_form');
+/* @escapeNotVerified */ echo $block->renderChildComponent('before_form');
 ?>
-<div data-role="spinner" data-component="<?php echo $block->getName(); ?>.areas" class="admin__data-grid-loading-mask">
+<div data-role="spinner" data-component="<?php /* @escapeNotVerified */ echo $block->getName(); ?>.areas" class="admin__data-grid-loading-mask">
     <div class="grid-loader"></div>
 </div>
-<div data-bind="scope: '<?php echo $block->getName(); ?>.areas'" class="entry-edit form-inline">
+<div data-bind="scope: '<?php /* @escapeNotVerified */ echo $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 d9937521b9720..c3859698d5d85 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 echo $block->getData('label'); ?>
+    <?php /* @escapeNotVerified */ echo $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 903883c46a675..3620d97788d9b 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 echo $block->getDataScope(); ?>.sections' " class="ui-tabs">
+<div data-bind="scope: '<?php /* @escapeNotVerified */ echo $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 471cf5f85bb6c..51a1ca4032b1a 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 echo $block->getDataScope(); ?>.sections' " class="ui-tabs">
+<div data-bind="scope: '<?php /* @escapeNotVerified */ echo $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 ddb3e569683ab..1db8cbc67afdc 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 echo $block->getSessionStorageKey(); ?>";
+            var key = "<?php /* @escapeNotVerified */ echo $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 2aa8cca2bd5e5..d7ab4160a2c9c 100644
--- a/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
+++ b/app/code/Magento/Ui/view/base/templates/stepswizard.phtml
@@ -8,16 +8,16 @@
 
 /** @var $block \Magento\Ui\Block\Component\StepsWizard */
 ?>
-    <div data-role="steps-wizard-main" class="steps-wizard" data-bind="scope: '<?= $block->getComponentName()?>'">
+    <div data-role="steps-wizard-main" class="steps-wizard" data-bind="scope: '<?= /* @escapeNotVerified */  $block->getComponentName()?>'">
         <div data-role="messages" class="messages"></div>
 
         <div data-role="steps-wizard-controls" class="steps-wizard-navigation">
             <ul class="nav-bar">
                 <?php foreach ($block->getSteps() as $step) { ?>
-                    <li data-role="collapsible" data-bind="css: { 'active': selectedStep() == '<?= $step->getComponentName() ?>'}">
-                        <a href="#<?= $step->getComponentName() ?>"
+                    <li data-role="collapsible" data-bind="css: { 'active': selectedStep() == '<?= /* @escapeNotVerified */  $step->getComponentName() ?>'}">
+                        <a href="#<?= /* @escapeNotVerified */  $step->getComponentName() ?>"
                            data-bind="click: showSpecificStep">
-                            <?= $step->getCaption() ?>
+                            <?= /* @escapeNotVerified */  $step->getCaption() ?>
                         </a>
                     </li>
                 <?php } ?>
@@ -26,20 +26,20 @@
                 <div class="action-wrap action-wrap-next" data-role="step-wizard-next">
                     <button type="button"
                             class="action-default action-primary action-next-step" data-bind="click: next">
-                        <span><?= __('Next') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Next') ?></span>
                     </button>
                 </div>
                 <div class="action-wrap action-wrap-prev" data-role="step-wizard-prev">
                     <button type="button"
                             class="action-default action-back-step"
                             data-bind="click: back, css: { 'disabled': disabled}">
-                        <span><?= __('Back') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Back') ?></span>
                     </button>
                 </div>
                 <div class="action-wrap" data-role="closeBtn">
                     <button type="button"
                             class="action-cancel action-tertiary" data-bind="click: close">
-                        <span><?= __('Cancel') ?></span>
+                        <span><?= /* @escapeNotVerified */  __('Cancel') ?></span>
                     </button>
                 </div>
             </div>
@@ -47,9 +47,9 @@
         <div data-role="steps-wizard-tab">
             <?php foreach ($block->getSteps() as $step) { ?>
             <div data-bind="visible: selectedStep() == $element.id"
-                 class="content" id="<?=$step->getComponentName() ?>"
+                 class="content" id="<?= /* @escapeNotVerified */ $step->getComponentName() ?>"
                  data-role="content">
-                <?= $step->getContent() ?>
+                <?= /* @escapeNotVerified */  $step->getContent() ?>
             </div>
             <?php } ?>
         </div>
@@ -60,10 +60,10 @@
         "*": {
             "Magento_Ui/js/core/app": {
                 "components": {
-                        "<?= $block->getComponentName()?>": {
+                        "<?= /* @escapeNotVerified */  $block->getComponentName()?>": {
                             "component": "Magento_Ui/js/lib/step-wizard",
-                            "initData": <?= $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData()) ?>,
-                            "stepsNames": <?= $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents()) ?>
+                            "initData": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getInitData()) ?>,
+                            "stepsNames": <?= /* @escapeNotVerified */  $this->helper("Magento\Framework\Json\Helper\Data")->jsonEncode($block->getStepComponents()) ?>
                         }
                     }
                 }
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 02f9e88aa2fee..ec52625364c69 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 echo $storedOriginShipment ?>';
-            this.storedFreeShipment = '<?php echo $storedFreeShipment ?>';
-            this.storedUpsType = '<?php echo $storedUpsType ?>';
+            this.storedOriginShipment = '<?php /* @escapeNotVerified */ echo $storedOriginShipment ?>';
+            this.storedFreeShipment = '<?php /* @escapeNotVerified */ echo $storedFreeShipment ?>';
+            this.storedUpsType = '<?php /* @escapeNotVerified */ echo $storedUpsType ?>';
             <?php /** @var $jsonHelper \Magento\Framework\Json\Helper\Data */ $jsonHelper = $this->helper('Magento\Framework\Json\Helper\Data'); ?>
-            this.storedAllowedMethods = <?php echo $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
-            this.originShipmentObj = <?php echo $jsonHelper->jsonEncode($orShipArr) ?>;
-            this.originShipmentObj['default'] = <?php echo $jsonHelper->jsonEncode($defShipArr) ?>;
+            this.storedAllowedMethods = <?php /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($storedAllowedMethods) ?>;
+            this.originShipmentObj = <?php /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($orShipArr) ?>;
+            this.originShipmentObj['default'] = <?php /* @escapeNotVerified */ echo $jsonHelper->jsonEncode($defShipArr) ?>;
 
             this.setFormValues();
             Event.observe($(this.carriersUpsTypeId), 'change', this.setFormValues.bind(this));
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/categories.phtml
index 2cb287443dedd..5c27c009b4451 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 $block \Magento\UrlRewrite\Block\Catalog\Category\Tree */
 ?>
 <fieldset class="fieldset" data-ui-id="category-selector">
-    <legend class="legend"><span><?php echo __('Select Category') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Select Category') ?></span></legend>
     <div class="content" style="clear: both;">
         <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 8c224cf3dd2eb..57716adc3029d 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/edit.phtml
@@ -21,7 +21,7 @@ require([
 ], function($){
 
     $('#edit_form').form()
-        .validation({validationUrl: '<?php echo $block->getValidationUrl() ?>'});
+        .validation({validationUrl: '<?php /* @escapeNotVerified */ echo $block->getValidationUrl() ?>'});
 
 });
 </script>
diff --git a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
index 10ce27c362539..4a0507fb4ea0d 100644
--- a/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
+++ b/app/code/Magento/UrlRewrite/view/adminhtml/templates/selector.phtml
@@ -11,12 +11,12 @@
 <div class="form-inline">
     <fieldset class="fieldset" data-container-for="entity-type-selector">
         <div class="field field-entity-type-selector">
-            <label for="entity-type-selector" class="label"><?php echo $block->getSelectorLabel() ?></label>
+            <label for="entity-type-selector" class="label"><?php /* @escapeNotVerified */ echo $block->getSelectorLabel() ?></label>
             <div class="control">
                 <?php $url = $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/*/*')?>
                 <select data-role="entity-type-selector" class="select" onchange="window.location = this.value;" id="entity-type-selector">
                 <?php foreach ($block->getModes() as $mode => $label): ?>
-                    <option <?php echo($block->isMode($mode) ? 'selected="selected" ' : '') ?>value="<?php echo $url . $mode ?>"><?php echo $label ?></option>
+                    <option <?php echo($block->isMode($mode) ? 'selected="selected" ' : '') ?>value="<?php /* @escapeNotVerified */ echo $url . $mode ?>"><?php /* @escapeNotVerified */ echo $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 5f68522a58e8d..ef25e742db145 100644
--- a/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/admin/forgotpassword.phtml
@@ -9,11 +9,11 @@
 ?>
 <form method="post" action="" id="login-form" data-mage-init='{"form": {}, "validation": {}}'>
     <fieldset class="admin__fieldset">
-        <legend class="admin__legend"><span><?php echo __('Password Help'); ?></span></legend><br/>
-        <input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
-        <p class="admin__field-info"><?php echo __('Enter your email address.  You will receive an email with a link to reset your password.'); ?></p>
+        <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>
         <div class="admin__field _required field-email">
-            <label for="email" class="admin__field-label"><span><?php echo __('Email address'); ?></span></label>
+            <label for="email" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('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>
@@ -21,11 +21,11 @@
         <?php echo $block->getChildHtml('form.additional.info'); ?>
         <div class="form-actions">
             <div class="actions">
-                <button class="action-retrieve action-primary" type="submit"><span><?php echo __('Retrieve Password'); ?></span></button>
+                <button class="action-retrieve action-primary" type="submit"><span><?php /* @escapeNotVerified */ echo __('Retrieve Password'); ?></span></button>
             </div>
             <div class="links">
-                <a class="action-back" href="<?php echo $block->getUrl('adminhtml', ['_nosecret' => true]); ?>">
-                    <?php echo __('Back to Sign in'); ?>
+                <a class="action-back" href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml', ['_nosecret' => true]); ?>">
+                    <?php /* @escapeNotVerified */ echo __('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 a7251b5b6538a..d7dad1a4e9eb4 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 echo $this->helper('Magento\Backend\Helper\Data')->getUrl('adminhtml/auth/forgotpassword', ['_nosecret' => true])?>"><?php echo __('Forgot your password?') ?></a>
+<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>
 </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 ba3d313a32886..210b231afc8fb 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 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="<?php /* @escapeNotVerified */ echo $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 echo __('Reset a Password'); ?></span></legend><br />
-        <input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
+        <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(); ?>" />
         <div class="admin__field _required field-password">
-            <label class="admin__field-label" for="password"><span><?php echo __('New Password'); ?></span></label>
+            <label class="admin__field-label" for="password"><span><?php /* @escapeNotVerified */ echo __('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" />
             </div>
         </div>
         <div class="admin__field _required field-confirmation">
-            <label class="admin__field-label" for="confirmation"><span><?php echo __('Confirm New Password'); ?></span></label>
+            <label class="admin__field-label" for="confirmation"><span><?php /* @escapeNotVerified */ echo __('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" />
             </div>
         </div>
         <div class="form-actions">
             <div class="actions">
-                <button type="submit" title="<?php echo __('Reset Password'); ?>" class="action-reset action-primary"><span><?php echo __('Reset Password'); ?></span></button>
+                <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Reset Password'); ?>" class="action-reset action-primary"><span><?php /* @escapeNotVerified */ echo __('Reset Password'); ?></span></button>
             </div>
             <div class="links">
-                <a class="action-back" href="<?php echo $block->getUrl('adminhtml', ['_nosecret' => true]) ?>"><?php echo __('Back to Sign in'); ?></a>
+                <a class="action-back" href="<?php /* @escapeNotVerified */ echo $block->getUrl('adminhtml', ['_nosecret' => true]) ?>"><?php /* @escapeNotVerified */ echo __('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 a9afe8a29c055..8c533568f4a64 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/edit.phtml
@@ -16,22 +16,22 @@
 
 <fieldset class="fieldset form-inline entry-edit">
     <legend class="legend">
-        <span><?php echo __('Roles Resources') ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Roles Resources') ?></span>
     </legend><br />
 
     <div class="field">
-        <label class="label" for="all"><span><?php echo __('Resource Access') ?></span></label>
+        <label class="label" for="all"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Custom') ?></option>
-                <option value="1" <?php echo($block->isEverythingAllowed() ? 'selected="selected"' : ''); ?>><?php echo __('All') ?></option>
+                <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>
             </select>
         </div>
     </div>
 
     <div class="field<?php if ($block->isEverythingAllowed()):?> no-display<?php endif?>" data-role="tree-resources-container">
-        <label class="label"><span><?php echo __('Resources') ?></span></label>
+        <label class="label"><span><?php /* @escapeNotVerified */ echo __('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 a7b90a5734861..cd3f894c3c165 100644
--- a/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
+++ b/app/code/Magento/User/view/adminhtml/templates/role/info.phtml
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?php echo $block->getUrl('*/*/saverole') ?>" method="post" id="role-edit-form">
+<form action="<?php /* @escapeNotVerified */ echo $block->getUrl('*/*/saverole') ?>" method="post" id="role-edit-form">
     <?php echo $block->getBlockHtml('formkey')?>
 </form>
 <script>
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 9419b6efca04a..afbcc28b0bf16 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 echo __('Role Users') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Role Users') ?></span></legend>
     <br />
     <?php echo $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 69b0e4960a7ae..3029a18e64bb1 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 echo $myBlock->getUsers(true) ?>);
+    var checkBoxes = $H(<?php /* @escapeNotVerified */ echo $myBlock->getUsers(true) ?>);
     var warning = false;
     if (checkBoxes.size() > 0) {
         warning = true;
@@ -44,7 +44,7 @@ require([
             if(checkbox[0]){
                 var checked = isInput ? !checkbox[0].checked : checkbox[0].checked;
                 if (checked) {
-                    if ( confirm("<?php echo __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
+                    if ( confirm("<?php /* @escapeNotVerified */ echo __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
                         checkbox[0].checked = false;
                         checkBoxes.unset(checkbox[0].value);
                         varienElementMethods.setHasChanges(checkbox[0]);
@@ -80,23 +80,23 @@ require([
     function massSelectUsers(allCheckbox)
     {
         if (!allCheckbox.checked && checkBoxes.size() > 0) {
-            if (!confirm("<?php echo __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
+            if (!confirm("<?php /* @escapeNotVerified */ echo __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') ?>") ) {
                 allCheckbox.checked = false;
                 return false;
             }
         }
-        <?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row)
+        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.rows.each(function(row)
         {
             $(row).getElementsByClassName('checkbox')[0].checked = allCheckbox.checked;
-            roleUsersRowInit(<?php echo $myBlock->getJsObjectName() ?>, row);
+            roleUsersRowInit(<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>, row);
         });
     }
     Event.observe(window, "load", function(){
-        <?php echo $myBlock->getJsObjectName() ?>.rowClickCallback = roleUsersRowClick;
-        <?php echo $myBlock->getJsObjectName() ?>.initRowCallback = roleUsersRowInit;
-        <?php echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
-        <?php echo $myBlock->getJsObjectName() ?>.checkCheckboxes = massSelectUsers;
-        <?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row){roleUsersRowInit(<?php echo $myBlock->getJsObjectName() ?>, row)});
+        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.rowClickCallback = roleUsersRowClick;
+        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.initRowCallback = roleUsersRowInit;
+        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
+        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.checkCheckboxes = massSelectUsers;
+        <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.rows.each(function(row){roleUsersRowInit(<?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>, row)});
         $('in_role_user_old').value = $('in_role_user').value;
     });
 <?php endif; ?>
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 6cfc3c5d5fa56..77e33f238c13c 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 echo $myBlock->getSelectedRoles(true) ?>);
+    var userRoles = $H(<?php /* @escapeNotVerified */ echo $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 echo __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') ?>") ) {
+                    if ( !confirm("<?php /* @escapeNotVerified */ echo __('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 echo $myBlock->getJsObjectName() ?>.setCheckboxChecked(checkbox[0], checked);
+                <?php /* @escapeNotVerified */ echo $myBlock->getJsObjectName() ?>.setCheckboxChecked(checkbox[0], checked);
             }
         }
     }
@@ -63,10 +63,10 @@ require([
         }
     }
 
-<?php echo $myBlock->getJsObjectName() ?>.rowClickCallback = roleRowClick;
-<?php echo $myBlock->getJsObjectName() ?>.initRowCallback = rolesRowInit;
-<?php echo $myBlock->getJsObjectName() ?>.checkboxCheckCallback = registerUserRole;
-<?php echo $myBlock->getJsObjectName() ?>.rows.each(function(row){rolesRowInit(<?php echo $myBlock->getJsObjectName() ?>, row)});
+<?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)});
 <?php endif; ?>
 
 });
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 59c5339ed6421..17ed051667ee5 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,7 +19,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
         <?php endif; ?>
 
         <?php echo $block->getRowPriceExclTaxHtml() ?>
@@ -28,14 +28,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $block->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
+                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->displayPrices($tax['base_row_amount'], $tax['row_amount']); ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php echo __('Total'); ?>:<br />
+                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
                     <?php echo $block->getFinalRowPriceExclTaxHtml(); ?>
                 </span>
             <?php endif; ?>
@@ -45,7 +45,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
         <?php endif; ?>
         <?php echo $block->getRowPriceInclTaxHtml(); ?>
 
@@ -54,14 +54,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $block->displayPrices($tax['base_row_amount_incl_tax'], $tax['row_amount_incl_tax']); ?></span>
+                        <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>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php echo __('Total'); ?>:<br />
+                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
                     <?php echo $block->getFinalRowPriceInclTaxHtml(); ?>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml b/app/code/Magento/Weee/view/adminhtml/templates/items/price/total.phtml
index 41323ef0e570b..a07de914a1184 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 echo $block->displayPrices($block->getBaseTotalAmount($_item), $block->getTotalAmount($_item)) ?>
+<?php /* @escapeNotVerified */ echo $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 183b7e80d3e52..6b4f64946f361 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,7 +19,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceExclTax()): ?>
     <div class="price-excl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php echo __('Excl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
         <?php endif; ?>
 
         <?php echo $block->getUnitPriceExclTaxHtml() ?>
@@ -29,14 +29,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $block->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
+                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->displayPrices($tax['base_amount'], $tax['amount']); ?></span>
                     <?php endforeach; ?>
                 </small>
             <?php endif; ?>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <br />
-                <span class="nobr"><?php echo __('Total'); ?>:<br />
+                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
                     <?php echo $block->getFinalUnitPriceExclTaxHtml(); ?>
                 </span>
             <?php endif; ?>
@@ -46,7 +46,7 @@ $_item = $block->getItem();
 <?php if ($block->displayBothPrices() || $block->displayPriceInclTax()): ?>
     <div class="price-incl-tax">
         <?php if ($block->displayBothPrices()): ?>
-            <span class="label"><?php echo __('Incl. Tax'); ?>:</span>
+            <span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
         <?php endif; ?>
         <?php echo $block->getUnitPriceInclTaxHtml(); ?>
 
@@ -55,14 +55,14 @@ $_item = $block->getItem();
             <?php if ($block->displayPriceWithWeeeDetails()): ?>
                 <small>
                     <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($_item) as $tax): ?>
-                        <span class="nobr"><?php echo $tax['title']; ?>: <?php echo $block->displayPrices($tax['base_amount_incl_tax'], $tax['amount_incl_tax']); ?></span>
+                        <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $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 echo __('Total'); ?>:<br />
+                <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
                     <?php echo $block->getFinalUnitPriceInclTaxHtml(); ?>
                 </span>
             <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml b/app/code/Magento/Weee/view/adminhtml/templates/order/create/items/price/row.phtml
index 895d24c39df16..0bcadfbf130df 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 echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice($block->getRowDisplayPriceExclTax()); ?>
+    <?php /* @escapeNotVerified */ echo $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 echo $tax['title']; ?>: <?php echo $block->formatPrice($tax['row_amount'], true, true); ?></span><br />
+                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?php echo __('Total'); ?>:<br />
-                <?php echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
+            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
+                <?php /* @escapeNotVerified */ echo $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 echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice($block->getRowDisplayPriceInclTax()); ?>
+    <?php /* @escapeNotVerified */ echo $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 echo $tax['title']; ?>: <?php echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
+                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br />
-                <?php echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
+            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>:<br />
+                <?php /* @escapeNotVerified */ echo $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 fa900ef262afc..c3dd1bbfda594 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 echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice(max(0, $_rowTotalWithoutDiscount)) ?>
+    <?php /* @escapeNotVerified */ echo $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 echo $tax['title']; ?>: <?php echo $block->formatPrice($tax['row_amount'], true, true); ?></span><br />
+                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?php echo __('Total'); ?>:<br />
-                <?php echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax() - $_item->getTotalDiscountAmount()); ?>
+            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
+                <?php /* @escapeNotVerified */ echo $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 echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
     <?php $_incl = $block->getTotalAmount($_item); ?>
-    <?php echo $block->formatPrice(max(0, $_incl)) ?>
+    <?php /* @escapeNotVerified */ echo $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 echo $tax['title']; ?>: <?php echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
+                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br />
-                <?php echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax() - $_item->getTotalDiscountAmount()); ?>
+            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>:<br />
+                <?php /* @escapeNotVerified */ echo $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 0e46e952e94f1..8ae89e1958eee 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 echo __('Excl. Tax'); ?>:</span>
+        <span class="label"><?php /* @escapeNotVerified */ echo __('Excl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+    <?php /* @escapeNotVerified */ echo $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 echo $tax['title']; ?>: <?php echo $block->formatPrice($tax['amount'], true, true); ?></span><br />
+                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?php echo __('Total'); ?>:<br />
-                <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total'); ?>:<br />
+                <?php /* @escapeNotVerified */ echo $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 echo __('Incl. Tax'); ?>:</span>
+        <br /><span class="label"><?php /* @escapeNotVerified */ echo __('Incl. Tax'); ?>:</span>
     <?php endif; ?>
-    <?php echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+    <?php /* @escapeNotVerified */ echo $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 echo $tax['title']; ?>: <?php echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?></span><br />
+                    <span class="nobr"><?php /* @escapeNotVerified */ echo $tax['title']; ?>: <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?php echo __('Total Incl. Tax'); ?>:<br />
-                <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+            <span class="nobr"><?php /* @escapeNotVerified */ echo __('Total Incl. Tax'); ?>:<br />
+                <?php /* @escapeNotVerified */ echo $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 dab9df556b76a..9921f99663fca 100644
--- a/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
+++ b/app/code/Magento/Weee/view/adminhtml/templates/renderer/tax.phtml
@@ -20,16 +20,16 @@ $data = ['fptAttribute' => [
 <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 echo $block->getElement()->getLabel() ?></span></label>
+    <label class="label"><span><?php /* @escapeNotVerified */ echo $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 echo __('Website'); ?></th>
-                    <th class="col-country required"><?php echo __('Country/State'); ?></th>
-                    <th class="col-tax required"><?php echo __('Tax'); ?></th>
-                    <th class="col-action"><?php echo __('Action'); ?></th>
+                    <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>
                 </tr>
             </thead>
             <tfoot>
@@ -50,34 +50,34 @@ $data = ['fptAttribute' => [
     <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">
             <td class="col-website" <?php if (!$block->isMultiWebsites()): ?>style="display: none"<?php endif; ?>>
-                <select name="<?php echo $block->getElement()->getName() ?>[<%- data.index %>][website_id]"
-                        class="<?php echo $block->getElement()->getClass() ?> website required-entry" data-role="select-website">
+                <select 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">
                     <?php foreach ($block->getWebsites() as $_websiteId => $_info): ?>
-                    <option value="<?php echo $_websiteId ?>"><?php echo $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?php echo $_info['currency'] ?>]<?php endif; ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_websiteId ?>"><?php /* @escapeNotVerified */ echo $_info['name'] ?><?php if (!empty($_info['currency'])): ?>[<?php /* @escapeNotVerified */ echo $_info['currency'] ?>]<?php endif; ?></option>
                     <?php endforeach ?>
                 </select>
             </td>
             <td class="col-country">
-                <select id="<?php echo $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_country"
-                        name="<?php echo $block->getElement()->getName() ?>[<%- data.index %>][country]"
-                        class="<?php echo $block->getElement()->getClass() ?> country required-entry" data-role="select-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">
                     <?php foreach ($block->getCountries() as $_country): ?>
-                    <option value="<?php echo $_country['value'] ?>"><?php echo htmlspecialchars($_country['label']) ?></option>
+                    <option value="<?php /* @escapeNotVerified */ echo $_country['value'] ?>"><?php /* @escapeNotVerified */ echo htmlspecialchars($_country['label']) ?></option>
                     <?php endforeach ?>
                 </select>
-                <select id="<?php echo $block->getElement()->getName() ?>_weee_tax_row_<%- data.index %>_state"
-                        name="<?php echo $block->getElement()->getName() ?>[<%- data.index %>][state]"
-                        class="<?php echo $block->getElement()->getClass() ?> state" disabled="" data-role="select-state">
+                <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">
                     <option value="0">*</option>
                 </select>
             </td>
             <td class="col-tax">
-                <input name="<?php echo $block->getElement()->getName() ?>[<%- data.index %>][price]"
-                       class="<?php echo $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
+                <input name="<?php /* @escapeNotVerified */ echo $block->getElement()->getName() ?>[<%- data.index %>][price]"
+                       class="<?php /* @escapeNotVerified */ echo $block->getElement()->getClass() ?> required-entry validate-greater-than-zero"
                        type="text" value="<%- data.value %>"/>
             </td>
             <td class="col-action">
-                <input name="<?php echo $block->getElement()->getName() ?>[<%- data.index %>][delete]" class="delete" type="hidden" value="" data-role="delete-fpt-item"/>
+                <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') ?>
             </td>
         </tr>
diff --git a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
index f8a77699ff4d9..7e50fc1e4f82b 100644
--- a/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
+++ b/app/code/Magento/Weee/view/base/templates/pricing/adjustment.phtml
@@ -19,16 +19,16 @@ $closeBrace = ')';
     <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
         <span class="weee"
               data-price-type="weee"
-              data-label="<?php echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute); ?>"><?php echo $block->renderWeeeTaxAttribute($weeeTaxAttribute); ?></span>
+              data-label="<?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute); ?>"><?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttribute($weeeTaxAttribute); ?></span>
     <?php endforeach; ?>
 <?php elseif ($block->showExclDescrIncl()): // excl. + weee + final ?>
     <?php foreach ($block->getWeeeTaxAttributes() as $weeeTaxAttribute): ?>
         <span class="weee"
               data-price-type="weee"
-              data-label="<?php echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute); ?>"><?php echo $block->renderWeeeTaxAttribute($weeeTaxAttribute); ?></span>
+              data-label="<?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttributeName($weeeTaxAttribute); ?>"><?php /* @escapeNotVerified */ echo $block->renderWeeeTaxAttribute($weeeTaxAttribute); ?></span>
     <?php endforeach; ?>
     <span class="price-final_price"
           data-price-type="weeePrice"
-          data-price-amount="<?php echo $block->getRawFinalAmount(); ?>"
-          data-label="<?php echo __('Final Price'); ?>"><?php echo $block->getFinalAmount(); ?></span>
+          data-price-amount="<?php /* @escapeNotVerified */ echo $block->getRawFinalAmount(); ?>"
+          data-label="<?php /* @escapeNotVerified */ echo __('Final Price'); ?>"><?php /* @escapeNotVerified */ echo $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 84d56677a8ff4..0f71192ce3985 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
@@ -17,14 +17,14 @@ $item = $block->getItem();
         <?php else: ?>
         <span class="minicart-price">
         <?php endif; ?>
-        <?php echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
             </span>
 
         <?php if ($this->helper('Magento\Weee\Helper\Data')->getApplied($item)): ?>
             <span class="minicart-tax-info" style="display: none">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php echo $tax['title']; ?>">
-                        <?php echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?>
+                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?>
                     </span>
                 <?php endforeach; ?>
             </span>
@@ -32,7 +32,7 @@ $item = $block->getItem();
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="minicart-tax-total">
                     <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total Incl. Tax')); ?>">
-                        <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -47,14 +47,14 @@ $item = $block->getItem();
         <?php else: ?>
             <span class="minicart-price">
         <?php endif; ?>
-        <?php echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
             </span>
 
             <?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 echo $tax['title']; ?>">
-                        <?php echo $block->formatPrice($tax['amount'], true, true); ?>
+                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?>
                     </span>
                 <?php endforeach; ?>
             </span>
@@ -62,7 +62,7 @@ $item = $block->getItem();
             <?php if ($block->displayFinalPrice()): ?>
                     <span class="minicart-tax-total">
                     <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
-                        <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+                        <?php /* @escapeNotVerified */ echo $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 fbabc4b56571f..d7366d05baeca 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 echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
-<?php echo $block->formatPrice($block->getRowDisplayPriceExclTax()); ?>
+<?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>" style="display: none;">
+    <span class="cart-tax-info" id="esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_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 echo $tax['title']; ?>"><?php echo $block->formatPrice($tax['row_amount'], true, true); ?></span>
+            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php echo __('Total'); ?>">
-                <?php echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
+        <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>
         </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 bdb9d5253afcf..ff840be74f6a8 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 echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
-<?php echo $block->formatPrice($block->getRowDisplayPriceInclTax()); ?>
+<?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>" style="display: none;">
+    <span class="cart-tax-info" id="subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $_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 echo $tax['title']; ?>"><?php echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?></span>
+                <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php echo __('Total Incl. Tax'); ?>">
-                <?php echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
+        <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>
         </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 107992e7b37e4..ed466292501ef 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 echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?php echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+<?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>" style="display:none;">
+    <span class="cart-tax-info" id="eunit-item-tax-details<?php /* @escapeNotVerified */ echo $_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 echo $tax['title']; ?>"><?php echo $block->formatPrice($tax['amount'], true, true); ?></span>
+            <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php echo __('Total'); ?>">
-                <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+        <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>
         </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 c8292b0458715..59c6d7f47d037 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 echo $_item->getId(); ?>"}}'>
+    <span class="cart-tax-total" data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php /* @escapeNotVerified */ echo $_item->getId(); ?>"}}'>
 <?php else: ?>
     <span class="cart-price">
 <?php endif; ?>
 
-<?php echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+<?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>" style="display: none;">
+    <span class="cart-tax-info" id="unit-item-tax-details<?php /* @escapeNotVerified */ echo $_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 echo $tax['title']; ?>"><?php echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?></span>
+                <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>"><?php /* @escapeNotVerified */ echo $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 echo $_item->getId(); ?>"}}'>
-            <span class="weee" data-label="<?php echo __('Total Incl. Tax'); ?>">
-                <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+        <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>
         </span>
     <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
index 6fe819b9d6dad..f5fe4f30da648 100644
--- a/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
+++ b/app/code/Magento/Weee/view/frontend/templates/email/items/price/row.phtml
@@ -20,23 +20,23 @@ $_order = $_item->getOrder();
 
 <?php if ($block->displayPriceExclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <span class="label"><?= __('Excl. Tax') ?>:</span>
+        <span class="label"><?= /* @escapeNotVerified */  __('Excl. Tax') ?>:</span>
     <?php endif; ?>
-    <?= $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
+    <?= /* @escapeNotVerified */  $_order->formatPrice($block->getRowDisplayPriceExclTax()) ?>
 
     <?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"><?= $tax['title'] ?>: <?= $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
             <br />
-            <span class="nobr"><?= __('Total') ?>:<br /> <?= $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
+            <span class="nobr"><?= /* @escapeNotVerified */  __('Total') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceExclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
@@ -44,21 +44,21 @@ $_order = $_item->getOrder();
 
 <?php if ($block->displayPriceInclTax() || $block->displayBothPrices()): ?>
     <?php if ($block->displayBothPrices()): ?>
-        <br /><span class="label"><?= __('Incl. Tax') ?>:</span>
+        <br /><span class="label"><?= /* @escapeNotVerified */  __('Incl. Tax') ?>:</span>
     <?php endif; ?>
-    <?= $_order->formatPrice($block->getRowDisplayPriceInclTax()) ?>
+    <?= /* @escapeNotVerified */  $_order->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"><?= $tax['title'] ?>: <?= $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
+                    <span class="nobr"><?= /* @escapeNotVerified */  $tax['title'] ?>: <?= /* @escapeNotVerified */  $_order->formatPrice($tax['row_amount_incl_tax'], true, true) ?></span><br />
                 <?php endforeach; ?>
             </small>
         <?php endif; ?>
 
         <?php if ($block->displayFinalPrice()): ?>
-            <span class="nobr"><?= __('Total Incl. Tax') ?>:<br /> <?= $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
+            <span class="nobr"><?= /* @escapeNotVerified */  __('Total Incl. Tax') ?>:<br /> <?= /* @escapeNotVerified */  $_order->formatPrice($block->getFinalRowDisplayPriceInclTax()) ?></span>
         <?php endif; ?>
     <?php endif; ?>
 <?php endif; ?>
diff --git a/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml b/app/code/Magento/Weee/view/frontend/templates/item/price/row.phtml
index 0f38316c1bea1..672f7efc3361f 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
@@ -14,27 +14,27 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?php echo $block->formatPrice($block->getRowDisplayPriceInclTax()); ?>
+                <?php /* @escapeNotVerified */ echo $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 echo $item->getId(); ?>" style="display: none;">
+            <div class="cart-tax-info" id="subtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php echo $tax['title']; ?>">
-                        <?php echo $block->formatPrice($tax['row_amount_incl_tax'], true, true); ?>
+                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
+                        <?php /* @escapeNotVerified */ echo $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 echo $item->getId(); ?>"}}'>
+                    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 echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalRowDisplayPriceInclTax()); ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -46,28 +46,28 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?php echo $block->formatPrice($block->getRowDisplayPriceExclTax()); ?>
+                <?php /* @escapeNotVerified */ echo $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 echo $item->getId(); ?>"
+            <span class="cart-tax-info" id="esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php echo $tax['title']; ?>">
-                        <?php echo $block->formatPrice($tax['row_amount'], true, true); ?>
+                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['row_amount'], true, true); ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php echo $item->getId(); ?>"}'>
+                    data-tax-toggle='{"itemTaxId" : "#esubtotal-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}'>
                     <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
-                        <?php echo $block->formatPrice($block->getFinalRowDisplayPriceExclTax()); ?>
+                        <?php /* @escapeNotVerified */ echo $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 de74279653f09..7fed46b9f1e7c 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 echo $_order->formatPrice($block->getTotalAmount($_item))?>
+<?php /* @escapeNotVerified */ echo $_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 f15ae2b8ae013..82c981e774a88 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
@@ -14,27 +14,27 @@ $item = $block->getItem();
     <span class="price-including-tax" data-label="<?php echo $block->escapeHtml(__('Incl. Tax')); ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#unit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-            <?php echo $block->formatPrice($block->getUnitDisplayPriceInclTax()); ?>
+            <?php /* @escapeNotVerified */ echo $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 echo $item->getId(); ?>" style="display: none;">
+            <span class="cart-tax-info" id="unit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>" style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php echo $tax['title']; ?>">
-                        <?php echo $block->formatPrice($tax['amount_incl_tax'], true, true); ?>
+                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
+                        <?php /* @escapeNotVerified */ echo $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 echo $item->getId(); ?>"}}'>
+                    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 echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($block->getFinalUnitDisplayPriceInclTax()); ?>
                     </span>
                 </span>
             <?php endif; ?>
@@ -46,28 +46,28 @@ $item = $block->getItem();
     <span class="price-excluding-tax" data-label="<?php echo $block->escapeHtml(__('Excl. Tax')); ?>">
         <?php if ($block->displayPriceWithWeeeDetails()): ?>
             <span class="cart-tax-total"
-                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php echo $item->getId(); ?>"}}'>
+                data-mage-init='{"taxToggle": {"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}}'>
         <?php else: ?>
             <span class="cart-price">
         <?php endif; ?>
-                <?php echo $block->formatPrice($block->getUnitDisplayPriceExclTax()); ?>
+                <?php /* @escapeNotVerified */ echo $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 echo $item->getId(); ?>"
+            <span class="cart-tax-info" id="eunit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"
                 style="display: none;">
                 <?php foreach ($this->helper('Magento\Weee\Helper\Data')->getApplied($item) as $tax): ?>
-                    <span class="weee" data-label="<?php echo $tax['title']; ?>">
-                        <?php echo $block->formatPrice($tax['amount'], true, true); ?>
+                    <span class="weee" data-label="<?php /* @escapeNotVerified */ echo $tax['title']; ?>">
+                        <?php /* @escapeNotVerified */ echo $block->formatPrice($tax['amount'], true, true); ?>
                     </span>
                 <?php endforeach; ?>
             </span>
 
             <?php if ($block->displayFinalPrice()): ?>
                 <span class="cart-tax-total"
-                    data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php echo $item->getId(); ?>"}'>
+                    data-tax-toggle='{"itemTaxId" : "#eunit-item-tax-details<?php /* @escapeNotVerified */ echo $item->getId(); ?>"}'>
                     <span class="weee" data-label="<?php echo $block->escapeHtml(__('Total')); ?>">
-                        <?php echo $block->formatPrice($block->getFinalUnitDisplayPriceExclTax()); ?>
+                        <?php /* @escapeNotVerified */ echo $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 a0f60f63ee64e..e114d5ade56fe 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
@@ -9,18 +9,18 @@
 ?>
 
 <?php $_divId = 'tree' . $block->getId() ?>
-<div id="<?php echo $_divId ?>" class="tree"></div>
+<div id="<?php /* @escapeNotVerified */ echo $_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 echo $block->getId() ?>;
+var tree<?php /* @escapeNotVerified */ echo $block->getId() ?>;
 
-var useMassaction = <?php echo $block->getUseMassaction() ? 1 : 0; ?>;
+var useMassaction = <?php /* @escapeNotVerified */ echo $block->getUseMassaction() ? 1 : 0; ?>;
 
-var isAnchorOnly = <?php echo $block->getIsAnchorOnly() ? 1 : 0; ?>;
+var isAnchorOnly = <?php /* @escapeNotVerified */ echo $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 echo $block->getNodeClickListener() ?>.createDelegate(this));
+                this.addListener('click', <?php /* @escapeNotVerified */ echo $block->getNodeClickListener() ?>.createDelegate(this));
             <?php endif; ?>
         }
 
@@ -58,10 +58,10 @@ Ext.extend(Ext.tree.TreePanel.Enhanced, Ext.tree.TreePanel, {
 
 jQuery(function()
 {
-    var emptyNodeAdded = <?php echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
+    var emptyNodeAdded = <?php /* @escapeNotVerified */ echo($block->getWithEmptyNode() ? 'false' : 'true') ?>;
 
     var categoryLoader = new Ext.tree.TreeLoader({
-       dataUrl: '<?php echo $block->getLoadTreeUrl() ?>'
+       dataUrl: '<?php /* @escapeNotVerified */ echo $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 echo __('None') ?>';
+                    empty.text = '<?php /* @escapeNotVerified */ echo __('None') ?>';
                     empty.children = [];
                     empty.id = 'none';
                     empty.path = '1/none';
@@ -151,25 +151,25 @@ jQuery(function()
     };
 
     categoryLoader.on("beforeload", function(treeLoader, node) {
-        $('<?php echo $_divId; ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
+        $('<?php /* @escapeNotVerified */ echo $_divId; ?>').fire('category:beforeLoad', {treeLoader:treeLoader});
         treeLoader.baseParams.id = node.attributes.id;
     });
 
-    tree<?php echo $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?php echo $_divId ?>', {
+    tree<?php /* @escapeNotVerified */ echo $block->getId() ?> = new Ext.tree.TreePanel.Enhanced('<?php /* @escapeNotVerified */ echo $_divId ?>', {
         animate:          false,
         loader:           categoryLoader,
         enableDD:         false,
         containerScroll:  true,
-        rootVisible:      '<?php echo $block->getRoot()->getIsVisible() ?>',
+        rootVisible:      '<?php /* @escapeNotVerified */ echo $block->getRoot()->getIsVisible() ?>',
         useAjax:          true,
         currentNodeId:    <?php echo (int) $block->getCategoryId() ?>,
         addNodeTo:        false
     });
 
     if (useMassaction) {
-        tree<?php echo $block->getId() ?>.on('check', function(node) {
-            $('<?php echo $_divId; ?>').fire('node:changed', {node:node});
-        }, tree<?php echo $block->getId() ?>);
+        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() ?>);
     }
 
     // set the root node
@@ -181,7 +181,7 @@ jQuery(function()
         category_id: <?php echo (int) $block->getCategoryId() ?>
     };
 
-    tree<?php echo $block->getId() ?>.loadTree({parameters:parameters, data:<?php echo $block->getTreeJson() ?>},true);
+    tree<?php /* @escapeNotVerified */ echo $block->getId() ?>.loadTree({parameters:parameters, data:<?php /* @escapeNotVerified */ echo $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 94cc3c75709bd..bcdf62afc6bf8 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
@@ -8,7 +8,7 @@
 
 ?>
 <fieldset class="fieldset">
-    <legend class="legend"><span><?php echo __('Layout Updates') ?></span></legend>
+    <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Layout Updates') ?></span></legend>
     <br />
     <div class="widget-layout-updates">
         <div id="page_group_container"></div>
@@ -33,31 +33,31 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<label for="widget_instance[<%- data.id %>][page_group]">Display on <span class="required">*</span></label>'+
         '<?php echo $block->getDisplayOnSelectHtml(); ?>'+
         '<div class="actions">'+
-        <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getRemoveLayoutButtonHtml()) ?> +
+        <?php /* @escapeNotVerified */ echo $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 $container['code'] ?> group_container" id="<?php echo $container['name'] ?>_<%- data.id %>">'+
-        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>]" />'+
-        '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][page_id]" value="<%- data.page_id %>" />'+
-        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][layout_handle]" value="<?php echo $container['layout_handle'] ?>" />'+
+    '<div class="no-display <?php /* @escapeNotVerified */ echo $container['code'] ?> group_container" id="<?php /* @escapeNotVerified */ echo $container['name'] ?>_<%- data.id %>">'+
+        '<input disabled="disabled" type="hidden" class="container_name" name="__[container_name]" value="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>]" />'+
+        '<input disabled="disabled" type="hidden" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][page_id]" value="<%- data.page_id %>" />'+
+        '<input disabled="disabled" type="hidden" class="layout_handle_pattern" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][layout_handle]" value="<?php /* @escapeNotVerified */ echo $container['layout_handle'] ?>" />'+
         '<table class="data-table">'+
             '<col width="200" />'+
             '<thead>'+
                 '<tr>'+
-                    '<th><label><?php echo $block->escapeJsQuote(__('%1', $container['label'])) ?></label></th>'+
-                    '<th><label><?php echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
-                    '<th><label><?php echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
+                    '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('%1', $container['label'])) ?></label></th>'+
+                    '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
+                    '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
                 '</tr>'+
             '</thead>'+
             '<tbody>'+
                 '<tr>'+
                     '<td>'+
-                        '<input disabled="disabled" type="radio" class="radio for_all" id="all_<?php echo $container['name'] ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
-                        '<label for="all_<?php echo $container['name'] ?>_<%- data.id %>"><?php echo $block->escapeJsQuote(__('All')) ?></label><br />'+
-                        '<input disabled="disabled" type="radio" class="radio for_specific" id="specific_<?php echo $container['name'] ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
-                        '<label for="specific_<?php echo $container['name'] ?>_<%- data.id %>"><?php echo $block->escapeJsQuote(__('Specific %1', $container['label'])) ?></label>'+
+                        '<input disabled="disabled" type="radio" class="radio for_all" id="all_<?php /* @escapeNotVerified */ echo $container['name'] ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][for]" value="all" onclick="WidgetInstance.togglePageGroupChooser(this)" checked="checked" />&nbsp;'+
+                        '<label for="all_<?php /* @escapeNotVerified */ echo $container['name'] ?>_<%- data.id %>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('All')) ?></label><br />'+
+                        '<input disabled="disabled" type="radio" class="radio for_specific" id="specific_<?php /* @escapeNotVerified */ echo $container['name'] ?>_<%- data.id %>" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][for]" value="specific" onclick="WidgetInstance.togglePageGroupChooser(this)" />&nbsp;'+
+                        '<label for="specific_<?php /* @escapeNotVerified */ echo $container['name'] ?>_<%- data.id %>"><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Specific %1', $container['label'])) ?></label>'+
                     '</td>'+
                     '<td>'+
                         '<div class="block_reference_container">'+
@@ -72,16 +72,16 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
                 '</tr>'+
             '</tbody>'+
         '</table>'+
-        '<div class="no-display chooser_container" id="<?php echo $container['name'] ?>_ids_<%- data.id %>">'+
-            '<input disabled="disabled" type="hidden" class="is_anchor_only" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][is_anchor_only]" value="<?php echo $container['is_anchor_only'] ?>" />'+
-            '<input disabled="disabled" type="hidden" class="product_type_id" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][product_type_id]" value="<?php echo $container['product_type_id'] ?>" />'+
+        '<div class="no-display chooser_container" id="<?php /* @escapeNotVerified */ echo $container['name'] ?>_ids_<%- data.id %>">'+
+            '<input disabled="disabled" type="hidden" class="is_anchor_only" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][is_anchor_only]" value="<?php /* @escapeNotVerified */ echo $container['is_anchor_only'] ?>" />'+
+            '<input disabled="disabled" type="hidden" class="product_type_id" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][product_type_id]" value="<?php /* @escapeNotVerified */ echo $container['product_type_id'] ?>" />'+
             '<p>' +
-                '<input disabled="disabled" type="text" class="input-text entities" name="widget_instance[<%- data.id %>][<?php echo $container['name'] ?>][entities]" value="<%- data.<?php echo $container['name'] ?>_entities %>" readonly="readonly" />&nbsp;' +
-                '<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?php echo $container['code'] ?>\', \'<?php echo $container['name'] ?>_ids_<%- data.id %>\')"  title="<?php echo $block->escapeJsQuote(__('Open Chooser')) ?>">' +
-                    '<img src="<?php echo $block->getViewFileUrl('images/rule_chooser_trigger.gif') ?>" alt="<?php echo $block->escapeJsQuote(__('Open Chooser')); ?>" />' +
+                '<input disabled="disabled" type="text" class="input-text entities" name="widget_instance[<%- data.id %>][<?php /* @escapeNotVerified */ echo $container['name'] ?>][entities]" value="<%- data.<?php /* @escapeNotVerified */ echo $container['name'] ?>_entities %>" readonly="readonly" />&nbsp;' +
+                '<a class="widget-option-chooser" href="javascript:void(0)" onclick="WidgetInstance.displayEntityChooser(\'<?php /* @escapeNotVerified */ echo $container['code'] ?>\', \'<?php /* @escapeNotVerified */ echo $container['name'] ?>_ids_<%- data.id %>\')"  title="<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Open Chooser')) ?>">' +
+                    '<img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/rule_chooser_trigger.gif') ?>" alt="<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Open Chooser')); ?>" />' +
                 '</a>&nbsp;' +
-                '<a href="javascript:void(0)" onclick="WidgetInstance.hideEntityChooser(\'<?php echo $container['name'] ?>_ids_<%- data.id %>\')" title="<?php echo $block->escapeJsQuote(__('Apply')); ?>">' +
-                    '<img src="<?php echo $block->getViewFileUrl('images/rule_component_apply.gif') ?>" alt="<?php echo $block->escapeJsQuote(__('Apply')); ?>" />' +
+                '<a href="javascript:void(0)" onclick="WidgetInstance.hideEntityChooser(\'<?php /* @escapeNotVerified */ echo $container['name'] ?>_ids_<%- data.id %>\')" title="<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Apply')); ?>">' +
+                    '<img src="<?php /* @escapeNotVerified */ echo $block->getViewFileUrl('images/rule_component_apply.gif') ?>" alt="<?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Apply')); ?>" />' +
                 '</a>' +
             '</p>'+
             '<div class="chooser"></div>'+
@@ -97,8 +97,8 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
                 '<th>&nbsp;</th>'+
             '</tr>'+
         '</thead>'+
@@ -127,14 +127,14 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Page')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Page')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
             '</tr>'+
         '</thead>'+
         '<tbody>'+
             '<tr>'+
-                '<td><?php echo $block->getLayoutsChooser() ?></td>'+
+                '<td><?php /* @escapeNotVerified */ echo $block->getLayoutsChooser() ?></td>'+
                 '<td>'+
                     '<div class="block_reference_container">'+
                         '<div class="block_reference"></div>'+
@@ -158,14 +158,14 @@ var pageGroupTemplate = '<div class="fieldset-wrapper page_group_container" id="
         '<col width="200" />'+
         '<thead>'+
             '<tr>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Page')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
-                '<th><label><?php echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Page')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Container')) ?> <span class="required">*</span></label></th>'+
+                '<th><label><?php /* @escapeNotVerified */ echo $block->escapeJsQuote(__('Template')) ?></label></th>'+
             '</tr>'+
         '</thead>'+
         '<tbody>'+
             '<tr>'+
-                '<td><?php echo $block->getPageLayoutsPageChooser() ?></td>'+
+                '<td><?php /* @escapeNotVerified */ echo $block->getPageLayoutsPageChooser() ?></td>'+
                 '<td>'+
                     '<div class="block_reference_container">'+
                         '<div class="block_reference"></div>'+
@@ -333,10 +333,10 @@ var WidgetInstance = {
             additional = {};
         }
         if (type == 'categories') {
-            additional.url = '<?php echo $block->getCategoriesChooserUrl() ?>';
+            additional.url = '<?php /* @escapeNotVerified */ echo $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->getProductsChooserUrl() ?>';
+            additional.url = '<?php /* @escapeNotVerified */ echo $block->getProductsChooserUrl() ?>';
             additional.post_parameters = $H({'product_type_id':$(chooser).down('input.product_type_id').value});
         }
         if (chooser && additional) {
@@ -440,13 +440,13 @@ var WidgetInstance = {
             selected = '';
             parameters = {};
             if (type == 'block_reference') {
-                url = '<?php echo $block->getBlockChooserUrl() ?>';
+                url = '<?php /* @escapeNotVerified */ echo $block->getBlockChooserUrl() ?>';
                 if (additional.selectedBlock) {
                     selected = additional.selectedBlock;
                 }
                 parameters.layout = value;
             } else if (type == 'block_template') {
-                url = '<?php echo $block->getTemplateChooserUrl() ?>';
+                url = '<?php /* @escapeNotVerified */ echo $block->getTemplateChooserUrl() ?>';
                 if (additional.selectedTemplate) {
                     selected = additional.selectedTemplate;
                 }
@@ -482,7 +482,7 @@ window.WidgetInstance = WidgetInstance;
 
 jQuery(function(){
     <?php foreach ($block->getPageGroups() as $pageGroup): ?>
-        WidgetInstance.addPageGroup(<?php echo Zend_Json::encode($pageGroup) ?>);
+        WidgetInstance.addPageGroup(<?php /* @escapeNotVerified */ echo Zend_Json::encode($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 4684918024139..ff2714c07c92a 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
@@ -22,13 +22,13 @@ wishlistControl = {
         if (!urlParams) {
             urlParams = '';
         }
-        var url = <?php echo $block->getJsObjectName() ?>.url + '?ajax=true' + urlParams;
+        var url = <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.url + '?ajax=true' + urlParams;
         new Ajax.Updater(
-            <?php echo $block->getJsObjectName() ?>.containerId,
+            <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.containerId,
             url,
             {
                 parameters: {form_key: FORM_KEY},
-                onComplete: <?php echo $block->getJsObjectName() ?>.initGrid.bind(<?php echo $block->getJsObjectName() ?>),
+                onComplete: <?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>.initGrid.bind(<?php /* @escapeNotVerified */ echo $block->getJsObjectName() ?>),
                 evalScripts:true
             }
         );
@@ -48,7 +48,7 @@ wishlistControl = {
     },
 
     removeItem: function (itemId) {
-        if(!confirm('<?php echo __('Are you sure you want to remove this item?') ?>')) {
+        if(!confirm('<?php /* @escapeNotVerified */ echo __('Are you sure you want to remove this item?') ?>')) {
             return false;
         }
         this.reload('&delete=' + itemId);
@@ -59,8 +59,8 @@ wishlistControl = {
 productConfigure.addListType(
     'wishlist',
     {
-        urlFetch: '<?php echo $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
-        urlConfirm: '<?php echo $block->getUrl('customer/wishlist_product_composite_wishlist/update') ?>'
+        urlFetch: '<?php /* @escapeNotVerified */ echo $block->getUrl('customer/wishlist_product_composite_wishlist/configure') ?>',
+        urlConfirm: '<?php /* @escapeNotVerified */ echo $block->getUrl('customer/wishlist_product_composite_wishlist/update') ?>'
     }
 );
 //-->
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 7d17f8f7abbc0..64ceb04b1401f 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 $block \Magento\Wishlist\Block\Customer\Wishlist\Button */
 ?>
 <?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->getShared() < $block->getConfig()->getSharingEmailLimit()): ?>
-    <button type="submit" name="save_and_share" title="<?php echo __('Share Wish List') ?>" class="action share">
-        <span><?php echo __('Share Wish List') ?></span>
+    <button type="submit" name="save_and_share" title="<?php /* @escapeNotVerified */ echo __('Share Wish List') ?>" class="action share">
+        <span><?php /* @escapeNotVerified */ echo __('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 8fdd179cb0b1b..74572226b7218 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/tocart.phtml
@@ -9,7 +9,7 @@
 ?>
 
 <?php if ($block->getWishlist()->getItemsCount() && $block->getWishlist()->isSalable()): ?>
-    <button type="button" data-role="all-tocart" title="<?php echo __('Add All to Cart') ?>" class="action tocart">
-        <span><?php echo __('Add All to Cart') ?></span>
+    <button type="button" data-role="all-tocart" title="<?php /* @escapeNotVerified */ echo __('Add All to Cart') ?>" class="action tocart">
+        <span><?php /* @escapeNotVerified */ echo __('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 91123a2ebbe55..62ddac2166326 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/button/update.phtml
@@ -9,7 +9,7 @@
 ?>
 
 <?php if ($block->getWishlist()->getItemsCount()): ?>
-    <button type="submit" name="do" title="<?php echo __('Update Wish List') ?>" class="action update">
-        <span><?php echo __('Update Wish List') ?></span>
+    <button type="submit" name="do" title="<?php /* @escapeNotVerified */ echo __('Update Wish List') ?>" class="action update">
+        <span><?php /* @escapeNotVerified */ echo __('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 196122cf80c6e..315faaacd8203 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 echo $block->getMoveFromCartParams(); ?>'
+       data-post='<?php /* @escapeNotVerified */ echo $block->getMoveFromCartParams(); ?>'
        class="use-ajax action action-towishlist">
-        <span><?php echo __('Move to Wishlist'); ?></span>
+        <span><?php /* @escapeNotVerified */ echo __('Move to Wishlist'); ?></span>
     </a>
 <?php endif ?>
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 3b9cf9d9d6b1f..5f7de0c2d08e6 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/email/items.phtml
@@ -19,25 +19,25 @@
             <?php $_product = $item->getProduct(); ?>
             <td class="col product">
                 <p>
-                    <a href="<?= $block->getProductUrl($_product) ?>">
+                    <a href="<?= /* @escapeNotVerified */  $block->getProductUrl($_product) ?>">
                         <?php echo $block->getImage($_product, 'product_small_image')->toHtml(); ?>
                     </a>
                 </p>
 
                 <p>
-                    <a href="<?= $block->getProductUrl($_product) ?>">
+                    <a href="<?= /* @escapeNotVerified */  $block->getProductUrl($_product) ?>">
                         <strong><?= $block->escapeHtml($_product->getName()) ?></strong>
                     </a>
                 </p>
                 <?php if ($block->hasDescription($item)): ?>
                     <p>
-                        <strong><?= __('Comment') ?>:</strong>
-                        <br/><?= $block->getEscapedDescription($item) ?>
+                        <strong><?= /* @escapeNotVerified */  __('Comment') ?>:</strong>
+                        <br/><?= /* @escapeNotVerified */  $block->getEscapedDescription($item) ?>
                     </p>
                 <?php endif; ?>
                 <p>
-                    <a href="<?= $block->getProductUrl($_product) ?>">
-                        <?= __('View Product') ?>
+                    <a href="<?= /* @escapeNotVerified */  $block->getProductUrl($_product) ?>">
+                        <?= /* @escapeNotVerified */  __('View Product') ?>
                     </a>
                 </p>
             </td>
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 a384e553697c5..7f586c64372ba 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
@@ -11,9 +11,9 @@
 
 <?php $children = $block->getChildNames(); ?>
 <?php if ($children): ?>
-    <div class="<?php echo $block->getCssClass() ?>">
+    <div class="<?php /* @escapeNotVerified */ echo $block->getCssClass() ?>">
         <?php foreach ($children as $childName):?>
-            <?php echo $block->getLayout()->renderElement($childName, false);?>
+            <?php /* @escapeNotVerified */ echo $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 ccefdab5a09a8..9a5abfce86334 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
@@ -12,35 +12,35 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <?php foreach ($block->getChildNames() as $childName): ?>
-    <?php echo $block->getLayout()->renderElement($childName, false); ?>
+    <?php /* @escapeNotVerified */ echo $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 $item->getId() ?>]"><span><?php echo __('Qty') ?></span></label>
+            <label class="label" for="qty[<?php /* @escapeNotVerified */ echo $item->getId() ?>]"><span><?php /* @escapeNotVerified */ echo __('Qty') ?></span></label>
             <div class="control">
-                <input type="number" data-role="qty" id="qty[<?php echo $item->getId() ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
-               name="qty[<?php echo $item->getId() ?>]" value="<?php echo $block->getAddToCartQty($item) * 1 ?>">
+                <input type="number" data-role="qty" id="qty[<?php /* @escapeNotVerified */ echo $item->getId() ?>]" class="input-text qty" data-validate="{'required-number':true,'validate-greater-than-zero':true}"
+               name="qty[<?php /* @escapeNotVerified */ echo $item->getId() ?>]" value="<?php /* @escapeNotVerified */ echo $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 echo $block->getItemAddToCartParams($item)?>' title="<?php echo __('Add to Cart') ?>" data-item-id="<?php echo $item->getId()?>" class="action tocart primary">
-                <span><?php echo __('Add to Cart') ?></span>
+            <button type="button" data-role="tocart" data-post='<?php /* @escapeNotVerified */ echo $block->getItemAddToCartParams($item)?>' title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>" data-item-id="<?php /* @escapeNotVerified */ echo $item->getId()?>" class="action tocart primary">
+                <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
             </button>
         </div>
     </div>
     <?php else: ?>
         <?php if ($product->getIsSalable()): ?>
-            <p class="available stock" title="<?php echo __('Availability') ?>">
-                <span><?php echo __('In stock') ?></span>
+            <p class="available stock" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                <span><?php /* @escapeNotVerified */ echo __('In stock') ?></span>
             </p>
         <?php else: ?>
-            <p class="unavailable stock" title="<?php echo __('Availability') ?>">
-                <span><?php echo __('Out of stock') ?></span>
+            <p class="unavailable stock" title="<?php /* @escapeNotVerified */ echo __('Availability') ?>">
+                <span><?php /* @escapeNotVerified */ echo __('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 baade6de4494e..990c912907020 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
@@ -12,10 +12,10 @@ $item = $block->getItem();
 ?>
 
 <div class="field comment-box">
-    <label class="label" for="product-item-comment-<?php echo $item->getWishlistItemId() ?>">
-        <span><?php echo __('Comment') ?></span>
+    <label class="label" for="product-item-comment-<?php /* @escapeNotVerified */ echo $item->getWishlistItemId() ?>">
+        <span><?php /* @escapeNotVerified */ echo __('Comment') ?></span>
     </label>
     <div class="control">
-        <textarea id="product-item-comment-<?php echo $item->getWishlistItemId() ?>" placeholder="<?php echo $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?php echo $item->getWishlistItemId() ?>]" title="<?php echo __('Comment') ?>" class="product-item-comment"><?php echo($block->escapeHtml($item->getDescription())) ?></textarea>
+        <textarea id="product-item-comment-<?php /* @escapeNotVerified */ echo $item->getWishlistItemId() ?>" placeholder="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Wishlist\Helper\Data')->defaultCommentString() ?>" name="description[<?php /* @escapeNotVerified */ echo $item->getWishlistItemId() ?>]" title="<?php /* @escapeNotVerified */ echo __('Comment') ?>" class="product-item-comment"><?php echo($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 b71eaaa46c709..7518f61677520 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
@@ -12,7 +12,7 @@ $product = $item->getProduct();
 ?>
 
 <?php if ($product->isVisibleInSiteVisibility()): ?>
-    <a class="action edit" href="<?php echo $block->getItemConfigureUrl($item) ?>">
-        <span><?php echo __('Edit') ?></span>
+    <a class="action edit" href="<?php /* @escapeNotVerified */ echo $block->getItemConfigureUrl($item) ?>">
+        <span><?php /* @escapeNotVerified */ echo __('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 055eae6d61c65..7a79f097b4c71 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
@@ -10,6 +10,6 @@
 $item = $block->getItem();
 $product = $item->getProduct();
 ?>
-<a class="product-item-photo" href="<?php echo $block->getProductUrl($item) ?>" title="<?php echo $block->escapeHtml($product->getName()) ?>">
+<a class="product-item-photo" href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>" title="<?php echo $block->escapeHtml($product->getName()) ?>">
     <?php echo $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 c7e7f7535d1c0..1355898ad5d95 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
@@ -11,7 +11,7 @@ $item = $block->getItem();
 $product = $item->getProduct();
 ?>
 <strong class="product-item-name">
-    <a href="<?php echo $block->getProductUrl($item) ?>" title="<?php echo $block->escapeHtml($product->getName()) ?>" class="product-item-link">
+    <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>" title="<?php echo $block->escapeHtml($product->getName()) ?>" class="product-item-link">
         <?php echo $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 75f22cba0d326..911d03790d206 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 echo $block->getLayout()->renderElement($childName, false); ?>
+    <?php /* @escapeNotVerified */ echo $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 ade66689106d7..3a4986a62e12c 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
@@ -8,6 +8,6 @@
 
 ?>
 
-<a href="#" data-role="remove" data-post-remove='<?php echo $block->getItemRemoveParams($block->getItem()); ?>' title="<?php echo __('Remove Item') ?>" class="btn-remove action delete">
-    <span><?php echo __('Remove item');?></span>
+<a href="#" data-role="remove" data-post-remove='<?php /* @escapeNotVerified */ echo $block->getItemRemoveParams($block->getItem()); ?>' title="<?php /* @escapeNotVerified */ echo __('Remove Item') ?>" class="btn-remove action delete">
+    <span><?php /* @escapeNotVerified */ echo __('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 f58b669ae60d1..d808f4350b76b 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
@@ -10,22 +10,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 echo $block->getUpdateParams(); ?>' class="action towishlist updated" data-action="add-to-wishlist">
-            <span><?php echo __('Update Wish List') ?></span>
+        <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getUpdateParams(); ?>' class="action towishlist updated" data-action="add-to-wishlist">
+            <span><?php /* @escapeNotVerified */ echo __('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 $_compareUrl ?>" class="action tocompare">
-            <span><?php echo __('Add to Compare') ?></span>
+        <a href="<?php /* @escapeNotVerified */ echo $_compareUrl ?>" class="action tocompare">
+            <span><?php /* @escapeNotVerified */ echo __('Add to Compare') ?></span>
         </a>
     <?php endif; ?>
 </div>
 <script type="text/x-magento-init">
     {
         "body": {
-            "addToWishlist": <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
+            "addToWishlist": <?php /* @escapeNotVerified */ echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWishlistOptions())?>
         }
     }
 </script>
\ No newline at end of file
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 d4b7a9dbfa6ca..4cf626a803506 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/item/list.phtml
@@ -17,7 +17,7 @@ $columns = $block->getColumns();
     <?php if (count($block->getItems())): ?>
     <ol class="product-items">
         <?php foreach ($block->getItems() as $item): ?>
-        <?php echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $item->getId() . '">' : '</li><li class="product-item" id="item_' . $item->getId() . '">' ?>
+        <?php /* @escapeNotVerified */ echo($iterator++ == 1) ? '<li data-row="product-item" class="product-item" id="item_' . $item->getId() . '">' : '</li><li class="product-item" id="item_' . $item->getId() . '">' ?>
             <div class="product-item-info">
                 <?php foreach ($columns as $column): ?>
                     <?php $column->setItem($item); echo $column->toHtml($item);?>
@@ -28,7 +28,7 @@ $columns = $block->getColumns();
     </ol>
     <?php else: ?>
         <div class="message info empty">
-            <span><?php echo __('This Wish List has no Items');?></span>
+            <span><?php /* @escapeNotVerified */ echo __('This Wish List has no Items');?></span>
         </div>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Wishlist/view/frontend/templates/link.phtml b/app/code/Magento/Wishlist/view/frontend/templates/link.phtml
index 05c0463c19b48..75905fc2c78e8 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 $block \Magento\Wishlist\Block\Link */
 ?>
 <li class="link wishlist" data-bind="scope: 'wishlist'">
-    <a <?php echo $block->getLinkAttributes() ?>><?php echo $block->escapeHtml($block->getLabel()) ?>
+    <a <?php /* @escapeNotVerified */ echo $block->getLinkAttributes() ?>><?php echo $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/options_list.phtml b/app/code/Magento/Wishlist/view/frontend/templates/options_list.phtml
index 11ce019d59d00..7868e1236c87c 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 __('See Details') ?></span>
+  <span class="action details tooltip toggle"><?php /* @escapeNotVerified */ echo __('See Details') ?></span>
   <div class="tooltip content">
-      <strong class="subtitle"><?php echo __('Options Details'); ?></strong>
+      <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('Options Details'); ?></strong>
       <dl>
           <?php foreach ($options as $option): ?>
           <dt class="label"><?php echo $block->escapeHtml($option['label']) ?></dt>
           <dd class="values">
               <?php if (is_array($option['value'])): ?>
-              <?php echo nl2br(implode("\n", $option['value'])) ?>
+              <?php /* @escapeNotVerified */ echo nl2br(implode("\n", $option['value'])) ?>
               <?php else: ?>
-              <?php echo $option['value'] ?>
+              <?php /* @escapeNotVerified */ echo $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 7043be8d41932..7fc5d58323489 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/rss/email.phtml
@@ -12,6 +12,6 @@
 <p style="font-size:12px; line-height:16px; margin:0 0 16px;">
     <?php echo __("RSS link to %1's wishlist", $block->escapeHtml($this->helper('Magento\Wishlist\Helper\Data')->getCustomerName())) ?>
     <br />
-    <a href="<?php echo $block->getLink(); ?>"><?php echo $block->getLink(); ?></a>
+    <a href="<?php /* @escapeNotVerified */ echo $block->getLink(); ?>"><?php /* @escapeNotVerified */ echo $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 cd0d472a6e7b0..858c376c58f5d 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 $block \Magento\Wishlist\Block\Rss\Link */
 ?>
 <?php if ($block->isRssAllowed() && $block->getLink() && $this->helper('Magento\Wishlist\Helper\Data')->getWishlist()->getItemsCount()): ?>
-    <a href="<?php echo $block->getLink(); ?>" class="action rss wishlist">
-        <span><?php echo __('RSS Feed') ?></span>
+    <a href="<?php /* @escapeNotVerified */ echo $block->getLink(); ?>" class="action rss wishlist">
+        <span><?php /* @escapeNotVerified */ echo __('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 02e5f04cd87a8..5005c812014f0 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->getUrl('wishlist/index/update') ?>" method="post">
+    <form class="form shared wishlist" action="<?php /* @escapeNotVerified */ echo $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 __('Wish List'); ?></caption>
+                <caption class="table-caption"><?php /* @escapeNotVerified */ echo __('Wish List'); ?></caption>
                 <thead>
                 <tr>
-                    <th class="col product" scope="col"><?php echo __('Product') ?></th>
-                    <th class="col comment" scope="col"><?php echo __('Comment') ?></th>
-                    <th class="col actions" scope="col"><?php echo __('Add to Cart') ?></th>
+                    <th class="col product" scope="col"><?php /* @escapeNotVerified */ echo __('Product') ?></th>
+                    <th class="col comment" scope="col"><?php /* @escapeNotVerified */ echo __('Comment') ?></th>
+                    <th class="col actions" scope="col"><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></th>
                 </tr>
                 </thead>
                 <tbody>
@@ -29,11 +29,11 @@
                     ?>
                     <tr>
                         <td data-th="<?php echo $block->escapeHtml(__('Product')) ?>" class="col product">
-                            <a class="product photo" href="<?php echo $block->getProductUrl($item) ?>" title="<?php echo $block->escapeHtml($product->getName()) ?>">
+                            <a class="product photo" href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>" title="<?php echo $block->escapeHtml($product->getName()) ?>">
                                 <?php echo $block->getImage($product, 'customer_shared_wishlist')->toHtml(); ?>
                             </a>
                             <strong class="product name">
-                                <a href="<?php echo $block->getProductUrl($item) ?>">
+                                <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl($item) ?>">
                                     <?php echo $block->escapeHtml($product->getName()) ?>
                                 </a>
                             </strong>
@@ -47,20 +47,20 @@
                             ?>
                             <?php echo $block->getDetailsHtml($item) ?>
                         </td>
-                        <td data-th="<?php echo $block->escapeHtml(__('Comment')) ?>" class="col comment"><?php echo $block->getEscapedDescription($item) ?></td>
+                        <td data-th="<?php echo $block->escapeHtml(__('Comment')) ?>" class="col comment"><?php /* @escapeNotVerified */ echo $block->getEscapedDescription($item) ?></td>
                         <td data-th="<?php echo $block->escapeHtml(__('Add to Cart')) ?>" class="col actions" data-role="add-to-links">
                             <?php if ($product->isSaleable()): ?>
                                 <?php if ($isVisibleProduct): ?>
                                     <button type="button"
-                                            title="<?php echo __('Add to Cart') ?>"
-                                            data-post='<?php echo $block->getSharedItemAddToCartUrl($item); ?>'
+                                            title="<?php /* @escapeNotVerified */ echo __('Add to Cart') ?>"
+                                            data-post='<?php /* @escapeNotVerified */ echo $block->getSharedItemAddToCartUrl($item); ?>'
                                             class="action tocart">
-                                        <span><?php echo __('Add to Cart') ?></span>
+                                        <span><?php /* @escapeNotVerified */ echo __('Add to Cart') ?></span>
                                     </button>
                                 <?php endif ?>
                             <?php endif; ?>
-                            <a href="#" data-post='<?php echo $block->getAddToWishlistParams($item); ?>'  onclick="location.assign(this.href); return false;" class="action towishlist" data-action="add-to-wishlist">
-                                <span><?php echo __('Add to Wish List') ?></span>
+                            <a href="#" data-post='<?php /* @escapeNotVerified */ echo $block->getAddToWishlistParams($item); ?>'  onclick="location.assign(this.href); return false;" class="action towishlist" data-action="add-to-wishlist">
+                                <span><?php /* @escapeNotVerified */ echo __('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 __('Add All to Cart') ?>"
-                            data-post='<?php echo $block->getSharedAddAllToCartUrl(); ?>'
+                            title="<?php /* @escapeNotVerified */ echo __('Add All to Cart') ?>"
+                            data-post='<?php /* @escapeNotVerified */ echo $block->getSharedAddAllToCartUrl(); ?>'
                             class="action tocart primary">
-                        <span><?php echo __('Add All to Cart') ?></span>
+                        <span><?php /* @escapeNotVerified */ echo __('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 __('Back') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('Back') ?></span>
                 </a>
             </div>
         </div>
     </form>
 <?php else: ?>
-    <div class="message info empty"><div><?php echo __('Wish List is empty now.') ?></div></div>
+    <div class="message info empty"><div><?php /* @escapeNotVerified */ echo __('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 2c1d8e291787d..b629cbcb61218 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 $block \Magento\Wishlist\Block\Customer\Sharing */
 ?>
 <form class="form wishlist share"
-      action="<?php echo $block->getSendUrl() ?>"
+      action="<?php /* @escapeNotVerified */ echo $block->getSendUrl() ?>"
       id="form-validate"
       method="post"
-      data-hasrequired="<?php echo __('* Required Fields') ?>"
+      data-hasrequired="<?php /* @escapeNotVerified */ echo __('* Required Fields') ?>"
       data-mage-init='{"validation":{}}'>
     <fieldset class="fieldset">
         <?php echo $block->getBlockHtml('formkey')?>
-        <legend class="legend"><span><?php echo __('Sharing Information') ?></span></legend><br />
+        <legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Sharing Information') ?></span></legend><br />
         <div class="field emails required">
-            <label class="label" for="email_address"><span><?php echo __('Email addresses, separated by commas') ?></span></label>
+            <label class="label" for="email_address"><span><?php /* @escapeNotVerified */ echo __('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 echo $block->getEnteredData('emails') ?></textarea>
+                <textarea name="emails" cols="60" rows="5" id="email_address" data-validate="{required:true,'validate-emails':true}"><?php /* @escapeNotVerified */ echo $block->getEnteredData('emails') ?></textarea>
             </div>
         </div>
         <div class="field text">
-            <label class="label" for="message"><span><?php echo __('Message') ?></span></label>
+            <label class="label" for="message"><span><?php /* @escapeNotVerified */ echo __('Message') ?></span></label>
             <div class="control">
-                <textarea id="message" name="message" cols="60" rows="5"><?php echo $block->getEnteredData('message') ?></textarea>
+                <textarea id="message" name="message" cols="60" rows="5"><?php /* @escapeNotVerified */ echo $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 __('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="<?php /* @escapeNotVerified */ echo __('Check here to link an RSS feed to your Wish List.') ?>" class="checkbox">
                 <label class="label" for="rss_url">
                     <span>
-                        <?php echo __('Check here to link an RSS feed to your Wish List.') ?>
+                        <?php /* @escapeNotVerified */ echo __('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 __('Share Wish List') ?>" class="action submit primary">
-                <span><?php echo __('Share Wish List') ?></span>
+            <button type="submit" title="<?php /* @escapeNotVerified */ echo __('Share Wish List') ?>" class="action submit primary">
+                <span><?php /* @escapeNotVerified */ echo __('Share Wish List') ?></span>
             </button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?php echo $block->getBackUrl(); ?>"><span><?php echo __('Back')?></span></a>
+            <a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl(); ?>"><span><?php /* @escapeNotVerified */ echo __('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 1da587a17cf6d..bab2e79a75f33 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><?php echo $block->getTitle(); ?></strong>
+            <strong><?php /* @escapeNotVerified */ echo $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 __('Last Added Items') ?></strong>
+            <strong class="subtitle"><?php /* @escapeNotVerified */ echo __('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 __('Add to Cart') ?></span></a>
+                                        <a href="#" data-bind="attr: {'data-post': add_to_cart_params}" class="action tocart primary"><span><?php /* @escapeNotVerified */ echo __('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 __('Add to Cart') ?></span></button>
+                                            <button type="button" class="action tocart primary" data-bind="attr: {'data-post': add_to_cart_params}"><span><?php /* @escapeNotVerified */ echo __('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 __('Remove This Item') ?>"
+                                           title="<?php /* @escapeNotVerified */ echo __('Remove This Item') ?>"
                                            class="btn-remove action delete">
-                                            <span><?php echo __('Remove This Item') ?></span>
+                                            <span><?php /* @escapeNotVerified */ echo __('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 $this->helper('Magento\Wishlist\Helper\Data')->getListUrl() ?>"
-                           title="<?php echo __('Go to Wish List') ?>"><span><?php echo __('Go to Wish List') ?></span></a>
+                           href="<?php /* @escapeNotVerified */ echo $this->helper('Magento\Wishlist\Helper\Data')->getListUrl() ?>"
+                           title="<?php /* @escapeNotVerified */ echo __('Go to Wish List') ?>"><span><?php /* @escapeNotVerified */ echo __('Go to Wish List') ?></span></a>
                     </div>
                 </div>
             <!-- /ko -->
             <!-- ko ifnot: wishlist().counter -->
-                <div class="empty"><?php echo __('You have no items in your wish list.') ?></div>
+                <div class="empty"><?php /* @escapeNotVerified */ echo __('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 1089e880f4a6f..0ea7dc1fbfd20 100644
--- a/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
+++ b/app/code/Magento/Wishlist/view/frontend/templates/view.phtml
@@ -13,18 +13,18 @@
     <?php echo($block->getChildHtml('wishlist.rss.link'));?>
     <form class="form-wishlist-items" id="wishlist-view-form"
           data-mage-init='{"wishlist":{
-          "addToCartUrl":<?php echo $block->getItemAddToCartParams("%item%");?>,
-          "confirmRemoveMessage":"<?php echo __("Are you sure you want to remove this product from your Wish List?") ?>",
-          "addAllToCartUrl":<?php echo $block->getAddAllToCartParams(); ?>,
+          "addToCartUrl":<?php /* @escapeNotVerified */ echo $block->getItemAddToCartParams("%item%");?>,
+          "confirmRemoveMessage":"<?php /* @escapeNotVerified */ echo __("Are you sure you want to remove this product from your Wish List?") ?>",
+          "addAllToCartUrl":<?php /* @escapeNotVerified */ echo $block->getAddAllToCartParams(); ?>,
           "commentString":""},
-          "validation": {}}' action="<?php echo $block->getUrl('wishlist/index/update', ['wishlist_id' => $block->getWishlistInstance()->getId()]) ?>" method="post">
+          "validation": {}}' action="<?php /* @escapeNotVerified */ echo $block->getUrl('wishlist/index/update', ['wishlist_id' => $block->getWishlistInstance()->getId()]) ?>" method="post">
         <?php echo $block->getChildHtml('top'); ?>
         <?php if ($block->hasWishlistItems()): ?>
             <?php echo $block->getBlockHtml('formkey');?>
             <?php $block->getChildBlock('items')->setItems($block->getWishlistItems()); ?>
             <?php echo $block->getChildHtml('items');?>
         <?php else: ?>
-            <div class="message info empty"><span><?php echo __('You have no items in your wish list.') ?></span></div>
+            <div class="message info empty"><span><?php /* @escapeNotVerified */ echo __('You have no items in your wish list.') ?></span></div>
         <?php endif ?>
         <?php echo $block->getChildHtml('bottom'); ?>
         <div class="actions-toolbar">
@@ -33,7 +33,7 @@
             </div>
             <div class="secondary">
                 <a href="<?php echo $block->escapeUrl($block->getBackUrl()) ?>" class="action back">
-                    <span><?php echo __('Back') ?></span>
+                    <span><?php /* @escapeNotVerified */ echo __('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 f06820d83708c..05b9e744d67ba 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
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -18,30 +20,30 @@
             role="heading"
             aria-level="2"
             data-role="title"
-            data-count="<?php echo count($_filters); ?>"><?php echo __('Now Shopping by') ?></strong>
+            data-count="<?php echo count($_filters); ?>"><?php /* @escapeNotVerified */ echo __('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 echo $block->stripTags($_filter->getLabel()) ?></span>
+                <span class="filter-value"><?php /* @escapeNotVerified */ echo $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 echo $_filter->getRemoveUrl() ?>"
-                       title="<?php echo __('Previous') ?>">
-                        <span><?php echo __('Previous') ?></span>
+                    <a class="action previous" href="<?php /* @escapeNotVerified */ echo $_filter->getRemoveUrl() ?>"
+                       title="<?php /* @escapeNotVerified */ echo __('Previous') ?>">
+                        <span><?php /* @escapeNotVerified */ echo __('Previous') ?></span>
                     </a>
                     <a class="action remove"
                        title="<?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>"
-                       href="<?php echo $clearLinkUrl ?>">
+                       href="<?php /* @escapeNotVerified */ echo $clearLinkUrl ?>">
                         <span><?php echo $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?></span>
                     </a>
                 <?php else: ?>
-                    <a class="action remove" href="<?php echo $_filter->getRemoveUrl() ?>"
-                       title="<?php echo $block->escapeHtml(__('Remove')) . " " . $currentFilterName;?>">
-                        <span><?php echo __('Remove This Item') ?></span>
+                    <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>
                 <?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 34ccfff824f76..e152f3cdfafe7 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
@@ -3,6 +3,8 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// @codingStandardsIgnoreFile
 ?>
 <?php
 /**
@@ -15,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 echo $filtered; ?>">
-            <strong data-role="title"><?php echo __('Shop By') ?></strong>
+        <div class="block-title filter-title" data-count="<?php /* @escapeNotVerified */ echo $filtered; ?>">
+            <strong data-role="title"><?php /* @escapeNotVerified */ echo __('Shop By') ?></strong>
         </div>
         <div class="block-content filter-content">
             <?php echo $block->getChildHtml('state') ?>
 
             <?php if ($block->getLayer()->getState()->getFilters()): ?>
                 <div class="block-actions filter-actions">
-                    <a href="<?php echo $block->getClearUrl() ?>" class="action clear filter-clear"><span><?php echo __('Clear All') ?></span></a>
+                    <a href="<?php /* @escapeNotVerified */ echo $block->getClearUrl() ?>" class="action clear filter-clear"><span><?php /* @escapeNotVerified */ echo __('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 echo __('Shopping Options') ?></strong>
+                        <strong role="heading" aria-level="2" class="block-subtitle filter-subtitle"><?php /* @escapeNotVerified */ echo __('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 echo __($filter->getName()) ?></div>
-                        <div data-role="content" class="filter-options-content"><?php echo $block->getChildBlock('renderer')->render($filter); ?></div>
+                        <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>
                 <?php endif; ?>
             <?php endforeach; ?>
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php b/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
index a9134fa240013..5842c74dd9fe3 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/XssOutputValidator.php
@@ -225,7 +225,11 @@ public function isXssUnsafeCommand($command)
      */
     private function getLastMethod($command)
     {
-        if (preg_match_all('/->.*?\(.*?\)/sim', $command, $matches)) {
+        if (preg_match_all(
+            '/->.*?\(.*?\)/sim',
+            $this->clearMethodBracketContent($command),
+            $matches
+        )) {
             $command = end($matches[0]);
             $command = substr($command, 0, strpos($command, '(') + 1);
         }
@@ -233,6 +237,38 @@ private function getLastMethod($command)
         return $command;
     }
 
+    /**
+     * @param string $command
+     * @return string
+     */
+    private function clearMethodBracketContent($command)
+    {
+        $bracketInterval = [];
+        $bracketOpenPos = [];
+        $command = str_split($command);
+        foreach ($command as $index => $character) {
+            if ($character == '(') {
+                array_push($bracketOpenPos, $index);
+            }
+            if (count($bracketOpenPos)) {
+                if ($character == ')') {
+                    $lastOpenPos = array_pop($bracketOpenPos);
+                    if (count($bracketOpenPos) == 0) {
+                        $bracketInterval[] = [$lastOpenPos, $index];
+                    }
+                }
+            }
+        }
+        foreach ($bracketInterval as $interval) {
+            for ($i = $interval[0] + 1; $i < $interval[1]; $i++) {
+                unset($command[$i]);
+            }
+        }
+        $command = implode('', $command);
+
+        return $command;
+    }
+
     /**
      * @param string $content
      * @return int
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 683f83724553b..47247f0e1f700 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
@@ -31,6 +31,7 @@ echo $var;
 ?>
 <?php /* @noEscape */ echo '\'' . $code . '\',\'' . $block->escapeQuote($data['parentSymbol']) . '\''; ?>
 <?= $block->getExtendedElement($switchAttributeCode)->toHtml(); ?>
+<?= $block->escapeHtml($_filter->getFilter()->getClearLinkText()) ?>
 <?php
 /**
  * echo $someVar;