diff --git a/CHANGELOG.md b/CHANGELOG.md
index d86d1d1d..66b0d205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,38 @@
+<a name="1.5.1"></a>
+## [1.5.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/v1.5.0...v1.5.1) (2020-02-25)
+
+
+### Bug Fixes
+
+* `The provided Android NDK is vnull while the recommended one is v21.0.6113669` error in some cases ([23aa6c5](https://github.com/NativeScript/nativescript-dev-webpack/commit/23aa6c5))
+* AOT compilation of multiple workers should work ([af5cb84](https://github.com/NativeScript/nativescript-dev-webpack/commit/af5cb84))
+* replace extension coming from package.json ([a04c0f8](https://github.com/NativeScript/nativescript-dev-webpack/commit/a04c0f8))
+
+
+### Features
+
+* Add .kt extension to known entry types ([55b56c8](https://github.com/NativeScript/nativescript-dev-webpack/commit/55b56c8))
+* Add .kt extension to known ones ([6e145a4](https://github.com/NativeScript/nativescript-dev-webpack/commit/6e145a4))
+
+
+
+<a name="1.5.0"></a>
+# [1.5.0](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.4.1...1.5.0) (2020-02-04)
+
+
+### Bug Fixes
+
+* ensure the js snapshot entry dir if not created (avoid ENOENT error) ([2a0eaf6](https://github.com/NativeScript/nativescript-dev-webpack/commit/2a0eaf6))
+* stop searching for snapshot artefacts when the snapshot tools are skipped (it's a cloud build, there aren't any snapshot artefacts locally) ([b8da140](https://github.com/NativeScript/nativescript-dev-webpack/commit/b8da140))
+
+
+### Features
+
+* **dependencies:** updated `[@angular](https://github.com/angular)/compiler-cli` dependency ([1dbcbf2](https://github.com/NativeScript/nativescript-dev-webpack/commit/1dbcbf2)), closes [#1114](https://github.com/NativeScript/nativescript-dev-webpack/issues/1114)
+* allow extending webpack.config.js through env ([69ace1e](https://github.com/NativeScript/nativescript-dev-webpack/commit/69ace1e))
+
+
+
 <a name="1.4.1"></a>
 ## [1.4.1](https://github.com/NativeScript/nativescript-dev-webpack/compare/1.4.0...1.4.1) (2020-01-07)
 
diff --git a/bundle-config-loader.ts b/bundle-config-loader.ts
index a3e3cdb8..34b4de27 100644
--- a/bundle-config-loader.ts
+++ b/bundle-config-loader.ts
@@ -4,7 +4,7 @@ import { getOptions } from "loader-utils";
 import * as escapeRegExp from "escape-string-regexp";
 
 // Matches all source, markup and style files that are not in App_Resources and in tests folder
-const defaultMatch = "(?<!\\bApp_Resources\\b.*)(?<!\\.\\/\\btests\\b\\/.*?)\\.(xml|css|js|(?<!\\.d\\.)ts|(?<!\\b_[\\w-]*\\.)scss)$";
+const defaultMatch = "(?<!\\bApp_Resources\\b.*)(?<!\\.\\/\\btests\\b\\/.*?)\\.(xml|css|js|kt|(?<!\\.d\\.)ts|(?<!\\b_[\\w-]*\\.)scss)$";
 
 const loader: loader.Loader = function (source, map) {
     let {
diff --git a/index.js b/index.js
index 766d4af4..4846dc02 100644
--- a/index.js
+++ b/index.js
@@ -79,12 +79,14 @@ exports.getEntryModule = function (appDirectory, platform) {
     const entry = getPackageJsonEntry(appDirectory);
 
     const tsEntryPath = path.resolve(appDirectory, `${entry}.ts`);
+    const ktEntryPath = path.resolve(appDirectory, `${entry}.kt`);
     const jsEntryPath = path.resolve(appDirectory, `${entry}.js`);
-    let entryExists = existsSync(tsEntryPath) || existsSync(jsEntryPath);
+    let entryExists = existsSync(tsEntryPath) || existsSync(ktEntryPath) || existsSync(jsEntryPath);
     if (!entryExists && platform) {
         const platformTsEntryPath = path.resolve(appDirectory, `${entry}.${platform}.ts`);
+        const platformKtEntryPath = path.resolve(appDirectory, `${entry}.${platform}.kt`);
         const platformJsEntryPath = path.resolve(appDirectory, `${entry}.${platform}.js`);
-        entryExists = existsSync(platformTsEntryPath) || existsSync(platformJsEntryPath);
+        entryExists = existsSync(platformTsEntryPath) || existsSync(platformKtEntryPath) || existsSync(platformJsEntryPath);
     }
 
     if (!entryExists) {
@@ -208,7 +210,7 @@ function getPackageJsonEntry(appDirectory) {
         throw new Error(`${appDirectory}/package.json must contain a 'main' attribute!`);
     }
 
-    return entry.replace(/\.js$/i, "");
+    return entry.replace(/\.js$/i, "").replace(/\.kt$/i, "");
 }
 
 function verifyEntryModuleDirectory(appDirectory) {
diff --git a/package.json b/package.json
index dc2d3e6f..c4b42a23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-dev-webpack",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "main": "index",
   "description": "",
   "homepage": "http://www.telerik.com",
@@ -58,7 +58,7 @@
     "loader-utils": "^1.2.3",
     "minimatch": "3.0.4",
     "nativescript-hook": "0.2.4",
-    "nativescript-worker-loader": "~0.10.0",
+    "nativescript-worker-loader": "~0.11.0",
     "properties-reader": "0.3.1",
     "proxy-lib": "0.4.0",
     "raw-loader": "~0.5.1",
diff --git a/snapshot/android/snapshot-generator.js b/snapshot/android/snapshot-generator.js
index d3b54d22..eb055dcd 100644
--- a/snapshot/android/snapshot-generator.js
+++ b/snapshot/android/snapshot-generator.js
@@ -400,7 +400,11 @@ SnapshotGenerator.prototype.buildCSource = function (androidArch, blobInputDir,
 }
 
 SnapshotGenerator.prototype.getRecommendedNdkWarning = function (localNdkRevision, recommendedAndroidNdkRevision) {
-    return `The provided Android NDK is v${localNdkRevision} while the recommended one is v${recommendedAndroidNdkRevision}`;
+    if (localNdkRevision) {
+        return `The provided Android NDK is v${localNdkRevision} while the required one is v${recommendedAndroidNdkRevision}`;
+    } else {
+        return `The provided Android NDK version is different than the required one - v${recommendedAndroidNdkRevision}`;
+    }
 }
 
 SnapshotGenerator.prototype.runMksnapshotTool = function (tool, mksnapshotParams, inputFile, snapshotInDocker, snapshotToolsPath, buildCSource) {