diff --git a/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html b/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html
index e596ced5d7834..170de87cfd767 100644
--- a/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html
+++ b/app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html
@@ -61,7 +61,7 @@
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 5bcb35156a1c0..328c230ef95a7 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -69,6 +69,7 @@
         </referenceContainer>
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
             <block class="Magento\Framework\View\Element\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html
index 149e1bdfd5420..0d009a345871a 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html
@@ -41,7 +41,7 @@
                         "
                         class="action primary checkout"
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html b/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html
index 8073eb00f64e4..748133c319757 100644
--- a/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html
+++ b/app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html
@@ -36,12 +36,12 @@
 
         <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'braintree_form_cc'}">
             <!-- ko if: (isShowLegend())-->
-            <legend class="legend"><span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span></legend><br />
+            <legend class="legend"><span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span></legend><br />
             <!-- /ko -->
             <!-- ko if: (useVault()) -->
             <div>
                 <label data-bind="attr: {for: getCode() + '_cc_token'}" class="label">
-                    <span><!-- ko text: $t('Payment Information')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Payment Information'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <select name="payment[cc_token]" class="select"
@@ -60,7 +60,7 @@
             <!-- /ko -->
             <div class="field type required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Type'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <!-- ko if: (!isCcDetectionEnabled())-->
@@ -102,7 +102,7 @@
             </div>
             <div class="field number required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number" name="payment[cc_number]" class="input-text" value=""
@@ -112,7 +112,7 @@
             </div>
             <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-                    <span><!-- ko text: $t('Expiration Date')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <div class="fields group group-2">
@@ -148,7 +148,7 @@
             <!-- ko if: (hasVerification())-->
             <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-                    <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number"
@@ -166,7 +166,7 @@
                               tabindex="0"
                               data-toggle="dropdown"
                               data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-                            <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
                         </span>
                         <div class="field-tooltip-content"
                              data-target="dropdown"
@@ -189,7 +189,7 @@
                            class="checkbox"
                            data-bind="checked: storeInVault"/>
                     <label class="label" for="braintree_store_in_vault">
-                        <span><!-- ko text: $t('Save this card for future use')--><!-- /ko --></span>
+                        <span><!-- ko i18n: 'Save this card for future use'--><!-- /ko --></span>
                     </label>
                 </div>
             </div>
@@ -212,7 +212,7 @@
                             css: {disabled: !isPlaceOrderActionAllowed()}
                             "
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
index 3b294d904b2cb..0282f24e480da 100644
--- a/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
+++ b/app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html
@@ -6,7 +6,7 @@
 -->
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
-    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="text: $t('Please type the letters below')"></span></label>
+    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters below'"></span></label>
     <div class="control captcha">
         <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
         <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
@@ -20,12 +20,12 @@
                                         }"
                          class="captcha-img"/>
                     <button type="button" class="action reload captcha-reload" data-bind="attr: {title: $t('Reload captcha')}, click: refresh">
-                        <span data-bind="text: $t('Reload captcha')"></span>
+                        <span data-bind="i18n: 'Reload captcha'"></span>
                     </button>
                 </div>
             </div>
             <!-- ko if: isCaseSensitive()-->
-            <div class="captcha-note note" data-bind="text: $t('Attention: Captcha is case sensitive.')"></div>
+            <div class="captcha-note note" data-bind="i18n: 'Attention: Captcha is case sensitive.'"></div>
             <!-- /ko -->
         </div>
     </div>
diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
index a779fd63c55f2..c375e94de8ca2 100644
--- a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -191,6 +191,7 @@
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="selectProvider" xsi:type="string">product_listing.product_listing.product_columns.ids</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
                     <item name="displayArea" xsi:type="string">bottom</item>
                     <item name="actions" xsi:type="array">
                         <item name="delete" xsi:type="array">
@@ -202,12 +203,23 @@
                             <item name="label" xsi:type="string" translate="true">Delete</item>
                             <item name="url" xsi:type="string">catalog/product/massDelete</item>
                         </item>
-                        <item name="disable" xsi:type="array">
+                        <item name="status" xsi:type="array">
                             <item name="type" xsi:type="string">status</item>
                             <item name="label" xsi:type="string" translate="true">Change status</item>
-                            <item name="url" xsi:type="string">catalog/*/massStatus</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="type" xsi:type="string">enable</item>
+                                    <item name="label" xsi:type="string" translate="true">Enable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massEnable</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="type" xsi:type="string">disable</item>
+                                    <item name="label" xsi:type="string" translate="true">Disable</item>
+                                    <item name="url" xsi:type="string">catalog/product/massDisable</item>
+                                </item>
+                            </item>
                         </item>
-                        <item name="enable" xsi:type="array">
+                        <item name="attributes" xsi:type="array">
                             <item name="type" xsi:type="string">attributes</item>
                             <item name="label" xsi:type="string" translate="true">Update attributes</item>
                             <item name="url" xsi:type="string">catalog/product_action_attribute/edit</item>
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 6f05b3b6a4cb5..2dc516c80d005 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -19,7 +19,7 @@
             <span class="counter-label">
             <!-- ko if: cart().summary_count -->
                 <!-- ko text: cart().summary_count --><!-- /ko -->
-                <!-- ko text: $t('items') --><!-- /ko -->
+                <!-- ko i18n: 'items' --><!-- /ko -->
             <!-- /ko -->
             </span>
         </span>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
index f6a1e6e73a2bf..00e2f5ba63abd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/authentication.html
@@ -9,7 +9,7 @@
         type="button"
         class="action action-auth-toggle"
         data-trigger="authentication">
-        <span data-bind="text: $t('Sign In')"></span>
+        <span data-bind="i18n: 'Sign In'"></span>
     </button>
     <div class="block-authentication"
          style="display: none"
@@ -34,7 +34,7 @@
                 <strong id="block-customer-login-heading"
                         role="heading"
                         aria-level="2"
-                        data-bind="text: $t('Sign In')"></strong>
+                        data-bind="i18n: 'Sign In'"></strong>
             </div>
             <div class="block-content" aria-labelledby="block-customer-login-heading">
                 <form data-role="login"
@@ -43,7 +43,7 @@
                     <div class="fieldset"
                               data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
                         <div class="field field-email required">
-                            <label class="label" for="login-email"><span data-bind="text: $t('Email Address')"></span></label>
+                            <label class="label" for="login-email"><span data-bind="i18n: 'Email Address'"></span></label>
                             <div class="control">
                                 <input type="email"
                                        class="input-text"
@@ -53,7 +53,7 @@
                             </div>
                         </div>
                         <div class="field field-password required">
-                            <label for="login-password" class="label"><span data-bind="text: $t('Password')"></span></label>
+                            <label for="login-password" class="label"><span data-bind="i18n: 'Password'"></span></label>
                             <div class="control">
                                 <input type="password"
                                        class="input-text"
@@ -69,11 +69,11 @@
                     <div class="actions-toolbar">
                         <input name="context" type="hidden" value="checkout" />
                         <div class="primary">
-                            <button type="submit" class="action action-login secondary"><span data-bind="text: $t('Sign In')"></span></button>
+                            <button type="submit" class="action action-login secondary"><span data-bind="i18n: 'Sign In'"></span></button>
                         </div>
                         <div class="secondary">
                             <a class="action action-remind" data-bind="attr: { href: forgotPasswordUrl }">
-                                <span data-bind="text: $t('Forgot Password')"></span>
+                                <span data-bind="i18n: 'Forgot Password'"></span>
                             </a>
                         </div>
                     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
index 895f94e4cbd94..3c87e88b6ad65 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address.html
@@ -6,7 +6,7 @@
 -->
 <div class="billing-address-same-as-shipping-block field choice" data-bind="visible: canUseShippingAddress()">
     <input type="checkbox" name="billing-address-same-as-shipping" data-bind="checked: isAddressSameAsShipping, click: useShippingAddress, attr: {id: 'billing-address-same-as-shipping-' + $parent.getCode()}"/>
-    <label data-bind="text: $t('My billing and shipping address are the same'), attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
+    <label data-bind="i18n: 'My billing and shipping address are the same', attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
 </div>
 
 <!-- ko template: 'Magento_Checkout/billing-address/details' --><!-- /ko -->
@@ -16,10 +16,10 @@
     <div class="actions-toolbar">
         <div class="primary">
             <button class="action action-update" type="button" data-bind="click: updateAddress">
-                <span data-bind="text: $t('Update')"></span>
+                <span data-bind="i18n: 'Update'"></span>
             </button>
             <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
index a9cb99a301cbd..52710e576f007 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -13,6 +13,6 @@
     <button type="button"
             class="action action-edit-address"
             data-bind="visible: !isAddressSameAsShipping(), click: editAddress">
-        <span data-bind="text: $t('Edit')"></span>
+        <span data-bind="i18n: 'Edit'"></span>
     </button>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
index 4174aa194d635..e433f0ab13f02 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -17,7 +17,7 @@
             <div class="choice field">
                 <input type="checkbox" class="checkbox" id="billing-save-in-address-book" data-bind="checked: saveInAddressBook" />
                 <label class="label" for="billing-save-in-address-book">
-                    <span data-bind="text: $t('Save in address book')"></span>
+                    <span data-bind="i18n: 'Save in address book'"></span>
                 </label>
             </div>
             <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
index f826ede448372..3df8446b3ffdf 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/list.html
@@ -5,7 +5,7 @@
  */
 -->
 <div class="field field-select-billing">
-    <label class="label"><span data-bind="text: $t('My billing and shipping address are the same')"></span></label>
+    <label class="label"><span data-bind="i18n: 'My billing and shipping address are the same'"></span></label>
     <div class="control" data-bind="if: (addressOptions.length > 1)">
         <select class="select" name="billing_address_id" data-bind="
         options: addressOptions,
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
index af295c6f0f3b3..dd037ff8d3622 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/estimation.html
@@ -6,8 +6,8 @@
 -->
 <div class="opc-estimated-wrapper">
     <div class="estimated-block">
-        <span class="estimated-label" data-bind="text: $t('Estimated Total')"></span>
-        <span class="estimated-price" data-bind="text: getValue()"></span>
+        <span class="estimated-label" data-bind="i18n: 'Estimated Total'"></span>
+        <span class="estimated-price" data-bind="i18n: getValue()"></span>
     </div>
     <div class="minicart-wrapper">
         <button type="button" class="action showcart" data-bind="click: showSidebar" data-toggle="opc-summary">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
index a2159cc764d2a..fe038cae6fc60 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/form/element/email.html
@@ -15,7 +15,7 @@
     <fieldset id="customer-email-fieldset" class="fieldset" data-bind="blockLoader: isLoading">
         <div class="field required">
             <label class="label" for="customer-email">
-                <span data-bind="text: $t('Email Address')"></span>
+                <span data-bind="i18n: 'Email Address'"></span>
             </label>
             <div class="control _with-tooltip">
                 <input class="input-text"
@@ -25,7 +25,7 @@
                        data-validate="{required:true, 'validate-email':true}"
                        id="customer-email" />
                 <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
-                <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko text: $t("You can create an account after checkout.")--><!-- /ko --></span>
+                <span class="note" data-bind="fadeVisible: isPasswordVisible() == false"><!-- ko i18n: "You can create an account after checkout."--><!-- /ko --></span>
             </div>
         </div>
 
@@ -33,7 +33,7 @@
         <fieldset class="fieldset hidden-fields" data-bind="fadeVisible: isPasswordVisible">
             <div class="field">
                 <label class="label" for="customer-password">
-                    <span data-bind="text: $t('Password')"></span>
+                    <span data-bind="i18n: 'Password'"></span>
                 </label>
                 <div class="control">
                     <input class="input-text"
@@ -42,7 +42,7 @@
                            name="password"
                            id="customer-password"
                            data-validate="{required:true, 'validate-password':true}" />
-                    <span class="note" data-bind="text: $t('You already have an account with us. Sign in or continue as guest.')"></span>
+                    <span class="note" data-bind="i18n: 'You already have an account with us. Sign in or continue as guest.'"></span>
                 </div>
 
             </div>
@@ -52,11 +52,11 @@
             <div class="actions-toolbar">
                 <input name="context" type="hidden" value="checkout" />
                 <div class="primary">
-                    <button type="submit" class="action login primary" data-action="checkout-method-login"><span data-bind="text: $t('Login')"></span></button>
+                    <button type="submit" class="action login primary" data-action="checkout-method-login"><span data-bind="i18n: 'Login'"></span></button>
                 </div>
                 <div class="secondary">
                     <a class="action remind" data-bind="attr: { href: forgotPasswordUrl }">
-                        <span data-bind="text: $t('Forgot Your Password?')"></span>
+                        <span data-bind="i18n: 'Forgot Your Password?'"></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
index 4e5e3b21f6387..441106e637d2b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html
@@ -6,7 +6,7 @@
 -->
 <div class="block-title">
     <strong>
-        <span class="text"><!-- ko text: $t('My Cart') --><!-- /ko --></span>
+        <span class="text"><!-- ko i18n: 'My Cart' --><!-- /ko --></span>
         <span
             class="qty empty"
             data-bind="css: { empty: cart().summary_count == 0 },
@@ -22,17 +22,17 @@
             class="action close"
             data-action="close"
             data-bind="attr: { title: $t('Close') }">
-        <span><!-- ko text: $t('Close') --><!-- /ko --></span>
+        <span><!-- ko i18n: 'Close' --><!-- /ko --></span>
     </button>
 
     <!-- ko if: cart().summary_count -->
         <div class="items-total">
             <span class="count"><!-- ko text: cart().summary_count --><!-- /ko --></span>
             <!-- ko if: cart().summary_count == 1 -->
-                <!-- ko text: $t('item') --><!-- /ko -->
+                <!-- ko i18n: 'item' --><!-- /ko -->
             <!-- /ko -->
             <!-- ko if: cart().summary_count > 1 -->
-                <!-- ko text: $t('items') --><!-- /ko -->
+                <!-- ko i18n: 'items' --><!-- /ko -->
             <!-- /ko -->
         </div>
 
@@ -54,7 +54,7 @@
                         type="button"
                         class="action primary checkout"
                         data-bind="attr: {title: $t('Go to Checkout')}">
-                    <!-- ko text: $t('Go to Checkout') --><!-- /ko -->
+                    <!-- ko i18n: 'Go to Checkout' --><!-- /ko -->
                 </button>
                 <div data-bind="html: cart().extra_actions"></div>
             </div>
@@ -63,7 +63,7 @@
     <!-- /ko -->
 
     <!-- ko if: cart().summary_count -->
-    <strong class="subtitle"><!-- ko text: $t('Recently added item(s)') --><!-- /ko --></strong>
+    <strong class="subtitle"><!-- ko i18n: 'Recently added item(s)' --><!-- /ko --></strong>
     <div data-action="scroll" class="minicart-items-wrapper">
         <ol id="mini-cart" class="minicart-items" data-bind="foreach: { data: cart().items, as: 'item' }">
             <!-- ko foreach: $parent.getRegion($parent.getItemRenderer(item.product_type)) -->
@@ -75,7 +75,7 @@
 
     <!-- ko ifnot: cart().summary_count -->
         <strong class="subtitle empty" data-bind="visible: closeSidebar()">
-            <!-- ko text: $t('You have no items in your shopping cart.') --><!-- /ko -->
+            <!-- ko i18n: 'You have no items in your shopping cart.' --><!-- /ko -->
         </strong>
         <!-- ko if: cart().cart_empty_message -->
             <p class="minicart empty text"><!-- ko text: cart().cart_empty_message --><!-- /ko --></p>
@@ -94,7 +94,7 @@
     <div class="actions">
         <div class="secondary">
             <a class="action viewcart" data-bind="attr: {href: shoppingCartUrl}">
-                <span><!-- ko text: $t('View and edit cart') --><!-- /ko --></span>
+                <span><!-- ko i18n: 'View and edit cart' --><!-- /ko --></span>
             </a>
         </div>
     </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 850d952ed1378..3331ff0296fdd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -33,10 +33,10 @@
 
             <!-- ko if: options.length -->
             <div class="product options" data-mage-init='{"collapsible":{"openedState": "active", "saveState": false}}'>
-                <span data-role="title" class="toggle"><!-- ko text: $t('See Details') --><!-- /ko --></span>
+                <span data-role="title" class="toggle"><!-- ko i18n: 'See Details' --><!-- /ko --></span>
 
                 <div data-role="content" class="content">
-                    <strong class="subtitle"><!-- ko text: $t('Options Details') --><!-- /ko --></strong>
+                    <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
                     <dl class="product options list">
                         <!-- ko foreach: { data: options, as: 'option' } -->
                         <dt class="label"><!-- ko text: option.label --><!-- /ko --></dt>
@@ -58,8 +58,8 @@
                 <!-- ko if: canApplyMsrp -->
 
                 <div class="details-map">
-                    <span class="label" data-bind="text: $t('Price')"></span>
-                    <span class="value" data-bind="text: $t('See price before order confirmation.')"></span>
+                    <span class="label" data-bind="i18n: 'Price'"></span>
+                    <span class="value" data-bind="i18n: 'See price before order confirmation.'"></span>
                 </div>
                 <!-- /ko -->
                 <!-- ko ifnot: canApplyMsrp -->
@@ -69,7 +69,7 @@
                 <!-- /ko -->
 
                 <div class="details-qty qty">
-                    <span class="label" data-bind="text: $t('Qty')"></span>
+                    <span class="label" data-bind="i18n: 'Qty'"></span>
                     <input data-bind="attr: {
                            id: 'cart-item-'+item_id+'-qty',
                            'data-cart-item': item_id,
@@ -86,7 +86,7 @@
                            }"
                             class="update-cart-item"
                             style="display: none">
-                        <span data-bind="text: $t('Update')"></span>
+                        <span data-bind="i18n: 'Update'"></span>
                     </button>
                 </div>
             </div>
@@ -95,14 +95,14 @@
                 <!-- ko if: is_visible_in_site_visibility -->
                 <div class="primary">
                     <a data-bind="attr: {href: configure_url, title: $t('Edit item')}" class="action edit">
-                        <span data-bind="text: $t('Edit')"></span>
+                        <span data-bind="i18n: 'Edit'"></span>
                     </a>
                 </div>
                 <!-- /ko -->
                 <div class="secondary">
                     <a href="#" data-bind="attr: {'data-cart-item': item_id, title: $t('Remove item')}"
                        class="action delete">
-                        <span data-bind="text: $t('Remove')"></span>
+                        <span data-bind="i18n: 'Remove'"></span>
                     </a>
                 </div>
             </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html
index 7f075dc088224..24009d53ea89d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/subtotal.html
@@ -6,7 +6,7 @@
 -->
 <div class="subtotal">
     <span class="label">
-        <!-- ko text: $t('Cart Subtotal') --><!-- /ko -->
+        <!-- ko i18n: 'Cart Subtotal' --><!-- /ko -->
     </span>
 
     <!-- ko foreach: elems -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
index 386f34af57ecc..c0499e1d900e7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment-methods/list.html
@@ -9,4 +9,4 @@
         <!-- ko template: element.getTemplate() --><!-- /ko -->
     <!-- /ko -->
 </div>
-<!-- ko ifnot: getRegion('payment-method-items')().length > 0 --><div class="no-payments-block"><!-- ko text: $t('No Payment Methods')--><!-- /ko --></div><!-- /ko -->
+<!-- ko ifnot: getRegion('payment-method-items')().length > 0 --><div class="no-payments-block"><!-- ko i18n: 'No Payment Methods'--><!-- /ko --></div><!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index 2ac1610f75496..5de9657e22ee7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 -->
-<li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
-    <div class="step-title" data-bind="text: $t(title)" data-role="title"></div>
+<li id="opc-payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
+    <div class="step-title" data-bind="i18n: title" data-role="title"></div>
     <div id="checkout-step-payment"
          class="step-content"
          data-role="content"
@@ -28,7 +28,7 @@
                     <!-- /ko -->
                 </div>
                 <div class="no-quotes-block" data-bind="visible: isPaymentMethodsAvailable() == false">
-                    <!-- ko text: $t('No Payment method available.')--><!-- /ko -->
+                    <!-- ko i18n: 'No Payment method available.'--><!-- /ko -->
                 </div>
                 <!-- ko foreach: getRegion('afterMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html b/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
index 6c13c80261d70..6276cae43639e 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/progress-bar.html
@@ -7,7 +7,7 @@
 <ul class="opc-progress-bar">
     <!-- ko foreach: { data: steps().sort(sortItems), as: 'item' } -->
         <li class="opc-progress-bar-item" data-bind="css: item.isVisible() ? '_active' : ($parent.isProcessed(item) ? '_complete' : '')">
-            <span data-bind="text: $t(item.title), click: $parent.navigateTo"></span>
+            <span data-bind="i18n: item.title, click: $parent.navigateTo"></span>
         </li>
     <!-- /ko -->
 </ul>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/registration.html b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
index c24d5c3e639c2..b6e280b8b61fc 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/registration.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/registration.html
@@ -6,13 +6,13 @@
 -->
 <div>
     <!-- ko ifnot: accountCreated -->
-    <p data-bind="text: $t('You can track your order status by creating an account')"></p>
-    <p><span data-bind="text: $t('Email Address')"></span>: <span data-bind="text: getEmailAddress()"></span></p>
+    <p data-bind="i18n: 'You can track your order status by creating an account'"></p>
+    <p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
     <form method="post" data-bind="submit: createAccount">
         <input type="submit" class="action primary" data-bind="value: $t('Create Account'), disable: creationStarted" />
     </form>
     <!-- /ko -->
     <!-- ko if: accountCreated -->
-    <p data-bind="text: $t('Your password will be sent to your email')"></p>
+    <p data-bind="i18n: 'Your password will be sent to your email'"></p>
     <!-- /ko -->
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html b/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html
index b0d2a0282444a..3f34ef05cd59d 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/review/actions/default.html
@@ -8,14 +8,14 @@
     <div class="primary">
         <button data-role="review-save" type="submit"
             data-bind="click: placeOrder($parents[1]), attr: {title: $t('Place Order')}"
-            class="button action primary checkout"><span data-bind="text: $t('Place Order')"></span></button>
+            class="button action primary checkout"><span data-bind="i18n: 'Place Order'"></span></button>
     </div>
     <div class="secondary">
-        <span id="checkout-review-edit-label" data-bind="text: $t('Forgot an Item?')"></span>
+        <span id="checkout-review-edit-label" data-bind="i18n: 'Forgot an Item?'"></span>
         <a data-bind="attr: {href: $parents[1].cartUrl}"
            aria-describedby="checkout-review-edit-label"
            class="action edit">
-            <span data-bind="text: $t('Edit Your Cart')"></span>
+            <span data-bind="i18n: 'Edit Your Cart'"></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
index 1f7470757da82..64c6620b67dfb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -14,10 +14,10 @@
     <button type="button"
             class="action edit-address-link"
             data-bind="click: editAddress, visible: address().isEditable()">
-        <span data-bind="text: $t('Edit')"></span>
+        <span data-bind="i18n: 'Edit'"></span>
     </button>
     <!-- /ko -->
     <button type="button" data-bind="click: selectAddress" class="action action-select-shipping-item">
-        <span data-bind="text: $t('Ship Here')"></span>
+        <span data-bind="i18n: 'Ship Here'"></span>
     </button>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
index e450ee3fd9c3d..f0257cfdfda44 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/form.html
@@ -16,7 +16,7 @@
         <div class="field choice" data-bind="visible: !isFormInline">
             <input type="checkbox" class="checkbox" id="shipping-save-in-address-book" data-bind="checked: saveInAddressBook" />
             <label class="label" for="shipping-save-in-address-book">
-                <span data-bind="text: $t('Save in address book')"></span>
+                <span data-bind="i18n: 'Save in address book'"></span>
             </label>
         </div>
         <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
index 6d262c39d9f0c..3462a7cf295a6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-information.html
@@ -9,9 +9,9 @@
 <div class="shipping-information">
     <div class="ship-to">
         <div class="shipping-information-title">
-            <span data-bind="text: $t('Ship To')"></span>
+            <span data-bind="i18n: 'Ship To'"></span>
             <button class="action action-edit" data-bind="click: back">
-                <span data-bind="text: $t('edit')"></span>
+                <span data-bind="i18n: 'edit'"></span>
             </button>
         </div>
         <div class="shipping-information-content">
@@ -22,13 +22,13 @@
     </div>
     <div class="ship-via">
         <div class="shipping-information-title">
-            <span data-bind="text: $t('Ship Via')"></span>
+            <span data-bind="i18n: 'Ship Via'"></span>
             <button class="action action-edit" data-bind="click: back">
-                <span data-bind="text: $t('edit')"></span>
+                <span data-bind="i18n: 'edit'"></span>
             </button>
         </div>
         <div class="shipping-information-content">
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </div>
     </div>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
index 9d3a5f0e97592..fdbc7815f946b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping.html
@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 -->
-<li id="shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
-    <div class="step-title" data-bind="text: $t('Shipping Address')" data-role="title"></div>
+<li id="opc-shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
+    <div class="step-title" data-bind="i18n: 'Shipping Address'" data-role="title"></div>
     <div id="checkout-step-shipping"
          class="step-content"
          data-role="content">
@@ -29,7 +29,7 @@
         <button type="button"
                 data-bind="click: showFormPopUp, visible: !isNewAddressAdded()"
                 class="action action-show-popup">
-            <span data-bind="text: $t('New Address')"></span></button>
+            <span data-bind="i18n: 'New Address'"></span></button>
         <div id="opc-new-shipping-address" data-bind="visible: isFormPopUpVisible()">
             <!-- ko template: 'Magento_Checkout/shipping-address/form' --><!-- /ko -->
         </div>
@@ -53,7 +53,7 @@
     data-bind="fadeVisible: visible(), blockLoader: isLoading"
     role="presentation">
     <div class="checkout-shipping-method">
-        <div class="step-title" data-bind="text: $t('Shipping Methods')" data-role="title"></div>
+        <div class="step-title" data-bind="i18n: 'Shipping Methods'" data-role="title"></div>
         <!-- ko foreach: getRegion('before-shipping-method-form') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->
@@ -69,9 +69,9 @@
                         <thead>
                             <tr class="row">
                                 <th class="col">&nbsp;</th>
-                                <th class="col col-price" data-bind="text: $t('Price')"></th>
-                                <th class="col col-method" data-bind="text: $t('Method Title')"></th>
-                                <th class="col col-carrier" data-bind="text: $t('Carrier Title')"></th>
+                                <th class="col col-price" data-bind="i18n: 'Price'"></th>
+                                <th class="col col-method" data-bind="i18n: 'Method Title'"></th>
+                                <th class="col col-carrier" data-bind="i18n: 'Carrier Title'"></th>
                             </tr>
                         </thead>
                         <tbody>
@@ -91,7 +91,8 @@
                                        data-bind="
                                                 value: method.carrier_code + '_' + method.method_code,
                                                 checked: $parent.isSelected,
-                                                attr: {'id': 's_method_' + method.carrier_code + '_' + method.method_code}"
+                                                attr: {'id': 's_method_' + method.carrier_code + '_' + method.method_code},
+                                                click: $parent.selectShippingMethod"
                                        class="radio"/>
                                 <!--/ko-->
                                 <!-- /ko -->
@@ -101,15 +102,15 @@
                                 <!-- ko template: getTemplate() --><!-- /ko -->
                                 <!-- /ko -->
                             </td>
-                            <td class="col col-method" data-bind="text: $t(method.method_title)"></td>
-                            <td class="col col-carrier" data-bind="text: $t(method.carrier_title)"></td>
+                            <td class="col col-method" data-bind="i18n: method.method_title"></td>
+                            <td class="col col-carrier" data-bind="i18n: method.carrier_title"></td>
                         </tr>
 
                         <!-- ko if:  method.error_message -->
                         <tr class="row row-error">
                             <td class="col col-error" colspan="4">
                                 <div class="message error">
-                                    <div data-bind="text: $t(method.error_message)"></div>
+                                    <div data-bind="i18n: method.error_message"></div>
                                 </div>
                                 <span class="no-display">
                                     <input name="shipping_method" type="radio" data-bind="attr: {'value' : method.method_code, 'id': 's_method_' + method.method_code}"/>
@@ -130,19 +131,19 @@
                 </div>
                 <!-- ko if: errorValidationMessage().length > 0 -->
                 <div class="message notice">
-                    <span><!-- ko text: $t(errorValidationMessage())--><!-- /ko --></span>
+                    <span><!-- ko i18n: errorValidationMessage()--><!-- /ko --></span>
                 </div>
                 <!-- /ko -->
                 <div class="actions-toolbar" id="shipping-method-buttons-container">
                     <div class="primary">
                         <button data-role="opc-continue" type="submit" class="button action continue primary">
-                            <span><!-- ko text: $t('Next')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'Next'--><!-- /ko --></span>
                         </button>
                     </div>
                 </div>
             </form>
             <!-- /ko -->
-            <!-- ko ifnot: rates().length > 0 --><div class="no-quotes-block"><!-- ko text: $t('Sorry, no quotes are available for this order at this time')--><!-- /ko --></div><!-- /ko -->
+            <!-- ko ifnot: rates().length > 0 --><div class="no-quotes-block"><!-- ko i18n: 'Sorry, no quotes are available for this order at this time'--><!-- /ko --></div><!-- /ko -->
         </div>
     </div>
 </li>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary.html b/app/code/Magento/Checkout/view/frontend/web/template/summary.html
index 322ef76b8f053..459d2f505f592 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary.html
@@ -5,7 +5,7 @@
  */
 -->
 <div class="opc-block-summary" data-bind="blockLoader: isLoading">
-    <span data-bind="text: $t('Order Summary')" class="title"></span>
+    <span data-bind="i18n: 'Order Summary'" class="title"></span>
     <!-- ko foreach: elems() -->
         <!-- ko template: getTemplate() --><!-- /ko -->
     <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
index bd6c7efd470fd..b51a70273b250 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/cart-items.html
@@ -8,7 +8,7 @@
 <div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}">
     <div class="title" data-role="title">
         <strong role="heading"><span data-bind="text: getItemsQty()"></span>
-            <!-- ko text: $t('Items in Cart') --><!-- /ko -->
+            <!-- ko i18n: 'Items in Cart' --><!-- /ko -->
         </strong>
     </div>
     <div class="content minicart-items" data-role="content">
@@ -32,7 +32,7 @@
 <div class="block items-in-cart" data-bind="mageInit: {'collapsible':{'openedState': 'active', 'active': true}}">
     <div class="title" data-role="title">
         <strong role="heading"><span data-bind="text: getItemsQty()"></span>
-            <!-- ko text: $t('Items in Cart') --><!-- /ko -->
+            <!-- ko i18n: 'Items in Cart' --><!-- /ko -->
         </strong>
     </div>
     <div class="content minicart-items" data-role="content">
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
index 78954c0a4feff..107907b157acf 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/grand-total.html
@@ -6,7 +6,7 @@
 -->
 <!-- ko if: isDisplayed() -->
 <tr>
-    <td colspan="2" data-bind="text: $t(title)"></td>
+    <td colspan="2" data-bind="i18n: title"></td>
     <td class="col grandtotal">
         <span data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
         <!-- ko foreach: elems() -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
index dab4d8393326c..05b39a8f11e00 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html
@@ -12,9 +12,9 @@
 
     <div class="product-item-inner">
         <div class="product-item-name-block">
-            <strong class="product-item-name" data-bind="text: $t($parent.name)"></strong>
+            <strong class="product-item-name" data-bind="i18n: $parent.name"></strong>
             <div class="details-qty">
-                <span class="label"><!-- ko text: $t('Qty') --><!-- /ko --></span>
+                <span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
                 <span class="value" data-bind="text: $parent.qty"></span>
             </div>
         </div>
@@ -25,12 +25,12 @@
 
     <!-- ko if: (JSON.parse($parent.options).length > 0)-->
     <div class="product options" data-bind="mageInit: {'collapsible':{'openedState': 'active'}}">
-        <span data-role="title" class="toggle"><!-- ko text: $t('View Details') --><!-- /ko --></span>
+        <span data-role="title" class="toggle"><!-- ko i18n: 'View Details' --><!-- /ko --></span>
         <div data-role="content" class="content">
-            <strong class="subtitle"><!-- ko text: $t('Options Details') --><!-- /ko --></strong>
+            <strong class="subtitle"><!-- ko i18n: 'Options Details' --><!-- /ko --></strong>
             <dl class="item-options">
                 <!--ko foreach: JSON.parse($parent.options)-->
-                <dt class="label" data-bind="text: $t(label)"></dt>
+                <dt class="label" data-bind="i18n: label"></dt>
                     <!-- ko if: ($data.full_view)-->
                     <dd class="values" data-bind="html: full_view"></dd>
                     <!-- /ko -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
index 34707698e61b6..f3a22cef746e5 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
@@ -7,17 +7,17 @@
 <!-- ko if: quoteIsVirtual == 0 -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
index f241430924ac8..e217668f605f1 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/subtotal.html
@@ -6,7 +6,7 @@
 -->
 
 <tr class="totals">
-    <th class="mark" scope="row" data-bind="text: $t(title)"></th>
+    <th class="mark" scope="row" data-bind="i18n: title"></th>
     <td class="amount">
         <span class="price" data-bind ="text: getValue(), attr:{'data-label': $t(title)}"></span>
         <!-- ko foreach: elems() -->
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html
index 074024dee00d9..12fb8acb37d77 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/summary/totals.html
@@ -5,7 +5,7 @@
  */
 -->
 <table class="data table table-totals">
-    <caption class="table-caption" data-bind="text: $t('Order Summary')"></caption>
+    <caption class="table-caption" data-bind="i18n: 'Order Summary'"></caption>
     <tbody>
     <!-- ko foreach: elems() -->
         <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html
index 315bc47af7dac..364d060893812 100644
--- a/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html
+++ b/app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/payment/checkout-agreements-link.html
@@ -6,9 +6,9 @@
 -->
 
 <div class="checkout-agreements" data-bind="visible: isVisible">
-    <!-- ko text: $t('You automatically accept') --><!-- /ko -->
+    <!-- ko i18n: 'You automatically accept' --><!-- /ko -->
     <button type="button" class="action action-show" data-bind="click: showAgreements">
-        <span><!-- ko text: $t('terms and conditions') --><!-- /ko --></span>
+        <span><!-- ko i18n: 'terms and conditions' --><!-- /ko --></span>
     </button>
-    <!-- ko text: $t('before placing the order') --><!-- /ko -->
+    <!-- ko i18n: 'before placing the order' --><!-- /ko -->
 </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 8ec724e351295..9fe3b4bc50756 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
@@ -240,7 +240,7 @@ if ($variations) {
                             },
                             outerClick: $parent.closeList.bind($parent, $index())">
                             <button class="action-select" data-bind="click: $parent.toggleList.bind($parent, $index())">
-                                <span data-bind="text: $t('Select')"></span>
+                                <span data-bind="i18n: 'Select'"></span>
                             </button>
                             <ul class="action-menu _active" data-bind="css: {'_active': $parent.opened() === $index()}">
                                 <li>
@@ -250,7 +250,7 @@ if ($variations) {
                                 <!-- ko ifnot: variation.readonly -->
                                 <li>
                                     <a class="action-menu-item" data-bind="
-                                    text: variation.status == 1 ? $t('Disable Product') : $t('Enable Product'),
+                                    i18n: variation.status == 1 ? 'Disable Product' : 'Enable Product',
                                     click: $parent.toggleProduct.bind($parent, $index())"></a>
                                 </li>
                                 <!-- /ko -->
diff --git a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
index a2d2941754ff8..fd9bf048afd35 100644
--- a/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
+++ b/app/code/Magento/Customer/view/frontend/web/template/authentication-popup.html
@@ -10,19 +10,19 @@
     <div class="block block-new-customer"
          data-label="or">
         <div class="block-title">
-            <strong id="block-new-customer-heading" role="heading" aria-level="2" data-bind="text: $t('Checkout out as a new customer')"></strong>
+            <strong id="block-new-customer-heading" role="heading" aria-level="2" data-bind="i18n: 'Checkout out as a new customer'"></strong>
         </div>
         <div class="block-content" aria-labelledby="block-new-customer-heading">
-            <p data-bind="text: $t('Creating an account has many benefits:')"></p>
+            <p data-bind="i18n: 'Creating an account has many benefits:'"></p>
             <ul>
-                <li data-bind="text: $t('See order and shipping status')"></li>
-                <li data-bind="text: $t('Track order history')"></li>
-                <li data-bind="text: $t('Check out faster')"></li>
+                <li data-bind="i18n: 'See order and shipping status'"></li>
+                <li data-bind="i18n: 'Track order history'"></li>
+                <li data-bind="i18n: 'Check out faster'"></li>
             </ul>
             <div class="actions-toolbar">
                 <div class="primary">
                     <a class="action action-register primary" data-bind="attr: {href: registerUrl}">
-                        <span data-bind="text: $t('Create Account')"></span>
+                        <span data-bind="i18n: 'Create Account'"></span>
                     </a>
                 </div>
             </div>
@@ -31,7 +31,7 @@
     <div class="block block-customer-login"
          data-label="or">
         <div class="block-title">
-            <strong id="block-customer-login-heading" role="heading" aria-level="2" data-bind="text:$t('Checkout out using your account')"></strong>
+            <strong id="block-customer-login-heading" role="heading" aria-level="2" data-bind="i18n: 'Checkout out using your account'"></strong>
         </div>
         <!-- ko foreach: getRegion('messages') -->
         <!-- ko template: getTemplate() --><!-- /ko -->
@@ -46,7 +46,7 @@
                   id="login-form">
                 <div class="fieldset login" data-hasrequired="* Required Fields">
                     <div class="field email required">
-                        <label class="label" for="email"><span data-bind="text: $t('Email Address')"></span></label>
+                        <label class="label" for="email"><span data-bind="i18n: 'Email Address'"></span></label>
                         <div class="control">
                             <input name="username"
                                    id="email"
@@ -56,7 +56,7 @@
                         </div>
                     </div>
                     <div class="field password required">
-                        <label for="pass" class="label"><span data-bind="text: $t('Password')"></span></label>
+                        <label for="pass" class="label"><span data-bind="i18n: 'Password'"></span></label>
                         <div class="control">
                             <input name="password"
                                    type="password"
@@ -73,12 +73,12 @@
                         <input name="context" type="hidden" value="checkout" />
                         <div class="primary">
                             <button type="submit" class="action action-login secondary" name="send" id="send2">
-                                <span data-bind="text: $t('Sign In')"></span>
+                                <span data-bind="i18n: 'Sign In'"></span>
                             </button>
                         </div>
                         <div class="secondary">
                             <a class="action" data-bind="attr: {href: forgotPasswordUrl}">
-                                <span data-bind="text: $t('Forgot Your Password?')"></span>
+                                <span data-bind="i18n: 'Forgot Your Password?'"></span>
                             </a>
                         </div>
                     </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
index 31cbc7e111aae..10ba17d7fad6f 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-form.html
@@ -6,13 +6,13 @@
 -->
 <div class="gift-message">
     <div class="gift-options-title">
-        <span data-bind="text: $t('Gift Message (optional)')"></span>
+        <span data-bind="i18n: 'Gift Message (optional)'"></span>
     </div>
     <div class="gift-options-content">
         <fieldset class="fieldset">
             <div class="field field-to">
                 <label for="gift-message-whole-to" class="label">
-                    <span data-bind="text: $t('To') + ':'"></span>
+                    <span data-bind="i18n: 'To:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -24,7 +24,7 @@
 
             <div class="field field-from">
                 <label for="gift-message-whole-from" class="label">
-                    <span data-bind="text: $t('From') + ':'"></span>
+                    <span data-bind="i18n: 'From:'"></span>
                 </label>
                 <div class="control">
                     <input type="text"
@@ -35,7 +35,7 @@
             </div>
             <div class="field text">
                 <label for="gift-message-whole-message" class="label">
-                    <span data-bind="text: $t('Message') + ':'"></span>
+                    <span data-bind="i18n: 'Message:'"></span>
                 </label>
                 <div class="control">
                     <textarea id="gift-message-whole-message"
@@ -50,12 +50,12 @@
                 <button type="submit" class="action secondary action-update" data-bind="
                     attr: {title: $t('Update')},
                     click: $data.submitOptions.bind($data)">
-                    <span data-bind="text: $t('Update')"></span>
+                    <span data-bind="i18n: 'Update'"></span>
                 </button>
                 <button class="action action-cancel" data-bind="
                     attr: {title: $t('Cancel')},
                     click: $data.hideFormBlock.bind($data)">
-                    <span data-bind="text: $t('Cancel')"></span>
+                    <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html
index 78f2175867b72..9811d2d595b9a 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message-item-level.html
@@ -11,7 +11,7 @@
    click: $data.toggleFormBlockVisibility.bind($data),
    css: {_active: formBlockVisibility() || resultBlockVisibility()}
    ">
-    <span data-bind="text: $t('Gift options')"></span>
+    <span data-bind="i18n: 'Gift options'"></span>
 </a>
 <div class="gift-content" data-bind="css: {_active: formBlockVisibility() || resultBlockVisibility()}"> <!-- add class "active" to display the content -->
     <!-- ko ifnot: resultBlockVisibility() -->
@@ -30,7 +30,7 @@
 
             <!-- ko if: getObservable('message') -->
                 <div class="gift-message-summary">
-                    <span data-bind="text: $t('Message') + ':'"></span>
+                    <span data-bind="i18n: 'Message' + ':'"></span>
                     <!-- ko text: getObservable('message') --><!-- /ko -->
                 </div>
             <!-- /ko -->
@@ -40,12 +40,12 @@
                     <button type="submit" class="action action-edit" data-bind="
                             click: $data.editOptions.bind($data),
                             attr: {title: $t('Edit')">
-                        <span data-bind="text: $t('Edit')"></span>
+                        <span data-bind="i18n: 'Edit'"></span>
                     </button>
                     <button class="action action-delete" data-bind="
                             click: $data.deleteOptions.bind($data),
                             attr: {title: $t('Delete')">
-                        <span data-bind="text: $t('Delete')"></span>
+                        <span data-bind="i18n: 'Delete'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
index dbe0ee8c877cd..b06bc3964d2e1 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
+++ b/app/code/Magento/GiftMessage/view/frontend/web/template/gift-message.html
@@ -10,7 +10,7 @@
          data-collapsible="true"
          data-bind="css: {_active: formBlockVisibility() || resultBlockVisibility()}">
         <div class="title" data-role="title" data-bind="click: $data.toggleFormBlockVisibility.bind($data)">
-            <span data-bind="text: $t('Gift options')"></span>
+            <span data-bind="i18n: 'Gift options'"></span>
         </div>
         <div class="content" data-role="content" data-bind="visible: formBlockVisibility() || resultBlockVisibility()">
             <!-- ko ifnot: resultBlockVisibility() -->
@@ -29,7 +29,7 @@
 
                     <!-- ko if: getObservable('message') -->
                         <div class="gift-message-summary">
-                            <span data-bind="text: $t('Message') + ':'"></span>
+                            <span data-bind="i18n: 'Message:'"></span>
                             <!-- ko text: getObservable('message') --><!-- /ko -->
                         </div>
                     <!-- /ko -->
@@ -38,11 +38,11 @@
                             <button type="submit"
                                     class="action action-edit"
                                     data-bind="attr: {title: $t('Edit')}, click: $data.editOptions.bind($data)">
-                                <span data-bind="text: $t('Edit')"></span>
+                                <span data-bind="i18n: 'Edit'"></span>
                             </button>
                             <button class="action action-delete"
                                     data-bind="attr: {title: $t('Delete')}, click: $data.deleteOptions.bind($data)">
-                                <span data-bind="text: $t('Delete')"></span>
+                                <span data-bind="i18n: 'Delete'"></span>
                             </button>
                         </div>
                     </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html
index fd14f3799a7e8..6ac1409e10e62 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/banktransfer.html
@@ -36,7 +36,7 @@
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html
index 524d7b769b416..d7f047edeb7b9 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/cashondelivery.html
@@ -36,7 +36,7 @@
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
index ba6c374417b49..8aaa29f59075a 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/checkmo.html
@@ -21,11 +21,11 @@
         <!-- ko if: getMailingAddress() || getPayableTo() -->
         <dl class="items check payable">
             <!-- ko if: getPayableTo() -->
-            <dt class="title"><!-- ko text: $t('Make Check payable to:') --><!-- /ko --></dt>
-            <dd class="content"><!-- ko text: $t(getPayableTo()) --><!-- /ko --></dd>
+            <dt class="title"><!-- ko i18n: 'Make Check payable to:' --><!-- /ko --></dt>
+            <dd class="content"><!-- ko i18n: getPayableTo() --><!-- /ko --></dd>
             <!-- /ko -->
             <!-- ko if: getMailingAddress() -->
-            <dt class="title"><!-- ko text: $t('Send Check to:') --><!-- /ko --></dt>
+            <dt class="title"><!-- ko i18n: 'Send Check to:' --><!-- /ko --></dt>
             <dd class="content">
                 <address class="checkmo mailing address" data-bind="html: $t(getMailingAddress())"></address>
             </dd>
@@ -48,7 +48,7 @@
                         enable: (getCode() == isChecked())
                         "
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
index 87858cef568ca..8154a87b26b98 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
@@ -27,7 +27,7 @@
             <fieldset class="fieldset payment method" data-bind='attr: {id: "payment_form_" + getCode()}'>
                 <div class="field field-number required">
                     <label for="po_number" class="label">
-                        <span><!-- ko text: $t('Purchase Order Number')--><!-- /ko --></span>
+                        <span><!-- ko i18n: 'Purchase Order Number'--><!-- /ko --></span>
                     </label>
                     <div class="control">
                         <input type="text"
@@ -56,7 +56,7 @@
                                 css: {disabled: !isPlaceOrderActionAllowed()}
                                 "
                                 data-role="review-save">
-                            <span data-bind="text: $t('Place Order')"></span>
+                            <span data-bind="i18n: 'Place Order'"></span>
                         </button>
                     </div>
                 </div>
diff --git a/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html b/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html
index c630d0039928e..2164af88215c8 100644
--- a/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html
+++ b/app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html
@@ -8,12 +8,12 @@
 <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}">
     <!-- ko if: (isShowLegend())-->
     <legend class="legend">
-        <span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span>
+        <span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span>
     </legend><br />
     <!-- /ko -->
     <div class="field type required">
         <label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
-            <span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Credit Card Type'--><!-- /ko --></span>
         </label>
         <div class="control">
             <ul class="credit-card-types">
@@ -41,7 +41,7 @@
     </div>
     <div class="field number required">
         <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
-            <span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
         </label>
         <div class="control">
             <input type="number" name="payment[cc_number]" class="input-text" value=""
@@ -58,7 +58,7 @@
     </div>
     <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}">
         <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-            <span><!-- ko text: $t('Expiration Date')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
         </label>
         <div class="control">
             <div class="fields group group-2">
@@ -96,7 +96,7 @@
     <!-- ko if: (hasVerification())-->
     <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
         <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-            <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
+            <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
         </label>
         <div class="control _with-tooltip">
             <input type="number"
@@ -115,7 +115,7 @@
                       tabindex="0"
                       data-toggle="dropdown"
                       data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-                    <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
                 </span>
                 <div class="field-tooltip-content"
                      data-target="dropdown"
@@ -129,12 +129,12 @@
         <div class="nested">
             <div class="field switch-solo required">
                 <label data-bind="attr: {for: getCode() + '_cc_issue'}" class="label">
-                    <span><!-- ko text: $t('Switch/Solo/Maestro Only')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Switch/Solo/Maestro Only'--><!-- /ko --></span>
                 </label>
             </div>
             <div class="field number required">
                 <label data-bind="attr: {for: getCode() + '_cc_issue'}" class="label">
-                    <span><!-- ko text: $t('Issue Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Issue Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number" name="payment[cc_ss_issue]"
@@ -146,7 +146,7 @@
 
             <div class="field date required">
                 <label data-bind="attr: {for: getCode() + '_start_month'}" class="label">
-                    <span><!-- ko text: $t('Start Date')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Start Date'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <div class="fields group group-2">
diff --git a/app/code/Magento/Payment/view/frontend/web/template/payment/free.html b/app/code/Magento/Payment/view/frontend/web/template/payment/free.html
index 483920bbe980e..1f7b3b7a51c6c 100644
--- a/app/code/Magento/Payment/view/frontend/web/template/payment/free.html
+++ b/app/code/Magento/Payment/view/frontend/web/template/payment/free.html
@@ -32,7 +32,7 @@
                         attr: {title: $t('Place Order')},
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         ">
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html b/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html
index 82774b93a59fe..8b101d5707f28 100644
--- a/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html
+++ b/app/code/Magento/Payment/view/frontend/web/template/payment/iframe.html
@@ -31,17 +31,17 @@
         <button data-role="review-save" type="submit"
                 data-bind="attr: {title: $t('Place Order')}"
                 class="button action primary checkout">
-            <span data-bind="text: $t('Place Order')"></span>
+            <span data-bind="i18n: 'Place Order'"></span>
         </button>
         <button type="submit" id="originalPlaceOrder" class="hidden"
                 data-bind="click: originalPlaceOrder($parents[1])"></button>
     </div>
     <div class="secondary">
-        <span id="checkout-review-edit-label" data-bind="text: $t('Forgot an Item?')"></span>
+        <span id="checkout-review-edit-label" data-bind="i18n: 'Forgot an Item?'"></span>
         <a data-bind="attr: {href: $parents[1].cartUrl}"
            aria-describedby="checkout-review-edit-label"
            class="action edit">
-            <span data-bind="text: $t('Edit Your Cart')"></span>
+            <span data-bind="i18n: 'Edit Your Cart'"></span>
         </a>
     </div>
 </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html
index cb5b2d5597a79..1ae9ae801a13d 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/express/billing-agreement.html
@@ -16,6 +16,6 @@
     data-bind='
         attr: {for: getBillingAgreementCode()}'
     class="label">
-    <span><!-- ko text: $t('Sign a billing agreement to streamline further purchases with PayPal.') --><!-- /ko --></span>
+    <span><!-- ko i18n: 'Sign a billing agreement to streamline further purchases with PayPal.' --><!-- /ko --></span>
 </label>
 <!-- /ko -->
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
index e82657ef85bad..302fe41a664f6 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html
@@ -29,13 +29,13 @@
                         type="submit"
                         data-bind="click: placePendingPaymentOrder, attr: {title: $t('Continue')}, css: {disabled: !isPlaceOrderActionAllowed()}"
                         class="button action primary checkout">
-                    <span data-bind="text: $t('Continue')"></span>
+                    <span data-bind="i18n: 'Continue'"></span>
                 </button>
             </div>
         </div>
         <div data-bind="visible: isInAction()">
             <div id="iframe-warning" class="message notice">
-                <div><!-- ko text: $t('Please do not refresh the page until you complete payment.') --><!-- /ko --></div>
+                <div><!-- ko i18n: 'Please do not refresh the page until you complete payment.' --><!-- /ko --></div>
             </div>
             <iframe data-bind="attr: {id: getCode() + '-iframe', src: getActionUrl()}"
                     data-container="paypal-iframe"
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
index 47cecc72a36b8..986757ac537e1 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express-bml.html
@@ -20,14 +20,14 @@
             <a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html"
                data-bind="click: showAcceptanceWindow"
                class="action action-help">
-                <!-- ko text: $t('See terms') --><!-- /ko -->
+                <!-- ko i18n: 'See terms' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website when you place an order.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website when you place an order.' --><!-- /ko -->
             </div>
             <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         </fieldset>
@@ -42,7 +42,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
index dfe3ed164504c..e6b0b5f97cd64 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflow-express.html
@@ -17,14 +17,14 @@
             <span data-bind="text: getTitle()"></span>
             <a data-bind="attr: {href: getPaymentAcceptanceMarkHref()}, click: showAcceptanceWindow"
                class="action action-help">
-                <!-- ko text: $t('What is PayPal?') --><!-- /ko -->
+                <!-- ko i18n: 'What is PayPal?' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website.' --><!-- /ko -->
             </div>
         </fieldset>
         <div class="checkout-agreements-block">
@@ -38,7 +38,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
index 5ebcba1266478..df3fad1c4980e 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html
@@ -60,7 +60,7 @@
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
index 47cecc72a36b8..986757ac537e1 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express-bml.html
@@ -20,14 +20,14 @@
             <a href="https://www.securecheckout.billmelater.com/paycapture-content/fetch?hash=AU826TU8&content=/bmlweb/ppwpsiw.html"
                data-bind="click: showAcceptanceWindow"
                class="action action-help">
-                <!-- ko text: $t('See terms') --><!-- /ko -->
+                <!-- ko i18n: 'See terms' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website when you place an order.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website when you place an order.' --><!-- /ko -->
             </div>
             <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         </fieldset>
@@ -42,7 +42,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
index abf833d1f0fb1..fc94573818ff2 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal-express.html
@@ -17,14 +17,14 @@
             <!-- PayPal Logo -->
             <span data-bind="text: getTitle()"></span>
             <a data-bind="attr: {href: getPaymentAcceptanceMarkHref()}, click: showAcceptanceWindow" class="action action-help">
-                <!-- ko text: $t('What is PayPal?') --><!-- /ko -->
+                <!-- ko i18n: 'What is PayPal?' --><!-- /ko -->
             </a>
         </label>
     </div>
     <div class="payment-method-content">
         <fieldset class="fieldset" data-bind='attr: {id: "payment_form_" + getCode()}'>
             <div class="payment-method-note">
-                <!-- ko text: $t('You will be redirected to the PayPal website.') --><!-- /ko -->
+                <!-- ko i18n: 'You will be redirected to the PayPal website.' --><!-- /ko -->
             </div>
             <!-- ko template: 'Magento_Paypal/payment/express/billing-agreement' --><!-- /ko -->
         </fieldset>
@@ -39,7 +39,7 @@
                         type="submit"
                         data-bind="click: continueToPayPal, enable: (getCode() == isChecked())"
                         disabled>
-                    <span data-bind="text: $t('Continue to PayPal')"></span>
+                    <span data-bind="i18n: 'Continue to PayPal'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html
index 25f0c4140da7e..724bd43648359 100644
--- a/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html
+++ b/app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html
@@ -42,7 +42,7 @@
                         css: {disabled: !isPlaceOrderActionAllowed()}
                         "
                         data-role="review-save">
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html b/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html
index 12ebb8ec864c9..b387604b4cd42 100644
--- a/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html
+++ b/app/code/Magento/Persistent/view/frontend/web/template/remember-me.html
@@ -7,10 +7,10 @@
 <!-- ko if: isRememberMeCheckboxVisible() -->
 <div id="remember-me-box" class="field choice persistent">
     <input type="checkbox" name="persistent_remember_me" class="checkbox" id="persistent_remember_me" data-bind="checked: isRememberMeCheckboxChecked, attr: {title: $t('Remember Me'), 'data-scope': dataScope}" />
-    <label for="persistent_remember_me" class="label"><span data-bind="text: $t('Remember Me')"></span></label>
+    <label for="persistent_remember_me" class="label"><span data-bind="i18n: 'Remember Me'"></span></label>
     <span class="tooltip wrapper">
-        <a class="link tooltip toggle" href="#" data-bind="text: $t('What\'s this?')"></a>
-        <span class="tooltip content" data-bind="text: $t('Check \'Remember Me\' to access your shopping cart on this computer even if you are not signed in.')"></span>
+        <a class="link tooltip toggle" href="#" data-bind="i18n: 'What\'s this?'"></a>
+        <span class="tooltip content" data-bind="i18n: 'Check \'Remember Me\' to access your shopping cart on this computer even if you are not signed in.'"></span>
     </span>
 </div>
 <!-- /ko -->
diff --git a/app/code/Magento/RequireJs/Model/FileManager.php b/app/code/Magento/RequireJs/Model/FileManager.php
index 7c9dee16935ef..6ce74ef2139b1 100644
--- a/app/code/Magento/RequireJs/Model/FileManager.php
+++ b/app/code/Magento/RequireJs/Model/FileManager.php
@@ -83,9 +83,7 @@ public function createMinResolverAsset()
      */
     public function createRequireJsMixinsAsset()
     {
-        $relPath = $this->config->getMixinsFileRelativePath();
-        $this->ensureSourceFile($relPath);
-        return $this->assetRepo->createArbitrary($relPath, '');
+        return $this->assetRepo->createArbitrary($this->config->getMixinsFileRelativePath(), '');
     }
 
     /**
diff --git a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
index 626db1149f1e5..0993494d09f57 100644
--- a/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
+++ b/app/code/Magento/RequireJs/Test/Unit/Model/FileManagerTest.php
@@ -207,4 +207,20 @@ public function testCreateMinResolverAsset()
 
         $this->object->createMinResolverAsset();
     }
+
+    public function testCreateRequireJsMixinsAsset()
+    {
+        $path = 'relative path';
+        $this->configMock
+            ->expects($this->once())
+            ->method('getMixinsFileRelativePath')
+            ->will($this->returnValue($path));
+        $this->assetRepoMock
+            ->expects($this->once())
+            ->method('createArbitrary')
+            ->with($path, '')
+            ->willReturn($this->asset);
+
+        $this->assertSame($this->asset, $this->object->createRequireJsMixinsAsset());
+    }
 }
diff --git a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
index 614c8fc4a2b51..f05e6ba670ba0 100644
--- a/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
+++ b/app/code/Magento/SalesRule/view/frontend/web/template/payment/discount.html
@@ -8,7 +8,7 @@
      data-bind="mageInit: {'collapsible':{'openedState': '_active'}}">
     <div class="payment-option-title field choice" data-role="title">
         <span class="action action-toggle" id="block-discount-heading" role="heading" aria-level="2">
-            <!-- ko text: $t('Apply Promo Code')--><!-- /ko -->
+            <!-- ko i18n: 'Apply Promo Code'--><!-- /ko -->
         </span>
     </div>
     <div class="payment-option-content" data-role="content">
@@ -16,7 +16,7 @@
             <div class="payment-option-inner">
                 <div class="field">
                     <label class="label" for="discount-code">
-                        <span data-bind="text: $t('Enter promo code')"></span>
+                        <span data-bind="i18n: 'Enter promo code'"></span>
                     </label>
                     <div class="control">
                         <input class="input-text"
@@ -32,12 +32,12 @@
                 <div class="primary">
                     <!-- ko ifnot: isApplied() -->
                         <button class="action action-apply" type="submit" data-bind="'value': $t('Apply'), click: apply">
-                            <span><!-- ko text: $t('Apply')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'Apply'--><!-- /ko --></span>
                         </button>
                     <!-- /ko -->
                     <!-- ko if: isApplied() -->
                         <button class="action action-cancel" type="submit" data-bind="'value': $t('Cancel'), click: cancel">
-                            <span><!-- ko text: $t('Cancel coupon')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'Cancel coupon'--><!-- /ko --></span>
                         </button>
                     <!-- /ko -->
                 </div>
diff --git a/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html b/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
index 22deac392831c..59be19490017d 100644
--- a/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
+++ b/app/code/Magento/Shipping/view/frontend/web/template/checkout/shipping/shipping-policy.html
@@ -10,7 +10,7 @@
           tabindex="0"
           data-toggle="dropdown"
           data-bind="mageInit: {'dropdown':{'activeClass': '_active'}}">
-        <!-- ko text: $t('See our Shipping Policy') --><!-- /ko -->
+        <!-- ko i18n: 'See our Shipping Policy' --><!-- /ko -->
     </span>
     <div class="field-tooltip-content"
          data-target="dropdown">
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
index d37e8816ae3e0..4451adbf528d6 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
@@ -7,7 +7,7 @@
 <!-- ko if: isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals incl">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(inclTaxLabel)"></strong>
+        <strong data-bind="i18n: inclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': $t(inclTaxLabel) }" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
@@ -15,7 +15,7 @@
 </tr>
 <tr class="grand totals excl">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(exclTaxLabel)"></strong>
+        <strong data-bind="i18n: exclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': exclTaxLabel }" class="amount">
         <strong><span class="price" data-bind="text: getGrandTotalExclTax()"></span></strong>
@@ -25,7 +25,7 @@
 <!-- ko if: !isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals">
     <th class="mark" scope="row">
-        <strong data-bind="text: $t(title)"></strong>
+        <strong data-bind="i18n: title"></strong>
     </th>
     <td data-bind="attr: {'data-th': $t(title)}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
@@ -34,7 +34,7 @@
 <!-- /ko -->
 <!-- ko if: isBaseGrandTotalDisplayNeeded() && isDisplayed() -->
 <tr class="totals charge">
-    <th class="mark" data-bind="text: $t(basicCurrencyMessage)" scope="row"></th>
+    <th class="mark" data-bind="i18n: basicCurrencyMessage" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getBaseValue(), attr: {'data-th': $t(basicCurrencyMessage)}"></span>
     </td>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
index 8caba625561df..1608f78ad1c91 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
@@ -8,33 +8,33 @@
     <!-- ko if: isBothPricesDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title) + ' ' + $t(excludingTaxMessage)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="text: $t(title)+ ' ' + $t(excludingTaxMessage)"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getExcludingValue()), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getExcludingValue(), attr: {'data-th': $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getExcludingValue()), attr: {'data-th': $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getExcludingValue(), attr: {'data-th': $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
         </td>
     </tr>
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
             <span class="label" data-bind="text: $t(title) + ' ' + $t(includingTaxMessage)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title) + ' ' + $t(excludingTaxMessage)}"></span>
             <!-- /ko -->
         </td>
     </tr>
@@ -42,17 +42,17 @@
     <!-- ko if: isIncludingDisplayed() -->
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getIncludingValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getIncludingValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
         </td>
     </tr>
@@ -60,17 +60,17 @@
     <!-- ko if: isExcludingDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: $t(title)"></span>
-            <span class="value" data-bind="text: $t(getShippingMethodTitle())"></span>
+            <span class="label" data-bind="i18n: title"></span>
+            <span class="value" data-bind="i18n: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue()), attr: {'data-th': $t(title)}"></span>
+                  data-bind="i18n: getValue(), attr: {'data-th': $t(title)}"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
index 4652d47e5e35a..a51407475cbfc 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
@@ -7,8 +7,8 @@
 <!-- ko if: isBothPricesDisplayed() -->
 <tr class="totals sub excl">
     <th class="mark" scope="row">
-        <span data-bind="text: $t(title)"></span>
-        <span data-bind="text: $t(excludingTaxMessage)"></span>
+        <span data-bind="i18n: title"></span>
+        <span data-bind="i18n: excludingTaxMessage"></span>
     </th>
     <td class="amount">
         <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(excludingTaxMessage) }"></span>
@@ -16,8 +16,8 @@
 </tr>
 <tr class="totals sub incl">
     <th class="mark" scope="row">
-        <span data-bind="text: $t(title)"></span>
-        <span data-bind="text: $t(includingTaxMessage)"></span>
+        <span data-bind="i18n: title"></span>
+        <span data-bind="i18n: includingTaxMessage"></span>
     </th>
     <td class="amount">
         <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': $t(includingTaxMessage) }"></span>
@@ -26,7 +26,7 @@
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': $t(title)}"></span>
     </td>
@@ -34,7 +34,7 @@
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && !isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValue(), attr: {'data-th': $t(title)}"></span>
     </td>
diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
index 5b2b739402261..5aa8b53e7fd08 100644
--- a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
+++ b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/tax.html
@@ -6,15 +6,15 @@
 -->
 <!-- ko if: ifShowValue() && !ifShowDetails() -->
 <tr class="totals-tax">
-    <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td data-bind="attr: {'data-th': $t(title) }" class="amount">
         <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
         <!-- /ko -->
         <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
         <!-- /ko -->
     </td>
 </tr>
@@ -22,15 +22,15 @@
 <!-- ko if: ifShowValue() && ifShowDetails() -->
     <tr class="totals-tax-summary"
         data-bind="mageInit: {'toggleAdvanced':{'selectorsToggleClass': 'shown', 'baseToggleClass': 'expanded', 'toggleContainers': '.totals-tax-details'}}">
-        <th data-bind="text: $t(title)" class="mark" scope="row"></th>
+        <th data-bind="i18n: title" class="mark" scope="row"></th>
         <td data-bind="attr: {'data-th': $t(title) }" class="amount">
             <!-- ko if: isCalculated() -->
             <span class="price"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
             <!-- /ko -->
             <!-- ko ifnot: isCalculated() -->
             <span class="not-calculated"
-                  data-bind="text: $t(getValue())"></span>
+                  data-bind="i18n: getValue()"></span>
             <!-- /ko -->
         </td>
     </tr>
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 35398f18763fe..b706894a17142 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -10,6 +10,7 @@
     <body>
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Cookie" name="js_cookies" template="Magento_Theme::js/cookie.phtml"/>
             <block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="html/notices.phtml"/>
diff --git a/app/code/Magento/Translation/Block/Html/Head/Config.php b/app/code/Magento/Translation/Block/Html/Head/Config.php
new file mode 100644
index 0000000000000..25c614842d8c2
--- /dev/null
+++ b/app/code/Magento/Translation/Block/Html/Head/Config.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Translation\Block\Html\Head;
+
+use Magento\Framework\RequireJs\Config as RequireJsConfig;
+use Magento\Framework\Translate\Inline as Inline;
+
+/**
+ * Block responsible for including Inline Translation config on the page
+ */
+class Config extends \Magento\Framework\View\Element\AbstractBlock
+{
+    /**
+     * @var \Magento\Translation\Model\FileManager
+     */
+    private $fileManager;
+
+    /**
+     * @var \Magento\Framework\View\Page\Config
+     */
+    protected $pageConfig;
+
+    /**
+     * @var Inline
+     */
+    private $inline;
+
+    /**
+     * @param \Magento\Framework\View\Element\Context $context
+     * @param RequireJsConfig $config
+     * @param \Magento\Framework\View\Page\Config $pageConfig
+     * @param \Magento\Translation\Model\FileManager $fileManager
+     * @param Inline $inline
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Framework\View\Element\Context $context,
+        \Magento\Framework\View\Page\Config $pageConfig,
+        \Magento\Translation\Model\FileManager $fileManager,
+        Inline $inline,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->pageConfig = $pageConfig;
+        $this->fileManager = $fileManager;
+        $this->inline = $inline;
+    }
+
+    /**
+     * Include RequireJs configuration as an asset on the page
+     *
+     * @return $this
+     */
+    protected function _prepareLayout()
+    {
+        $this->addInlineTranslationConfig();
+
+        return parent::_prepareLayout();
+    }
+
+    /**
+     * Include RequireJs inline translation configuration as an asset on the page
+     * @return void
+     */
+    private function addInlineTranslationConfig()
+    {
+        if ($this->inline->isAllowed()) {
+            $after = RequireJsConfig::REQUIRE_JS_FILE_NAME;
+            $tConfig = $this->fileManager->createTranslateConfigAsset();
+            $assetCollection = $this->pageConfig->getAssetCollection();
+            $assetCollection->insert(
+                $tConfig->getFilePath(),
+                $tConfig,
+                $after
+            );
+        }
+    }
+}
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
new file mode 100644
index 0000000000000..c5429d77a7fc8
--- /dev/null
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Translation\Model;
+
+/**
+ * A service for handling Translation config files
+ */
+class FileManager
+{
+    /**
+     * File name of RequireJs inline translation config
+     */
+    const TRANSLATION_CONFIG_FILE_NAME = 'Magento_Translation/js/i18n-config.js';
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
+    /**
+     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     */
+    public function __construct(
+        \Magento\Framework\View\Asset\Repository $assetRepo
+    ) {
+        $this->assetRepo = $assetRepo;
+    }
+
+    /**
+     * Create a view asset representing the requirejs config.config property for inline translation
+     *
+     * @return \Magento\Framework\View\Asset\File
+     */
+    public function createTranslateConfigAsset()
+    {
+        return $this->assetRepo->createArbitrary(
+            $this->assetRepo->getStaticViewFileContext()->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME,
+            ''
+        );
+    }
+}
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
index 7a66f0858982b..2da6a00eb29c8 100644
--- a/app/code/Magento/Translation/Model/Js/DataProvider.php
+++ b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -108,8 +108,8 @@ protected function getPhrases($content)
             $result = preg_match_all($pattern, $content, $matches);
 
             if ($result) {
-                if (isset($matches[1])) {
-                    foreach ($matches[1] as $match) {
+                if (isset($matches[2])) {
+                    foreach ($matches[2] as $match) {
                         $phrases[] = $match;
                     }
                 }
diff --git a/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php b/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
new file mode 100644
index 0000000000000..9b09c5b40f292
--- /dev/null
+++ b/app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Translation\Test\Unit\Model;
+
+use Magento\Translation\Model\FileManager;
+
+class FileManagerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\Translation\Model\FileManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $assetRepoMock;
+
+    protected function setUp()
+    {
+        $this->assetRepoMock = $this->getMock('\Magento\Framework\View\Asset\Repository', [], [], '', false);
+        $this->model = new FileManager($this->assetRepoMock);
+    }
+
+    public function testCreateTranslateConfigAsset()
+    {
+        $path = 'relative path';
+        $expectedPath = $path . '/' . FileManager::TRANSLATION_CONFIG_FILE_NAME;
+        $fileMock = $this->getMock('\Magento\Framework\View\Asset\File', [], [], '', false);
+        $contextMock = $this->getMockForAbstractClass(
+            '\Magento\Framework\View\Asset\ContextInterface',
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getConfigPath']
+        );
+        $this->assetRepoMock->expects($this->once())->method('getStaticViewFileContext')->willReturn($contextMock);
+        $contextMock->expects($this->once())->method('getConfigPath')->willReturn($path);
+        $this->assetRepoMock
+            ->expects($this->once())
+            ->method('createArbitrary')
+            ->with($expectedPath, '')
+            ->willReturn($fileMock);
+
+        $this->assertSame($fileMock, $this->model->createTranslateConfigAsset());
+    }
+}
diff --git a/app/code/Magento/Translation/etc/di.xml b/app/code/Magento/Translation/etc/di.xml
index 615d565f7419e..9741db0c208e1 100644
--- a/app/code/Magento/Translation/etc/di.xml
+++ b/app/code/Magento/Translation/etc/di.xml
@@ -57,8 +57,9 @@
     <type name="Magento\Translation\Model\Js\Config">
         <arguments>
             <argument name="patterns" xsi:type="array">
-                <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\([\'|\"](.+?)[\'|\"]\)~</item>
-                <item name="mage_translation_static" xsi:type="string">~\$t\([\'|\"](.+?)[\'|\"]\)~</item>
+                <item name="i18n_translation" xsi:type="string"><![CDATA[~i18n\:\s*(["'])(.*?)(?<!\\)\1~]]></item>
+                <item name="mage_translation_widget" xsi:type="string">~\$\.mage\.__\((['"])(.+?)\1\)~</item>
+                <item name="mage_translation_static" xsi:type="string">~\$t\((["'])(.+?)\1\)~</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/Translation/view/base/web/js/i18n-config.js b/app/code/Magento/Translation/view/base/web/js/i18n-config.js
new file mode 100644
index 0000000000000..b37dc385cb488
--- /dev/null
+++ b/app/code/Magento/Translation/view/base/web/js/i18n-config.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+'use strict';
+
+(function () {
+    require.config({
+        config: {
+            'Magento_Ui/js/lib/ko/bind/i18n': {
+                inlineTranslation: true
+            }
+        }
+    });
+})();
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/provider.js b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
index 8b20266f1e796..dfcbb887157d2 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/provider.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
@@ -2,12 +2,15 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'jquery',
     'underscore',
     'mageUtils',
-    'uiComponent'
-], function ($, _, utils, Component) {
+    'uiComponent',
+    'Magento_Ui/js/modal/alert',
+    'mage/translate'
+], function ($, _, utils, Component, alert, $t) {
     'use strict';
 
     return Component.extend({
@@ -17,6 +20,9 @@ define([
             }
         },
 
+        /**
+         * initialize provider
+         */
         initialize: function () {
             utils.limit(this, 'reload', 200);
             _.bindAll(this, 'onReload');
@@ -24,6 +30,9 @@ define([
             return this._super();
         },
 
+        /**
+         * initialize config
+         */
         initConfig: function () {
             this._super();
 
@@ -35,17 +44,33 @@ define([
             return this;
         },
 
+        /**
+         * reload data from server
+         */
         reload: function () {
             this.trigger('reload');
-
             $.ajax({
                 url: this.update_url,
                 method: 'GET',
                 data: this.get('params'),
                 dataType: 'json'
-            }).done(this.onReload);
+            })
+                .error(this.onError)
+                .done(this.onReload);
+        },
+
+        /**
+         * alert with error message
+         */
+        onError: function () {
+            alert({
+                content: $t('Something go wrong')
+            });
         },
 
+        /**
+         * set data and triggered reloaded
+         */
         onReload: function (data) {
             this.set('data', data)
                 .trigger('reloaded');
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js b/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
new file mode 100644
index 0000000000000..79db8a2ff33c7
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/tree-massactions.js
@@ -0,0 +1,128 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko',
+    'underscore',
+    'Magento_Ui/js/grid/massactions'
+], function (ko, _, Massactions) {
+    'use strict';
+
+    return Massactions.extend({
+        defaults: {
+            template: 'ui/grid/tree-massactions',
+            submenuTemplate: 'ui/grid/submenu',
+            selectProvider: '',
+            modules: {
+                selections: '${ $.selectProvider }'
+            },
+            listens: {
+                opened: 'hideSubmenus'
+            }
+        },
+
+        /**
+         * Initializes observable properties.
+         *
+         * @returns {Massactions} Chainable.
+         */
+        initObservable: function () {
+            this._super()
+                .recursiveObserveActions(this.actions());
+
+            return this;
+        },
+
+        /**
+         * Recursive initializes observable actions.
+         *
+         * @param {Array} actions - Action objects.
+         * @returns {Massactions} Chainable.
+         */
+        recursiveObserveActions: function (actions) {
+            _.each(actions, function (action) {
+                if (action.actions) {
+                    action.visible = ko.observable(false);
+                    action.parent = actions;
+                    this.recursiveObserveActions(action.actions);
+                }
+            }, this);
+
+            return this;
+        },
+
+        /**
+         * Applies specified action.
+         *
+         * @param {String} actionIndex - Actions' identifier.
+         * @returns {Massactions} Chainable.
+         */
+        applyAction: function (actionIndex) {
+            var action = this.getAction(actionIndex),
+                visibility;
+
+            if (action.visible) {
+                visibility = action.visible();
+
+                this.hideSubmenus(action.parent);
+                action.visible(!visibility);
+
+                return this;
+            }
+
+            return this._super(actionIndex);
+        },
+
+        /**
+         * Retrieves action object associated with a specified index.
+         *
+         * @param {String} actionIndex - Actions' identifier.
+         * @param {Array} actions - Action objects.
+         * @returns {Object} Action object.
+         */
+        getAction: function (actionIndex, actions) {
+            var currentActions = actions || this.actions(),
+                result = false;
+
+            _.find(currentActions, function (action) {
+                if (action.type === actionIndex) {
+                    result = action;
+
+                    return true;
+                }
+
+                if (action.actions) {
+                    result = this.getAction(actionIndex, action.actions);
+
+                    return result;
+                }
+            }, this);
+
+            return result;
+        },
+
+        /**
+         * Recursive hide all sub folders in given array.
+         *
+         * @param {Array} actions - Action objects.
+         * @returns {Massactions} Chainable.
+         */
+        hideSubmenus: function (actions) {
+            var currentActions = actions || this.actions();
+
+            _.each(currentActions, function (action) {
+                if (action.visible && action.visible()) {
+                    action.visible(false);
+                }
+
+                if (action.actions) {
+                    this.hideSubmenus(action.actions);
+                }
+            }, this);
+
+            return this;
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
new file mode 100644
index 0000000000000..ef0f5fa1c31a7
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/bind/i18n.js
@@ -0,0 +1,174 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'ko',
+    'module',
+    'mage/translate'
+], function ($, ko, module) {
+    'use strict';
+
+    var locations = {
+            'legend': 'Caption for the fieldset element',
+            'label': 'Label for an input element.',
+            'button': 'Push button',
+            'a': 'Link label',
+            'b': 'Bold text',
+            'strong': 'Strong emphasized text',
+            'i': 'Italic text',
+            'em': 'Emphasized text',
+            'u': 'Underlined text',
+            'sup': 'Superscript text',
+            'sub': 'Subscript text',
+            'span': 'Span element',
+            'small': 'Smaller text',
+            'big': 'Bigger text',
+            'address': 'Contact information',
+            'blockquote': 'Long quotation',
+            'q': 'Short quotation',
+            'cite': 'Citation',
+            'caption': 'Table caption',
+            'abbr': 'Abbreviated phrase',
+            'acronym': 'An acronym',
+            'var': 'Variable part of a text',
+            'dfn': 'Term',
+            'strike': 'Strikethrough text',
+            'del': 'Deleted text',
+            'ins': 'Inserted text',
+            'h1': 'Heading level 1',
+            'h2': 'Heading level 2',
+            'h3': 'Heading level 3',
+            'h4': 'Heading level 4',
+            'h5': 'Heading level 5',
+            'h6': 'Heading level 6',
+            'center': 'Centered text',
+            'select': 'List options',
+            'img': 'Image',
+            'input': 'Form element'
+        },
+
+        /**
+         * Generates [data-translate] attribute's value
+         * @param {Object} translationData
+         * @param {String} location
+         */
+        composeTranslateAttr = function (translationData, location) {
+            var obj = [{
+                'shown': translationData.shown,
+                'translated': translationData.translated,
+                'original': translationData.original,
+                'location': locations[location] || 'Text'
+            }];
+
+            return JSON.stringify(obj);
+        },
+
+        /**
+         * Sets text for the element
+         * @param {Object} el
+         * @param {String} text
+         */
+        setText = function (el, text) {
+            $(el).text(text);
+        },
+
+        /**
+         * Sets [data-translate] attribute for the element
+         * @param {Object} el - The element which is binded
+         * @param {String} original - The original value of the element
+         */
+        setTranslateProp = function (el, original) {
+            var location = $(el).prop('tagName').toLowerCase(),
+                translationArray = $.mage.translate.parsedTranslate(original),
+                translationData = translationArray.length > 3 ?
+                {
+                    shown: translationArray[1], translated: translationArray[2], original: translationArray[3]
+                } :
+                {
+                    shown: original, translated: original, original: original
+                },
+                translateAttr = composeTranslateAttr(translationData, location);
+
+            $(el).attr('data-translate', translateAttr);
+
+            setText(el, translationData.shown);
+        },
+
+        /**
+         * Checks if node represents ko virtual node (nodeType === 8, nodeName === '#comment').
+         *
+         * @param {HTMLElement} node
+         * @returns {Boolean}
+         */
+        isVirtualElement = function (node) {
+            return node.nodeType === 8;
+        },
+
+        /**
+        * Checks if it's real DOM element
+        * in case of virtual element, returns span wrapper
+        * @param {Object} el
+        * @param {bool} isUpdate
+        * @return {Object} el
+        */
+        getRealElement = function (el, isUpdate) {
+            if (isVirtualElement(el)) {
+                if (isUpdate) {
+                    return $(el).next('span');
+                }
+
+                return $('<span/>').insertAfter(el);
+            }
+
+            return el;
+        },
+
+        /**
+         * execute i18n binding
+         * @param {Object} element
+         * @param {Function} valueAccessor
+         * @param {bool} isUpdate
+         */
+        execute = function (element, valueAccessor, isUpdate) {
+            var original = ko.unwrap(valueAccessor() || ''),
+                el = getRealElement(element, isUpdate),
+                inlineTranslation = (module.config() || {}).inlineTranslation;
+
+            if (inlineTranslation) {
+                setTranslateProp(el, original);
+            } else {
+                setText(el, $.mage.__(original));
+            }
+        };
+
+    /**
+     * i18n binding
+     * @property {Function}  init
+     * @property {Function}  update
+     */
+    ko.bindingHandlers.i18n = {
+
+        /**
+         * init i18n binding
+         * @param {Object} element
+         * @param {Function} valueAccessor
+         */
+        init: function (element, valueAccessor) {
+            execute(element, valueAccessor);
+        },
+
+        /**
+         * update i18n binding
+         * @param {Object} element
+         * @param {Function} valueAccessor
+         */
+        update: function (element, valueAccessor) {
+            execute(element, valueAccessor, true);
+        }
+    };
+
+    ko.virtualElements.allowedBindings.i18n = true;
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js b/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js
index 2758b3f8c2391..8b37ca2b25eb8 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/ko/initialize.js
@@ -15,6 +15,7 @@ define([
     './bind/fadeVisible',
     './bind/mage-init',
     './bind/after-render',
+    './bind/i18n',
     './extender/observable_array'
 ], function (ko, templateEngine) {
     'use strict';
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/actions.html b/app/code/Magento/Ui/view/base/web/templates/grid/actions.html
index 89bf5ba4061d1..29a93df1a9805 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/actions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/actions.html
@@ -12,8 +12,8 @@
            outerClick: close">
         <button
             class="action-select"
-            data-bind="title: $t('Select Items')">
-            <span data-bind="text: $t('Actions')"></span>
+            data-bind="i18n: 'Select Items'">
+            <span data-bind="i18n: 'Actions'"></span>
         </button>
         <ul
             class="action-menu"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html b/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html
index 85fba7ed0c6c2..17cca78d5bb17 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/cells/actions.html
@@ -28,7 +28,7 @@
             },
             outerClick: closeList.bind($data, $parentContext.$index())">
         <button class="action-select" data-bind="click: toggleList.bind($data, $parentContext.$index())">
-            <span data-bind="text: $t('Select')"></span>
+            <span data-bind="i18n: 'Select'"></span>
         </button>
         <ul
             class="action-menu"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html b/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
index 8553c127d60cb..277e4a992a86b 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/columns/multiselect.html
@@ -25,7 +25,7 @@
             data-bind="css: { '_active': menuVisible },
                        click: toggleMenu,
                        enable: totalRecords">
-            <span data-bind="text: $t('Options')"></span>
+            <span data-bind="i18n: 'Options'"></span>
         </button>
         <ul
             class="action-menu"
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
index 5d9ab4bc189a3..07b20b76bb103 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/bookmarks.html
@@ -15,14 +15,14 @@
         data-toggle="dropdown"
         aria-haspopup="true">
         <span class="admin__action-dropdown-text"
-                data-bind="text: activeView() ? activeView().label() : $t('Default View') "></span>
+                data-bind="i18n: activeView() ? activeView().label() : 'Default View' "></span>
     </button>
     <ul class="admin__action-dropdown-menu">
         <!-- ko foreach: elems -->
             <!-- ko template: getTemplate() --><!-- /ko -->
         <!-- /ko -->
         <li data-bind="visible: hasChanges" class="action-dropdown-menu-action action-dropdown-menu-item-last">
-            <a href="" data-bind="click: createNewView, text: $t('Save Current View')"></a>
+            <a href="" data-bind="click: createNewView, i18n: 'Save Current View'"></a>
         </li>
     </ul>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
index 0e59e52a184c0..7327208e7c520 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/bookmarks/view.html
@@ -24,14 +24,14 @@
             class="action-submit"
             data-bind="click: function(){ $parent.close().saveView($data) }, attr: {title: $t('Save all changes')}"
             type="button">
-            <span data-bind="text: $t('Submit')"></span>
+            <span data-bind="i18n: 'Submit'"></span>
         </button>
         <div class="action-dropdown-menu-item-actions">
             <button
                 data-bind="click: function(){ $parent.close().removeView($data) }, attr: {title: $t('Delete bookmark')}"
                 class="action-delete"
                 type="button">
-                <span data-bind="text: $t('Delete')"></span>
+                <span data-bind="i18n: 'Delete'"></span>
             </button>
         </div>
     </div>
@@ -47,7 +47,7 @@
                 class="action-edit"
                 data-bind="click: startEdit, attr: {title: $t('Edit bookmark')}"
                 type="button">
-                <span data-bind="text: $t('Edit')"></span>
+                <span data-bind="i18n: 'Edit'"></span>
             </button>
         </div>
         <!-- /ko -->
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html b/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
index 88e8ed6907d60..7ba7e5811ed6d 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/controls/columns.html
@@ -11,7 +11,7 @@
         data-bind="click: toggleOpened"
         data-toggle="dropdown"
         aria-haspopup="true">
-        <span class="admin__action-dropdown-text" data-bind="text: $t('Columns')"></span>
+        <span class="admin__action-dropdown-text" data-bind="i18n: 'Columns'"></span>
     </button>
     <div data-bind="css: {_overflow: hasOverflow()}" class="admin__action-dropdown-menu admin__data-grid-action-columns-menu">
         <div class="admin__action-dropdown-menu-header">
@@ -29,12 +29,12 @@
         <div class="admin__action-dropdown-menu-footer">
             <div class="admin__action-dropdown-footer-secondary-actions">
                 <button data-bind="click: reset" class="action-tertiary" type="button">
-                    <span data-bind="text: $t('Reset')"></span>
+                    <span data-bind="i18n: 'Reset'"></span>
                 </button>
             </div>
             <div class="admin__action-dropdown-footer-main-actions">
                 <button data-bind="click: function () { $data.close().cancel(); }" class="action-tertiary" type="button">
-                    <span data-bind="text: $t('Cancel')"></span>
+                    <span data-bind="i18n: 'Cancel'"></span>
                 </button>
             </div>
         </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html b/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
index 8a0f12a35876b..0005efa2bfbd5 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/dnd/listing.html
@@ -35,7 +35,7 @@
         <!-- ko ifnot: hasData() -->
             <tr class="data-grid-tr-no-data">
                 <td data-bind="attr: { colspan: countVisible() },
-                               text: $t('We couldn\'t find any records.')"></td>
+                               i18n: 'We couldn\'t find any records.'"></td>
             </tr>
         <!-- /ko -->
     </tbody>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html b/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html
index 985ae16e58dca..d50c4fb2b9c1a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/exportButton.html
@@ -14,7 +14,7 @@
         data-bind="click: toggleOpened"
         data-toggle="dropdown"
         aria-haspopup="true">
-        <span class="admin__action-dropdown-text" data-bind="text: $t('Export')"></span>
+        <span class="admin__action-dropdown-text" data-bind="i18n: 'Export'"></span>
     </button>
     <div class="admin__action-dropdown-menu admin__data-grid-action-export-menu">
         <!-- ko foreach: options -->
@@ -43,12 +43,12 @@
                 class="action-tertiary"
                 data-bind="click: close"
                 type="button">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
             <button class="action-secondary"
                 type="button"
                 data-bind="click: applyOption">
-                <span data-bind="text: $t('Export')"></span>
+                <span data-bind="i18n: 'Export'"></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
index 78e5cbb86cfe9..e396c223d8a92 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/chips.html
@@ -10,7 +10,7 @@
     <div class="admin__current-filters-title-wrap">
         <span
             class="admin__current-filters-title"
-            data-bind="text: $t('Active filters:')"></span>
+            data-bind="i18n: 'Active filters:'"></span>
     </div>
     <div class="admin__current-filters-list-wrap">
         <ul class="admin__current-filters-list" data-role="filter-list">
@@ -34,7 +34,7 @@
                         data-action="grid-filter-remove-chip"
                         data-bind="click: $parent.clear.bind($parent, elem)"
                         type="button">
-                        <span data-bind="text: $t('Remove')"></span>
+                        <span data-bind="i18n: 'Remove'"></span>
                     </button>
                 </li>
                 <!-- /ko -->
@@ -47,7 +47,7 @@
             type="button"
             data-action="grid-filter-reset"
             data-bind="
-                text: $t('Clear all'),
+                i18n: 'Clear all',
                 click: clear,
                 attr: {
                     'data-action': hasData() ? 'grid-filter-reset' : ''
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
index b7ad8f86ed0cb..e81c1fd1dbf96 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/filters.html
@@ -10,7 +10,7 @@
             class="action-default _active"
             data-action="grid-filter-expand"
             data-bind="click: toggleOpened, attr: { disabled: !hasVisible() }, css: { _active: isOpened() }">
-            <span data-bind="text: $t('Filters')"></span>
+            <span data-bind="i18n: 'Filters'"></span>
         </button>
     </div>
 </div>
@@ -26,7 +26,7 @@
 
     <fieldset class="admin__fieldset admin__data-grid-filters">
         <legend class="admin__filters-legend">
-            <span data-bind="text: $t('Advanced filter')"></span>
+            <span data-bind="i18n: 'Advanced filter'"></span>
         </legend>
         <!-- ko foreach: elems -->
             <!-- ko if: $data.isGroup -->
@@ -50,14 +50,14 @@
                 type="button"
                 data-action="grid-filter-cancel"
                 data-bind="click: function(){ $data.close().cancel(); }">
-                <span data-bind="text: $t('Cancel')"></span>
+                <span data-bind="i18n: 'Cancel'"></span>
             </button>
             <button
                 class="action-secondary"
                 type="button"
                 data-action="grid-filter-apply"
                 data-bind="click: function(){ $data.close().apply(); }">
-                <span data-bind="text: $t('Apply Filters')"></span>
+                <span data-bind="i18n: 'Apply Filters'"></span>
             </button>
         </div>
     </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/listing.html b/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
index 4856d57fd2d02..a90887745c81a 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/listing.html
@@ -35,7 +35,7 @@
             <!-- ko ifnot: hasData() -->
                 <tr class="data-grid-tr-no-data">
                     <td data-bind="attr: { colspan: countVisible() },
-                                   text: $t('We couldn\'t find any records.')"></td>
+                                   i18n: 'We couldn\'t find any records.'"></td>
                 </tr>
             <!-- /ko -->
         </tbody>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
index 14aebeaedaeb5..1a9d495f42296 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/search/search.html
@@ -18,6 +18,6 @@
                 }"
             type="text"/>
     <button class="action-submit" data-bind="click: apply.bind($data, false)" type="button">
-        <span data-bind="text: $t('Search')"></span>
+        <span data-bind="i18n: 'Search'"></span>
     </button>
 </div>
\ No newline at end of file
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
new file mode 100644
index 0000000000000..8cd8cc6592960
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/submenu.html
@@ -0,0 +1,22 @@
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+
+<ul
+    class="action-submenu"
+    data-bind="foreach: {data: action.actions, as: 'action'},
+    css: { _active: action.visible }">
+    <li data-bind="css: { '_visible': $data.visible}">
+        <span
+            class="action-menu-item"
+            data-bind="text: label,
+            click: $parent.applyAction.bind($parent, type)"></span>
+            <!-- ko if: $data.actions-->
+                <!-- ko template: {name: $parent.submenuTemplate, data: $parent} -->
+                <!-- /ko -->
+            <!-- /ko -->
+    </li>
+</ul>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
new file mode 100644
index 0000000000000..352f29cb8bc66
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/tree-massactions.html
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="col-xs-2" data-bind="outerClick: close">
+    <div
+            class="action-select-wrap"
+            data-bind="css: {'_active': opened}">
+        <button
+                class="action-select"
+                data-bind="title: $t('Select Items'), click: toggleOpened">
+            <span data-bind="text: $t('Actions')"></span>
+        </button>
+        <ul
+            class="action-menu"
+            data-bind="css: {'_active': opened},
+                foreach: {data: actions, as: 'action'}">
+            <li data-bind="css: { '_visible': $data.visible}">
+                <span
+                    class="action-menu-item"
+                    data-bind="text: label,
+                        click: $parent.applyAction.bind($parent, type)">
+                </span>
+                    <!-- ko if: $data.actions -->
+                        <!-- ko template: {name: $parent.submenuTemplate, data: $parent} -->
+                        <!-- /ko -->
+                    <!-- /ko-->
+            </li>
+        </ul>
+    </div>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/tab.html b/app/code/Magento/Ui/view/base/web/templates/tab.html
index e03c45ae273c9..01d2b14107820 100644
--- a/app/code/Magento/Ui/view/base/web/templates/tab.html
+++ b/app/code/Magento/Ui/view/base/web/templates/tab.html
@@ -18,7 +18,7 @@
                        <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"
-                                   data-bind="text: $t('Changes have been made to this section that have not been saved.')">
+                                   data-bind="i18n: 'Changes have been made to this section that have not been saved.'">
                            </span>
                        </span>
                         <span class="admin__page-nav-item-message-loader">
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
index defa4a4ae3c55..f207c4c3d0cc0 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -229,13 +229,6 @@
             transition-timing-function: ease-in-out;
             visibility: hidden;
             z-index: @submenu__z-index - 1;
-            &._overlap {
-                overflow-y: auto;
-                height: 100%;
-                &::-webkit-scrollbar {
-                    width: 0;
-                }
-            }
         }
         &._show  {
             > .submenu {
@@ -449,14 +442,6 @@
     z-index: @menu-overlay__z-index;
 }
 
-//  Hide submenu group section title for only one group in submenu
-.submenu-group-title {
-    .column:only-child .level-1:only-child > &,
-    .submenu-title ~ ul > .level-1:only-child > & {
-        display: none;
-    }
-}
-
 //
 //  Tablets
 //  _____________________________________________
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
index 99d3f60854103..8472066b42e2d 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_actions.less
@@ -390,15 +390,19 @@ button {
         .appearing__on();
     }
     > li {
-        display: block;
         border: none; // ToDo UI: Should be deleted with old styles
+        display: block;
         padding: 0;
+        position: relative;
         transition: background-color .1s linear;
         > a {
             &:hover {
                 text-decoration: none;
             }
         }
+        &._visible {
+            background-color: @action-menu__hover__background-color;
+        }
         &:hover {
             background-color: @action-menu__hover__background-color;
         }
@@ -412,6 +416,14 @@ button {
         padding: .6875em 1em;
         cursor: pointer;
     }
+    .action-submenu {
+        &:extend(.action-menu all);
+        left: 100%;
+        margin-top: -1px;
+        position: absolute;
+        right: auto;
+        top: 0;
+    }
     a {
         &.action-menu-item {
             color: @text__color;
diff --git a/app/design/adminhtml/Magento/backend/web/js/theme.js b/app/design/adminhtml/Magento/backend/web/js/theme.js
index c3d695cb9e582..9d1524c4e2352 100644
--- a/app/design/adminhtml/Magento/backend/web/js/theme.js
+++ b/app/design/adminhtml/Magento/backend/web/js/theme.js
@@ -10,7 +10,6 @@ define('globalNavigationScroll', [
 
     var win = $(window),
         subMenuClass = '.submenu',
-        overlapClassName = '_overlap',
         fixedClassName = '_fixed',
         menu = $('.menu-wrapper'),
         content = $('.page-wrapper'),
@@ -84,7 +83,7 @@ define('globalNavigationScroll', [
 
                     menu.css('top', -nextTop);
 
-                } else if (winTop < winTopLast) { // scroll up
+                } else if (winTop <= winTopLast) { // scroll up
 
                     nextTop > -scrollStep ?
                         nextTop += scrollStep : nextTop = 0;
@@ -118,21 +117,27 @@ define('globalNavigationScroll', [
         //  Reset position if fixed and out of smart scroll
         if ((menuHeight < contentHeight) && (menuHeight <= winHeight)) {
             menu.removeAttr('style');
-            //  Remove overlap classes from submenus and clear overlap adding event
-            subMenus.removeClass(overlapClassName);
             menuItems.off();
         }
 
     });
 
     //  Add event to menuItems to check submenu overlap
-    menuItems.on('click', function () {
-        
-        var submenu = $(this).children(subMenuClass);
+    menuItems.on('click', function (e) {
+
+        var submenu = $(this).children(subMenuClass),
+            delta;
+
         submenuHeight = submenu.height();
 
-        if (isMenuFixed() && (submenuHeight > winHeight)) {
-            checkAddClass(submenu, overlapClassName);
+        if (submenuHeight > menuHeight && menuHeight > winHeight) {
+            menu.height(submenuHeight - $('.logo')[0].offsetHeight);
+            delta = -menu.position().top;
+            window.scrollTo(0, 0);
+            positionMenu();
+            window.scrollTo(0, delta);
+            positionMenu();
+            menuHeight = submenuHeight;
         }
     });
 
@@ -161,7 +166,7 @@ define('globalNavigation', [
         _create: function () {
             var selectors = this.options.selectors;
 
-            this.menu      = this.element;
+            this.menu = this.element;
             this.menuLinks = $(selectors.topLevelHref, selectors.topLevelItem);
             this.closeActions = $(selectors.closeSubmenuBtn);
 
@@ -195,9 +200,9 @@ define('globalNavigation', [
          * Remove active class from current menu item
          * Turn back active class to current page menu item
          */
-        _blur: function(e){
+        _blur: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem),
+                menuItem = $(e.target).closest(selectors.topLevelItem),
                 currentItem = $(selectors.menu).find(selectors.currentItem);
 
             menuItem.removeClass('_active');
@@ -207,11 +212,11 @@ define('globalNavigation', [
         /**
          * Add focus to active menu item
          */
-        _keyboard: function(e) {
+        _keyboard: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem);
+                menuItem = $(e.target).closest(selectors.topLevelItem);
 
-            if(e.which === 13) {
+            if (e.which === 13) {
                 this._close(e);
                 $(selectors.topLevelHref, menuItem).focus();
             }
@@ -222,11 +227,11 @@ define('globalNavigation', [
          */
         _focus: function (e) {
             var selectors = this.options.selectors,
-                menuItem  = $(e.target).closest(selectors.topLevelItem);
+                menuItem = $(e.target).closest(selectors.topLevelItem);
 
             menuItem.addClass('_active')
-                    .siblings(selectors.topLevelItem)
-                    .removeClass('_active');
+                .siblings(selectors.topLevelItem)
+                .removeClass('_active');
         },
 
         _closeSubmenu: function (e) {
@@ -239,23 +244,26 @@ define('globalNavigation', [
         },
 
         _open: function (e) {
-            var selectors           = this.options.selectors,
-                menuItemSelector    = selectors.topLevelItem,
-                menuItem            = $(e.target).closest(menuItemSelector),
-                subMenu             = $(selectors.subMenu, menuItem),
-                close               = this._closeSubmenu.bind(this),
-                closeBtn            = subMenu.find(selectors.closeSubmenuBtn);
+            var selectors = this.options.selectors,
+                menuItemSelector = selectors.topLevelItem,
+                menuItem = $(e.target).closest(menuItemSelector),
+                subMenu = $(selectors.subMenu, menuItem),
+                close = this._closeSubmenu.bind(this),
+                closeBtn = subMenu.find(selectors.closeSubmenuBtn);
+
 
             if (subMenu.length) {
                 e.preventDefault();
             }
 
             menuItem.addClass('_show')
-                    .siblings(menuItemSelector)
-                    .removeClass('_show');
+                .siblings(menuItemSelector)
+                .removeClass('_show');
 
             subMenu.attr('aria-expanded', 'true');
 
+            //subMenu.css('height', subMenu.find('ul.menu')[0].height() + subMenu.find('strong.submenu-title').height());
+
             closeBtn.on('click', close);
 
             this.overlay.show(0).on('click', close);
@@ -263,11 +271,11 @@ define('globalNavigation', [
         },
 
         _close: function (e) {
-            var selectors   = this.options.selectors,
-                menuItem    = this.menu.find(selectors.topLevelItem + '._show'),
-                subMenu     = $(selectors.subMenu, menuItem),
-                closeBtn    = subMenu.find(selectors.closeSubmenuBtn),
-                blur        = this._blur.bind(this);
+            var selectors = this.options.selectors,
+                menuItem = this.menu.find(selectors.topLevelItem + '._show'),
+                subMenu = $(selectors.subMenu, menuItem),
+                closeBtn = subMenu.find(selectors.closeSubmenuBtn),
+                blur = this._blur.bind(this);
 
             e.preventDefault();
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
new file mode 100644
index 0000000000000..15e584202f140
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/adapter.test.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'Magento_Ui/js/form/adapter'
+], function (obj) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/adapter', function () {
+        describe('"on" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('on')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.on;
+
+                expect(type).toEqual('function');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
new file mode 100644
index 0000000000000..4b96064f0059f
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/client.test.js
@@ -0,0 +1,73 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/client'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/client', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"save" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('save')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.save;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                obj.urls = {};
+                obj.urls.beforeSave = {};
+                expect(obj.save()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.save();
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initialize" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initialize')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initialize;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initialize()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initialize();
+
+                expect(type).toEqual('object');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
new file mode 100644
index 0000000000000..ff33571c008e8
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/area.test.js
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/area'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/area', function () {
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initObservable;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initObservable();
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy();
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initElement;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        on: function () {
+                        }
+                    },
+                    type = typeof obj.initElement(arg);
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"onChildrenUpdate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onChildrenUpdate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.onChildrenUpdate;
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.delegate" method ', function () {
+                obj.delegate = jasmine.createSpy();
+                obj.onChildrenUpdate();
+                expect(obj.delegate).toHaveBeenCalled();
+            });
+        });
+        describe('"onContentLoading" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onContentLoading')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.onContentLoading;
+
+                expect(type).toEqual('function');
+            });
+            it('Try called', function () {
+                obj.onContentLoading = jasmine.createSpy();
+                obj.onContentLoading();
+                expect(obj.onContentLoading).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
new file mode 100644
index 0000000000000..ab3a81d14e262
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection.test.js
@@ -0,0 +1,173 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/collection'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/collection', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initElement;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object arguments', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    activate: function () {
+
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called object arguments', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        activate: function () {
+                        }
+                    },
+                    type = typeof obj.initElement(arg);
+
+                expect(type).toEqual('object');
+            });
+            it('Check call method "this.bubble" inner initElement method', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    activate: function () {
+                    }
+                };
+                obj.bubble = jasmine.createSpy();
+                obj.initElement(arg);
+                expect(obj.bubble).toHaveBeenCalled();
+            });
+        });
+        describe('"initChildren" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initChildren')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initChildren;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initChildren()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initChildren();
+
+                expect(type).toEqual('object');
+            });
+            it('Check call method "this.source.get" inner initElement method', function () {
+                obj.source.get = jasmine.createSpy();
+                obj.initChildren();
+                expect(obj.source.get).toHaveBeenCalled();
+            });
+            it('Check this.initialItems property affter called initChildren', function () {
+                obj.initialItems = null;
+                obj.initChildren();
+                expect(obj.initialItems).toEqual([]);
+            });
+        });
+        describe('"addChild" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('addChild')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.addChild;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with arguments', function () {
+                expect(obj.addChild()).toBeDefined();
+            });
+            it('Check returned value type if method called with arguments', function () {
+                var type = typeof obj.addChild();
+
+                expect(type).toEqual('object');
+            });
+            it('Check this.childIndex property affter called addChild', function () {
+                obj.childIndex = null;
+                obj.addChild('4');
+                expect(obj.childIndex).toEqual('4');
+            });
+        });
+        describe('"hasChanged" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hasChanged')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.hasChanged;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.hasChanged()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.hasChanged();
+
+                expect(type).toEqual('boolean');
+            });
+        });
+        describe('"validate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('validate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.validate;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.validate()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                expect(obj.validate()).toEqual([]);
+            });
+        });
+        describe('"removeAddress" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('removeAddress')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.removeAddress;
+
+                expect(type).toEqual('function');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
new file mode 100644
index 0000000000000..73020d43c8b9d
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/collection/item.test.js
@@ -0,0 +1,256 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/collection/item'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/collection/item', function () {
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initProperties" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initProperties')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initProperties;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initProperties()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initProperties();
+
+                expect(type).toEqual('object');
+            });
+            it('Check "displayed" property', function () {
+                obj.displayed = null;
+                obj.initProperties();
+                expect(obj.displayed).toEqual([]);
+            });
+        });
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initObservable;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initObservable();
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy();
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initElement;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        }
+                    },
+                    type = typeof obj.initElement(arg);
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.insertToIndexed" method with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    }
+                };
+
+                obj.insertToIndexed = jasmine.createSpy();
+                obj.initElement(arg);
+                expect(obj.insertToIndexed).toHaveBeenCalledWith(arg);
+            });
+        });
+        describe('"insertToIndexed" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('insertToIndexed')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.insertToIndexed;
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "insertToIndexed" method with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    }
+                };
+
+                obj.insertToIndexed(arg);
+                expect(obj.insertToIndexed).toHaveBeenCalledWith(arg);
+            });
+        });
+        describe('"formatPreviews" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('formatPreviews')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.formatPreviews;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if call method with array arguments', function () {
+                expect(obj.formatPreviews(['1', '2', '3'])).toEqual(
+                    [
+                        {
+                            'items': ['1'],
+                            'separator': '',
+                            'prefix': ''
+                        },
+                        {
+                            'items': ['2'],
+                            'separator': '',
+                            'prefix': ''
+                        },
+                        {
+                            'items': ['3'],
+                            'separator': '',
+                            'prefix': ''
+                        }
+                    ]
+                );
+            });
+        });
+        describe('"buildPreview" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('buildPreview')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.buildPreview;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    items: [],
+                    prefix: 'magento'
+                };
+
+                expect(obj.buildPreview(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        items: [],
+                        prefix: 'magento'
+                    },
+                    type = typeof obj.buildPreview(arg);
+
+                expect(type).toEqual('string');
+            });
+            it('Check called "this.getPreview" method with object argument', function () {
+                var arg = {
+                    items: [],
+                    prefix: 'magento'
+                };
+
+                obj.getPreview = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
+                obj.buildPreview(arg);
+                expect(obj.getPreview).toHaveBeenCalledWith(arg.items);
+            });
+        });
+        describe('"hasPreview" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hasPreview')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.hasPreview;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        items: [],
+                        prefix: 'magento'
+                    },
+                    type = typeof obj.hasPreview(arg);
+
+                expect(type).toEqual('boolean');
+            });
+            it('Check called "this.getPreview" method with object argument', function () {
+                var arg = {
+                    items: [],
+                    prefix: 'magento'
+                };
+
+                obj.getPreview = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
+                obj.hasPreview(arg);
+                expect(obj.getPreview).toHaveBeenCalledWith(arg.items);
+            });
+        });
+        describe('"getPreview" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('getPreview')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.getPreview;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        items: [],
+                        prefix: 'magento'
+                    },
+                    type = typeof obj.getPreview(arg);
+
+                expect(type).toEqual('object');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
new file mode 100644
index 0000000000000..cb9b0ee342c9c
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/group.test.js
@@ -0,0 +1,132 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/group'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/group', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initObservable;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initObservable();
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"isSingle" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('isSingle')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.isSingle;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if this.elems.getLength return 1', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
+
+                expect(obj.isSingle()).toEqual(true);
+            });
+            it('Check returned value if this.elems.getLength return not 1', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 2;
+                });
+
+                expect(obj.isSingle()).toEqual(false);
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.isSingle();
+
+                expect(type).toEqual('boolean');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
+                obj.isSingle();
+                expect(obj.elems.getLength).toHaveBeenCalled();
+            });
+        });
+        describe('"isMultiple" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('isMultiple')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.isMultiple;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if this.elems.getLength return more 1', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 4;
+                });
+
+                expect(obj.isMultiple()).toEqual(true);
+            });
+            it('Check returned value if this.elems.getLength return 1 or less', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
+
+                expect(obj.isMultiple()).toEqual(false);
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.isMultiple();
+
+                expect(type).toEqual('boolean');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.elems.getLength = jasmine.createSpy().and.callFake(function () {
+                    return 1;
+                });
+                obj.isMultiple();
+                expect(obj.elems.getLength).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
new file mode 100644
index 0000000000000..d3e8c7249c0d0
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/html.test.js
@@ -0,0 +1,238 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/html'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/html', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        window.FORM_KEY = 'magentoFormKey';
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initObservable;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initObservable();
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"initContainer" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initContainer')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initContainer;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with arguments', function () {
+                var parent = {
+                    on: jasmine.createSpy()
+                };
+
+                expect(obj.initContainer(parent)).toBeDefined();
+            });
+            it('Check returned value type if method called with arguments', function () {
+                var parent = {
+                        on: jasmine.createSpy()
+                    },
+                    type = typeof obj.initContainer(parent);
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "arguments.on" method inner "initContainer" method', function () {
+                var parent = {
+                    on: jasmine.createSpy()
+                };
+
+                obj.initContainer(parent);
+                expect(parent.on).toHaveBeenCalled();
+            });
+        });
+        describe('"initAjaxConfig" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initAjaxConfig')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initAjaxConfig;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initAjaxConfig()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initAjaxConfig();
+
+                expect(type).toEqual('object');
+            });
+            it('Check url property', function () {
+                obj.ajaxConfig = null;
+                obj.url = 'magento';
+
+                obj.initAjaxConfig();
+                expect(obj.ajaxConfig.url).toEqual(obj.url);
+            });
+            it('Check FORM_KEY property', function () {
+                obj.ajaxConfig = null;
+
+                obj.initAjaxConfig();
+                expect(obj.ajaxConfig.data.FORM_KEY).toEqual(window.FORM_KEY);
+            });
+            it('Check success property', function () {
+                obj.ajaxConfig = null;
+
+                obj.initAjaxConfig();
+                expect(typeof obj.ajaxConfig.success).toEqual('function');
+            });
+        });
+        describe('"onContainerToggle" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onContainerToggle')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.onContainerToggle;
+
+                expect(type).toEqual('function');
+            });
+            it('Check call method "this.shouldLoad" inner onContainerToggle method', function () {
+                obj.shouldLoad = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+
+                obj.onContainerToggle(true);
+                expect(obj.shouldLoad).toHaveBeenCalled();
+            });
+            it('Check call method "this.loadData" inner onContainerToggle method', function () {
+                obj.shouldLoad = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+                obj.loadData = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+
+                obj.onContainerToggle(true);
+                expect(obj.loadData).toHaveBeenCalled();
+            });
+        });
+        describe('"hasData" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hasData')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.hasData;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned type', function () {
+                var type = typeof obj.hasData();
+
+                expect(type).toEqual('boolean');
+            });
+        });
+        describe('"shouldLoad" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('shouldLoad')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.shouldLoad;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned type', function () {
+                var type = typeof obj.shouldLoad();
+
+                expect(type).toEqual('boolean');
+            });
+        });
+        describe('"loadData" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('loadData')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.loadData;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.loadData()).toBeDefined();
+            });
+        });
+        describe('"onDataLoaded" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onDataLoaded')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.onDataLoaded;
+
+                expect(type).toEqual('function');
+            });
+            it('Check call method "this.updateContent" inner onDataLoaded method', function () {
+                var data = 'magento';
+
+                obj.updateContent = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
+                obj.onDataLoaded(data);
+                expect(obj.loadData).toHaveBeenCalled();
+            });
+        });
+        describe('"updateContent" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('updateContent')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.updateContent;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.updateContent()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                expect(typeof obj.updateContent()).toEqual('object');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
new file mode 100644
index 0000000000000..ffea4906b6e03
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab.test.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/tab'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/tab', function () {
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        window.FORM_KEY = 'magentoFormKey';
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initObservable" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initObservable')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initObservable;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initObservable()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initObservable();
+
+                expect(type).toEqual('object');
+            });
+            it('Check called "this.observe" method', function () {
+                obj.observe = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
+                obj.initObservable();
+                expect(obj.observe).toHaveBeenCalled();
+            });
+        });
+        describe('"onUniqueUpdate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onUniqueUpdate')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.onUniqueUpdate;
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.trigger" inner onUniqueUpdate method', function () {
+                obj.trigger = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
+                obj.onUniqueUpdate();
+                expect(obj.trigger).toHaveBeenCalled();
+            });
+        });
+        describe('"activate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('activate')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.activate;
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.setUnique" inner activate method', function () {
+                obj.setUnique = jasmine.createSpy().and.callFake(function () {
+                    return obj;
+                });
+                obj.activate();
+                expect(obj.setUnique).toHaveBeenCalled();
+            });
+            it('Check observable variable "active" after execution activate method', function () {
+                obj.activate();
+                expect(obj.active()).toEqual(true);
+            });
+            it('Check observable variable "wasActivated" after execution activate method', function () {
+                obj.activate();
+                expect(obj.wasActivated()).toEqual(true);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
new file mode 100644
index 0000000000000..d9ffd6cbbd600
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/components/tab_group.test.js
@@ -0,0 +1,157 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/components/tab_group'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/components/tab_group', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        window.FORM_KEY = 'magentoFormKey';
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initElement" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initElement')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initElement;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    },
+                    active: function () {
+                    }
+                };
+
+                expect(obj.initElement(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        on: function () {
+                        },
+                        active: function () {
+                        }
+                    },
+                    type = typeof obj.initElement(arg);
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initActivation" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initActivation')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.initActivation;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called with object argument', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    },
+                    active: function () {
+                    }
+                };
+
+                expect(obj.initActivation(arg)).toBeDefined();
+            });
+            it('Check returned value type if method called with object argument', function () {
+                var arg = {
+                        initContainer: function () {
+                        },
+                        on: function () {
+                        },
+                        active: function () {
+                        }
+                    },
+                    type = typeof obj.initActivation(arg);
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"validate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('validate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.validate;
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "argument.delegate" inner validate method', function () {
+                var arg = {
+                    initContainer: function () {
+                    },
+                    on: function () {
+                    },
+                    active: function () {
+                    },
+                    delegate: jasmine.createSpy()
+                };
+
+                obj.validate(arg);
+                expect(arg.delegate).toHaveBeenCalled();
+            });
+        });
+        describe('"onValidate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('onValidate')).toBeDefined();
+            });
+            it('Check answer type', function () {
+                var type = typeof obj.onValidate;
+
+                expect(type).toEqual('function');
+            });
+            it('Check called "this.elems.sortBy" inner onValidate method', function () {
+                obj.elems.sortBy = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
+                obj.onValidate();
+                expect(obj.elems.sortBy).toHaveBeenCalled();
+            });
+            it('Check called "this.validate" in onValidate and count calls', function () {
+                obj.elems.sortBy = jasmine.createSpy().and.callFake(function () {
+                    return ['1', '2', '3'];
+                });
+                obj.validate = jasmine.createSpy().and.callFake(function () {
+                    return [];
+                });
+                obj.onValidate();
+                expect(obj.validate.calls.count()).toBe(3);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
new file mode 100644
index 0000000000000..c3fe88933d56c
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/form.test.js
@@ -0,0 +1,179 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/form'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/form', function () {
+
+        var obj = new Constr({
+            provider: 'provName',
+            name: '',
+            index: ''
+        });
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initAdapter" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initAdapter')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.save;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initAdapter()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initAdapter();
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initialize" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initialize')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initialize;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initialize()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initialize();
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initProperties" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initProperties')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initProperties;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initProperties()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initProperties();
+
+                expect(type).toEqual('object');
+            });
+            it('Check this.selector property (is modify in initProperties method)', function () {
+                obj.selector = null;
+                obj.initProperties();
+                expect(typeof obj.selector).toEqual('string');
+            });
+        });
+        describe('"hideLoader" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('hideLoader')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.hideLoader;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.hideLoader()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.hideLoader();
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"save" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('save')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.save;
+
+                expect(type).toEqual('function');
+            });
+            it('Check call method "this.validate" inner save method', function () {
+                obj.validate = jasmine.createSpy();
+                obj.source.get = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+                obj.save();
+                expect(obj.validate).toHaveBeenCalled();
+            });
+            it('Check call method "this.source.get" inner save method', function () {
+                obj.validate = jasmine.createSpy();
+                obj.source.get = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+                obj.save();
+                expect(obj.source.get).toHaveBeenCalled();
+            });
+            it('Check call method "this.submit" inner save method', function () {
+                obj.validate = jasmine.createSpy();
+                obj.source.get = jasmine.createSpy().and.callFake(function () {
+                    return false;
+                });
+                obj.submit = jasmine.createSpy().and.callFake(function () {
+                    return true;
+                });
+                obj.save();
+                expect(obj.source.get).toHaveBeenCalled();
+            });
+        });
+        describe('"submit" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('submit')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.submit;
+
+                expect(type).toEqual('function');
+            });
+        });
+        describe('"validate" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('validate')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.validate;
+
+                expect(type).toEqual('function');
+            });
+        });
+        describe('"reset" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('reset')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.reset;
+
+                expect(type).toEqual('function');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
new file mode 100644
index 0000000000000..211407c6bd464
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/provider.test.js
@@ -0,0 +1,106 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+/*jscs:disable jsDoc*/
+
+define([
+    'underscore',
+    'uiRegistry',
+    'Magento_Ui/js/form/provider'
+], function (_, registry, Constr) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/provider', function () {
+
+        var obj = new Constr({
+                provider: 'provName',
+                name: '',
+                index: ''
+            }),
+            originalClient = obj.client;
+
+        registry.set('provName', {
+            on: function () {
+            },
+            get: function () {
+            },
+            set: function () {
+            }
+        });
+
+        describe('"initialize" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initialize')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initialize;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initialize()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initialize();
+
+                expect(type).toEqual('object');
+            });
+        });
+        describe('"initClient" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('initClient')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.initClient;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                expect(obj.initClient()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.initClient();
+
+                expect(type).toEqual('object');
+            });
+            it('Check returned value type if method called without arguments', function () {
+                obj.client = null;
+                expect(typeof obj.client).toEqual('object');
+            });
+        });
+        describe('"save" method', function () {
+            it('Check for defined ', function () {
+                expect(obj.hasOwnProperty('save')).toBeDefined();
+            });
+            it('Check method type', function () {
+                var type = typeof obj.save;
+
+                expect(type).toEqual('function');
+            });
+            it('Check returned value if method called without arguments', function () {
+                obj.client = originalClient;
+                obj.client.save = jasmine.createSpy();
+                expect(obj.save()).toBeDefined();
+            });
+            it('Check returned value type if method called without arguments', function () {
+                var type = typeof obj.save();
+
+                expect(type).toEqual('object');
+            });
+            it('Check call method "this.get" inner save method', function () {
+                obj.get = jasmine.createSpy();
+                obj.save();
+                expect(obj.get).toHaveBeenCalled();
+            });
+            it('Check call method "this.client.save" inner save method', function () {
+                obj.get = jasmine.createSpy();
+                obj.save();
+                expect(obj.client.save).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
index e827351aa76c6..614c010046190 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/multiselect.test.js
@@ -22,7 +22,8 @@ define([
                 provider: 'provider'
             });
             multiSelect.source = {
-                set: function () {}
+                set: function () {
+                }
             };
             spyOn(multiSelect.source, 'set');
         });
@@ -31,9 +32,9 @@ define([
         });
 
         it('Default state - Select no rows', function () {
-            multiSelect.rows.push({id:1});
-            multiSelect.rows.push({id:2});
-            multiSelect.rows.push({id:3});
+            multiSelect.rows.push({id: 1});
+            multiSelect.rows.push({id: 2});
+            multiSelect.rows.push({id: 3});
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
@@ -46,101 +47,99 @@ define([
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([4,5]);
+            expect(multiSelect.selected()).toEqual([4, 5]);
         });
 
         it('Select all rows on several pages', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.selectPage();
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
             multiSelect.selectPage();
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([1,2,3,4]);
+            expect(multiSelect.selected()).toEqual([1, 2, 3, 4]);
         });
 
         it('Select all rows on current page with some specific rows on another page', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
             multiSelect.selectPage();
             multiSelect.rows([
-                {id:5},
-                {id:6}
+                {id: 5},
+                {id: 6}
             ]);
             multiSelect.selected.push(6);
-
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([3,4,6]);
+            expect(multiSelect.excluded()).toEqual([5]);
+            expect(multiSelect.selected()).toEqual([3, 4, 6]);
         });
 
         it('Select all rows on several pages without some specific rows', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
             multiSelect.selectPage();
             multiSelect.selected.remove(4); // remove second
 
             expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
+            expect(multiSelect.excluded()).toEqual([4]);
             expect(multiSelect.selected()).toEqual([3]);
         });
 
         it('Select all rows all over the Grid', function () {
             multiSelect.rows([
-                {id:1},
-                {id:2}
+                {id: 1},
+                {id: 2}
             ]);
             multiSelect.selectAll();
             multiSelect.rows([
-                {id:3},
-                {id:4}
+                {id: 3},
+                {id: 4}
             ]);
 
             expect(multiSelect.allSelected()).toBeFalsy();
             expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([1,2]);
-        });
-
-        it('Select all rows all over the Grid without all rows on current page but with specific rows on another page', function () {
-            multiSelect.rows([
-                {id:1},
-                {id:2}
-            ]);
-            multiSelect.rows([
-                {id:3},
-                {id:4}
-            ]);
-            multiSelect.selectAll();
-            multiSelect.deselectPage();
-            multiSelect.rows([
-                {id:5},
-                {id:6}
-            ]);
-            multiSelect.selected.push(6);
-
-            expect(multiSelect.allSelected()).toBeFalsy();
-            expect(multiSelect.excluded()).toEqual([]);
-            expect(multiSelect.selected()).toEqual([6]);
+            expect(multiSelect.selected()).toEqual([3, 4, 1, 2]);
         });
 
+        it('Select all rows all over the Grid without all rows on current page but with specific rows on another page',
+            function () {
+                multiSelect.rows([
+                    {id: 1},
+                    {id: 2}
+                ]);
+                multiSelect.rows([
+                    {id: 3},
+                    {id: 4}
+                ]);
+                multiSelect.selectAll();
+                multiSelect.deselectPage();
+                multiSelect.rows([
+                    {id: 5},
+                    {id: 6}
+                ]);
+
+                expect(multiSelect.allSelected()).toBeFalsy();
+                expect(multiSelect.excluded()).toEqual([3, 4]);
+                expect(multiSelect.selected()).toEqual([5, 6]);
+            });
     });
 });
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js
index 788cbf7b80783..df18473c65408 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/dnd.test.js
@@ -4,36 +4,38 @@
  */
 
 define([
-        'Magento_Ui/js/grid/dnd'
-    ], function(dnd){
-        'use strict';
+    'Magento_Ui/js/grid/dnd'
+], function (Dnd) {
+    'use strict';
 
-        describe('Magento_Ui/js/grid/controls/grid/dnd', function(){
-            var dragAndDrop,
-                fakeElement;
+    describe('Magento_Ui/js/grid/controls/grid/dnd', function () {
+        var dragAndDrop,
+            fakeElement;
 
-            beforeEach(function(){
-                spyOn(document, 'addEventListener');
-                dragAndDrop = new dnd({a:'a'});
+        beforeEach(function () {
+            spyOn(document, 'addEventListener');
+            dragAndDrop = new Dnd({
+                a: 'a'
             });
-            it('Dragging changes <body> state on init', function(){
-                expect(document.addEventListener).toHaveBeenCalled();
-                expect(dragAndDrop.$body).toBeDefined();
-            });
-            it('specifies column as dragable', function(){
-                fakeElement = document.createElement('HTMLTableCellElement');
-                dragAndDrop.addColumn(fakeElement);
-                expect(dragAndDrop.columns.length).toBeGreaterThan(0);
-            });
-            it('has setTable method', function () {
-                fakeElement = document.createElement('HTMLTableElement');
-                dragAndDrop.setTable(fakeElement);
-                expect(dragAndDrop.table).toBeDefined();
-            });
-            it('has setDragTable method', function () {
-                fakeElement = document.createElement('HTMLTableElement');
-                dragAndDrop.setDragTable(fakeElement);
-                expect(dragAndDrop.dragTable).toBeDefined();
-            });
-        })
-    });
\ No newline at end of file
+        });
+        it('Dragging changes <body> state on init', function () {
+            expect(document.addEventListener).toHaveBeenCalled();
+            expect(dragAndDrop.$body).toBeDefined();
+        });
+        it('specifies column as dragable', function () {
+            fakeElement = document.createElement('HTMLTableCellElement');
+            dragAndDrop.addColumn(fakeElement);
+            expect(dragAndDrop.columns.length).toBeGreaterThan(0);
+        });
+        it('has setTable method', function () {
+            fakeElement = document.createElement('HTMLTableElement');
+            dragAndDrop.setTable(fakeElement);
+            expect(dragAndDrop.table).toBeDefined();
+        });
+        it('has setDragTable method', function () {
+            fakeElement = document.createElement('HTMLTableElement');
+            dragAndDrop.setDragTable(fakeElement);
+            expect(dragAndDrop.dragTable).toBeDefined();
+        });
+    })
+});
\ No newline at end of file
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
index a77af66929f07..71cc27d7da04d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/filters/filters.test.js
@@ -126,7 +126,10 @@ define([
         it('Clears filters data.', function () {
             var elem = {
                 value: '',
-                clear: function() {
+                getPreview: function () {
+                    return true;
+                },
+                clear: function () {
                     this.value = '';
                     return this.value;
                 }
@@ -143,7 +146,10 @@ define([
         });
         it('Set active elements where exist value from elems.', function () {
             var elem = {
-                hasData: function() {
+                getPreview: function () {
+                    return true;
+                },
+                hasData: function () {
                     return false;
                 }
             };
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
new file mode 100644
index 0000000000000..2396898adb227
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/tree-massactions.test.js
@@ -0,0 +1,128 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+/*jscs:disable requirePaddingNewLinesInObjects*/
+
+define([
+    'Magento_Ui/js/grid/tree-massactions'
+], function (TreeMassaction) {
+    'use strict';
+
+    describe('Magento_Ui/js/grid/tree-massactions', function () {
+        var model;
+
+        beforeEach(function () {
+            model = new TreeMassaction({
+                actions: [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'enable'
+                    }, {
+                        type: 'disable'
+                    }]
+                }]
+            });
+        });
+        describe('check initObservable', function () {
+            it('by default will set visible for all action where exist actions', function () {
+                expect(model.actions()[0].visible).toBeDefined();
+                expect(model.actions()[0].visible()).toBeFalsy();
+            });
+            it('check when actions is absent', function () {
+                model.actions([{
+                    type: 'delete'
+                }]);
+                model.initObservable();
+                expect(model.actions()[0].visible).toBeUndefined();
+            });
+            it('check nested level actions', function () {
+                model.actions()[0].actions[0].actions = [{type: 'delete'}];
+                model.initObservable();
+                expect(model.actions()[0].actions[0].visible).toBeDefined();
+                expect(model.actions()[0].actions[0].visible()).toBeFalsy();
+            });
+            it('check reference to parent object', function () {
+                expect(model.actions()[0].parent).toBe(model.actions());
+            });
+        });
+        describe('check recursiveObserveActions', function () {
+            it('set visible for all action where exist actions', function () {
+                var actions = [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'delete'
+                    }]
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].visible).toBeDefined();
+                expect(actions[0].visible()).toBeFalsy();
+            });
+            it('check when actions is absent', function () {
+                var actions = [{
+                    type: 'delete'
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].visible).toBeUndefined();
+            });
+            it('check nested level actions', function () {
+                var actions = [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'delete',
+                        actions: [{
+                            type: 'safely'
+                        }]
+                    }]
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].actions[0].visible).toBeDefined();
+                expect(actions[0].actions[0].visible()).toBeFalsy();
+            });
+            it('check reference to parent object', function () {
+                var actions = [{
+                    type: 'availability',
+                    actions: [{
+                        type: 'delete'
+                    }]
+                }];
+
+                model.recursiveObserveActions(actions);
+                expect(actions[0].parent).toBe(actions);
+            });
+        });
+        it('check getAction', function () {
+            expect(model.getAction('availability')).toBe(model.actions()[0]);
+            expect(model.getAction('enable')).toBe(model.actions()[0].actions[0]);
+            expect(model.getAction('absent')).toBeFalsy();
+        });
+        describe('check hideSubmenus', function () {
+            it('with class actions', function () {
+                model.actions()[0].visible(true);
+                expect(model.actions()[0].visible()).toBeTruthy();
+                model.hideSubmenus();
+                expect(model.actions()[0].visible()).toBeFalsy();
+            });
+            it('with another object', function () {
+                var actions = model.actions();
+
+                actions[0].visible(true);
+                expect(actions[0].visible()).toBeTruthy();
+                model.hideSubmenus(actions);
+                expect(actions[0].visible()).toBeFalsy();
+            });
+        });
+        describe('check applyAction', function () {
+            it('change visibility of submenu', function () {
+                expect(model.actions()[0].visible()).toBeFalsy();
+                expect(model.applyAction('availability')).toBe(model);
+                expect(model.actions()[0].visible()).toBeTruthy();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js
index b76b1d984a646..5a948bb07c435 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/core.test.js
@@ -4,83 +4,68 @@
  */
 
 define([
-        'Magento_Ui/js/lib/component/core'
-    ], function (core) {
-        'use strict';
+    'Magento_Ui/js/lib/component/core'
+], function (core) {
+    'use strict';
 
-        describe( 'Magento_Ui/js/lib/component/core', function(){
-            var coreObj,
-                returnedValue;
+    describe('Magento_Ui/js/lib/component/core', function () {
+        var coreObj,
+            returnedValue;
 
-            beforeEach(function(){
-                coreObj = core;
-            });
-            it("has initialize", function(){
-                spyOn(coreObj, 'initialize');
-                coreObj.initialize();
-                expect(coreObj.initialize).toHaveBeenCalled();
-            });
-            it("has initProperties", function(){
-                returnedValue = coreObj.initProperties();
-                expect(typeof returnedValue).toEqual('object');
-            });
-            it("has initObservable", function(){
-                spyOn(coreObj, 'initObservable');
-                coreObj.initObservable();
-                expect(coreObj.initObservable).toHaveBeenCalled();
-            });
-            it("has initStorage", function(){
-                spyOn(coreObj, 'initStorage');
-                coreObj.initStorage();
-                expect(coreObj.initStorage).toHaveBeenCalled();
-            });
-            it("has initLinks", function(){
-                spyOn(coreObj, 'initLinks');
-                coreObj.initLinks();
-                expect(coreObj.initLinks).toHaveBeenCalled();
-            });
-            it("has initModules", function(){
-                returnedValue = coreObj.initModules();
-                expect(typeof returnedValue).toEqual('object');
-            });
-            it("has initUnique", function(){
-                returnedValue = coreObj.initUnique();
-                expect(typeof returnedValue).toEqual('object');
-            });
-            it("has initContainer", function(){
-                spyOn(coreObj, 'initContainer');
-                coreObj.initContainer();
-                expect(coreObj.initContainer).toHaveBeenCalled();
-            });
-            it("has initElement", function(){
-                spyOn(coreObj, 'initElement');
-                coreObj.initElement();
-                expect(coreObj.initElement).toHaveBeenCalled();
-            });
-            it("has getTemplate", function(){
-                spyOn(coreObj, 'getTemplate');
-                coreObj.getTemplate();
-                expect(coreObj.getTemplate).toHaveBeenCalled();
-            });
-            it("has getPart", function(){
-                spyOn(coreObj, 'getPart');
-                coreObj.getPart();
-                expect(coreObj.getPart).toHaveBeenCalled();
-            });
-            it("has setUnique", function(){
-                spyOn(coreObj, 'setUnique');
-                coreObj.setUnique();
-                expect(coreObj.setUnique).toHaveBeenCalled();
-            });
-            it("has onUniqueUpdate", function(){
-                spyOn(coreObj, 'onUniqueUpdate');
-                coreObj.onUniqueUpdate();
-                expect(coreObj.onUniqueUpdate).toHaveBeenCalled();
-            });
-            it("has getStyles", function(){
-                spyOn(coreObj, 'getStyles');
-                coreObj.getStyles();
-                expect(coreObj.getStyles).toHaveBeenCalled();
-            })
+        beforeEach(function () {
+            coreObj = core;
+        });
+        it('has initialize', function () {
+            spyOn(coreObj, 'initialize');
+            coreObj.initialize();
+            expect(coreObj.initialize).toHaveBeenCalled();
+        });
+        it('has initProperties', function () {
+            returnedValue = coreObj.initProperties();
+            expect(typeof returnedValue).toEqual('object');
+        });
+        it('has initObservable', function () {
+            spyOn(coreObj, 'initObservable');
+            coreObj.initObservable();
+            expect(coreObj.initObservable).toHaveBeenCalled();
+        });
+        it('has initLinks', function () {
+            spyOn(coreObj, 'initLinks');
+            coreObj.initLinks();
+            expect(coreObj.initLinks).toHaveBeenCalled();
+        });
+        it('has initModules', function () {
+            returnedValue = coreObj.initModules();
+            expect(typeof returnedValue).toEqual('object');
+        });
+        it('has initUnique', function () {
+            returnedValue = coreObj.initUnique();
+            expect(typeof returnedValue).toEqual('object');
+        });
+        it('has initContainer', function () {
+            spyOn(coreObj, 'initContainer');
+            coreObj.initContainer();
+            expect(coreObj.initContainer).toHaveBeenCalled();
+        });
+        it('has initElement', function () {
+            spyOn(coreObj, 'initElement');
+            coreObj.initElement();
+            expect(coreObj.initElement).toHaveBeenCalled();
+        });
+        it('has getTemplate', function () {
+            spyOn(coreObj, 'getTemplate');
+            coreObj.getTemplate();
+            expect(coreObj.getTemplate).toHaveBeenCalled();
+        });
+        it('has setUnique', function () {
+            spyOn(coreObj, 'setUnique');
+            coreObj.setUnique();
+            expect(coreObj.setUnique).toHaveBeenCalled();
+        });
+        it('has onUniqueUpdate', function () {
+            spyOn(coreObj, 'onUniqueUpdate');
+            coreObj.onUniqueUpdate();
+            expect(coreObj.onUniqueUpdate).toHaveBeenCalled();
         });
     });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
index a1df16bb75031..04b7f0ebe5a7e 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/component/links.test.js
@@ -3,36 +3,36 @@
  * See COPYING.txt for license details.
  */
 define([
-        'Magento_Ui/js/lib/component/links'
-    ], function (links) {
-        'use strict';
+    'Magento_Ui/js/lib/component/links'
+], function (links) {
+    'use strict';
 
-        describe( 'Magento_Ui/js/lib/component/links', function(){
-            var linksObj,
-                returnedValue;
+    describe('Magento_Ui/js/lib/component/links', function () {
+        var linksObj,
+            returnedValue;
 
-            beforeEach(function(){
-                linksObj = links;
-                linksObj.maps = {
-                    exports: {},
-                    imports: {}
-                };
+        beforeEach(function () {
+            linksObj = links;
+            linksObj.maps = {
+                exports: {},
+                imports: {}
+            };
 
-            });
-            it('has defaults', function(){
-                expect(typeof linksObj.defaults).toEqual('object');
-            });
-            it('has setLinks method', function(){
-                returnedValue = linksObj.setLinks(undefined,'imports');
-                expect(typeof returnedValue).toEqual('object');
-                spyOn(linksObj, "setLinks");
-                linksObj.setLinks(undefined,'imports');
-                expect(linksObj.setLinks).toHaveBeenCalled();
-            });
-            it('has setListners method', function(){
-                spyOn(linksObj, "setListners");
-                linksObj.setListners();
-                expect(linksObj.setListners).toHaveBeenCalled();
-            });
+        });
+        it('has defaults', function () {
+            expect(typeof linksObj.defaults).toEqual('object');
+        });
+        it('has setLinks method', function () {
+            returnedValue = linksObj.setLinks(undefined, 'imports');
+            expect(typeof returnedValue).toEqual('object');
+            spyOn(linksObj, 'setLinks');
+            linksObj.setLinks(undefined, 'imports');
+            expect(linksObj.setLinks).toHaveBeenCalled();
+        });
+        it('has setListeners method', function () {
+            spyOn(linksObj, 'setListeners');
+            linksObj.setListeners();
+            expect(linksObj.setListeners).toHaveBeenCalled();
         });
     });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
new file mode 100644
index 0000000000000..4cf82e6493e80
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/ko/bind/i18n.test.js
@@ -0,0 +1,105 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'ko',
+    'jquery',
+    'Magento_Ui/js/lib/ko/bind/i18n',
+    'mage/translate'
+], function (ko, $) {
+    'use strict';
+
+    describe('i18n binding', function () {
+        var elWithStaticText = $('<span />'),
+            elWithVariable = $('<span />'),
+            staticText = "staticText",
+            staticTextTranslated = "staticTextTranslated",
+            variableText = "variableText",
+            variable = ko.observable(variableText),
+            variableTranslated = "variableTextTranslated",
+            mockStaticValueAccessor = function () {
+                return staticText
+            },
+            mockValueAccessor = function () {
+                return variable
+            },
+            dataTranslateAttr = '[{"shown":"&","translated":"&","original":"$","location":"Span element"}]',
+            dataTranslateAttrName = 'data-translate',
+            manageInlineTranslation = function (state) {
+                var context = require.s.contexts._;
+                context.config['config'] = {
+                    'Magento_Ui/js/lib/ko/bind/i18n': {
+                        inlineTranslation: !!state
+                    }
+                };
+            },
+            turnOnInlineTranslation = function () {
+                manageInlineTranslation(true);
+            },
+            turnOffInlineTranslation = function () {
+                manageInlineTranslation(false);
+            }
+
+        beforeEach(function () {
+            $(document.body).append(elWithStaticText);
+            $(document.body).append(elWithVariable);
+        });
+
+        afterEach(function () {
+            elWithStaticText.remove();
+            elWithVariable.remove();
+        });
+
+        it('if inline translation is off, just set text for element', function () {
+            turnOffInlineTranslation();
+
+            ko.applyBindingsToNode(elWithStaticText[0], { i18n: staticText });
+            ko.applyBindingsToNode(elWithVariable[0], { i18n: variable });
+
+            expect(elWithStaticText.text()).toEqual(staticText);
+            expect(elWithVariable.text()).toEqual(variable());
+            expect(elWithStaticText.attr(dataTranslateAttrName)).toBe(undefined);
+            expect(elWithVariable.attr(dataTranslateAttrName)).toBe(undefined);
+        });
+
+        it('if inline translation is on, ' +
+        'and there is no translation for this text, set original text for element', function () {
+            turnOnInlineTranslation();
+
+            ko.applyBindingsToNode(elWithStaticText[0], { i18n: staticText });
+            ko.applyBindingsToNode(elWithVariable[0], { i18n: variable });
+
+            expect(elWithStaticText.text()).toEqual(staticText);
+            expect(elWithVariable.text()).toEqual(variableText);
+            expect(elWithStaticText.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, staticText).replace(/\&/g, staticText));
+            expect(elWithVariable.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, variableText).replace(/\&/g, variableText));
+        });
+
+        it('if inline translation is on, ' +
+        'and there is translation for this text, set translated text for element', function () {
+            turnOnInlineTranslation();
+            $.mage.translate.add(staticText, staticTextTranslated);
+            $.mage.translate.add(variableText, variableTranslated);
+            spyOn($.mage, '__').and.callThrough();
+
+            var context = require.s.contexts._;
+            context.config.config = {
+                'Magento_Ui/js/lib/ko/bind/i18n': {
+                    inlineTranslation: true
+                }
+            };
+
+            ko.applyBindingsToNode(elWithStaticText[0], {i18n: staticText });
+            ko.applyBindingsToNode(elWithVariable[0], { i18n: variable });
+
+            expect($.mage.__).toHaveBeenCalledWith(staticText);
+            expect($.mage.__).toHaveBeenCalledWith(variableText);
+            expect(elWithStaticText.text()).toEqual(staticTextTranslated);
+            expect(elWithVariable.text()).toEqual(variableTranslated);
+            expect(elWithStaticText.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, staticText).replace(/\&/g, staticTextTranslated));
+            expect(elWithVariable.attr(dataTranslateAttrName)).toEqual(dataTranslateAttr.replace(/\$/g, variableText).replace(/\&/g, variableTranslated));
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
index 14bde78ef9866..f988b210d2819 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/lib/registry/registry.test.js
@@ -15,7 +15,7 @@ define([
                 expect(registry).toBeDefined();
             });
             it('Check type', function () {
-                var type = typeof(registry);
+                var type = typeof registry;
 
                 expect(type).toEqual('object');
             });
@@ -25,7 +25,7 @@ define([
                 expect(registry.hasOwnProperty('set')).toBeDefined();
             });
             it('Check type', function () {
-                var type = typeof(registry.set);
+                var type = typeof registry.set;
 
                 expect(type).toEqual('function');
             });
@@ -33,7 +33,7 @@ define([
                 expect(registry.set()).toBeDefined();
             });
             it('Check returned value type', function () {
-                var type = typeof(registry.set());
+                var type = typeof registry.set();
 
                 expect(type).toEqual('object');
             });
@@ -50,21 +50,22 @@ define([
                 expect(registry.hasOwnProperty('get')).toBeDefined();
             });
             it('Check type', function () {
-                var type = typeof(registry.get);
+                var type = typeof registry.get;
 
                 expect(type).toEqual('function');
             });
             it('Check returned value if method called without arguments', function () {
-                expect(registry.get()).toBeDefined();
+                expect(registry.get()).toBeUndefined();
             });
             it('Check returned value type if method called without arguments', function () {
                 var type = registry.get() instanceof Array;
 
-                expect(type).toEqual(true);
+                expect(type).toBeFalsy();
             });
             it('Check called callback with arguments', function () {
                 var elems = ['magento'],
-                    callback = function(){};
+                    callback = function () {};
+
                 registry.events.wait = jasmine.createSpy();
                 registry.get(elems, callback);
                 expect(registry.events.wait).toHaveBeenCalledWith(elems, callback);
@@ -105,10 +106,9 @@ define([
                 expect(type).toEqual('function');
             });
             it('Check returned value if registry.storage has property', function () {
-                var name = 'magento',
-                    value = 'magentoValue';
+                var name = 'magento';
 
-                registry.storage.data[name] = value;
+                registry.storage.data[name] = 'magentoValue';
                 expect(registry.has(name)).toEqual(true);
             });
             it('Check returned value if registry.storage has not property', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js
index b5e2837467beb..2b1496d56e270 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/modal/modal.test.js
@@ -20,8 +20,5 @@ define([
             expect(element.trigger('openDialog')).toBe(element);
             expect(element.trigger('closeDialog')).toBe(element);
         });
-        it('Check for transition support', function () {
-            expect(modal.whichTransitionEvent()).toBe('webkitTransitionEnd');
-        });
     });
-});
\ No newline at end of file
+});
diff --git a/dev/tools/grunt/configs/eslint.js b/dev/tools/grunt/configs/eslint.js
index c72131becc648..9ce30aa58156e 100644
--- a/dev/tools/grunt/configs/eslint.js
+++ b/dev/tools/grunt/configs/eslint.js
@@ -9,7 +9,8 @@ module.exports = {
     file: {
         options: {
             configFile: 'dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc',
-            reset: true
+            reset: true,
+            useEslintrc: false
         },
         src: ''
     },
diff --git a/dev/tools/grunt/tasks/static.js b/dev/tools/grunt/tasks/static.js
index 433e7a2b161f3..7cd6b2c8ce976 100644
--- a/dev/tools/grunt/tasks/static.js
+++ b/dev/tools/grunt/tasks/static.js
@@ -29,7 +29,7 @@ module.exports = function (grunt) {
         grunt.option('force', true);
         grunt.task.run(tasks);
 
-        if (!grunt.option('path')) {
+        if (!grunt.option('file')) {
             fs.unlinkSync(pc.static.tmp);
         }
     });
diff --git a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
index 9622e03bdbf0b..cc1beb3ea07b3 100644
--- a/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
+++ b/lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php
@@ -152,7 +152,7 @@ public function testGetConfig()
             ->willReturnArgument(0);
 
         $actual = $this->object->getConfig();
-        $this->assertStringMatchesFormat($expected, $actual);
+        $this->assertEquals($actual, $expected);
     }
 
     public function testGetMinResolverCode()
diff --git a/lib/web/extjs/defaults.js b/lib/web/extjs/defaults.js
index 5203e1a6fe27a..c47859dacb418 100644
--- a/lib/web/extjs/defaults.js
+++ b/lib/web/extjs/defaults.js
@@ -1,4 +1,13 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global Ext*/
 define(['extjs/ext-tree'], function () {
+    'use strict';
+
     Ext.UpdateManager.defaults.loadScripts = false;
     Ext.UpdateManager.defaults.disableCaching = true;
-});
\ No newline at end of file
+    Ext.BLANK_IMAGE_URL = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+});
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index faa11353c33a4..60196addb1778 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -2,27 +2,37 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /*jshint browser:true jquery:true */
+/*eslint max-depth: 0*/
+
 (function (factory) {
+    'use strict';
+
     if (typeof define === 'function' && define.amd) {
         define([
-            "jquery",
-            "jquery/ui",
-            "jquery/jquery-ui-timepicker-addon"
+            'jquery',
+            'jquery/ui',
+            'jquery/jquery-ui-timepicker-addon'
         ], factory);
     } else {
-        factory(jQuery);
+        factory(window.jQuery);
     }
 }(function ($) {
+    'use strict';
+
+    var calendarBasePrototype;
+
     /**
      * Widget calendar
      */
     $.widget('mage.calendar', {
+
         /**
          * Merge global options with options passed to widget invoke
          * @protected
          */
-        _create: function() {
+        _create: function () {
             this._enableAMPM();
             this.options = $.extend(
                 {},
@@ -35,13 +45,14 @@
                 this.options
             );
             this._initPicker(this.element);
+            this._overwriteGenerateHtml();
         },
 
         /**
          * Get picker name
          * @protected
          */
-        _picker: function(){
+        _picker: function () {
             return this.options.showsTime ? 'datetimepicker' : 'datepicker';
         },
 
@@ -49,31 +60,278 @@
          * Fix for Timepicker - Set ampm option for Timepicker if timeformat contains string 'tt'
          * @protected
          */
-        _enableAMPM: function() {
+        _enableAMPM: function () {
             if (this.options.timeFormat && this.options.timeFormat.indexOf('tt') >= 0) {
                 this.options.ampm = true;
             }
         },
 
+        /**
+         * Wrapper for overwrite jQuery UI datepicker function.
+         */
+        _overwriteGenerateHtml: function () {
+            var self = this;
+
+            /**
+             * overwrite jQuery UI datepicker function.
+             * @param {Object} inst - instance datepicker.
+             * @return {String} html template
+             */
+            $.datepicker.constructor.prototype._generateHTML = function (inst) {
+                var today = this._daylightSavingAdjust(self.getTimezoneDate()),
+                    isRTL = this._get(inst, 'isRTL'),
+                    showButtonPanel = this._get(inst, 'showButtonPanel'),
+                    hideIfNoPrevNext = this._get(inst, 'hideIfNoPrevNext'),
+                    navigationAsDateFormat = this._get(inst, 'navigationAsDateFormat'),
+                    numMonths = this._getNumberOfMonths(inst),
+                    showCurrentAtPos = this._get(inst, 'showCurrentAtPos'),
+                    stepMonths = this._get(inst, 'stepMonths'),
+                    isMultiMonth = parseInt(numMonths[0], 10) !== 1 || parseInt(numMonths[1], 10) !== 1,
+                    currentDate = this._daylightSavingAdjust(!inst.currentDay ? new Date(9999, 9, 9) :
+                        new Date(inst.currentYear, inst.currentMonth, inst.currentDay)),
+                    minDate = this._getMinMaxDate(inst, 'min'),
+                    maxDate = this._getMinMaxDate(inst, 'max'),
+                    drawMonth = inst.drawMonth - showCurrentAtPos,
+                    drawYear = inst.drawYear,
+                    maxDraw,
+                    prevText = this._get(inst, 'prevText'),
+                    prev,
+                    nextText = this._get(inst, 'nextText'),
+                    next,
+                    currentText = this._get(inst, 'currentText'),
+                    gotoDate,
+                    controls,
+                    buttonPanel,
+                    firstDay,
+                    showWeek = this._get(inst, 'showWeek'),
+                    dayNames = this._get(inst, 'dayNames'),
+                    dayNamesMin = this._get(inst, 'dayNamesMin'),
+                    monthNames = this._get(inst, 'monthNames'),
+                    monthNamesShort =  this._get(inst, 'monthNamesShort'),
+                    beforeShowDay = this._get(inst, 'beforeShowDay'),
+                    showOtherMonths = this._get(inst, 'showOtherMonths'),
+                    selectOtherMonths = this._get(inst, 'selectOtherMonths'),
+                    defaultDate = this._getDefaultDate(inst),
+                    html = '',
+                    row = 0,
+                    col = 0,
+                    selectedDate,
+                    cornerClass = ' ui-corner-all',
+                    group = '',
+                    calender = '',
+                    dow = 0,
+                    thead,
+                    day,
+                    daysInMonth,
+                    leadDays,
+                    curRows,
+                    numRows,
+                    printDate,
+                    dRow = 0,
+                    tbody,
+                    daySettings,
+                    otherMonth,
+                    unselectable;
+
+                if (drawMonth < 0) {
+                    drawMonth += 12;
+                    drawYear--;
+                }
+
+                if (maxDate) {
+                    maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+                        maxDate.getMonth() - numMonths[0] * numMonths[1] + 1, maxDate.getDate()));
+                    maxDraw = minDate && maxDraw < minDate ? minDate : maxDraw;
+
+                    while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+                        drawMonth--;
+
+                        if (drawMonth < 0) {
+                            drawMonth = 11;
+                            drawYear--;
+
+                        }
+                    }
+                }
+                inst.drawMonth = drawMonth;
+                inst.drawYear = drawYear;
+                prevText = !navigationAsDateFormat ? prevText : this.formatDate(prevText,
+                    this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+                    this._getFormatConfig(inst));
+                prev = this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+                    '<a class="ui-datepicker-prev ui-corner-all" data-handler="prev" data-event="click"' +
+                    ' title="' + prevText + '">' +
+                    '<span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'e' : 'w') + '">' +
+                    '' + prevText + '</span></a>'
+                    : hideIfNoPrevNext ? ''
+                        :   '<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="' +
+                            '' + prevText + '"><span class="ui-icon ui-icon-circle-triangle-' +
+                            '' + (isRTL ? 'e' : 'w') + '">' + prevText + '</span></a>';
+                nextText = !navigationAsDateFormat ?
+                    nextText
+                    :   this.formatDate(nextText,
+                        this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+                        this._getFormatConfig(inst));
+                next = this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+                    '<a class="ui-datepicker-next ui-corner-all" data-handler="next" data-event="click"' +
+                    'title="' + nextText + '"><span class="ui-icon ui-icon-circle-triangle-' +
+                    '' + (isRTL ? 'w' : 'e') + '">' + nextText + '</span></a>'
+                    : hideIfNoPrevNext ? ''
+                        :   '<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="' + nextText + '">' +
+                            '<span class="ui-icon ui-icon-circle-triangle-' + (isRTL ? 'w' : 'e') + '">' + nextText +
+                            '</span></a>';
+                gotoDate = this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today;
+                currentText = !navigationAsDateFormat ? currentText :
+                    this.formatDate(currentText, gotoDate, this._getFormatConfig(inst));
+                controls = !inst.inline ?
+                    '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ' +
+                    'ui-corner-all" data-handler="hide" data-event="click">' +
+                    this._get(inst, 'closeText') + '</button>'
+                    : '';
+                buttonPanel = showButtonPanel ?
+                    '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
+                    this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ' +
+                    'ui-state-default ui-priority-secondary ui-corner-all" data-handler="today" data-event="click"' +
+                    '>' + currentText + '</button>' : '' + (isRTL ? '' : controls) + '</div>' : '';
+                firstDay = parseInt(this._get(inst, 'firstDay'), 10);
+                firstDay = isNaN(firstDay) ? 0 : firstDay;
+
+                for (row; row < numMonths[0]; row++) {
+                    this.maxRows = 4;
+
+                    for (col; col < numMonths[1]; col++) {
+                        selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+
+                        if (isMultiMonth) {
+                            calender += '<div class="ui-datepicker-group';
+
+                            if (numMonths[1] > 1) {
+                                switch (col) {
+                                    case 0: calender += ' ui-datepicker-group-first';
+                                        cornerClass = ' ui-corner-' + (isRTL ? 'right' : 'left');
+                                        break;
+
+                                    case numMonths[1] - 1: calender += ' ui-datepicker-group-last';
+                                        cornerClass = ' ui-corner-' + (isRTL ? 'left' : 'right');
+                                        break;
+
+                                    default: calender += ' ui-datepicker-group-middle'; cornerClass = '';
+                                }
+                            }
+                            calender += '">';
+                        }
+                        calender += '<div class="ui-datepicker-header ' +
+                            'ui-widget-header ui-helper-clearfix' + cornerClass + '">' +
+                            (/all|left/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? next : prev : '') +
+                            (/all|right/.test(cornerClass) && parseInt(row, 10) === 0 ? isRTL ? prev : next : '') +
+                            this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+                            row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+                            '</div><table class="ui-datepicker-calendar"><thead>' +
+                            '<tr>';
+                        thead = showWeek ?
+                            '<th class="ui-datepicker-week-col">' + this._get(inst, 'weekHeader') + '</th>' : '';
+
+                        for (dow; dow < 7; dow++) { // days of the week
+                            day = (dow + firstDay) % 7;
+                            thead += '<th' + ((dow + firstDay + 6) % 7 >= 5 ?
+                                ' class="ui-datepicker-week-end"' : '') + '>' +
+                                '<span title="' + dayNames[day] + '">' + dayNamesMin[day] + '</span></th>';
+                        }
+                        calender += thead + '</tr></thead><tbody>';
+                        daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+
+                        if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+                            inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+                        }
+                        leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+                        curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+                        numRows = isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows;
+                        this.maxRows = numRows;
+                        printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+
+                        for (dRow; dRow < numRows; dRow++) { // create date picker rows
+                            calender += '<tr>';
+                            tbody = !showWeek ? '' : '<td class="ui-datepicker-week-col">' +
+                            this._get(inst, 'calculateWeek')(printDate) + '</td>';
+
+                            for (dow = 0; dow < 7; dow++) { // create date picker days
+                                daySettings = beforeShowDay ?
+                                    beforeShowDay.apply(inst.input ? inst.input[0] : null, [printDate]) : [true, ''];
+                                otherMonth = printDate.getMonth() !== drawMonth;
+                                unselectable = otherMonth && !selectOtherMonths || !daySettings[0] ||
+                                minDate && printDate < minDate || maxDate && printDate > maxDate;
+                                tbody += '<td class="' +
+                                ((dow + firstDay + 6) % 7 >= 5 ? ' ui-datepicker-week-end' : '') + // highlight weekends
+                                (otherMonth ? ' ui-datepicker-other-month' : '') + // highlight days from other months
+                                (printDate.getTime() === selectedDate.getTime() &&
+                                drawMonth === inst.selectedMonth && inst._keyEvent || // user pressed key
+                                defaultDate.getTime() === printDate.getTime() &&
+                                defaultDate.getTime() === selectedDate.getTime() ?
+                                    // or defaultDate is current printedDate and defaultDate is selectedDate
+                                ' ' + this._dayOverClass : '') + // highlight selected day
+                                (unselectable ? ' ' + this._unselectableClass + ' ui-state-disabled' : '') +
+                                (otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
+                                (printDate.getTime() === currentDate.getTime() ? ' ' + this._currentClass : '') +
+                                (printDate.getDate() === today.getDate() && printDate.getMonth() === today.getMonth() &&
+                                printDate.getYear() === today.getYear() ? ' ui-datepicker-today' : '')) + '"' +
+                                ((!otherMonth || showOtherMonths) && daySettings[2] ?
+                                ' title="' + daySettings[2] + '"' : '') + // cell title
+                                (unselectable ? '' : ' data-handler="selectDay" data-event="click" data-month="' +
+                                '' + printDate.getMonth() + '" data-year="' + printDate.getFullYear() + '"') + '>' +
+                                (otherMonth && !showOtherMonths ? '&#xa0;' : // display for other months
+                                    unselectable ? '<span class="ui-state-default">' + printDate.getDate() + '</span>'
+                                        : '<a class="ui-state-default' +
+                                    (printDate.getTime() === today.getTime() ? ' ' : '') +
+                                    (printDate.getTime() === currentDate.getTime() ? ' ui-state-active' : '') +
+                                    (otherMonth ? ' ui-priority-secondary' : '') +
+                                    '" href="#">' + printDate.getDate() + '</a>') + '</td>';
+                                printDate.setDate(printDate.getDate() + 1);
+                                printDate = this._daylightSavingAdjust(printDate);
+                            }
+                            calender += tbody + '</tr>';
+                        }
+                        drawMonth++;
+
+                        if (drawMonth > 11) {
+                            drawMonth = 0;
+                            drawYear++;
+                        }
+                        calender += '</tbody></table>' + (isMultiMonth ? '</div>' +
+                        (numMonths[0] > 0 && col === numMonths[1] - 1 ? '<div class="ui-datepicker-row-break"></div>'
+                            : '') : '');
+                        group += calender;
+                    }
+                    html += group;
+                }
+                html += buttonPanel + ($.ui.ie6 && !inst.inline ?
+                    '<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
+                inst._keyEvent = false;
+
+                return html;
+            };
+        },
+
         /**
          * If server timezone is defined then take to account server timezone shift
-         * @param {Date}
-         * @return {Date}
+         * @param {Object} date
+         * @return {Object} date
          */
-        getTimezoneDate: function(date) {
+        getTimezoneDate: function (date) {
             date = date || new Date();
+
             if (this.options.serverTimezoneSeconds) {
                 date.setTime((this.options.serverTimezoneSeconds + date.getTimezoneOffset() * 60) * 1000);
             }
+
             return date;
         },
 
         /**
          * Set current date if the date is not set
          * @protected
-         * @param {Element}
+         * @param {Object} element
          */
-        _setCurrentDate: function(element) {
+        _setCurrentDate: function (element) {
             if (!element.val()) {
                 element[this._picker()]('setDate', this.getTimezoneDate())
                     .val('');
@@ -83,126 +341,135 @@
         /**
          * Init Datetimepicker
          * @protected
-         * @param {Element}
+         * @param {Object} element
          */
-        _initPicker: function(element) {
+        _initPicker: function (element) {
             var picker = element[this._picker()](this.options),
                 pickerButtonText = picker.next('.ui-datepicker-trigger')
-                                          .find('img')
-                                          .attr('title');
+                    .find('img')
+                    .attr('title');
             picker.next('.ui-datepicker-trigger')
-                  .addClass('v-middle')
-                  .text('') // Remove jQuery UI datepicker generated image
-                  .append('<span>' + pickerButtonText + '</span>');
+                .addClass('v-middle')
+                .text('') // Remove jQuery UI datepicker generated image
+                .append('<span>' + pickerButtonText + '</span>');
             this._setCurrentDate(element);
         },
 
         /**
          * destroy instance of datetimepicker
          */
-        _destroy: function(){
+        _destroy: function () {
             this.element[this._picker()]('destroy');
             this._super();
         }
     });
 
+    calendarBasePrototype = $.mage.calendar.prototype;
+
     /**
      * Extension for Calendar - date and time format convert functionality
      * @var {Object}
      */
-    var calendarBasePrototype = $.mage.calendar.prototype;
     $.widget('mage.calendar', $.extend({}, calendarBasePrototype,
-        /** @lends {$.mage.calendar.prototype} */ {
-            /**
-             * key - backend format, value - jquery format
-             * @type {Object}
-             * @private
-             */
-            dateTimeFormat: {
-                date: {
-                    'EEEE': 'DD',
-                    'EEE': 'D',
-                    'EE': 'D',
-                    'E': 'D',
-                    'D': 'o',
-                    'MMMM': 'MM',
-                    'MMM': 'M',
-                    'MM': 'mm',
-                    'M': 'mm',
-                    'yyyy': 'yy',
-                    'y': 'yy',
-                    'Y': 'yy',
-                    'yy': 'yy' // Always long year format on frontend
+            /** @lends {$.mage.calendar.prototype} */ {
+                /**
+                 * key - backend format, value - jquery format
+                 * @type {Object}
+                 * @private
+                 */
+                dateTimeFormat: {
+                    date: {
+                        'EEEE': 'DD',
+                        'EEE': 'D',
+                        'EE': 'D',
+                        'E': 'D',
+                        'D': 'o',
+                        'MMMM': 'MM',
+                        'MMM': 'M',
+                        'MM': 'mm',
+                        'M': 'mm',
+                        'yyyy': 'yy',
+                        'y': 'yy',
+                        'Y': 'yy',
+                        'yy': 'yy' // Always long year format on frontend
+                    },
+                    time: {
+                        'a': 'tt',
+                        'HH': 'hh',
+                        'H': 'h'
+                    }
                 },
-                time: {
-                    'a': 'tt',
-                    'HH': 'hh',
-                    'H': 'h'
-                }
-            },
 
-            /**
-             * Add Date and Time converting to _create method
-             * @protected
-             */
-            _create: function() {
-                if (this.options.dateFormat) {
-                    this.options.dateFormat = this._convertFormat(this.options.dateFormat, 'date');
-                }
-                if (this.options.timeFormat) {
-                    this.options.timeFormat = this._convertFormat(this.options.timeFormat, 'time');
-                }
-                calendarBasePrototype._create.apply(this, arguments);
-            },
+                /**
+                 * Add Date and Time converting to _create method
+                 * @protected
+                 */
+                _create: function () {
+                    if (this.options.dateFormat) {
+                        this.options.dateFormat = this._convertFormat(this.options.dateFormat, 'date');
+                    }
 
-            /**
-             * Converting date or time format
-             * @protected
-             * @param {string}
-             * @param {string}
-             * @return {string}
-             */
-            _convertFormat: function(format, type) {
-                var symbols = format.match(/([a-z]+)/ig),
-                    separators = format.match(/([^a-z]+)/ig),
-                    self = this;
-                var convertedFormat = '';
-                if (symbols) {
-                    $.each(symbols, function(key, val) {
-                        convertedFormat +=
-                            (self.dateTimeFormat[type][val] || val) +
-                            (separators[key] || '');
-                    });
+                    if (this.options.timeFormat) {
+                        this.options.timeFormat = this._convertFormat(this.options.timeFormat, 'time');
+                    }
+                    calendarBasePrototype._create.apply(this, arguments);
+                },
+
+                /**
+                 * Converting date or time format
+                 * @protected
+                 * @param {String} format
+                 * @param {String} type
+                 * @return {String}
+                 */
+                _convertFormat: function (format, type) {
+                    var symbols = format.match(/([a-z]+)/ig),
+                        separators = format.match(/([^a-z]+)/ig),
+                        self = this,
+                        convertedFormat = '';
+
+                    if (symbols) {
+                        $.each(symbols, function (key, val) {
+                            convertedFormat +=
+                                (self.dateTimeFormat[type][val] || val) +
+                                (separators[key] || '');
+                        });
+                    }
+
+                    return convertedFormat;
                 }
-                return convertedFormat;
-            }
-    }));
+            })
+    );
 
     /**
      * Widget dateRange
      * @extends $.mage.calendar
      */
     $.widget('mage.dateRange', $.mage.calendar, {
+
         /**
          * creates two instances of datetimepicker for date range selection
          * @protected
          */
-        _initPicker: function() {
+        _initPicker: function () {
+            var from,
+                to;
+
             if (this.options.from && this.options.to) {
-                var from = this.element.find('#' + this.options.from.id),
-                    to = this.element.find('#' + this.options.to.id);
-                this.options.onSelect = $.proxy(function(selectedDate) {
+                from = this.element.find('#' + this.options.from.id);
+                to = this.element.find('#' + this.options.to.id);
+                this.options.onSelect = $.proxy(function (selectedDate) {
                     to[this._picker()]('option', 'minDate', selectedDate);
                 }, this);
                 $.mage.calendar.prototype._initPicker.call(this, from);
-                from.on('change', $.proxy(function() {
+                from.on('change', $.proxy(function () {
                     to[this._picker()]('option', 'minDate', from[this._picker()]('getDate'));
                 }, this));
-                this.options.onSelect = $.proxy(function(selectedDate) {
+                this.options.onSelect = $.proxy(function (selectedDate) {
                     from[this._picker()]('option', 'maxDate', selectedDate);
                 }, this);
                 $.mage.calendar.prototype._initPicker.call(this, to);
-                to.on('change', $.proxy(function() {
+                to.on('change', $.proxy(function () {
                     from[this._picker()]('option', 'maxDate', to[this._picker()]('getDate'));
                 }, this));
             }
@@ -211,11 +478,12 @@
         /**
          * destroy two instances of datetimepicker
          */
-        _destroy: function(){
-            if(this.options.from) {
+        _destroy: function () {
+            if (this.options.from) {
                 this.element.find('#' + this.options.from.id)[this._picker()]('destroy');
             }
-            if(this.options.to) {
+
+            if (this.options.to) {
                 this.element.find('#' + this.options.to.id)[this._picker()]('destroy');
             }
             this._super();
@@ -225,7 +493,11 @@
     // Overrides the "today" button functionality to select today's date when clicked.
     $.datepicker._gotoTodayOriginal = $.datepicker._gotoToday;
 
-    $.datepicker._gotoToday = function(el) {
+    /**
+     * _gotoToday
+     * @param {Object} el
+     */
+    $.datepicker._gotoToday = function (el) {
         $.datepicker._gotoTodayOriginal.call(this, el);
         $.datepicker._selectDate.call(this, el);
         $(el).blur();   // To ensure that user can re-select date field without clicking outside it first.
diff --git a/lib/web/mage/translate.js b/lib/web/mage/translate.js
index c551c943f85ab..1b1404070828b 100644
--- a/lib/web/mage/translate.js
+++ b/lib/web/mage/translate.js
@@ -13,6 +13,27 @@
         factory(jQuery);
     }
 }(function ($) {
+    /**
+     * Generate array with matches
+     * @param {string} text
+     * @return {Array}
+     */
+    var parse = function (text){
+        var reg = /{{(.*?)}}{{(.*?)}}{{(.*?)}}{{(.*?)}}/,
+        matches = text.replace('{{{','{{').replace('}}}','}}').match(reg);
+        return matches || [];
+        },
+
+        /**
+         * Function returns parsed translation (must be second in the record,
+         * example "Price": "{{{Price_1}}{{Price_2}}{{Price_3}}{{theme}}}" - need "Price_2")
+         * @param {string} text
+         * @return {string}
+         */
+        getParsedTranslation = function (text){
+            return parse(text)[2] || text;
+        } ;
+
     $.extend(true, $, {
         mage: {
             translate: (function() {
@@ -37,12 +58,30 @@
                 };
 
                 /**
-                 * Make a translation
+                 * Make a translation (this func expect _data to be dictionary)
+                 * @param {string} text
+                 * @return {text}
+                 */
+                this.dumbTranslate = function (text) {
+                    return _data[text] ? _data[text] : [text];
+                };
+
+                /**
+                 * Make a translation with parsing (to handle case when _data represents tuple)
                  * @param {string} text
                  * @return {string}
                  */
-                this.translate = function(text) {
-                    return _data[text] ? _data[text] : text;
+                this.translate = function (text) {
+                    return _data[text] ? getParsedTranslation(_data[text]) : text;
+                };
+
+                /**
+                 * Make a translation with parsing, returns all matches (to handle case when _data represents tuple)
+                 * @param {string} text
+                 * @return {Array}
+                 */
+                this.parsedTranslate = function (text) {
+                    return _data[text] ? parse(_data[text]) : [text];
                 };
 
                 return this;