diff --git a/src/optimize/babel_options.build.js b/src/optimize/babel_options.build.js
index ec3f11f6f1528..81c78e7700a69 100644
--- a/src/optimize/babel_options.build.js
+++ b/src/optimize/babel_options.build.js
@@ -7,7 +7,7 @@ if (!process.env.BABEL_CACHE_PATH) {
 
 exports.webpack = {
   stage: 1,
-  nonStandard: false,
+  nonStandard: true,
   optional: ['runtime']
 };
 
diff --git a/src/optimize/babel_options.js b/src/optimize/babel_options.js
index 903701133ae59..6ffe782c9b694 100644
--- a/src/optimize/babel_options.js
+++ b/src/optimize/babel_options.js
@@ -10,7 +10,7 @@ if (!process.env.BABEL_CACHE_PATH) {
 
 exports.webpack = {
   stage: 1,
-  nonStandard: false,
+  nonStandard: true,
   optional: ['runtime']
 };
 
diff --git a/src/optimize/base_optimizer.js b/src/optimize/base_optimizer.js
index 98d4f75e44b3c..e61e2d14078a5 100644
--- a/src/optimize/base_optimizer.js
+++ b/src/optimize/base_optimizer.js
@@ -90,15 +90,6 @@ class BaseOptimizer {
       return ExtractTextPlugin.extract(makeLoaderString(loaders));
     };
 
-    const makeBabelLoader = query => {
-      return makeLoaderString([
-        {
-          name: 'babel-loader',
-          query: defaults({}, query || {}, babelOptions.webpack)
-        }
-      ]);
-    };
-
     return {
       context: fromRoot('.'),
       entry: this.bundles.toWebpackEntries(),
@@ -143,15 +134,15 @@ class BaseOptimizer {
           { test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/, loader: 'file-loader' },
           { test: /[\/\\]src[\/\\](core_plugins|ui)[\/\\].+\.js$/, loader: loaderWithSourceMaps('rjs-repack-loader') },
           {
-            test: /\.js$/,
+            test: /\.jsx?$/,
             exclude: babelExclude.concat(this.env.noParse),
-            loader: makeBabelLoader(),
+            loader: makeLoaderString([
+              {
+                name: 'babel-loader',
+                query: babelOptions.webpack
+              }
+            ]),
           },
-          {
-            test: /\.jsx$/,
-            exclude: babelExclude.concat(this.env.noParse),
-            loader: makeBabelLoader({ nonStandard: true }),
-          }
         ],
         postLoaders: this.env.postLoaders || [],
         noParse: this.env.noParse,
diff --git a/src/ui_framework/components/form/_check_box.scss b/src/ui_framework/components/form/_check_box.scss
index 8b165df41e4e7..2d3b73ea7008a 100644
--- a/src/ui_framework/components/form/_check_box.scss
+++ b/src/ui_framework/components/form/_check_box.scss
@@ -41,4 +41,9 @@
   &:focus {
     @include focus;
   }
+
+  &:disabled {
+    opacity: 0.3;
+    cursor: not-allowed;
+  }
 }
diff --git a/src/ui_framework/components/form/_text_input.scss b/src/ui_framework/components/form/_text_input.scss
index fb613e8e50fd3..1bf90d5884efa 100644
--- a/src/ui_framework/components/form/_text_input.scss
+++ b/src/ui_framework/components/form/_text_input.scss
@@ -18,4 +18,9 @@
     outline: none;
     border-color: $selectedBorderColor;
   }
+
+  &:disabled {
+    opacity: 0.3;
+    cursor: not-allowed;
+  }
 }
diff --git a/src/ui_framework/doc_site/src/views/form/check_box.html b/src/ui_framework/doc_site/src/views/form/check_box.html
index ac81104ba5b02..29afec79267e8 100644
--- a/src/ui_framework/doc_site/src/views/form/check_box.html
+++ b/src/ui_framework/doc_site/src/views/form/check_box.html
@@ -1,3 +1,9 @@
 <input type="checkbox" class="kuiCheckBox">
 
+<hr class="guideBreak">
+
 <input type="checkbox" class="kuiCheckBox" checked>
+
+<hr class="guideBreak">
+
+<input type="checkbox" class="kuiCheckBox" checked disabled>
diff --git a/src/ui_framework/doc_site/src/views/form/text_input.html b/src/ui_framework/doc_site/src/views/form/text_input.html
index 1044f02dae205..f14abd6fc6447 100644
--- a/src/ui_framework/doc_site/src/views/form/text_input.html
+++ b/src/ui_framework/doc_site/src/views/form/text_input.html
@@ -7,3 +7,7 @@
 <hr class="guideBreak">
 
 <input type="text" class="kuiTextInput" required>
+
+<hr class="guideBreak">
+
+<input type="text" class="kuiTextInput" value="Disabled" disabled>