diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8715ce074..0b6bbc55c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,61 @@
 NativeScript CLI Changelog
 ================
 
+
+5.4.0 (2019, May 15)
+==
+
+### Implemented
+* [Implemented #3993](https://github.com/NativeScript/nativescript-cli/issues/3993): Improve `ctrl + c` handling.
+* [Implemented #4374](https://github.com/NativeScript/nativescript-cli/issues/4374): Add `iCloudContainerEnvironment` build option.
+* [Implemented #4394](https://github.com/NativeScript/nativescript-cli/issues/4394): Enable Using Hot Module Replacement by Default for New Projects
+* [Implemented #4518](https://github.com/NativeScript/nativescript-cli/issues/4518): Show deprecation messages for things that will be dropped for 6.0.0 release
+* [Implemented #4541](https://github.com/NativeScript/nativescript-cli/issues/4541): [Beta] Allow integration of Apple Watch application in NativeScript app
+* [Implemented #4548](https://github.com/NativeScript/nativescript-cli/issues/4548): Deprecate support for the Legacy Workflow
+* [Implemented #4602](https://github.com/NativeScript/nativescript-cli/issues/4602): Streamline CLI's logger
+
+
+### Fixed
+* [Fixed #4280](https://github.com/NativeScript/nativescript-cli/issues/4280): Incorrect message if you delete app's folder and run command with `--path` in it
+* [Fixed #4512](https://github.com/NativeScript/nativescript-cli/issues/4512): App's Podfile should be applied last
+* [Fixed #4573](https://github.com/NativeScript/nativescript-cli/pull/4573): logcat process is not restarted in some cases
+* [Fixed #4593](https://github.com/NativeScript/nativescript-cli/issues/4593): Node.js processes not killed after `tns create` on macOS when analytics are enabled
+* [Fixed #4598](https://github.com/NativeScript/nativescript-cli/issues/4598): app.css changes don't apply when debugging with --debug-brk
+* [Fixed #4606](https://github.com/NativeScript/nativescript-cli/issues/4606): Unable to build application for iOS with nativescript-bottombar
+* [Fixed #4616](https://github.com/NativeScript/nativescript-cli/issues/4616): `tns plugin create` command hangs
+
+5.3.4 (2019, April 24)
+==
+
+### Fixed
+* [Fixed #4561](https://github.com/NativeScript/nativescript-cli/issues/4561): CLI merges xcconfig files only for specified build configuration
+
+5.3.3 (2019, April 23)
+==
+
+### Fixed
+* [Fixed #4527](https://github.com/NativeScript/nativescript-cli/issues/4527): Unable to upload applications to App Store
+
+5.3.2 (2019, April 12)
+==
+
+### Fixed
+* [Fixed #1798](https://github.com/NativeScript/nativescript-cli/issues/1798): Test init command doesn't add a sample test in TypeScript for TypeScript/Angular projects
+* [Fixed #4498](https://github.com/NativeScript/nativescript-cli/pull/4498): API: Change the AppStore ids for kinvey scanner and preview app
+* [Fixed #4504](https://github.com/NativeScript/nativescript-cli/issues/4504): Custom tagged versions of android runtime are not supported
+* [Fixed #4510](https://github.com/NativeScript/nativescript-cli/pull/4510): Handle HTTP 304 response status code
+
+5.3.1 (2019, April 03)
+==
+
+### Implemented
+* [Implemented #4492](https://github.com/NativeScript/nativescript-cli/pull/4492): API(kinvey): provide correct data to preview-sdk based on the schema
+
+### Fixed
+* [Fixed #4370](https://github.com/NativeScript/nativescript-cli/issues/4370): NativeScript CLI installation fails on linux
+* [Fixed #4451](https://github.com/NativeScript/nativescript-cli/issues/4451): Error while trying to start application on Android emulator with API level Q
+* [Fixed #4483](https://github.com/NativeScript/nativescript-cli/pull/4483): Detection fixes for emulator/device
+
 5.3.0 (2019, March 27)
 ==
 
diff --git a/Gruntfile.js b/Gruntfile.js
index fdaa5f0827..fb02e2b240 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -236,7 +236,7 @@ module.exports = function (grunt) {
 	});
 	grunt.registerTask("lint", ["tslint:build"]);
 	grunt.registerTask("all", ["clean", "test", "lint"]);
-	grunt.registerTask("rebuild", ["clean", "ts:devlib"]);
+	grunt.registerTask("rebuild", ["clean", "default"]);
 	grunt.registerTask("default", ["ts:devlib", "generate_unit_testing_dependencies"]);
 	grunt.registerTask("docs-jekyll", ['template']);
 };
diff --git a/PublicAPI.md b/PublicAPI.md
index a2f251389e..3fdbba0e30 100644
--- a/PublicAPI.md
+++ b/PublicAPI.md
@@ -70,6 +70,18 @@ const tns = require("nativescript");
 	* [deviceLog](#devicelog)
 * [previewQrCodeService](#previewqrcodeservice)
 	* [getPlaygroundAppQrCode](#getplaygroundappqrcode)
+* [cleanupService](#cleanupservice)
+	* [setCleanupLogFile](#setcleanuplogfile)
+* [initializeService](#initializeService)
+	* [initialize](#initialize)
+* [logger](#logger)
+	* [initialize](#initialize)
+	* [getLevel](#getlevel)
+	* [appenders](#appenders)
+		* [emit-appender](#emit-appender)
+		* [cli-appender](#cli-appender)
+	* [custom layouts](#custom-layouts)
+
 
 ## Module projectService
 
@@ -1487,6 +1499,201 @@ tns.previewQrCodeService.getPlaygroundAppQrCode()
 	});
 ```
 
+## cleanupService
+The `cleanupService` is used to handle actions that should be executed after CLI's process had exited. This is an internal service, that runs detached childProcess in which it executes CLI's cleanup actions once CLI is dead. As the process is detached, logs from it are not shown anywhere, so the service exposes a way to add log file in which the child process will write its logs.
+
+### setCleanupLogFile
+Defines the log file location where the child cleanup process will write its logs.
+
+> NOTE: You must call this method immediately after requiring NativeScript CLI. In case you call it after the cleanup process had started, it will not use the passed log file.
+
+* Definition
+```TypeScript
+/**
+ * Sets the file in which the cleanup process will write its logs.
+ * This method must be called before starting the cleanup process, i.e. when CLI is initialized.
+ * @param {string} filePath Path to file where the logs will be written. The logs are appended to the passed file.
+ * @returns {void}
+ */
+setCleanupLogFile(filePath: string): void;
+```
+
+* Usage
+```JavaScript
+const tns = require("nativescript");
+tns.cleanupService.setCleanupLogFile("/Users/username/cleanup-logs.txt");
+```
+
+## initializeService
+The `initializeService` is used to initialize CLI's configuration at the beginning and print all warnings related to current environment.
+
+### initialize
+This method executes initialization actions based on the passed parameters. In case `loggerOptions` are not passed, the default CLI logger will be used.
+After initialization, the method will print all system warnings.
+
+* Definition
+```TypeScript
+interface IInitializeOptions {
+	loggerOptions?: ILoggerOptions;
+	settingsServiceOptions?: IConfigurationSettings;
+	extensibilityOptions?: { pathToExtensions: string };
+}
+
+interface IInitializeService {
+	initialize(initOpts?: IInitializeOptions): Promise<void>;
+}
+
+```
+
+> NOTE: For more information about loggerOptions, you can check `logger`.
+
+* Usage
+	* Initialization without passing any data - `logger` will be initialized with default CLI settings. Warnings will be printed if there are any.
+	```JavaScript
+	const tns = require("nativescript");
+	tns.initializeService.initialize();
+	```
+	* Initialize with custom settings service options:
+	```JavaScript
+	const tns = require("nativescript");
+	tns.initializeService.initialize({ settingsServiceOptions: { profileDir: "/Users/username/customDir", userAgentName: "MyApp" } });
+	```
+	* Initialize with custom extensibility path:
+	```JavaScript
+	const tns = require("nativescript");
+	tns.initializeService.initialize({ extensibilityOptions: { pathToExtensions: "/Users/username/customDir/extensions" } });
+	```
+
+## logger
+
+`logger` module is used to show any kind of information to the user. The `logger` uses `log4js` internally, which allows setting different levels for the messages.
+The levels are available in `tns.constants.LoggerLevel` enum. Only messages from the current log level (or higher) are shown to the user, i.e. in case the log level is set to `INFO`, `DEBUG` and `TRACE` messages will not be shown to the user, but `WARN` and `ERROR` messages will be shown. </br>
+`logger` module can be configured how to show the messages by using different appenders and layouts. </br>
+* `appenders` are responsible for output of log events. They may write events to files, send emails, store them in a database, or anything. Most appenders use layouts to serialise the events to strings for output.
+* `layout` is a function for converting a LogEvent into a string representation.
+
+`log4js` has predefined appenders and layouts that can be used. In case you do not pass any options to logger's initialization, CLI will default to [console appender](https://log4js-node.github.io/log4js-node/console.html) with [messagePassThrough layout](https://log4js-node.github.io/log4js-node/layouts.html#message-pass-through) with `INFO` log level.</br>
+You can override only the properties you want, i.e. only the log level, the layout or the appender. </br>
+`nativescript` itself has additional appenders that you can use. More information about them can be found below. You can get a full list of the available appenders by checking the `tns.constants.LoggerAppenders` object. </br>
+
+> NOTE: When CLI is used as a command-line tool, it uses a custom appender and layout in order to write coloured messages to stdout or stderr.
+
+### initialize
+The `initialize` method initializes the log4js settings - level, appender and layout. Once called, the settings cannot be changed anymore for the current process.
+
+* Definition
+```TypeScript
+interface IAppenderOptions extends IDictionary<any> {
+	type: string;
+	layout?: Layout;
+}
+
+interface ILoggerOptions {
+	level?: LoggerLevel;
+	appenderOptions?: IAppenderOptions;
+}
+
+initialize(opts?: ILoggerOptions): void;
+```
+
+* Usage
+  * Initialize with default settings:
+	```JavaScript
+	tns.logger.initialize();
+	```
+  * Initialize with DEBUG log level:
+	```JavaScript
+	tns.logger.initialize({ level: tns.constants.LoggerLevel.DEBUG });
+	```
+  * Initialize with different appender, for example [fileSync](https://log4js-node.github.io/log4js-node/fileSync.html) appender:
+	```JavaScript
+	tns.logger.initialize({ appenderOptions: { type: "fileSync" } });
+	```
+  * Initialize with different layout, for example [Pattern](https://log4js-node.github.io/log4js-node/layouts.html#pattern) layout:
+	```JavaScript
+	tns.logger.initialize({ appenderOptions: { layout: { type: "pattern" } } });
+	```
+  * Initialize with custom appender, layout and level:
+	```JavaScript
+	tns.logger.initialize({ appenderOptions: { type: "fileSync", layout: { type: "pattern" } }, level: tns.constants.LoggerLevel.DEBUG });
+	```
+
+### getLevel
+This method returns information for the current log level.
+
+* Definition
+```TypeScript
+getLevel(): string;
+```
+
+* Usage
+```JavaScript
+console.log(`Current log level is: ${tns.logger.getLevel()}`);
+```
+
+### appenders
+The `appenders` are log4js concept. `appenders` are responsible for output of log events. You can use all predefined [log4js appenders](https://log4js-node.github.io/log4js-node/appenders.html) and also several predefined CLI appenders
+
+#### emit-appender
+The `emit-appender` is used to emit the log events through a passed emitter instead of writing the messages. Whenever a message should be shown, the `emit-appender` emits `logData` event with an object containing the `loggingEvent` and the message passed through the specified layout stored in `formattedMessage` property.
+
+* Usage:
+```JavaScript
+const tns = require("nativescript");
+const { EventEmitter } = require("events");
+const { EMIT_APPENDER_EVENT_NAME, LoggerAppenders } = tns.constants;
+const emitter = new EventEmitter();
+// IMPORTANT: Add the event handler before calling logger's initialize method.
+// This is required as log4js makes a copy of the appenderOptions, where the emitter is passed
+// NOTE: In case you want to debug the event handler, place `debugger` in it.
+emitter.on(EMIT_APPENDER_EVENT_NAME, (logData) => {
+	if (logData.loggingEvent.level.levelStr === LoggerLevel.WARN) {
+		console.log(`WARNING: ${logData.formattedMessage}`);
+	}
+});
+
+const logger = tns.logger;
+logger.initialize({
+	appenderOptions: {
+		type: LoggerAppenders.emitAppender,
+		emitter
+	}
+});
+```
+
+> NOTE: In several cases CLI passes additional configuration properties in the `context` of the `loggingEvent`. Full list is available in the `tns.constants.LoggerConfigData` object. These properties are used by CLI's layout and appender to change the way the message is printed on the terminal and if it should be on stderr or stdout.
+
+#### cli-appender
+`cli-appender` prints messages to stdout or stderr based on the passed options for the message.
+
+* Usage
+```JavaScript
+const tns = require("nativescript");
+const { EventEmitter } = require("events");
+const { EMIT_APPENDER_EVENT_NAME, LoggerAppenders } = tns.constants;
+
+const logger = tns.logger;
+logger.initialize({
+	appenderOptions: {
+		type: LoggerAppenders.cliAppender,
+	}
+});
+```
+
+### custom layouts
+You can define your own layout function in the following way:
+```JavaScript
+const log4js = require("nativescript/node_modules/log4js");
+const util = require("util");
+log4js.addLayout("myCustomLayout", (config) => {
+    return (loggingEvent) => {
+        return util.format.apply(null, loggingEvent.data);
+    }
+});
+
+tns.logger.initialize({ appenderOptions: { layout: { type: "myCustomLayout" } } });
+```
+
 ## How to add a new method to Public API
 CLI is designed as command line tool and when it is used as a library, it does not give you access to all of the methods. This is mainly implementation detail. Most of the CLI's code is created to work in command line, not as a library, so before adding method to public API, most probably it will require some modification.
 For example the `$options` injected module contains information about all `--` options passed on the terminal. When the CLI is used as a library, the options are not populated. Before adding method to public API, make sure its implementation does not rely on `$options`.
diff --git a/config/test-dependencies.json b/config/test-dependencies.json
index 7a4868e2fb..879c04a950 100644
--- a/config/test-dependencies.json
+++ b/config/test-dependencies.json
@@ -28,5 +28,25 @@
     {
         "name": "karma-qunit",
         "framework": "qunit"
+    },
+    {
+        "name": "@types/karma-chai",
+        "framework": "mocha",
+        "projectType": ".ts"
+    },
+    {
+        "name": "@types/mocha",
+        "framework": "mocha",
+        "projectType": ".ts"
+    },
+    {
+        "name": "@types/jasmine",
+        "framework": "jasmine",
+        "projectType": ".ts"
+    },
+    {
+        "name": "@types/qunit",
+        "framework": "qunit",
+        "projectType": ".ts"
     }
 ]
\ No newline at end of file
diff --git a/docs/build-jekyll-md.sh b/docs/build-jekyll-md.sh
index df30621d91..832c7afbb2 100755
--- a/docs/build-jekyll-md.sh
+++ b/docs/build-jekyll-md.sh
@@ -5,5 +5,7 @@ rm -rf docs-cli
 npm install --ignore-scripts
 
 grunt docs-jekyll
-cd docs-cli
-mv index.md start.md
\ No newline at end of file
+if [ -d docs-cli ]; then 
+    cd docs-cli
+    mv index.md start.md 
+fi
\ No newline at end of file
diff --git a/docs/man_pages/lib-management/plugin-create.md b/docs/man_pages/lib-management/plugin-create.md
index bfa6d6f7ad..b267887ade 100644
--- a/docs/man_pages/lib-management/plugin-create.md
+++ b/docs/man_pages/lib-management/plugin-create.md
@@ -28,6 +28,8 @@ Create from a custom plugin seed | `$ tns plugin create <Plugin Repository Name>
 * `--path` - Specifies the directory where you want to create the project, if different from the current directory.
 * `--username` - Specifies the Github username, which will be used to build the URLs in the plugin's package.json file.
 * `--pluginName` - Used to set the default file and class names in the plugin source.
+* `--includeTypeScriptDemo` - Specifies if TypeScript demo should be created. Default value is `y` (i.e. `demo` will be created), in case you do not want to create this demo, pass `--includeTypeScriptDemo=n`
+* `--includeAngularDemo` - Specifies if Angular demo should be created. Default value is `y` (i.e. `demo-angular` will be created), in case you do not want to create this demo, pass `--includeAngularDemo=n`
 * `--template` - Specifies the custom seed archive, which you want to use to create your plugin. If `--template` is not set, the NativeScript CLI creates the plugin from the default NativeScript Plugin Seed. `<Template>` can be a URL or a local path to a `.tar.gz` file with the contents of a seed repository.<% if(isHtml) { %> This must be a clone of the [NativeScript Plugin Seed](https://github.com/NativeScript/nativescript-plugin-seed) and must contain a `src` directory with a package.json file and a script at `src/scripts/postclone.js`. After the archive is extracted, the postclone script will be executed with the username (`gitHubUsername`) and plugin name (`pluginName`) parameters given to the `tns plugin create` command prompts. For more information, visit the default plugin seed repository and [examine the source script](https://github.com/NativeScript/nativescript-plugin-seed/blob/master/src/scripts/postclone.js) there. Examples:
 
   * Using a local file:
diff --git a/docs/man_pages/project/creation/create.md b/docs/man_pages/project/creation/create.md
index d4c897b238..1bc0a7ecf9 100644
--- a/docs/man_pages/project/creation/create.md
+++ b/docs/man_pages/project/creation/create.md
@@ -51,7 +51,8 @@ Template | Command
 `Angular - Hello World`, `--ng`, `--angular` | tns create tns-template-hello-world-ng
 `Angular - SideDrawer` | tns create tns-template-drawer-navigation-ng
 `Angular - Tabs` | tns create tns-template-tab-navigation-ng
-`Vue.js`, `--vue`, `--vuejs` | tns create tns-template-blank-vue
+`Vue.js - Blank`, `--vue`, `--vuejs` | tns create tns-template-blank-vue
+`Vue.js - SideDrawer`, | tns create tns-template-drawer-navigation-vue
 
 ### Related Commands
 
diff --git a/docs/man_pages/project/testing/build-android.md b/docs/man_pages/project/testing/build-android.md
index 5c08518eee..a68d6e2543 100644
--- a/docs/man_pages/project/testing/build-android.md
+++ b/docs/man_pages/project/testing/build-android.md
@@ -26,7 +26,13 @@ General | `$ tns build android [--compileSdk <API Level>] [--key-store-path <Fil
 * `--key-store-alias-password` - Provides the password for the alias specified with `--key-store-alias-password`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--copy-to` - Specifies the file path where the built `.apk` will be copied. If it points to a non-existent directory path, it will be created. If the specified value is existing directory, the original file name will be used.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
-* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. For example: `--env.uglify --env.snapshot`.
+* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. Supported additional flags:
+    *   `--env.aot` - creates Ahead-Of-Time build (Angular only).
+    *   `--env.snapshot`- creates [Snapshot](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#v8-heap-snapshot) (only for release builds on Mac OS & for Android).
+    *   `--env.uglify` - provides basic obfuscation and smaller app size.
+    *   `--env.report` - creates a Webpack report inside a `report` folder in the root folder.
+    *   `--env.sourceMap` - creates inline source maps (useful for debbuging bundled app).
+    *   `--env.hiddenSourceMap` - creates sources maps in the root folder (useful for Crashlytics usage with bundled app in release).
 * `--aab` - Specifies that the build will produce an Android App Bundle(`.aab`) file.
 
 <% if(isHtml) { %>
diff --git a/docs/man_pages/project/testing/build-ios.md b/docs/man_pages/project/testing/build-ios.md
index 611436531d..6eeaa0f4f0 100644
--- a/docs/man_pages/project/testing/build-ios.md
+++ b/docs/man_pages/project/testing/build-ios.md
@@ -23,11 +23,18 @@ General | `$ tns build ios [--for-device] [--release] [--copy-to <File Path>] [-
 
 * `--release` - If set, produces a release build. Otherwise, produces a debug build.
 * `--for-device` - If set, produces an application package that you can deploy on device. Otherwise, produces a build that you can run only in the native iOS Simulator.
+* `--i-cloud-container-environment` - If set, adds the passed `iCloudContainerEnvironment` when exporting an application package with the `--for-device` option.
 * `--copy-to` - Specifies the file path where the built `.ipa` will be copied. If it points to a non-existent directory path, it will be created. If the specified value is existing directory, the original file name will be used.
 * `--team-id` - If used without parameter, lists all team names and ids. If used with team name or id, it will switch to automatic signing mode and configure the .xcodeproj file of your app. In this case .xcconfig should not contain any provisioning/team id flags. This team id will be further used for codesigning the app. For Xcode 9.0+, xcodebuild will be allowed to update and modify automatically managed provisioning profiles.
 * `--provision` - If used without parameter, lists all eligible provisioning profiles. If used with UUID or name of your provisioning profile, it will switch to manual signing mode and configure the .xcodeproj file of your app. In this case xcconfig should not contain any provisioning/team id flags. This provisioning profile will be further used for codesigning the app.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
-* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. For example: `--env.uglify --env.snapshot`.
+* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. Supported additional flags:
+    *   `--env.aot` - creates Ahead-Of-Time build (Angular only).
+    *   `--env.snapshot`- creates [Snapshot](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#v8-heap-snapshot) (only for release builds on Mac OS & for Android).
+    *   `--env.uglify` - provides basic obfuscation and smaller app size.
+    *   `--env.report` - creates a Webpack report inside a `report` folder in the root folder.
+    *   `--env.sourceMap` - creates inline source maps (useful for debbuging bundled app).
+    *   `--env.hiddenSourceMap` - creates sources maps in the root folder (useful for Crashlytics usage with bundled app in release).
 
 <% } %>
 
diff --git a/docs/man_pages/project/testing/build.md b/docs/man_pages/project/testing/build.md
index 766af4847a..ca58867483 100644
--- a/docs/man_pages/project/testing/build.md
+++ b/docs/man_pages/project/testing/build.md
@@ -22,9 +22,22 @@ Usage | Synopsis
 
 <% if(isHtml) { %>
 
-### Command Limitations
+### Options
+
+* `--justlaunch` - If set, does not print the application output in the console.
+* `--release` - If set, produces a release build. Otherwise, produces a debug build.
+* `--device` - Specifies a connected device/emulator to start and run the app. `<Device ID>` is the index or `Device Identifier` of the target device as listed by the `$ tns device <Platform> --available-devices` command.
+* `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
+* `--hmr` - (Beta) Enables the hot module replacement (HMR) feature. HMR depends on `webpack` and adding the `--hmr` flag to the command will automatically enable the `--bundle` option as well. <% if(isConsole) { %> The HMR feature is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.<% } %>
+* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. Supported additional flags:
+    *   `--env.aot` - creates Ahead-Of-Time build (Angular only).
+    *   `--env.snapshot`- creates [Snapshot](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#v8-heap-snapshot) (only for release builds on Mac OS & for Android).
+    *   `--env.uglify` - provides basic obfuscation and smaller app size.
+    *   `--env.report` - creates a Webpack report inside a `report` folder in the root folder.
+    *   `--env.sourceMap` - creates inline source maps (useful for debbuging bundled app).
+    *   `--env.hiddenSourceMap` - creates sources maps in the root folder (useful for Crashlytics usage with bundled app in release).
+* `--syncAllFiles` - Watches all production dependencies inside node_modules for changes. Triggers project rebuild if necessary!
 
-* You can run the `$ tns build ios` command only on macOS systems.
 
 ### Related Commands
 
diff --git a/docs/man_pages/project/testing/debug-android.md b/docs/man_pages/project/testing/debug-android.md
index 02492c5212..2553e63ace 100644
--- a/docs/man_pages/project/testing/debug-android.md
+++ b/docs/man_pages/project/testing/debug-android.md
@@ -9,7 +9,7 @@ position: 4
 
 Initiates a debugging session for your project on a connected Android device or Android emulator. When necessary, the command will prepare, build, deploy and launch the app before starting the debug session. While debugging, the output from the application is printed in the console and any changes made to your code are synchronizes with the deployed app.
 
-To enable Hot Module Replacement (HMR) in Angular projects, follow the steps outlined in this wiki: https://github.com/NativeScript/nativescript-angular/wiki/HMR.
+To enable Hot Module Replacement (HMR) in Angular projects, follow the steps outlined in [the HMR documentation section](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#hot-module-replacement).
 
 ### Commands
 
@@ -31,12 +31,12 @@ Attach the debug tools to a running app in the native emulator | `$ tns debug an
 * `--no-watch` - If set, changes in your code will not be reflected during the execution of this command.
 * `--clean` - If set, forces the complete rebuild of the native application.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
-* `--hmr` - (Beta) Enables the hot module replacement (HMR) feature. HMR depends on `webpack` and adding the `--hmr` flag to the command will automatically enable the `--bundle` option as well.<% if(isConsole) { %> The HMR feature is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.<% } %>
+* `--hmr` - Enables the hot module replacement (HMR) feature. HMR depends on `webpack` and adding the `--hmr` flag to the command will automatically enable the `--bundle` option as well.<% if(isConsole) { %> For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.<% } %>
 * `--syncAllFiles` - Watches all production dependencies inside node_modules for changes. Triggers project rebuild if necessary!
 
 <% if(isHtml) { %>
 
->Note: Hot Module Replacement (HMR) is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.
+>Note: For more information about HMR, the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.
 
 ### Command Limitations
 
diff --git a/docs/man_pages/project/testing/run-android.md b/docs/man_pages/project/testing/run-android.md
index 877c9bd329..2026e0b4da 100644
--- a/docs/man_pages/project/testing/run-android.md
+++ b/docs/man_pages/project/testing/run-android.md
@@ -33,7 +33,13 @@ Start a default emulator if none are running, or run application on all connecte
 * `--key-store-alias-password` - Provides the password for the alias specified with `--key-store-alias-password`. You can use the `--key-store-*` options along with `--release` to produce a signed release build. You need to specify all `--key-store-*` options.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
 * `--hmr` - (Beta) Enables the hot module replacement (HMR) feature. HMR depends on `webpack` and adding the `--hmr` flag to the command will automatically enable the `--bundle` option as well. <% if(isConsole) { %> The HMR feature is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.<% } %>
-* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. For example: `--env.uglify --env.snapshot`.
+* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. 
+    *   `--env.aot` - creates Ahead-Of-Time build (Angular only).
+    *   `--env.snapshot`- creates [Snapshot](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#v8-heap-snapshot) (only for release builds on Mac OS & for Android).
+    *   `--env.uglify` - provides basic obfuscation and smaller app size.
+    *   `--env.report` - creates a Webpack report inside a `report` folder in the root folder.
+    *   `--env.sourceMap` - creates inline source maps (useful for debbuging bundled app).
+    *   `--env.hiddenSourceMap` - creates sources maps in the root folder (useful for Crashlytics usage with bundled app in release).
 * `--syncAllFiles` - Watches all production dependencies inside node_modules for changes. Triggers project rebuild if necessary!
 
 <% if(isHtml) { %>
diff --git a/docs/man_pages/project/testing/run-ios.md b/docs/man_pages/project/testing/run-ios.md
index 429532f228..997464e95e 100644
--- a/docs/man_pages/project/testing/run-ios.md
+++ b/docs/man_pages/project/testing/run-ios.md
@@ -36,7 +36,13 @@ Start an emulator with specified device identifier and sdk | `$ tns run ios [--d
 * `--release` - If set, produces a release build. Otherwise, produces a debug build.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
 * `--hmr` - (Beta) Enables the hot module replacement (HMR) feature. HMR depends on `webpack` and adding the `--hmr` flag to the command will automatically enable the `--bundle` option as well. <% if(isConsole) { %> The HMR feature is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.<% } %>
-* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. For example: `--env.uglify --env.snapshot`.
+* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. 
+    *   `--env.aot` - creates Ahead-Of-Time build (Angular only).
+    *   `--env.snapshot`- creates [Snapshot](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#v8-heap-snapshot) (only for release builds on Mac OS & for Android).
+    *   `--env.uglify` - provides basic obfuscation and smaller app size.
+    *   `--env.report` - creates a Webpack report inside a `report` folder in the root folder.
+    *   `--env.sourceMap` - creates inline source maps (useful for debbuging bundled app).
+    *   `--env.hiddenSourceMap` - creates sources maps in the root folder (useful for Crashlytics usage with bundled app in release).
 * `--syncAllFiles` - Watches all production dependencies inside node_modules for changes. Triggers project rebuild if necessary!
 
 <% } %>
diff --git a/docs/man_pages/project/testing/run.md b/docs/man_pages/project/testing/run.md
index 88b07d1bb0..ed555af37f 100644
--- a/docs/man_pages/project/testing/run.md
+++ b/docs/man_pages/project/testing/run.md
@@ -24,7 +24,13 @@ Run on a selected connected device or running emulator. Will start emulator with
 * `--device` - Specifies a connected device/emulator to start and run the app. `<Device ID>` is the index or `Device Identifier` of the target device as listed by the `$ tns device <Platform> --available-devices` command.
 * `--bundle` - Specifies that the `webpack` bundler will be used to bundle the application.
 * `--hmr` - (Beta) Enables the hot module replacement (HMR) feature. HMR depends on `webpack` and adding the `--hmr` flag to the command will automatically enable the `--bundle` option as well. <% if(isConsole) { %> The HMR feature is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/NativeScript/issues/6398.<% } %>
-* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. For example: `--env.uglify --env.snapshot`.
+* `--env.*` - Specifies additional flags that the bundler may process. May be passed multiple times. Supported additional flags:
+    *   `--env.aot` - creates Ahead-Of-Time build (Angular only).
+    *   `--env.snapshot`- creates [Snapshot](https://docs.nativescript.org/performance-optimizations/bundling-with-webpack#v8-heap-snapshot) (only for release builds on Mac OS & for Android).
+    *   `--env.uglify` - provides basic obfuscation and smaller app size.
+    *   `--env.report` - creates a Webpack report inside a `report` folder in the root folder.
+    *   `--env.sourceMap` - creates inline source maps (useful for debbuging bundled app).
+    *   `--env.hiddenSourceMap` - creates sources maps in the root folder (useful for Crashlytics usage with bundled app in release).
 * `--syncAllFiles` - Watches all production dependencies inside node_modules for changes. Triggers project rebuild if necessary!
 
 
diff --git a/lib/bootstrap.ts b/lib/bootstrap.ts
index fcad46b946..3b77b4214b 100644
--- a/lib/bootstrap.ts
+++ b/lib/bootstrap.ts
@@ -1,5 +1,5 @@
 require("./common/bootstrap");
-$injector.require("logger", "./common/logger");
+$injector.requirePublicClass("logger", "./common/logger/logger");
 $injector.require("config", "./config");
 $injector.require("options", "./options");
 // note: order above is important!
@@ -13,6 +13,7 @@ $injector.require("androidProjectService", "./services/android-project-service")
 $injector.require("androidPluginBuildService", "./services/android-plugin-build-service");
 $injector.require("iOSEntitlementsService", "./services/ios-entitlements-service");
 $injector.require("iOSExtensionsService", "./services/ios-extensions-service");
+$injector.require("iOSWatchAppService", "./services/ios-watch-app-service");
 $injector.require("iOSProjectService", "./services/ios-project-service");
 $injector.require("iOSProvisionService", "./services/ios-provision-service");
 $injector.require("xcconfigService", "./services/xcconfig-service");
@@ -108,7 +109,7 @@ $injector.require("xcprojService", "./services/xcproj-service");
 $injector.require("versionsService", "./services/versions-service");
 $injector.requireCommand("install", "./commands/install");
 
-$injector.require("initService", "./services/init-service");
+$injector.require("projectInitService", "./services/project-init-service");
 $injector.requireCommand("init", "./commands/init");
 
 $injector.require("infoService", "./services/info-service");
@@ -140,6 +141,7 @@ $injector.require("previewAppLiveSyncService", "./services/livesync/playground/p
 $injector.require("previewAppLogProvider", "./services/livesync/playground/preview-app-log-provider");
 $injector.require("previewAppPluginsService", "./services/livesync/playground/preview-app-plugins-service");
 $injector.require("previewSdkService", "./services/livesync/playground/preview-sdk-service");
+$injector.require("previewSchemaService", "./services/livesync/playground/preview-schema-service");
 $injector.requirePublicClass("previewDevicesService", "./services/livesync/playground/devices/preview-devices-service");
 $injector.requirePublic("previewQrCodeService", "./services/livesync/playground/preview-qr-code-service");
 $injector.requirePublic("sysInfo", "./sys-info");
@@ -189,5 +191,13 @@ $injector.require("hmrStatusService", "./services/hmr-status-service");
 $injector.require("pacoteService", "./services/pacote-service");
 $injector.require("qrCodeTerminalService", "./services/qr-code-terminal-service");
 $injector.require("testInitializationService", "./services/test-initialization-service");
+$injector.require("workflowService", "./services/workflow-service");
 
 $injector.require("networkConnectivityValidator", "./helpers/network-connectivity-validator");
+$injector.requirePublic("cleanupService", "./services/cleanup-service");
+
+$injector.require("applePortalSessionService", "./services/apple-portal/apple-portal-session-service");
+$injector.require("applePortalCookieService", "./services/apple-portal/apple-portal-cookie-service");
+$injector.require("applePortalApplicationService", "./services/apple-portal/apple-portal-application-service");
+
+$injector.requirePublicClass("initializeService", "./services/initialize-service");
diff --git a/lib/commands/appstore-list.ts b/lib/commands/appstore-list.ts
index 6313a2f64b..aadc7e665b 100644
--- a/lib/commands/appstore-list.ts
+++ b/lib/commands/appstore-list.ts
@@ -5,7 +5,7 @@ export class ListiOSApps implements ICommand {
 	public allowedParameters: ICommandParameter[] = [new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector)];
 
 	constructor(private $injector: IInjector,
-		private $itmsTransporterService: IITMSTransporterService,
+		private $applePortalApplicationService: IApplePortalApplicationService,
 		private $logger: ILogger,
 		private $projectData: IProjectData,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
@@ -31,16 +31,17 @@ export class ListiOSApps implements ICommand {
 			password = await this.$prompter.getPassword("Apple ID password");
 		}
 
-		const iOSApplications = await this.$itmsTransporterService.getiOSApplications({ username, password });
+		const applications = await this.$applePortalApplicationService.getApplications({ username, password });
 
-		if (!iOSApplications || !iOSApplications.length) {
-			this.$logger.out("Seems you don't have any applications yet.");
+		if (!applications || !applications.length) {
+			this.$logger.info("Seems you don't have any applications yet.");
 		} else {
-			const table: any = createTable(["Application Name", "Bundle Identifier", "Version"], iOSApplications.map(element => {
-				return [element.name, element.bundleId, element.version];
+			const table: any = createTable(["Application Name", "Bundle Identifier", "In Flight Version"], applications.map(application => {
+				const version = (application && application.versionSets && application.versionSets.length && application.versionSets[0].inFlightVersion &&  application.versionSets[0].inFlightVersion.version) || "";
+				return [application.name, application.bundleId, version];
 			}));
 
-			this.$logger.out(table.toString());
+			this.$logger.info(table.toString());
 		}
 	}
 }
diff --git a/lib/commands/appstore-upload.ts b/lib/commands/appstore-upload.ts
index 03168cde65..0870e7b388 100644
--- a/lib/commands/appstore-upload.ts
+++ b/lib/commands/appstore-upload.ts
@@ -6,14 +6,16 @@ export class PublishIOS implements ICommand {
 	public allowedParameters: ICommandParameter[] = [new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector),
 	new StringCommandParameter(this.$injector), new StringCommandParameter(this.$injector)];
 
-	constructor(private $errors: IErrors,
+	constructor(
 		private $injector: IInjector,
 		private $itmsTransporterService: IITMSTransporterService,
 		private $logger: ILogger,
 		private $projectData: IProjectData,
 		private $options: IOptions,
 		private $prompter: IPrompter,
-		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) {
+		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+		private $hostInfo: IHostInfo,
+		private $errors: IErrors) {
 		this.$projectData.initializeProjectData();
 	}
 
@@ -78,6 +80,7 @@ export class PublishIOS implements ICommand {
 					provision: this.$options.provision,
 					teamId: this.$options.teamId,
 					buildForDevice: true,
+					iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
 					mobileProvisionIdentifier,
 					codeSignIdentity
 				};
@@ -107,11 +110,16 @@ export class PublishIOS implements ICommand {
 			username,
 			password,
 			ipaFilePath,
+			shouldExtractIpa: !!this.$options.ipa,
 			verboseLogging: this.$logger.getLevel() === "TRACE"
 		});
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
+		if (!this.$hostInfo.isDarwin) {
+			this.$errors.failWithoutHelp("iOS publishing is only available on Mac OS X.");
+		}
+
 		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
 			this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
 		}
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
index 0c4f091f19..79ba67eeff 100644
--- a/lib/commands/build.ts
+++ b/lib/commands/build.ts
@@ -9,12 +9,14 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		protected $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$platformService: IPlatformService,
 		private $bundleValidatorHelper: IBundleValidatorHelper,
-		protected $logger: ILogger) {
-			super($options, $platformsData, $platformService, $projectData);
-			this.$projectData.initializeProjectData();
+		protected $logger: ILogger,
+		protected $workflowService: IWorkflowService) {
+		super($options, $platformsData, $platformService, $projectData);
+		this.$projectData.initializeProjectData();
 	}
 
 	public async executeCore(args: string[]): Promise<string> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		const platform = args[0].toLowerCase();
 		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {
 			bundle: !!this.$options.bundle,
@@ -33,6 +35,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 		await this.$platformService.preparePlatform(platformInfo);
 		const buildConfig: IBuildConfig = {
 			buildForDevice: this.$options.forDevice,
+			iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
 			projectDir: this.$options.path,
 			clean: this.$options.clean,
 			teamId: this.$options.teamId,
@@ -62,7 +65,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 			this.$errors.fail(`Applications for platform ${platform} can not be built on this OS`);
 		}
 
-		this.$bundleValidatorHelper.validate();
+		this.$bundleValidatorHelper.validate(this.$projectData);
 	}
 
 	protected async validateArgs(args: string[], platform: string): Promise<ICanExecuteCommandOutput> {
@@ -93,8 +96,9 @@ export class BuildIosCommand extends BuildCommandBase implements ICommand {
 		$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$platformService: IPlatformService,
 		$bundleValidatorHelper: IBundleValidatorHelper,
-		$logger: ILogger) {
-			super($options, $errors, $projectData, $platformsData, $devicePlatformsConstants, $platformService, $bundleValidatorHelper, $logger);
+		$logger: ILogger,
+		$workflowService: IWorkflowService) {
+		super($options, $errors, $projectData, $platformsData, $devicePlatformsConstants, $platformService, $bundleValidatorHelper, $logger, $workflowService);
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -106,7 +110,7 @@ export class BuildIosCommand extends BuildCommandBase implements ICommand {
 
 		super.validatePlatform(platform);
 
-		let result = await super.canExecuteCommandBase(platform, { notConfiguredEnvOptions: { hideSyncToPreviewAppOption: true }});
+		let result = await super.canExecuteCommandBase(platform, { notConfiguredEnvOptions: { hideSyncToPreviewAppOption: true } });
 		if (result.canExecute) {
 			result = await super.validateArgs(args, platform);
 		}
@@ -128,8 +132,9 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 		$platformService: IPlatformService,
 		$bundleValidatorHelper: IBundleValidatorHelper,
 		protected $androidBundleValidatorHelper: IAndroidBundleValidatorHelper,
-		protected $logger: ILogger) {
-			super($options, $errors, $projectData, $platformsData, $devicePlatformsConstants, $platformService, $bundleValidatorHelper, $logger);
+		protected $logger: ILogger,
+		$workflowService: IWorkflowService) {
+		super($options, $errors, $projectData, $platformsData, $devicePlatformsConstants, $platformService, $bundleValidatorHelper, $logger, $workflowService);
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -148,7 +153,7 @@ export class BuildAndroidCommand extends BuildCommandBase implements ICommand {
 		const platform = this.$devicePlatformsConstants.Android;
 		super.validatePlatform(platform);
 		this.$androidBundleValidatorHelper.validateRuntimeVersion(this.$projectData);
-		let result = await super.canExecuteCommandBase(platform, { notConfiguredEnvOptions: { hideSyncToPreviewAppOption: true }});
+		let result = await super.canExecuteCommandBase(platform, { notConfiguredEnvOptions: { hideSyncToPreviewAppOption: true } });
 		if (result.canExecute) {
 			if (this.$options.release && (!this.$options.keyStorePath || !this.$options.keyStorePassword || !this.$options.keyStoreAlias || !this.$options.keyStoreAliasPassword)) {
 				this.$errors.fail(ANDROID_RELEASE_BUILD_ERROR_MESSAGE);
diff --git a/lib/commands/clean-app.ts b/lib/commands/clean-app.ts
index e22c1a4c64..e95daf8a9e 100644
--- a/lib/commands/clean-app.ts
+++ b/lib/commands/clean-app.ts
@@ -10,12 +10,15 @@ export class CleanAppCommandBase extends ValidatePlatformCommandBase implements
 		$platformService: IPlatformService,
 		protected $errors: IErrors,
 		protected $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
-		$platformsData: IPlatformsData) {
+		$platformsData: IPlatformsData,
+		private $logger: ILogger) {
 			super($options, $platformsData, $platformService, $projectData);
 			this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
+		this.$logger.warn(`"tns clean-app ${this.platform.toLowerCase()}" command has been deprecated and will be removed in the upcoming NativeScript CLI v6.0.0. More info can be found in this issue https://github.com/NativeScript/nativescript-cli/issues/4518.`);
+
 		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {
 			bundle: !!this.$options.bundle,
 			release: this.$options.release,
@@ -49,8 +52,9 @@ export class CleanAppIosCommand extends CleanAppCommandBase implements ICommand
 		protected $platformsData: IPlatformsData,
 		protected $errors: IErrors,
 		$platformService: IPlatformService,
-		$projectData: IProjectData) {
-		super($options, $projectData, $platformService, $errors, $devicePlatformsConstants, $platformsData);
+		$projectData: IProjectData,
+		$logger: ILogger) {
+		super($options, $projectData, $platformService, $errors, $devicePlatformsConstants, $platformsData, $logger);
 	}
 
 	protected get platform(): string {
@@ -66,8 +70,9 @@ export class CleanAppAndroidCommand extends CleanAppCommandBase implements IComm
 		protected $platformsData: IPlatformsData,
 		protected $errors: IErrors,
 		$platformService: IPlatformService,
-		$projectData: IProjectData) {
-		super($options, $projectData, $platformService, $errors, $devicePlatformsConstants, $platformsData);
+		$projectData: IProjectData,
+		$logger: ILogger) {
+		super($options, $projectData, $platformService, $errors, $devicePlatformsConstants, $platformsData, $logger);
 	}
 
 	protected get platform(): string {
diff --git a/lib/commands/create-project.ts b/lib/commands/create-project.ts
index 50c02b67fe..e19d0f4658 100644
--- a/lib/commands/create-project.ts
+++ b/lib/commands/create-project.ts
@@ -5,6 +5,8 @@ import { isInteractive } from "../common/helpers";
 export class CreateProjectCommand implements ICommand {
 	public enableHooks = false;
 	public allowedParameters: ICommandParameter[] = [this.$stringParameter];
+	private static BlankTemplateKey = "Blank";
+	private static BlankTemplateDescription = "A blank app";
 	private static HelloWorldTemplateKey = "Hello World";
 	private static HelloWorldTemplateDescription = "A Hello World app";
 	private static DrawerTemplateKey = "SideDrawer";
@@ -109,11 +111,11 @@ or --js flags.)
 		let selectedTemplate: string;
 		switch (flavorSelection) {
 			case constants.NgFlavorName: {
-				selectedFlavorTemplates.push(...this.getNgFlavors());
+				selectedFlavorTemplates.push(...this.getNgTemplates());
 				break;
 			}
 			case constants.VueFlavorName: {
-				selectedFlavorTemplates.push({ value: "tns-template-blank-vue" });
+				selectedFlavorTemplates.push(...this.getVueTemplates());
 				break;
 			}
 			case constants.TsFlavorName: {
@@ -178,7 +180,7 @@ or --js flags.)
 		return templates;
 	}
 
-	private getNgFlavors() {
+	private getNgTemplates() {
 		const templates = [{
 			key: CreateProjectCommand.HelloWorldTemplateKey,
 			value: constants.RESERVED_TEMPLATE_NAMES.angular,
@@ -198,6 +200,21 @@ or --js flags.)
 		return templates;
 	}
 
+	private getVueTemplates() {
+		const templates = [{
+			key: CreateProjectCommand.BlankTemplateKey,
+			value: "tns-template-blank-vue",
+			description: CreateProjectCommand.BlankTemplateDescription
+		},
+		{
+			key: CreateProjectCommand.DrawerTemplateKey,
+			value: "tns-template-drawer-navigation-vue",
+			description: CreateProjectCommand.DrawerTemplateDescription
+		}];
+
+		return templates;
+	}
+
 	public async postCommandAction(args: string[]): Promise<void> {
 		const { projectDir } = this.createdProjectData;
 		const relativePath = path.relative(process.cwd(), projectDir);
diff --git a/lib/commands/debug.ts b/lib/commands/debug.ts
index 95457625e0..734b546b5b 100644
--- a/lib/commands/debug.ts
+++ b/lib/commands/debug.ts
@@ -18,11 +18,13 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 		private $debugDataService: IDebugDataService,
 		private $liveSyncService: IDebugLiveSyncService,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
-		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) {
+		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper,
+		private $workflowService: IWorkflowService) {
 		super($options, $platformsData, $platformService, $projectData);
 	}
 
 	public async execute(args: string[]): Promise<void> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		await this.$devicesService.initialize({
 			platform: this.platform,
 			deviceId: this.$options.device,
@@ -67,7 +69,7 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 		}
 
 		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
-		this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);
+		this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);
 
 		const result = await super.canExecuteCommandBase(this.platform, { validateOptions: true, notConfiguredEnvOptions: { hideCloudBuildOption: true, hideSyncToPreviewAppOption: true } });
 		return result;
@@ -91,7 +93,8 @@ export class DebugIOSCommand implements ICommand {
 		private $sysInfo: ISysInfo,
 		private $projectData: IProjectData,
 		$iosDeviceOperations: IIOSDeviceOperations,
-		$iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider) {
+		$iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
+		$cleanupService: ICleanupService) {
 		this.$projectData.initializeProjectData();
 		// Do not dispose ios-device-lib, so the process will remain alive and the debug application (NativeScript Inspector or Chrome DevTools) will be able to connect to the socket.
 		// In case we dispose ios-device-lib, the socket will be closed and the code will fail when the debug application tries to read/send data to device socket.
@@ -99,6 +102,7 @@ export class DebugIOSCommand implements ICommand {
 		// In case we do not set it to false, the dispose will be called once the command finishes its execution, which will prevent the debugging.
 		$iosDeviceOperations.setShouldDispose(false);
 		$iOSSimulatorLogProvider.setShouldDispose(false);
+		$cleanupService.setShouldDispose(false);
 	}
 
 	public execute(args: string[]): Promise<void> {
diff --git a/lib/commands/deploy.ts b/lib/commands/deploy.ts
index c83b357ca0..ad6fffc62b 100644
--- a/lib/commands/deploy.ts
+++ b/lib/commands/deploy.ts
@@ -14,8 +14,8 @@ export class DeployOnDeviceCommand extends ValidatePlatformCommandBase implement
 		$platformsData: IPlatformsData,
 		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) {
-			super($options, $platformsData, $platformService, $projectData);
-			this.$projectData.initializeProjectData();
+		super($options, $platformsData, $platformService, $projectData);
+		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -26,7 +26,7 @@ export class DeployOnDeviceCommand extends ValidatePlatformCommandBase implement
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		this.$androidBundleValidatorHelper.validateNoAab();
-		this.$bundleValidatorHelper.validate();
+		this.$bundleValidatorHelper.validate(this.$projectData);
 		if (!args || !args.length || args.length > 1) {
 			return false;
 		}
diff --git a/lib/commands/extensibility/list-extensions.ts b/lib/commands/extensibility/list-extensions.ts
index aabc3f9c13..d3a1761bc7 100644
--- a/lib/commands/extensibility/list-extensions.ts
+++ b/lib/commands/extensibility/list-extensions.ts
@@ -13,7 +13,7 @@ export class ListExtensionsCommand implements ICommand {
 			});
 
 			const table = helpers.createTable(["Name", "Version"], data);
-			this.$logger.out(table.toString());
+			this.$logger.info(table.toString());
 		} else {
 			this.$logger.info("No extensions installed.");
 		}
diff --git a/lib/commands/init.ts b/lib/commands/init.ts
index a704c25022..36984c0dd6 100644
--- a/lib/commands/init.ts
+++ b/lib/commands/init.ts
@@ -1,12 +1,12 @@
-export class InitCommand implements ICommand {
+export class ProjectInitCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 	public enableHooks = false;
 
-	constructor(private $initService: IInitService) { }
+	constructor(private $projectInitService: IProjectInitService) { }
 
 	public async execute(args: string[]): Promise<void> {
-		return this.$initService.initialize();
+		return this.$projectInitService.initialize();
 	}
 }
 
-$injector.registerCommand("init", InitCommand);
+$injector.registerCommand("init", ProjectInitCommand);
diff --git a/lib/commands/list-platforms.ts b/lib/commands/list-platforms.ts
index 7210609be8..bd450f52b9 100644
--- a/lib/commands/list-platforms.ts
+++ b/lib/commands/list-platforms.ts
@@ -15,16 +15,16 @@ export class ListPlatformsCommand implements ICommand {
 		if (installedPlatforms.length > 0) {
 			const preparedPlatforms = this.$platformService.getPreparedPlatforms(this.$projectData);
 			if (preparedPlatforms.length > 0) {
-				this.$logger.out("The project is prepared for: ", helpers.formatListOfNames(preparedPlatforms, "and"));
+				this.$logger.info("The project is prepared for: ", helpers.formatListOfNames(preparedPlatforms, "and"));
 			} else {
-				this.$logger.out("The project is not prepared for any platform");
+				this.$logger.info("The project is not prepared for any platform");
 			}
 
-			this.$logger.out("Installed platforms: ", helpers.formatListOfNames(installedPlatforms, "and"));
+			this.$logger.info("Installed platforms: ", helpers.formatListOfNames(installedPlatforms, "and"));
 		} else {
 			const formattedPlatformsList = helpers.formatListOfNames(this.$platformService.getAvailablePlatforms(this.$projectData), "and");
-			this.$logger.out("Available platforms for this OS: ", formattedPlatformsList);
-			this.$logger.out("No installed platforms found. Use $ tns platform add");
+			this.$logger.info("Available platforms for this OS: ", formattedPlatformsList);
+			this.$logger.info("No installed platforms found. Use $ tns platform add");
 		}
 	}
 }
diff --git a/lib/commands/plugin/create-plugin.ts b/lib/commands/plugin/create-plugin.ts
index 278c024cf1..30bf15538a 100644
--- a/lib/commands/plugin/create-plugin.ts
+++ b/lib/commands/plugin/create-plugin.ts
@@ -5,6 +5,8 @@ export class CreatePluginCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 	public userMessage = "What is your GitHub username?\n(will be used to update the Github URLs in the plugin's package.json)";
 	public nameMessage = "What will be the name of your plugin?\n(use lowercase characters and dashes only)";
+	public includeTypeScriptDemoMessage = 'Do you want to include a "TypeScript NativeScript" application linked with your plugin to make development easier?';
+	public includeAngularDemoMessage = 'Do you want to include an "Angular NativeScript" application linked with your plugin to make development easier?';
 	public pathAlreadyExistsMessageTemplate = "Path already exists and is not empty %s";
 	constructor(private $options: IOptions,
 		private $errors: IErrors,
@@ -62,15 +64,25 @@ export class CreatePluginCommand implements ICommand {
 
 		const gitHubUsername = await this.getGitHubUsername(config.username);
 		const pluginNameSource = await this.getPluginNameSource(config.pluginName, pluginRepoName);
+		const includeTypescriptDemo = await this.getShouldIncludeDemoResult(config.includeTypeScriptDemo, this.includeTypeScriptDemoMessage);
+		const includeAngularDemo = await this.getShouldIncludeDemoResult(config.includeAngularDemo, this.includeAngularDemoMessage);
 
-		if (!isInteractive() && (!config.username || !config.pluginName)) {
-			this.$logger.printMarkdown("Using default values for Github user and/or plugin name since your shell is not interactive.");
+		if (!isInteractive() && (!config.username || !config.pluginName || !config.includeAngularDemo || !config.includeTypeScriptDemo)) {
+			this.$logger.printMarkdown("Using default values for plugin creation options since your shell is not interactive.");
 		}
 
 		// run postclone script manually and kill it if it takes more than 10 sec
 		const pathToPostCloneScript = path.join("scripts", "postclone");
-		const params = [pathToPostCloneScript, `gitHubUsername=${gitHubUsername}`, `pluginName=${pluginNameSource}`, "initGit=y"];
-		const outputScript = (await this.$childProcess.spawnFromEvent(process.execPath, params, "close", { cwd, timeout: 10000 }));
+		const params = [
+			pathToPostCloneScript,
+			`gitHubUsername=${gitHubUsername}`,
+			`pluginName=${pluginNameSource}`,
+			"initGit=y",
+			`includeTypeScriptDemo=${includeTypescriptDemo}`,
+			`includeAngularDemo=${includeAngularDemo}`
+		];
+
+		const outputScript = (await this.$childProcess.spawnFromEvent(process.execPath, params, "close", { stdio: "inherit", cwd, timeout: 10000 }));
 		if (outputScript && outputScript.stdout) {
 			this.$logger.printMarkdown(outputScript.stdout);
 		}
@@ -101,7 +113,7 @@ export class CreatePluginCommand implements ICommand {
 		}
 	}
 
-	private async getGitHubUsername(gitHubUsername: string) {
+	private async getGitHubUsername(gitHubUsername: string): Promise<string> {
 		if (!gitHubUsername) {
 			gitHubUsername = "NativeScriptDeveloper";
 			if (isInteractive()) {
@@ -112,7 +124,7 @@ export class CreatePluginCommand implements ICommand {
 		return gitHubUsername;
 	}
 
-	private async getPluginNameSource(pluginNameSource: string, pluginRepoName: string) {
+	private async getPluginNameSource(pluginNameSource: string, pluginRepoName: string): Promise<string> {
 		if (!pluginNameSource) {
 			// remove nativescript- prefix for naming plugin files
 			const prefix = 'nativescript-';
@@ -124,6 +136,15 @@ export class CreatePluginCommand implements ICommand {
 
 		return pluginNameSource;
 	}
+
+	private async getShouldIncludeDemoResult(includeDemoOption: string, message: string): Promise<string> {
+		let shouldIncludeDemo = !!includeDemoOption;
+		if (!includeDemoOption && isInteractive()) {
+			shouldIncludeDemo = await this.$prompter.confirm(message, () => { return true; });
+		}
+
+		return shouldIncludeDemo ? "y" : "n";
+	}
 }
 
 $injector.registerCommand(["plugin|create"], CreatePluginCommand);
diff --git a/lib/commands/plugin/list-plugins.ts b/lib/commands/plugin/list-plugins.ts
index f9afa9c316..ac91549e79 100644
--- a/lib/commands/plugin/list-plugins.ts
+++ b/lib/commands/plugin/list-plugins.ts
@@ -16,18 +16,18 @@ export class ListPluginsCommand implements ICommand {
 		const dependenciesData: string[][] = this.createTableCells(installedPlugins.dependencies);
 
 		const dependenciesTable: any = createTable(headers, dependenciesData);
-		this.$logger.out("Dependencies:");
-		this.$logger.out(dependenciesTable.toString());
+		this.$logger.info("Dependencies:");
+		this.$logger.info(dependenciesTable.toString());
 
 		if (installedPlugins.devDependencies && installedPlugins.devDependencies.length) {
 			const devDependenciesData: string[][] = this.createTableCells(installedPlugins.devDependencies);
 
 			const devDependenciesTable: any = createTable(headers, devDependenciesData);
 
-			this.$logger.out("Dev Dependencies:");
-			this.$logger.out(devDependenciesTable.toString());
+			this.$logger.info("Dev Dependencies:");
+			this.$logger.info(devDependenciesTable.toString());
 		} else {
-			this.$logger.out("There are no dev dependencies.");
+			this.$logger.info("There are no dev dependencies.");
 		}
 
 		const viewDependenciesCommand: string = "npm view <pluginName> grep dependencies".cyan.toString();
diff --git a/lib/commands/post-install.ts b/lib/commands/post-install.ts
index d3f998e157..aa07aee4f0 100644
--- a/lib/commands/post-install.ts
+++ b/lib/commands/post-install.ts
@@ -1,3 +1,5 @@
+import { doesCurrentNpmCommandMatch } from "../common/helpers";
+
 export class PostInstallCliCommand implements ICommand {
 	constructor(private $fs: IFileSystem,
 		private $subscriptionService: ISubscriptionService,
@@ -13,24 +15,35 @@ export class PostInstallCliCommand implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
 
 	public async execute(args: string[]): Promise<void> {
+		const isRunningWithSudoUser = !!process.env.SUDO_USER;
+
 		if (!this.$hostInfo.isWindows) {
 			// when running under 'sudo' we create a working dir with wrong owner (root) and
 			// it is no longer accessible for the user initiating the installation
 			// patch the owner here
-			if (process.env.SUDO_USER) {
+			if (isRunningWithSudoUser) {
 				// TODO: Check if this is the correct place, probably we should set this at the end of the command.
 				await this.$fs.setCurrentUserAsOwner(this.$settingsService.getProfileDir(), process.env.SUDO_USER);
 			}
 		}
 
-		await this.$helpService.generateHtmlPages();
-		// Explicitly ask for confirmation of usage-reporting:
-		await this.$analyticsService.checkConsent();
-		await this.$commandsService.tryExecuteCommand("autocomplete", []);
+		const canExecutePostInstallTask = !isRunningWithSudoUser || doesCurrentNpmCommandMatch([/^--unsafe-perm$/]);
+
+		if (canExecutePostInstallTask) {
+			await this.$helpService.generateHtmlPages();
+
+			// Explicitly ask for confirmation of usage-reporting:
+			await this.$analyticsService.checkConsent();
+			await this.$commandsService.tryExecuteCommand("autocomplete", []);
+		}
+
 		// Make sure the success message is separated with at least one line from all other messages.
-		this.$logger.out();
+		this.$logger.info();
 		this.$logger.printMarkdown("Installation successful. You are good to go. Connect with us on `http://twitter.com/NativeScript`.");
-		await this.$subscriptionService.subscribeForNewsletter();
+
+		if (canExecutePostInstallTask) {
+			await this.$subscriptionService.subscribeForNewsletter();
+		}
 	}
 
 	public async postCommandAction(args: string[]): Promise<void> {
diff --git a/lib/commands/prepare.ts b/lib/commands/prepare.ts
index 409ddf16c6..d0f821c808 100644
--- a/lib/commands/prepare.ts
+++ b/lib/commands/prepare.ts
@@ -7,12 +7,14 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 		$platformService: IPlatformService,
 		$projectData: IProjectData,
 		private $platformCommandParameter: ICommandParameter,
-		$platformsData: IPlatformsData) {
-			super($options, $platformsData, $platformService, $projectData);
-			this.$projectData.initializeProjectData();
+		$platformsData: IPlatformsData,
+		private $workflowService: IWorkflowService) {
+		super($options, $platformsData, $platformService, $projectData);
+		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {
 			bundle: !!this.$options.bundle,
 			release: this.$options.release,
diff --git a/lib/commands/preview.ts b/lib/commands/preview.ts
index 1dddd24a3c..59cf02ad7e 100644
--- a/lib/commands/preview.ts
+++ b/lib/commands/preview.ts
@@ -13,11 +13,15 @@ export class PreviewCommand implements ICommand {
 		private $projectData: IProjectData,
 		private $options: IOptions,
 		private $previewAppLogProvider: IPreviewAppLogProvider,
-		private $previewQrCodeService: IPreviewQrCodeService) {
-			this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
-		}
+		private $previewQrCodeService: IPreviewQrCodeService,
+		protected $workflowService: IWorkflowService,
+		$cleanupService: ICleanupService) {
+		this.$analyticsService.setShouldDispose(false);
+		$cleanupService.setShouldDispose(false);
+	}
 
 	public async execute(): Promise<void> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		this.$previewAppLogProvider.on(DEVICE_LOG_EVENT_NAME, (deviceId: string, message: string) => {
 			this.$logger.info(message);
 		});
@@ -42,7 +46,7 @@ export class PreviewCommand implements ICommand {
 		}
 
 		await this.$networkConnectivityValidator.validate();
-		this.$bundleValidatorHelper.validate(PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);
+		this.$bundleValidatorHelper.validate(this.$projectData, PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);
 		return true;
 	}
 }
diff --git a/lib/commands/run.ts b/lib/commands/run.ts
index 5e34cfe578..cf83c86dd5 100644
--- a/lib/commands/run.ts
+++ b/lib/commands/run.ts
@@ -13,10 +13,13 @@ export class RunCommandBase implements ICommand {
 		private $errors: IErrors,
 		private $hostInfo: IHostInfo,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
-		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) { }
+		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper,
+		private $options: IOptions,
+		private $workflowService: IWorkflowService) { }
 
 	public allowedParameters: ICommandParameter[] = [];
 	public async execute(args: string[]): Promise<void> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		await this.$analyticsService.trackPreviewAppData(this.platform, this.$projectData.projectDir);
 		return this.$liveSyncCommandHelper.executeCommandLiveSync(this.platform, this.liveSyncCommandHelperAdditionalOptions);
 	}
@@ -66,7 +69,7 @@ export class RunIosCommand implements ICommand {
 		private $errors: IErrors,
 		private $injector: IInjector,
 		private $platformService: IPlatformService,
-		private $projectData: IProjectData,
+		private $projectDataService: IProjectDataService,
 		private $options: IOptions) {
 	}
 
@@ -75,11 +78,13 @@ export class RunIosCommand implements ICommand {
 	}
 
 	public async canExecute(args: string[]): Promise<boolean> {
-		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, this.$projectData)) {
+		const projectData = this.$projectDataService.getProjectData();
+
+		if (!this.$platformService.isPlatformSupportedForOS(this.$devicePlatformsConstants.iOS, projectData)) {
 			this.$errors.fail(`Applications for platform ${this.$devicePlatformsConstants.iOS} can not be built on this OS`);
 		}
 
-		const result = await this.runCommand.canExecute(args) && await this.$platformService.validateOptions(this.$options.provision, this.$options.teamId, this.$projectData, this.$platformsData.availablePlatforms.iOS);
+		const result = await this.runCommand.canExecute(args) && await this.$platformService.validateOptions(this.$options.provision, this.$options.teamId, projectData, this.$platformsData.availablePlatforms.iOS);
 		return result;
 	}
 }
diff --git a/lib/commands/test-init.ts b/lib/commands/test-init.ts
index 5a17fb42f8..fb0985fa65 100644
--- a/lib/commands/test-init.ts
+++ b/lib/commands/test-init.ts
@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { TESTING_FRAMEWORKS } from '../constants';
+import { TESTING_FRAMEWORKS, ProjectTypes } from '../constants';
 import { fromWindowsRelativePathToUnix } from '../common/helpers';
 
 class TestInitCommand implements ICommand {
@@ -31,6 +31,8 @@ class TestInitCommand implements ICommand {
 			this.$errors.fail(`Unknown or unsupported unit testing framework: ${frameworkToInstall}`);
 		}
 
+		const projectFilesExtension = this.$projectData.projectType === ProjectTypes.TsFlavorName || this.$projectData.projectType === ProjectTypes.NgFlavorName ? ".ts" : ".js";
+
 		let modulesToInstall: IDependencyInformation[] = [];
 		try {
 			modulesToInstall = this.$testInitializationService.getDependencies(frameworkToInstall);
@@ -38,6 +40,8 @@ class TestInitCommand implements ICommand {
 			this.$errors.failWithoutHelp(`Unable to install the unit testing dependencies. Error: '${err.message}'`);
 		}
 
+		modulesToInstall = modulesToInstall.filter(moduleToInstall => !moduleToInstall.projectType || moduleToInstall.projectType === projectFilesExtension);
+
 		for (const mod of modulesToInstall) {
 			let moduleToInstall = mod.name;
 			moduleToInstall += `@${mod.version}`;
@@ -96,16 +100,16 @@ class TestInitCommand implements ICommand {
 		const frameworks = [frameworkToInstall].concat(this.karmaConfigAdditionalFrameworks[frameworkToInstall] || [])
 			.map(fw => `'${fw}'`)
 			.join(', ');
-		const testFiles = `'${fromWindowsRelativePathToUnix(relativeTestsDir)}/**/*.js'`;
+		const testFiles = `'${fromWindowsRelativePathToUnix(relativeTestsDir)}/**/*${projectFilesExtension}'`;
 		const karmaConfTemplate = this.$resources.readText('test/karma.conf.js');
 		const karmaConf = _.template(karmaConfTemplate)({ frameworks, testFiles });
 
 		this.$fs.writeFile(path.join(projectDir, 'karma.conf.js'), karmaConf);
 
-		const exampleFilePath = this.$resources.resolvePath(`test/example.${frameworkToInstall}.js`);
+		const exampleFilePath = this.$resources.resolvePath(`test/example.${frameworkToInstall}${projectFilesExtension}`);
 
 		if (shouldCreateSampleTests && this.$fs.exists(exampleFilePath)) {
-			this.$fs.copyFile(exampleFilePath, path.join(testsDir, 'example.js'));
+			this.$fs.copyFile(exampleFilePath, path.join(testsDir, `example${projectFilesExtension}`));
 			this.$logger.info(`\nExample test file created in ${relativeTestsDir}`.yellow);
 		} else {
 			this.$logger.info(`\nPlace your test files under ${relativeTestsDir}`.yellow);
diff --git a/lib/commands/test.ts b/lib/commands/test.ts
index 62cc07418d..51fd1efd64 100644
--- a/lib/commands/test.ts
+++ b/lib/commands/test.ts
@@ -10,14 +10,18 @@ abstract class TestCommandBase {
 	protected abstract $options: IOptions;
 	protected abstract $platformEnvironmentRequirements: IPlatformEnvironmentRequirements;
 	protected abstract $errors: IErrors;
+	protected abstract $cleanupService: ICleanupService;
+	protected abstract $workflowService: IWorkflowService;
 
 	async execute(args: string[]): Promise<void> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		await this.$testExecutionService.startKarmaServer(this.platform, this.$projectData, this.projectFilesConfig);
 	}
 
 	async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		this.$projectData.initializeProjectData();
 		this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
+		this.$cleanupService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
 		this.projectFilesConfig = helpers.getProjectFilesConfig({ isReleaseBuild: this.$options.release });
 
 		const output = await this.$platformEnvironmentRequirements.checkEnvironmentRequirements({
@@ -51,7 +55,9 @@ class TestAndroidCommand extends TestCommandBase implements ICommand {
 		protected $analyticsService: IAnalyticsService,
 		protected $options: IOptions,
 		protected $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
-		protected $errors: IErrors) {
+		protected $errors: IErrors,
+		protected $cleanupService: ICleanupService,
+		protected $workflowService: IWorkflowService) {
 		super();
 	}
 
@@ -65,7 +71,9 @@ class TestIosCommand extends TestCommandBase implements ICommand {
 		protected $analyticsService: IAnalyticsService,
 		protected $options: IOptions,
 		protected $platformEnvironmentRequirements: IPlatformEnvironmentRequirements,
-		protected $errors: IErrors) {
+		protected $errors: IErrors,
+		protected $cleanupService: ICleanupService,
+		protected $workflowService: IWorkflowService) {
 		super();
 	}
 
diff --git a/lib/commands/update.ts b/lib/commands/update.ts
index 1649284c41..bcdc250e2e 100644
--- a/lib/commands/update.ts
+++ b/lib/commands/update.ts
@@ -12,7 +12,8 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma
 		private $pluginsService: IPluginsService,
 		private $projectDataService: IProjectDataService,
 		private $fs: IFileSystem,
-		private $logger: ILogger) {
+		private $logger: ILogger,
+		private $workflowService: IWorkflowService) {
 		super($options, $platformsData, $platformService, $projectData);
 		this.$projectData.initializeProjectData();
 	}
@@ -28,6 +29,11 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma
 	static readonly backupFailMessage: string = "Could not backup project folders!";
 
 	public async execute(args: string[]): Promise<void> {
+		if (this.$options.workflow) {
+			await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, force: true });
+			return;
+		}
+
 		const tmpDir = path.join(this.$projectData.projectDir, UpdateCommand.tempFolder);
 
 		try {
diff --git a/lib/common/bootstrap.ts b/lib/common/bootstrap.ts
index 78370b281a..d5276f5ae4 100644
--- a/lib/common/bootstrap.ts
+++ b/lib/common/bootstrap.ts
@@ -6,7 +6,6 @@ $injector.require("errors", "./errors");
 $injector.requirePublic("fs", "./file-system");
 $injector.require("hostInfo", "./host-info");
 $injector.require("osInfo", "./os-info");
-$injector.require("timers", "./timers");
 
 $injector.require("dispatcher", "./dispatchers");
 $injector.require("commandDispatcher", "./dispatchers");
@@ -28,7 +27,6 @@ $injector.require("childProcess", "./child-process");
 $injector.require("prompter", "./prompter");
 $injector.require("projectHelper", "./project-helper");
 $injector.require("pluginVariablesHelper", "./plugin-variables-helper");
-$injector.require("progressIndicator", "./progress-indicator");
 
 $injector.requireCommand(["help", "/?"], "./commands/help");
 $injector.requireCommand("usage-reporting", "./commands/analytics");
@@ -85,7 +83,6 @@ $injector.require("iOSEmulatorServices", "./mobile/ios/simulator/ios-emulator-se
 $injector.require("wp8EmulatorServices", "./mobile/wp8/wp8-emulator-services");
 
 $injector.require("autoCompletionService", "./services/auto-completion-service");
-$injector.require("processService", "./services/process-service");
 $injector.requirePublic("settingsService", "./services/settings-service");
 $injector.require("opener", "./opener");
 $injector.require("microTemplateService", "./services/micro-templating-service");
diff --git a/lib/common/child-process.ts b/lib/common/child-process.ts
index f253af2c1a..125ec99592 100644
--- a/lib/common/child-process.ts
+++ b/lib/common/child-process.ts
@@ -62,7 +62,15 @@ export class ChildProcess extends EventEmitter implements IChildProcess {
 			let isResolved = false;
 			let capturedOut = "";
 			let capturedErr = "";
-
+			let killTimer: NodeJS.Timer = null;
+
+			if (spawnFromEventOptions && spawnFromEventOptions.timeout) {
+				this.$logger.trace(`Setting maximum time for execution of current child process to ${spawnFromEventOptions.timeout}`);
+				killTimer = setTimeout(() => {
+					this.$logger.trace(`Sending SIGTERM to current child process as maximum time for execution ${spawnFromEventOptions.timeout} had passed.`);
+					childProcess.kill('SIGTERM');
+				}, spawnFromEventOptions.timeout);
+			}
 			if (childProcess.stdout) {
 				childProcess.stdout.on("data", (data: string) => {
 					if (spawnFromEventOptions && spawnFromEventOptions.emitOptions && spawnFromEventOptions.emitOptions.eventName) {
@@ -91,17 +99,27 @@ export class ChildProcess extends EventEmitter implements IChildProcess {
 					exitCode: exitCode
 				};
 
+				const clearKillTimer = () => {
+					if (killTimer) {
+						clearTimeout(killTimer);
+					}
+				};
+
+				const resolveAction = () => {
+					isResolved = true;
+					resolve(result);
+					clearKillTimer();
+				};
+
 				if (spawnFromEventOptions && spawnFromEventOptions.throwError === false) {
 					if (!isResolved) {
 						this.$logger.trace("Result when throw error is false:");
 						this.$logger.trace(result);
-						isResolved = true;
-						resolve(result);
+						resolveAction();
 					}
 				} else {
 					if (exitCode === 0) {
-						isResolved = true;
-						resolve(result);
+						resolveAction();
 					} else {
 						let errorMessage = `Command ${command} failed with exit code ${exitCode}`;
 						if (capturedErr) {
@@ -111,6 +129,7 @@ export class ChildProcess extends EventEmitter implements IChildProcess {
 						if (!isResolved) {
 							isResolved = true;
 							reject(new Error(errorMessage));
+							clearKillTimer();
 						}
 					}
 				}
diff --git a/lib/common/commands/analytics.ts b/lib/common/commands/analytics.ts
index 52e9d10871..bc35003138 100644
--- a/lib/common/commands/analytics.ts
+++ b/lib/common/commands/analytics.ts
@@ -41,7 +41,7 @@ class AnalyticsCommand implements ICommand {
 				break;
 			case "status":
 			case "":
-				this.$logger.out(await this.$analyticsService.getStatusMessage(this.settingName, this.$options.json, this.humanReadableSettingName));
+				this.$logger.info(await this.$analyticsService.getStatusMessage(this.settingName, this.$options.json, this.humanReadableSettingName));
 				break;
 		}
 	}
diff --git a/lib/common/commands/autocompletion.ts b/lib/common/commands/autocompletion.ts
index 1bc11bb526..40c1efb0cd 100644
--- a/lib/common/commands/autocompletion.ts
+++ b/lib/common/commands/autocompletion.ts
@@ -19,7 +19,7 @@ export class AutoCompleteCommand implements ICommand {
 					this.$logger.info("Autocompletion is already enabled");
 				}
 			} else {
-				this.$logger.out("If you are using bash or zsh, you can enable command-line completion.");
+				this.$logger.info("If you are using bash or zsh, you can enable command-line completion.");
 				const message = "Do you want to enable it now?";
 
 				const autoCompetionStatus = await this.$prompter.confirm(message, () => true);
diff --git a/lib/common/commands/device/device-log-stream.ts b/lib/common/commands/device/device-log-stream.ts
index 52154e28a9..37b4ad0e2d 100644
--- a/lib/common/commands/device/device-log-stream.ts
+++ b/lib/common/commands/device/device-log-stream.ts
@@ -7,8 +7,10 @@ export class OpenDeviceLogStreamCommand implements ICommand {
 		private $options: IOptions,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider,
 		private $loggingLevels: Mobile.ILoggingLevels,
-		$iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider) {
+		$iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
+		$cleanupService: ICleanupService) {
 			$iOSSimulatorLogProvider.setShouldDispose(false);
+			$cleanupService.setShouldDispose(false);
 		}
 
 	allowedParameters: ICommandParameter[] = [];
diff --git a/lib/common/commands/device/list-applications.ts b/lib/common/commands/device/list-applications.ts
index 5c9fe66513..f90fa36125 100644
--- a/lib/common/commands/device/list-applications.ts
+++ b/lib/common/commands/device/list-applications.ts
@@ -19,7 +19,7 @@ export class ListApplicationsCommand implements ICommand {
 		};
 		await this.$devicesService.execute(action);
 
-		this.$logger.out(output.join(EOL));
+		this.$logger.info(output.join(EOL));
 	}
 }
 $injector.registerCommand(["device|list-applications", "devices|list-applications"], ListApplicationsCommand);
diff --git a/lib/common/commands/device/list-devices.ts b/lib/common/commands/device/list-devices.ts
index 3601650592..1e49785fac 100644
--- a/lib/common/commands/device/list-devices.ts
+++ b/lib/common/commands/device/list-devices.ts
@@ -23,7 +23,7 @@ export class ListDevicesCommand implements ICommand {
 			this.printEmulators("\nAvailable emulators", emulators);
 		}
 
-		this.$logger.out("\nConnected devices & emulators");
+		this.$logger.info("\nConnected devices & emulators");
 		let index = 1;
 		await this.$devicesService.initialize({ platform: args[0], deviceId: null, skipInferPlatform: true, skipDeviceDetectionInterval: true, skipEmulatorStart: true });
 
@@ -31,7 +31,7 @@ export class ListDevicesCommand implements ICommand {
 		let action: (_device: Mobile.IDevice) => Promise<void>;
 		if (this.$options.json) {
 			action = async (device) => {
-				this.$logger.out(JSON.stringify(device.deviceInfo));
+				this.$logger.info(JSON.stringify(device.deviceInfo));
 			};
 		} else {
 			action = async (device) => {
@@ -44,18 +44,18 @@ export class ListDevicesCommand implements ICommand {
 		await this.$devicesService.execute(action, undefined, { allowNoDevices: true });
 
 		if (!this.$options.json && table.length) {
-			this.$logger.out(table.toString());
+			this.$logger.info(table.toString());
 		}
 	}
 
 	private printEmulators(title: string, emulators: Mobile.IDeviceInfo[]) {
-		this.$logger.out(title);
+		this.$logger.info(title);
 		const table: any = createTable(["Device Name", "Platform", "Version", "Device Identifier", "Image Identifier", "Error Help"], []);
 		for (const info of emulators) {
 			table.push([info.displayName, info.platform, info.version, info.identifier || "", info.imageIdentifier || "", info.errorHelp || ""]);
 		}
 
-		this.$logger.out(table.toString());
+		this.$logger.info(table.toString());
 	}
 }
 
diff --git a/lib/common/commands/proxy/proxy-clear.ts b/lib/common/commands/proxy/proxy-clear.ts
index 859e491ab0..78e0a8523d 100644
--- a/lib/common/commands/proxy/proxy-clear.ts
+++ b/lib/common/commands/proxy/proxy-clear.ts
@@ -10,7 +10,7 @@ export class ProxyClearCommand extends ProxyCommandBase {
 
 	public async execute(args: string[]): Promise<void> {
 		await this.$proxyService.clearCache();
-		this.$logger.out("Successfully cleared proxy.");
+		this.$logger.info("Successfully cleared proxy.");
 		await this.tryTrackUsage();
 	}
 }
diff --git a/lib/common/commands/proxy/proxy-get.ts b/lib/common/commands/proxy/proxy-get.ts
index 8b376dc8ac..4f49e891e8 100644
--- a/lib/common/commands/proxy/proxy-get.ts
+++ b/lib/common/commands/proxy/proxy-get.ts
@@ -10,7 +10,7 @@ export class ProxyGetCommand extends ProxyCommandBase {
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		this.$logger.out(await this.$proxyService.getInfo());
+		this.$logger.info(await this.$proxyService.getInfo());
 		await this.tryTrackUsage();
 	}
 }
diff --git a/lib/common/commands/proxy/proxy-set.ts b/lib/common/commands/proxy/proxy-set.ts
index 8bbfaab1d0..461d26c8ff 100644
--- a/lib/common/commands/proxy/proxy-set.ts
+++ b/lib/common/commands/proxy/proxy-set.ts
@@ -107,8 +107,8 @@ export class ProxySetCommand extends ProxyCommandBase {
 		this.$logger.warn(`${messageNote}Run '${clientName} proxy set --help' for more information.`);
 
 		await this.$proxyService.setCache(settings);
-		this.$logger.out(`Successfully setup proxy.${EOL}`);
-		this.$logger.out(await this.$proxyService.getInfo());
+		this.$logger.info(`Successfully setup proxy.${EOL}`);
+		this.$logger.info(await this.$proxyService.getInfo());
 		await this.tryTrackUsage();
 	}
 
diff --git a/lib/common/constants.ts b/lib/common/constants.ts
index 285a33df5d..699647df64 100644
--- a/lib/common/constants.ts
+++ b/lib/common/constants.ts
@@ -92,6 +92,7 @@ export class Proxy {
  */
 export class HttpStatusCodes {
 	static SEE_OTHER = 303;
+	static NOT_MODIFIED = 304;
 	static PAYMENT_REQUIRED = 402;
 	static PROXY_AUTHENTICATION_REQUIRED = 407;
 }
diff --git a/lib/common/declarations.d.ts b/lib/common/declarations.d.ts
index 4b27870564..7959c0ad8f 100644
--- a/lib/common/declarations.d.ts
+++ b/lib/common/declarations.d.ts
@@ -207,11 +207,6 @@ declare const enum TrackingTypes {
 	 * Defines that the broker process should get and track the data from preview app to Google Analytics
 	 */
 	PreviewAppData = "PreviewAppData",
-
-	/**
-	 * Defines that all information has been sent and no more data will be tracked in current session.
-	 */
-	Finish = "finish"
 }
 
 /**
@@ -653,7 +648,8 @@ interface ISpawnFromEventOptions {
 	throwError: boolean;
 	emitOptions?: {
 		eventName: string;
-	}
+	},
+	timeout?: number;
 }
 
 interface IProjectDir {
@@ -1285,20 +1281,6 @@ interface IServiceContractGenerator {
 	generate(definitionsPath?: string): Promise<IServiceContractClientCode>;
 }
 
-/**
- * Used to show indication that a process is running
- */
-interface IProgressIndicator {
-	/**
-	 * Prints indication that a process is running
-	 * @param  {Promise<T>}	promise		process
-	 * @param  {number}			timeout		time interval for printing indication
-	 * @param  {boolean}		options		whether to surpress the trailing new line printed after the process ends
-	 * @return {Promise<T>}
-	 */
-	showProgressIndicator<T>(promise: Promise<T>, timeout: number, options?: { surpressTrailingNewLine?: boolean }): Promise<T>;
-}
-
 /**
  * Describes project file that should be livesynced
  */
@@ -1471,14 +1453,10 @@ interface INet {
 	waitForPortToListen(waitForPortListenData: IWaitForPortListenData): Promise<boolean>;
 }
 
-interface IProcessService {
-	listenersCount: number;
-	attachToProcessExitSignals(context: any, callback: () => void): void;
-}
-
 interface IDependencyInformation {
 	name: string;
 	version?: string;
+	projectType?: string;
 	excludedPeerDependencies?: string[];
 }
 
diff --git a/lib/common/definitions/extensibility.d.ts b/lib/common/definitions/extensibility.d.ts
index 778b36d24d..cf7c261f40 100644
--- a/lib/common/definitions/extensibility.d.ts
+++ b/lib/common/definitions/extensibility.d.ts
@@ -130,6 +130,11 @@ interface IExtensibilityService {
 	 * @returns {IExtensionCommandInfo} Information about the extension and the registered command.
 	 */
 	getExtensionNameWhereCommandIsRegistered(inputOpts: IGetExtensionCommandInfoParams): Promise<IExtensionCommandInfo>;
+
+	/**
+	 * Defines the path where CLI will search for extensions.
+	 */
+	pathToExtensions: string;
 }
 
 /**
diff --git a/lib/common/definitions/logger.d.ts b/lib/common/definitions/logger.d.ts
index a719108d6c..6e098bc4c1 100644
--- a/lib/common/definitions/logger.d.ts
+++ b/lib/common/definitions/logger.d.ts
@@ -1,19 +1,67 @@
-interface ILogger {
-	getLevel(): string;
-	fatal(formatStr?: any, ...args: any[]): void;
-	error(formatStr?: any, ...args: any[]): void;
-	warn(formatStr?: any, ...args: any[]): void;
-	warnWithLabel(formatStr?: any, ...args: any[]): void;
-	info(formatStr?: any, ...args: any[]): void;
-	debug(formatStr?: any, ...args: any[]): void;
-	trace(formatStr?: any, ...args: any[]): void;
-	printMarkdown(...args: any[]): void;
-
-	out(formatStr?: any, ...args: any[]): void;
-	write(...args: any[]): void;
-
-	prepare(item: any): string;
-	printInfoMessageOnSameLine(message: string): void;
-	printMsgWithTimeout(message: string, timeout: number): Promise<void>;
-	printOnStderr(formatStr?: any, ...args: any[]): void;
+import { Layout, LoggingEvent, Configuration, Level } from "log4js";
+import { EventEmitter } from "events";
+import { LoggerLevel } from "../../constants";
+
+declare global {
+	interface IAppenderOptions extends IDictionary<any> {
+		type: string;
+		layout?: Layout;
+	}
+
+	interface ILoggerOptions {
+		level?: LoggerLevel;
+		appenderOptions?: IAppenderOptions;
+	}
+
+	interface ILogger {
+		initialize(opts?: ILoggerOptions): void;
+		initializeCliLogger(): void;
+		getLevel(): string;
+		fatal(formatStr?: any, ...args: any[]): void;
+		error(formatStr?: any, ...args: any[]): void;
+		warn(formatStr?: any, ...args: any[]): void;
+		info(formatStr?: any, ...args: any[]): void;
+		debug(formatStr?: any, ...args: any[]): void;
+		trace(formatStr?: any, ...args: any[]): void;
+		printMarkdown(...args: any[]): void;
+		prepare(item: any): string;
+
+		/**
+		 * DEPRECATED
+		 * Do not use it.
+		 */
+		out(formatStr?: any, ...args: any[]): void;
+
+		/**
+		 * DEPRECATED
+		 * Do not use it.
+		 */
+		write(...args: any[]): void;
+
+		/**
+		 * DEPRECATED
+		 * Do not use it.
+		 */
+		printInfoMessageOnSameLine(message: string): void;
+
+		/**
+		 * DEPRECATED
+		 * Do not use it.
+		 */
+		printMsgWithTimeout(message: string, timeout: number): Promise<void>;
+
+		/**
+		 * DEPRECATED
+		 * Do not use it.
+		 */
+		printOnStderr(formatStr?: any, ...args: any[]): void;
+	}
+
+	interface Log4JSAppenderConfiguration extends Configuration {
+		layout: Layout;
+	}
+
+	interface Log4JSEmitAppenderConfiguration extends Log4JSAppenderConfiguration {
+		emitter: EventEmitter;
+	}
 }
diff --git a/lib/common/definitions/timers.d.ts b/lib/common/definitions/timers.d.ts
deleted file mode 100644
index 2b57b8b06f..0000000000
--- a/lib/common/definitions/timers.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-interface ITimers {
-	setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer;
-	clearInterval(intervalId: NodeJS.Timer): void;
-}
\ No newline at end of file
diff --git a/lib/common/dispatchers.ts b/lib/common/dispatchers.ts
index 4a33a299ba..db126ca6bc 100644
--- a/lib/common/dispatchers.ts
+++ b/lib/common/dispatchers.ts
@@ -61,7 +61,7 @@ export class CommandDispatcher implements ICommandDispatcher {
 		if (json && json.buildVersion) {
 			version = `${version}-${json.buildVersion}`;
 		}
-		this.$logger.out(version);
+		this.$logger.info(version);
 	}
 }
 $injector.register("commandDispatcher", CommandDispatcher);
diff --git a/lib/common/helpers.ts b/lib/common/helpers.ts
index f3c22b4430..5ca4bb5d3f 100644
--- a/lib/common/helpers.ts
+++ b/lib/common/helpers.ts
@@ -384,6 +384,35 @@ export function createTable(headers: string[], data: string[][]): any {
 	return table;
 }
 
+export function getMessageWithBorders(message: string, spanLength = 3): string {
+	if (!message) {
+		return "";
+	}
+
+	const longestRowLength = message.split("\n").sort((a, b) => { return b.length - a.length; })[0].length;
+	let border = "*".repeat(longestRowLength + 2 * spanLength); // * 2 for both sides
+	if (border.length % 2 === 0) {
+		border += "*"; // the * should always be an odd number in order to get * in each edge (we will remove the even *s below)
+	}
+	border = border.replace(/\*\*/g, "* "); // ***** => * * * in order to have similar padding to the side borders
+	const formatRow = function (row: string) {
+		return _.padEnd("*", spanLength) + _.padEnd(row, border.length - (2 * spanLength)) + _.padStart("*", spanLength) + EOL;
+	};
+	const emptyRow = formatRow("");
+
+	const messageWithBorders = [];
+	messageWithBorders.push(
+		EOL,
+		border + EOL,
+		emptyRow,
+		...message.split("\n").map(row => formatRow(row.trim())),
+		emptyRow,
+		border + EOL,
+		EOL
+	);
+	return messageWithBorders.join("");
+}
+
 export function remove<T>(array: T[], predicate: (element: T) => boolean, numberOfElements?: number): T[] {
 	numberOfElements = numberOfElements || 1;
 	const index = _.findIndex(array, predicate);
diff --git a/lib/common/http-client.ts b/lib/common/http-client.ts
index 902be6e9c7..5c970b7eea 100644
--- a/lib/common/http-client.ts
+++ b/lib/common/http-client.ts
@@ -15,19 +15,11 @@ export class HttpClient implements Server.IHttpClient {
 	// We receive multiple response packets every ms but we don't need to be very aggressive here.
 	private static STUCK_RESPONSE_CHECK_INTERVAL = 10000;
 
-	private defaultUserAgent: string;
-	private cleanupData: ICleanupRequestData[];
+private defaultUserAgent: string;
 
 	constructor(private $logger: ILogger,
-		private $processService: IProcessService,
 		private $proxyService: IProxyService,
 		private $staticConfig: Config.IStaticConfig) {
-		this.cleanupData = [];
-		this.$processService.attachToProcessExitSignals(this, () => {
-			this.cleanupData.forEach(d => {
-				this.cleanupAfterRequest(d);
-			});
-		});
 	}
 
 	public async httpRequest(options: any, proxySettings?: IProxySettings): Promise<Server.IResponse> {
@@ -107,7 +99,6 @@ export class HttpClient implements Server.IHttpClient {
 		const result = new Promise<Server.IResponse>((resolve, reject) => {
 			let timerId: NodeJS.Timer;
 			const cleanupRequestData: ICleanupRequestData = Object.create({ timers: [] });
-			this.cleanupData.push(cleanupRequestData);
 
 			const promiseActions: IPromiseActions<Server.IResponse> = {
 				resolve,
@@ -168,7 +159,7 @@ export class HttpClient implements Server.IHttpClient {
 							this.setResponseResult(promiseActions, cleanupRequestData, { err: new Error(HttpClient.STUCK_RESPONSE_ERROR_MESSAGE) });
 						}
 					}, HttpClient.STUCK_RESPONSE_CHECK_INTERVAL);
-					const successful = helpers.isRequestSuccessful(responseData);
+					const successful = helpers.isRequestSuccessful(responseData) || responseData.statusCode === HttpStatusCodes.NOT_MODIFIED;
 					if (!successful) {
 						pipeTo = undefined;
 					}
@@ -298,7 +289,9 @@ export class HttpClient implements Server.IHttpClient {
 	 * @param {string} requestProto The protocol used for the current request - http or https.
 	 */
 	private async useProxySettings(proxySettings: IProxySettings, cliProxySettings: IProxySettings, options: any, headers: any, requestProto: string): Promise<void> {
-		if (proxySettings || cliProxySettings) {
+		const isLocalRequest = options.host === "localhost" || options.host === "127.0.0.1";
+		// don't use the proxy for requests to localhost
+		if (!isLocalRequest && (proxySettings || cliProxySettings)) {
 			const proto = (proxySettings && proxySettings.protocol) || cliProxySettings.protocol || "http:";
 			const host = (proxySettings && proxySettings.hostname) || cliProxySettings.hostname;
 			const port = (proxySettings && proxySettings.port) || cliProxySettings.port;
diff --git a/lib/common/logger.ts b/lib/common/logger.ts
deleted file mode 100644
index aebd47b2a0..0000000000
--- a/lib/common/logger.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-import * as log4js from "log4js";
-import * as util from "util";
-import * as stream from "stream";
-import * as marked from "marked";
-const TerminalRenderer = require("marked-terminal");
-const chalk = require("chalk");
-
-export class Logger implements ILogger {
-	private log4jsLogger: log4js.Logger = null;
-	private passwordRegex = /(password=).*?(['&,]|$)|(password["']?\s*:\s*["']).*?(["'])/i;
-	private passwordReplacement = "$1$3*******$2$4";
-	private static LABEL = "[WARNING]:";
-
-	constructor($config: Config.IConfig,
-		private $options: IOptions) {
-		const appenders: IDictionary<log4js.Appender> = {};
-		const categories: IDictionary<{ appenders: string[]; level: string; }> = {};
-		let level: string = null;
-		if (this.$options.log) {
-			level = this.$options.log;
-		} else {
-			level = $config.DEBUG ? "TRACE" : "INFO";
-		}
-
-		appenders["out"] = {
-			type: "console",
-			layout: {
-				type: "messagePassThrough"
-			}
-		};
-		categories["default"] = {
-			appenders: ['out'],
-			level
-		};
-
-		log4js.configure({ appenders, categories });
-
-		this.log4jsLogger = log4js.getLogger();
-	}
-
-	getLevel(): string {
-		return this.log4jsLogger.level.toString();
-	}
-
-	fatal(...args: string[]): void {
-		this.log4jsLogger.fatal.apply(this.log4jsLogger, args);
-	}
-
-	error(...args: string[]): void {
-		const message = util.format.apply(null, args);
-		const colorizedMessage = message.red;
-
-		this.log4jsLogger.error.apply(this.log4jsLogger, [colorizedMessage]);
-	}
-
-	warn(...args: string[]): void {
-		const message = util.format.apply(null, args);
-		const colorizedMessage = message.yellow;
-
-		this.log4jsLogger.warn.apply(this.log4jsLogger, [colorizedMessage]);
-	}
-
-	warnWithLabel(...args: string[]): void {
-		const message = util.format.apply(null, args);
-		this.warn(`${Logger.LABEL} ${message}`);
-	}
-
-	info(...args: string[]): void {
-		this.log4jsLogger.info.apply(this.log4jsLogger, args);
-	}
-
-	debug(...args: string[]): void {
-		const encodedArgs: string[] = this.getPasswordEncodedArguments(args);
-		this.log4jsLogger.debug.apply(this.log4jsLogger, encodedArgs);
-	}
-
-	trace(...args: string[]): void {
-		const encodedArgs: string[] = this.getPasswordEncodedArguments(args);
-		this.log4jsLogger.trace.apply(this.log4jsLogger, encodedArgs);
-	}
-
-	out(...args: string[]): void {
-		console.log(util.format.apply(null, args));
-	}
-
-	write(...args: string[]): void {
-		process.stdout.write(util.format.apply(null, args));
-	}
-
-	prepare(item: any): string {
-		if (typeof item === "undefined" || item === null) {
-			return "[no content]";
-		}
-		if (typeof item === "string") {
-			return item;
-		}
-		// do not try to read streams, because they may not be rewindable
-		if (item instanceof stream.Readable) {
-			return "[ReadableStream]";
-		}
-
-		// There's no point in printing buffers
-		if (item instanceof Buffer) {
-			return "[Buffer]";
-		}
-
-		return JSON.stringify(item);
-	}
-
-	public printInfoMessageOnSameLine(message: string): void {
-		if (!this.$options.log || this.$options.log === "info") {
-			this.write(message);
-		}
-	}
-
-	public printMsgWithTimeout(message: string, timeout: number): Promise<void> {
-		return new Promise<void>((resolve, reject) => {
-			setTimeout(() => {
-				this.printInfoMessageOnSameLine(message);
-				resolve();
-			}, timeout);
-
-		});
-	}
-
-	public printMarkdown(...args: string[]): void {
-		const opts = {
-			unescape: true,
-			link: chalk.red,
-			strong: chalk.green.bold,
-			firstHeading: chalk.blue.bold,
-			tableOptions: {
-				chars: { 'mid': '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },
-				style: {
-					'padding-left': 1,
-					'padding-right': 1,
-					head: ['green', 'bold'],
-					border: ['grey'],
-					compact: false
-				}
-			}
-		};
-
-		marked.setOptions({ renderer: new TerminalRenderer(opts) });
-
-		const formattedMessage = marked(util.format.apply(null, args));
-		this.write(formattedMessage);
-	}
-
-	public printOnStderr(...args: string[]): void {
-		if (process.stderr) {
-			process.stderr.write(util.format.apply(null, args));
-		}
-	}
-
-	private getPasswordEncodedArguments(args: string[]): string[] {
-		return _.map(args, argument => {
-			if (typeof argument === 'string' && !!argument.match(/password/i)) {
-				argument = argument.replace(this.passwordRegex, this.passwordReplacement);
-			}
-
-			return argument;
-		});
-	}
-}
-
-$injector.register("logger", Logger);
diff --git a/lib/common/logger/appenders/cli-appender.ts b/lib/common/logger/appenders/cli-appender.ts
new file mode 100644
index 0000000000..bf8c2355c6
--- /dev/null
+++ b/lib/common/logger/appenders/cli-appender.ts
@@ -0,0 +1,29 @@
+import { LoggingEvent } from "log4js";
+import { LoggerConfigData } from "../../../constants";
+
+function cliAppender(layout: Function) {
+	const appender = (loggingEvent: LoggingEvent) => {
+		if (loggingEvent && loggingEvent.data) {
+			const stream = loggingEvent.context[LoggerConfigData.useStderr] ? process.stderr : process.stdout;
+			const preparedData = layout(loggingEvent);
+			stream.write(preparedData);
+		}
+	};
+
+	return appender;
+}
+
+function configure(config: Log4JSAppenderConfiguration, layouts: any) {
+	// the default layout for the appender
+	let layout = layouts.messagePassThroughLayout;
+
+	// check if there is another layout specified
+	if (config.layout) {
+		layout = layouts.layout(config.layout.type, config.layout);
+	}
+
+	// create a new appender instance
+	return cliAppender(layout);
+}
+
+exports.configure = configure;
diff --git a/lib/common/logger/appenders/emit-appender.ts b/lib/common/logger/appenders/emit-appender.ts
new file mode 100644
index 0000000000..9902579a67
--- /dev/null
+++ b/lib/common/logger/appenders/emit-appender.ts
@@ -0,0 +1,38 @@
+import { LoggingEvent } from "log4js";
+import { EventEmitter } from "events";
+import { EMIT_APPENDER_EVENT_NAME } from "../../../constants";
+
+function emitAppender(layout: Function, emitter: EventEmitter) {
+	const appender = (loggingEvent: LoggingEvent) => {
+		emitter.emit(EMIT_APPENDER_EVENT_NAME, { loggingEvent, formattedMessage: layout(loggingEvent) });
+	};
+
+	appender.shutdown = () => {
+		emitter.removeAllListeners(EMIT_APPENDER_EVENT_NAME);
+	};
+
+	return appender;
+}
+
+function configure(config: Log4JSEmitAppenderConfiguration, layouts: any) {
+	if (!config.emitter) {
+		throw new Error("Emitter must be passed to emit-appender");
+	}
+
+	if (!config.emitter.emit || typeof config.emitter.emit !== "function") {
+		throw new Error("The passed emitter must be instance of EventEmitter");
+	}
+
+	// the default layout for the appender
+	let layout = layouts.messagePassThroughLayout;
+
+	// check if there is another layout specified
+	if (config.layout) {
+		layout = layouts.layout(config.layout.type, config.layout);
+	}
+
+	// create a new appender instance
+	return emitAppender(layout, config.emitter);
+}
+
+exports.configure = configure;
diff --git a/lib/common/logger/layouts/cli-layout.ts b/lib/common/logger/layouts/cli-layout.ts
new file mode 100644
index 0000000000..60595a3aeb
--- /dev/null
+++ b/lib/common/logger/layouts/cli-layout.ts
@@ -0,0 +1,33 @@
+import { format } from "util";
+import { getMessageWithBorders } from "../../helpers";
+import { LoggingEvent } from "log4js";
+import { LoggerConfigData, LoggerLevel } from "../../../constants";
+import { EOL } from "os";
+
+export function layout(config: any) {
+	return function (logEvent: LoggingEvent): string {
+		let msg = format.apply(null, logEvent.data);
+
+		if (logEvent.context[LoggerConfigData.wrapMessageWithBorders]) {
+			msg = getMessageWithBorders(msg);
+		}
+
+		if (!logEvent.context[LoggerConfigData.skipNewLine]) {
+			msg += EOL;
+		}
+
+		if (logEvent.level.isEqualTo(LoggerLevel.INFO)) {
+			return msg;
+		}
+
+		if (logEvent.level.isEqualTo(LoggerLevel.ERROR)) {
+			return msg.red.bold;
+		}
+
+		if (logEvent.level.isEqualTo(LoggerLevel.WARN)) {
+			return msg.yellow;
+		}
+
+		return msg;
+	};
+}
diff --git a/lib/common/logger/logger.ts b/lib/common/logger/logger.ts
new file mode 100644
index 0000000000..ca80f80747
--- /dev/null
+++ b/lib/common/logger/logger.ts
@@ -0,0 +1,227 @@
+import * as log4js from "log4js";
+import * as util from "util";
+import * as stream from "stream";
+import * as marked from "marked";
+import { cache } from "../decorators";
+import { layout } from "./layouts/cli-layout";
+import { LoggerConfigData, LoggerLevel, LoggerAppenders } from "../../constants";
+const TerminalRenderer = require("marked-terminal");
+const chalk = require("chalk");
+
+export class Logger implements ILogger {
+	private log4jsLogger: log4js.Logger = null;
+	private passwordRegex = /(password=).*?(['&,]|$)|(password["']?\s*:\s*["']).*?(["'])/i;
+	private passwordReplacement = "$1$3*******$2$4";
+
+	constructor(private $config: Config.IConfig,
+		private $options: IOptions) {
+	}
+
+	@cache()
+	public initialize(opts?: ILoggerOptions): void {
+		opts = opts || {};
+		const { appenderOptions: appenderOpts, level } = opts;
+
+		const appender: any = {
+			type: "console",
+			layout: {
+				type: "messagePassThrough"
+			}
+		};
+
+		if (appenderOpts) {
+			_.merge(appender, appenderOpts);
+		}
+
+		const appenders: IDictionary<log4js.Appender> = {
+			out: appender
+		};
+
+		const categories: IDictionary<{ appenders: string[]; level: string; }> = {
+			default: {
+				appenders: ['out'],
+				level: level || (this.$config.DEBUG ? "TRACE" : "INFO")
+			}
+		};
+
+		log4js.configure({ appenders, categories });
+
+		this.log4jsLogger = log4js.getLogger();
+	}
+
+	public initializeCliLogger(): void {
+		log4js.addLayout("cli", layout);
+
+		this.initialize({
+			appenderOptions: { type: LoggerAppenders.cliAppender, layout: { type: "cli" } },
+			level: <any>this.$options.log
+		});
+	}
+
+	getLevel(): string {
+		this.initialize();
+
+		return this.log4jsLogger.level.toString();
+	}
+
+	fatal(...args: any[]): void {
+		this.logMessage(args, LoggerLevel.FATAL);
+	}
+
+	error(...args: any[]): void {
+		args.push({ [LoggerConfigData.useStderr]: true });
+		this.logMessage(args, LoggerLevel.ERROR);
+	}
+
+	warn(...args: any[]): void {
+		this.logMessage(args, LoggerLevel.WARN);
+	}
+
+	info(...args: any[]): void {
+		this.logMessage(args, LoggerLevel.INFO);
+	}
+
+	debug(...args: any[]): void {
+		const encodedArgs: string[] = this.getPasswordEncodedArguments(args);
+		this.logMessage(encodedArgs, LoggerLevel.DEBUG);
+	}
+
+	trace(...args: any[]): void {
+		const encodedArgs: string[] = this.getPasswordEncodedArguments(args);
+		this.logMessage(encodedArgs, LoggerLevel.TRACE);
+	}
+
+	prepare(item: any): string {
+		if (typeof item === "undefined" || item === null) {
+			return "[no content]";
+		}
+		if (typeof item === "string") {
+			return item;
+		}
+		// do not try to read streams, because they may not be rewindable
+		if (item instanceof stream.Readable) {
+			return "[ReadableStream]";
+		}
+
+		// There's no point in printing buffers
+		if (item instanceof Buffer) {
+			return "[Buffer]";
+		}
+
+		return JSON.stringify(item);
+	}
+
+	public printMarkdown(...args: string[]): void {
+		const opts = {
+			unescape: true,
+			link: chalk.red,
+			strong: chalk.green.bold,
+			firstHeading: chalk.blue.bold,
+			tableOptions: {
+				chars: { 'mid': '', 'left-mid': '', 'mid-mid': '', 'right-mid': '' },
+				style: {
+					'padding-left': 1,
+					'padding-right': 1,
+					head: ['green', 'bold'],
+					border: ['grey'],
+					compact: false
+				}
+			}
+		};
+
+		marked.setOptions({ renderer: new TerminalRenderer(opts) });
+
+		const formattedMessage = marked(util.format.apply(null, args));
+		this.info(formattedMessage, { [LoggerConfigData.skipNewLine]: true });
+	}
+
+	private logMessage(inputData: any[], logMethod: string): void {
+		this.initialize();
+
+		const logOpts = this.getLogOptionsForMessage(inputData);
+		const data = logOpts.data;
+		delete logOpts.data;
+
+		for (const prop in logOpts) {
+			this.log4jsLogger.addContext(prop, logOpts[prop]);
+		}
+
+		(<IDictionary<any>>this.log4jsLogger)[logMethod.toLowerCase()].apply(this.log4jsLogger, data);
+
+		for (const prop in logOpts) {
+			this.log4jsLogger.removeContext(prop);
+		}
+	}
+
+	private getLogOptionsForMessage(data: any[]): { data: any[], [key: string]: any } {
+		const opts = _.keys(LoggerConfigData);
+
+		const result: any = {};
+		const cleanedData = _.cloneDeep(data);
+
+		// objects created with Object.create(null) do not have `hasOwnProperty` function
+		const dataToCheck = data.filter(el => typeof el === "object" && el.hasOwnProperty && typeof el.hasOwnProperty === "function");
+
+		for (const element of dataToCheck) {
+			if (opts.length === 0) {
+				break;
+			}
+
+			const remainingOpts = _.cloneDeep(opts);
+			for (const prop of remainingOpts) {
+				const hasProp = element && element.hasOwnProperty(prop);
+				if (hasProp) {
+					opts.splice(opts.indexOf(prop), 1);
+					result[prop] = element[prop];
+					cleanedData.splice(cleanedData.indexOf(element), 1);
+				}
+			}
+		}
+
+		result.data = cleanedData;
+		return result;
+	}
+
+	private getPasswordEncodedArguments(args: string[]): string[] {
+		return _.map(args, argument => {
+			if (typeof argument === 'string' && !!argument.match(/password/i)) {
+				argument = argument.replace(this.passwordRegex, this.passwordReplacement);
+			}
+
+			return argument;
+		});
+	}
+
+	/*******************************************************************************************
+	 * Metods below are deprecated. Delete them in 6.0.0 release:                              *
+	 * Present only for backwards compatibility as some plugins (nativescript-plugin-firebase) *
+	 * use these methods in their hooks                                                          *
+	 *******************************************************************************************/
+
+	out(...args: any[]): void {
+		this.info(args);
+	}
+
+	write(...args: any[]): void {
+		this.info(args, { [LoggerConfigData.skipNewLine]: true });
+	}
+
+	printOnStderr(...args: string[]): void {
+		this.error(args);
+	}
+
+	printInfoMessageOnSameLine(message: string): void {
+		this.info(message, { [LoggerConfigData.skipNewLine]: true });
+	}
+
+	printMsgWithTimeout(message: string, timeout: number): Promise<void> {
+		return new Promise<void>((resolve, reject) => {
+			setTimeout(() => {
+				this.printInfoMessageOnSameLine(message);
+				resolve();
+			}, timeout);
+		});
+	}
+}
+
+$injector.register("logger", Logger);
diff --git a/lib/common/mobile/android/android-emulator-services.ts b/lib/common/mobile/android/android-emulator-services.ts
index 0226a03a73..c9f2f20c07 100644
--- a/lib/common/mobile/android/android-emulator-services.ts
+++ b/lib/common/mobile/android/android-emulator-services.ts
@@ -1,6 +1,7 @@
 import { AndroidVirtualDevice } from "../../constants";
 import { getCurrentEpochTime, sleep } from "../../helpers";
 import { EOL } from "os";
+import { LoggerConfigData } from "../../../constants";
 
 export class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService {
 	constructor(private $androidGenymotionService: Mobile.IAndroidVirtualDeviceService,
@@ -65,7 +66,7 @@ export class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService
 		this.$androidVirtualDeviceService.detach(deviceInfo);
 	}
 
-	private async startEmulatorCore(options: Mobile.IAndroidStartEmulatorOptions): Promise<{runningEmulator: Mobile.IDeviceInfo, errors: string[], endTimeEpoch: number}> {
+	private async startEmulatorCore(options: Mobile.IAndroidStartEmulatorOptions): Promise<{ runningEmulator: Mobile.IDeviceInfo, errors: string[], endTimeEpoch: number }> {
 		const timeout = options.timeout || AndroidVirtualDevice.TIMEOUT_SECONDS;
 		const endTimeEpoch = getCurrentEpochTime() + this.$utils.getMilliSecondsTimeout(timeout);
 
@@ -146,21 +147,21 @@ export class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService
 		return (best && best.version >= AndroidVirtualDevice.MIN_ANDROID_VERSION) ? best : null;
 	}
 
-	private async waitForEmulatorBootToComplete(emulator: Mobile.IDeviceInfo, endTimeEpoch: number, timeout: number): Promise<{runningEmulator: Mobile.IDeviceInfo, errors: string[]}> {
-		this.$logger.printInfoMessageOnSameLine("Waiting for emulator device initialization...");
+	private async waitForEmulatorBootToComplete(emulator: Mobile.IDeviceInfo, endTimeEpoch: number, timeout: number): Promise<{ runningEmulator: Mobile.IDeviceInfo, errors: string[] }> {
+		this.$logger.info("Waiting for emulator device initialization...", { [LoggerConfigData.skipNewLine]: true });
 
 		const isInfiniteWait = this.$utils.getMilliSecondsTimeout(timeout || AndroidVirtualDevice.TIMEOUT_SECONDS) === 0;
 		while (getCurrentEpochTime() < endTimeEpoch || isInfiniteWait) {
 			const isEmulatorBootCompleted = await this.isEmulatorBootCompleted(emulator.identifier);
 			if (isEmulatorBootCompleted) {
-				this.$logger.printInfoMessageOnSameLine(EOL);
+				this.$logger.info(EOL, { [LoggerConfigData.skipNewLine]: true });
 				return {
 					runningEmulator: emulator,
 					errors: []
 				};
 			}
 
-			this.$logger.printInfoMessageOnSameLine(".");
+			this.$logger.info(".", { [LoggerConfigData.skipNewLine]: true });
 			await sleep(10000);
 		}
 
diff --git a/lib/common/mobile/android/logcat-helper.ts b/lib/common/mobile/android/logcat-helper.ts
index d662733afe..f95117a47a 100644
--- a/lib/common/mobile/android/logcat-helper.ts
+++ b/lib/common/mobile/android/logcat-helper.ts
@@ -16,7 +16,6 @@ export class LogcatHelper implements Mobile.ILogcatHelper {
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $logger: ILogger,
 		private $injector: IInjector,
-		private $processService: IProcessService,
 		private $devicesService: Mobile.IDevicesService) {
 		this.mapDevicesLoggingData = Object.create(null);
 	}
@@ -40,7 +39,8 @@ export class LogcatHelper implements Mobile.ILogcatHelper {
 
 			logcatStream.on("close", (code: number) => {
 				try {
-					this.stop(deviceIdentifier);
+					this.forceStop(deviceIdentifier);
+
 					if (code !== 0) {
 						this.$logger.trace("ADB process exited with code " + code.toString());
 					}
@@ -53,8 +53,6 @@ export class LogcatHelper implements Mobile.ILogcatHelper {
 				const lineText = line.toString();
 				this.$deviceLogProvider.logData(lineText, this.$devicePlatformsConstants.Android, deviceIdentifier);
 			});
-
-			this.$processService.attachToProcessExitSignals(this, logcatStream.kill);
 		}
 	}
 
@@ -72,8 +70,6 @@ export class LogcatHelper implements Mobile.ILogcatHelper {
 			logcatDumpStream.removeAllListeners();
 			lineStream.removeAllListeners();
 		});
-
-		this.$processService.attachToProcessExitSignals(this, logcatDumpStream.kill);
 	}
 
 	/**
@@ -81,13 +77,17 @@ export class LogcatHelper implements Mobile.ILogcatHelper {
 	 */
 	public stop(deviceIdentifier: string): void {
 		if (this.mapDevicesLoggingData[deviceIdentifier] && !this.mapDevicesLoggingData[deviceIdentifier].keepSingleProcess) {
-			this.mapDevicesLoggingData[deviceIdentifier].loggingProcess.removeAllListeners();
-			this.mapDevicesLoggingData[deviceIdentifier].loggingProcess.kill("SIGINT");
-			this.mapDevicesLoggingData[deviceIdentifier].lineStream.removeAllListeners();
-			delete this.mapDevicesLoggingData[deviceIdentifier];
+			this.forceStop(deviceIdentifier);
 		}
 	}
 
+	private forceStop(deviceIdentifier: string): void {
+		this.mapDevicesLoggingData[deviceIdentifier].loggingProcess.removeAllListeners();
+		this.mapDevicesLoggingData[deviceIdentifier].loggingProcess.kill("SIGINT");
+		this.mapDevicesLoggingData[deviceIdentifier].lineStream.removeAllListeners();
+		delete this.mapDevicesLoggingData[deviceIdentifier];
+	}
+
 	private async getLogcatStream(deviceIdentifier: string, pid?: string) {
 		const device = await this.$devicesService.getDevice(deviceIdentifier);
 		const minAndroidWithLogcatPidSupport = "7.0.0";
diff --git a/lib/common/mobile/device-log-provider.ts b/lib/common/mobile/device-log-provider.ts
index 18261a35b8..ab2da4345a 100644
--- a/lib/common/mobile/device-log-provider.ts
+++ b/lib/common/mobile/device-log-provider.ts
@@ -1,5 +1,6 @@
 import { DeviceLogProviderBase } from "./device-log-provider-base";
 import { DEVICE_LOG_EVENT_NAME } from "../constants";
+import { LoggerConfigData } from "../../constants";
 
 export class DeviceLogProvider extends DeviceLogProviderBase {
 	constructor(protected $logFilter: Mobile.ILogFilter,
@@ -21,7 +22,7 @@ export class DeviceLogProvider extends DeviceLogProviderBase {
 	}
 
 	private logDataCore(data: string): void {
-		this.$logger.write(data);
+		this.$logger.info(data, { [LoggerConfigData.skipNewLine]: true });
 	}
 }
 $injector.register("deviceLogProvider", DeviceLogProvider);
diff --git a/lib/common/mobile/ios/device/ios-device-file-system.ts b/lib/common/mobile/ios/device/ios-device-file-system.ts
index d5637751cf..ffc9a0b238 100644
--- a/lib/common/mobile/ios/device/ios-device-file-system.ts
+++ b/lib/common/mobile/ios/device/ios-device-file-system.ts
@@ -19,7 +19,7 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 		let children: string[] = [];
 		const result = await this.$iosDeviceOperations.listDirectory([{ deviceId: deviceIdentifier, path: devicePath, appId: appIdentifier }]);
 		children = result[deviceIdentifier][0].response;
-		this.$logger.out(children.join(EOL));
+		this.$logger.info(children.join(EOL));
 	}
 
 	public async getFile(deviceFilePath: string, appIdentifier: string, outputFilePath?: string): Promise<void> {
@@ -29,7 +29,7 @@ export class IOSDeviceFileSystem implements Mobile.IDeviceFileSystem {
 		}
 
 		const fileContent = await this.getFileContent(deviceFilePath, appIdentifier);
-		this.$logger.out(fileContent);
+		this.$logger.info(fileContent);
 	}
 
 	public async getFileContent(deviceFilePath: string, appIdentifier: string): Promise<string> {
diff --git a/lib/common/mobile/ios/device/ios-device-operations.ts b/lib/common/mobile/ios/device/ios-device-operations.ts
index f2d90eafce..1676b1ca09 100644
--- a/lib/common/mobile/ios/device/ios-device-operations.ts
+++ b/lib/common/mobile/ios/device/ios-device-operations.ts
@@ -9,16 +9,11 @@ export class IOSDeviceOperations extends EventEmitter implements IIOSDeviceOpera
 	public shouldDispose: boolean;
 	private deviceLib: IOSDeviceLib.IOSDeviceLib;
 
-	constructor(private $logger: ILogger,
-		private $processService: IProcessService) {
+	constructor(private $logger: ILogger) {
 		super();
 
 		this.isInitialized = false;
 		this.shouldDispose = true;
-		this.$processService.attachToProcessExitSignals(this, () => {
-			this.setShouldDispose(true);
-			this.dispose();
-		});
 	}
 
 	public async install(ipaPath: string, deviceIdentifiers: string[], errorHandler: DeviceOperationErrorHandler): Promise<IOSDeviceResponse> {
diff --git a/lib/common/mobile/ios/device/ios-device.ts b/lib/common/mobile/ios/device/ios-device.ts
index f51ba972a5..e10a589114 100644
--- a/lib/common/mobile/ios/device/ios-device.ts
+++ b/lib/common/mobile/ios/device/ios-device.ts
@@ -20,7 +20,6 @@ export class IOSDevice extends IOSDeviceBase {
 		protected $deviceLogProvider: Mobile.IDeviceLogProvider,
 		protected $lockService: ILockService,
 		private $iOSSocketRequestExecutor: IiOSSocketRequestExecutor,
-		protected $processService: IProcessService,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $iOSDeviceProductNameMapper: Mobile.IiOSDeviceProductNameMapper,
 		private $iosDeviceOperations: IIOSDeviceOperations,
diff --git a/lib/common/mobile/ios/ios-device-base.ts b/lib/common/mobile/ios/ios-device-base.ts
index d9e6d11ae6..62be589cfc 100644
--- a/lib/common/mobile/ios/ios-device-base.ts
+++ b/lib/common/mobile/ios/ios-device-base.ts
@@ -6,7 +6,6 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 	protected abstract $errors: IErrors;
 	protected abstract $deviceLogProvider: Mobile.IDeviceLogProvider;
 	protected abstract $iOSDebuggerPortService: IIOSDebuggerPortService;
-	protected abstract $processService: IProcessService;
 	protected abstract $lockService: ILockService;
 	abstract deviceInfo: Mobile.IDeviceInfo;
 	abstract applicationManager: Mobile.IDeviceApplicationManager;
@@ -33,8 +32,6 @@ export abstract class IOSDeviceBase implements Mobile.IiOSDevice {
 					this.cachedSockets[appId].on("close", async () => {
 						await this.destroyDebugSocket(appId);
 					});
-
-					this.$processService.attachToProcessExitSignals(this, () => this.destroyDebugSocket(appId));
 				}
 
 				return this.cachedSockets[appId];
diff --git a/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts b/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts
index d0d70022df..6f1cb80593 100644
--- a/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts
+++ b/lib/common/mobile/ios/simulator/ios-simulator-application-manager.ts
@@ -15,18 +15,10 @@ export class IOSSimulatorApplicationManager extends ApplicationManagerBase {
 		private device: Mobile.IiOSDevice,
 		private $options: IOptions,
 		private $fs: IFileSystem,
-		private $processService: IProcessService,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider,
 		$logger: ILogger,
 		$hooksService: IHooksService) {
 		super($logger, $hooksService);
-		this.$processService.attachToProcessExitSignals(this, () => {
-			for (const appId in this._lldbProcesses) {
-				/* tslint:disable:no-floating-promises */
-				this.detachNativeDebugger(appId);
-				/* tslint:enable:no-floating-promises */
-			}
-		});
 	}
 
 	public async getInstalledApplications(): Promise<string[]> {
diff --git a/lib/common/mobile/ios/simulator/ios-simulator-device.ts b/lib/common/mobile/ios/simulator/ios-simulator-device.ts
index b05dde67b6..50a178d4f3 100644
--- a/lib/common/mobile/ios/simulator/ios-simulator-device.ts
+++ b/lib/common/mobile/ios/simulator/ios-simulator-device.ts
@@ -22,8 +22,7 @@ export class IOSSimulator extends IOSDeviceBase implements Mobile.IiOSDevice {
 		private $iOSEmulatorServices: Mobile.IiOSSimulatorService,
 		private $iOSNotification: IiOSNotification,
 		private $iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
-		private $logger: ILogger,
-		protected $processService: IProcessService) {
+		private $logger: ILogger) {
 		super();
 		this.applicationManager = this.$injector.resolve(applicationManagerPath.IOSSimulatorApplicationManager, { iosSim: this.$iOSSimResolver.iOSSim, device: this });
 		this.fileSystem = this.$injector.resolve(fileSystemPath.IOSSimulatorFileSystem, { iosSim: this.$iOSSimResolver.iOSSim });
diff --git a/lib/common/mobile/ios/simulator/ios-simulator-log-provider.ts b/lib/common/mobile/ios/simulator/ios-simulator-log-provider.ts
index 79464bd8bc..a01fcee0ed 100644
--- a/lib/common/mobile/ios/simulator/ios-simulator-log-provider.ts
+++ b/lib/common/mobile/ios/simulator/ios-simulator-log-provider.ts
@@ -8,7 +8,6 @@ export class IOSSimulatorLogProvider extends EventEmitter implements Mobile.IiOS
 
 	constructor(private $iOSSimResolver: Mobile.IiOSSimResolver,
 		private $logger: ILogger,
-		private $processService: IProcessService,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
 			super();
@@ -47,8 +46,6 @@ export class IOSSimulatorLogProvider extends EventEmitter implements Mobile.IiOS
 				deviceLogChildProcess.stderr.on("data", action.bind(this));
 			}
 
-			this.$processService.attachToProcessExitSignals(this, deviceLogChildProcess.kill);
-
 			this.simulatorsLoggingEnabled[deviceId] = true;
 			this.simulatorsLogProcess[deviceId] = deviceLogChildProcess;
 		}
diff --git a/lib/common/mobile/mobile-core/android-process-service.ts b/lib/common/mobile/mobile-core/android-process-service.ts
index b2fa281035..ee6b4e5c88 100644
--- a/lib/common/mobile/mobile-core/android-process-service.ts
+++ b/lib/common/mobile/mobile-core/android-process-service.ts
@@ -1,8 +1,7 @@
 import { EOL } from "os";
-import * as shelljs from "shelljs";
 import { DeviceAndroidDebugBridge } from "../android/device-android-debug-bridge";
 import { TARGET_FRAMEWORK_IDENTIFIERS } from "../../constants";
-import { exported, cache } from "../../decorators";
+import { exported } from "../../decorators";
 
 export class AndroidProcessService implements Mobile.IAndroidProcessService {
 	private _devicesAdbs: IDictionary<Mobile.IDeviceAndroidDebugBridge>;
@@ -10,8 +9,7 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 
 	constructor(private $errors: IErrors,
 		private $injector: IInjector,
-		private $net: INet,
-		private $processService: IProcessService) {
+		private $net: INet) {
 		this._devicesAdbs = {};
 		this._forwardedLocalPorts = {};
 	}
@@ -22,8 +20,6 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 	}
 
 	public async mapAbstractToTcpPort(deviceIdentifier: string, appIdentifier: string, framework: string): Promise<string> {
-		this.tryAttachToProcessExitSignals();
-
 		const adb = await this.setupForPortForwarding({ deviceIdentifier, appIdentifier });
 
 		const processId = (await this.getProcessIds(adb, [appIdentifier]))[appIdentifier];
@@ -120,16 +116,16 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 
 		if (!localPort) {
 			localPort = await this.$net.getFreePort();
-			await adb.executeCommand(["forward", `tcp:${localPort}`, portForwardInputData.abstractPort], {deviceIdentifier: portForwardInputData.deviceIdentifier});
+			await adb.executeCommand(["forward", `tcp:${localPort}`, portForwardInputData.abstractPort], { deviceIdentifier: portForwardInputData.deviceIdentifier });
 		}
 
 		this._forwardedLocalPorts[portForwardInputData.deviceIdentifier] = localPort;
+		// TODO: Uncomment for 6.0.0 release
+		// await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", portForwardInputData.deviceIdentifier, "forward", "--remove", `tcp:${localPort}`] });
 		return localPort && +localPort;
 	}
 
 	private async setupForPortForwarding(portForwardInputData?: Mobile.IPortForwardDataBase): Promise<Mobile.IDeviceAndroidDebugBridge> {
-		this.tryAttachToProcessExitSignals();
-
 		const adb = this.getAdb(portForwardInputData.deviceIdentifier);
 
 		return adb;
@@ -279,18 +275,6 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 
 		return result;
 	}
-
-	@cache()
-	private tryAttachToProcessExitSignals(): void {
-		this.$processService.attachToProcessExitSignals(this, () => {
-			_.each(this._forwardedLocalPorts, (port: number, deviceIdentifier: string) => {
-				// We need to use shelljs here instead of $adb because listener functions of exit, SIGINT and SIGTERM must only perform synchronous operations.
-				// The Node.js process will exit immediately after calling the 'exit' event listeners causing any additional work still queued in the event loop to be abandoned.
-				// See the official documentation for more information and examples - https://nodejs.org/dist/latest-v6.x/docs/api/process.html#process_event_exit.
-				shelljs.exec(`adb -s ${deviceIdentifier} forward --remove tcp:${port}`);
-			});
-		});
-	}
 }
 
 $injector.register("androidProcessService", AndroidProcessService);
diff --git a/lib/common/mobile/mobile-core/devices-service.ts b/lib/common/mobile/mobile-core/devices-service.ts
index 11efa236ed..00858d4510 100644
--- a/lib/common/mobile/mobile-core/devices-service.ts
+++ b/lib/common/mobile/mobile-core/devices-service.ts
@@ -42,8 +42,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		private $androidEmulatorServices: Mobile.IEmulatorPlatformService,
 		private $androidEmulatorDiscovery: Mobile.IDeviceDiscovery,
 		private $emulatorHelper: Mobile.IEmulatorHelper,
-		private $prompter: IPrompter,
-		private $timers: ITimers) {
+		private $prompter: IPrompter) {
 		super();
 		this.attachToKnownDeviceDiscoveryEvents();
 		this.attachToKnownEmulatorDiscoveryEvents();
@@ -293,7 +292,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 		if (!this.deviceDetectionInterval) {
 			let isDeviceDetectionIntervalInProgress = false;
 
-			this.deviceDetectionInterval = this.$timers.setInterval(async () => {
+			this.deviceDetectionInterval = setInterval(async () => {
 				if (isDeviceDetectionIntervalInProgress) {
 					return;
 				}
@@ -320,7 +319,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	@exported("devicesService")
 	public startEmulatorDetectionInterval(opts: Mobile.IHasDetectionInterval = {}): void {
 		let isEmulatorDetectionIntervalRunning = false;
-		this.emulatorDetectionInterval = this.$timers.setInterval(async () => {
+		this.emulatorDetectionInterval = setInterval(async () => {
 			if (isEmulatorDetectionIntervalRunning) {
 				return;
 			}
@@ -336,14 +335,14 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 	@exported("devicesService")
 	public stopDeviceDetectionInterval(): void {
 		if (this.deviceDetectionInterval) {
-			this.$timers.clearInterval(this.deviceDetectionInterval);
+			clearInterval(this.deviceDetectionInterval);
 		}
 	}
 
 	@exported("devicesService")
 	public stopEmulatorDetectionInterval(): void {
 		if (this.emulatorDetectionInterval) {
-			this.$timers.clearInterval(this.emulatorDetectionInterval);
+			clearInterval(this.emulatorDetectionInterval);
 		}
 	}
 
@@ -607,7 +606,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
 			return;
 		}
 
-		this.$logger.out("Searching for devices...");
+		this.$logger.info("Searching for devices...");
 
 		deviceInitOpts = deviceInitOpts || {};
 		this._data = deviceInitOpts;
diff --git a/lib/common/progress-indicator.ts b/lib/common/progress-indicator.ts
deleted file mode 100644
index ee48daa699..0000000000
--- a/lib/common/progress-indicator.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { isInteractive } from './helpers';
-
-export class ProgressIndicator implements IProgressIndicator {
-	constructor(private $logger: ILogger) { }
-
-	public async showProgressIndicator<T>(promise: Promise<T>, timeout: number, options?: { surpressTrailingNewLine?: boolean }): Promise<T> {
-		const surpressTrailingNewLine = options && options.surpressTrailingNewLine;
-
-		let isFulfilled = false;
-
-		const tempPromise = new Promise<T>((resolve, reject) => {
-			promise
-				.then(res => {
-					isFulfilled = true;
-					resolve(res);
-				})
-				.catch(err => {
-					isFulfilled = true;
-					reject(err);
-				});
-		});
-
-		if (!isInteractive()) {
-			while (!isFulfilled) {
-				await this.$logger.printMsgWithTimeout(".", timeout);
-			}
-		}
-
-		if (!surpressTrailingNewLine) {
-			this.$logger.out();
-		}
-
-		return tempPromise;
-	}
-}
-$injector.register("progressIndicator", ProgressIndicator);
diff --git a/lib/common/services/auto-completion-service.ts b/lib/common/services/auto-completion-service.ts
index 8cf5b56b84..46a5e322de 100644
--- a/lib/common/services/auto-completion-service.ts
+++ b/lib/common/services/auto-completion-service.ts
@@ -98,7 +98,7 @@ export class AutoCompletionService implements IAutoCompletionService {
 		this.removeObsoleteAutoCompletion();
 
 		if (this.scriptsOk && this.scriptsUpdated) {
-			this.$logger.out("Restart your shell to disable command auto-completion.");
+			this.$logger.info("Restart your shell to disable command auto-completion.");
 		}
 	}
 
@@ -108,7 +108,7 @@ export class AutoCompletionService implements IAutoCompletionService {
 		this.removeObsoleteAutoCompletion();
 
 		if (this.scriptsOk && this.scriptsUpdated) {
-			this.$logger.out("Restart your shell to enable command auto-completion.");
+			this.$logger.info("Restart your shell to enable command auto-completion.");
 		}
 	}
 
@@ -155,11 +155,11 @@ export class AutoCompletionService implements IAutoCompletionService {
 				this.scriptsUpdated = true;
 			}
 		} catch (err) {
-			this.$logger.out("Unable to update %s. Command-line completion might not work.", fileName);
+			this.$logger.info("Unable to update %s. Command-line completion might not work.", fileName);
 			// When npm is installed with sudo, in some cases the installation cannot write to shell profiles
 			// Advise the user how to enable autocompletion after the installation is completed.
 			if ((err.code === "EPERM" || err.code === "EACCES") && !this.$hostInfo.isWindows && process.env.SUDO_USER) {
-				this.$logger.out("To enable command-line completion, run '$ %s autocomplete enable'.", this.$staticConfig.CLIENT_NAME);
+				this.$logger.info("To enable command-line completion, run '$ %s autocomplete enable'.", this.$staticConfig.CLIENT_NAME);
 			}
 
 			this.$logger.trace(err);
@@ -179,8 +179,8 @@ export class AutoCompletionService implements IAutoCompletionService {
 		} catch (err) {
 			// If file does not exist, autocompletion was not working for it, so ignore this error.
 			if (err.code !== "ENOENT") {
-				this.$logger.out("Failed to update %s. Auto-completion may still work or work incorrectly. ", fileName);
-				this.$logger.out(err);
+				this.$logger.info("Failed to update %s. Auto-completion may still work or work incorrectly. ", fileName);
+				this.$logger.info(err);
 				this.scriptsOk = false;
 			}
 		}
@@ -211,7 +211,7 @@ export class AutoCompletionService implements IAutoCompletionService {
 				this.$fs.chmod(filePath, "0644");
 			}
 		} catch (err) {
-			this.$logger.out("Failed to update %s. Auto-completion may not work. ", filePath);
+			this.$logger.info("Failed to update %s. Auto-completion may not work. ", filePath);
 			this.$logger.trace(err);
 			this.scriptsOk = false;
 		}
diff --git a/lib/common/services/commands-service.ts b/lib/common/services/commands-service.ts
index d441a2959a..315bbfa6e1 100644
--- a/lib/common/services/commands-service.ts
+++ b/lib/common/services/commands-service.ts
@@ -37,6 +37,7 @@ export class CommandsService implements ICommandsService {
 			}
 
 			this.$options.setupOptions(projectData);
+			this.$options.printMessagesForDeprecatedOptions(this.$logger);
 	}
 
 	public allCommands(opts: { includeDevCommands: boolean }): string[] {
diff --git a/lib/common/services/lock-service.ts b/lib/common/services/lock-service.ts
index 530fe2e12e..50298e8668 100644
--- a/lib/common/services/lock-service.ts
+++ b/lib/common/services/lock-service.ts
@@ -4,7 +4,6 @@ import { cache } from "../decorators";
 import { getHash } from "../helpers";
 
 export class LockService implements ILockService {
-	private currentlyLockedFiles: string[] = [];
 
 	@cache()
 	private get defaultLockFilePath(): string {
@@ -28,14 +27,7 @@ export class LockService implements ILockService {
 
 	constructor(private $fs: IFileSystem,
 		private $settingsService: ISettingsService,
-		private $processService: IProcessService) {
-		this.$processService.attachToProcessExitSignals(this, () => {
-			const locksToRemove = _.clone(this.currentlyLockedFiles);
-			for (const lockToRemove of locksToRemove) {
-				lockfile.unlockSync(lockToRemove);
-				this.cleanLock(lockToRemove);
-			}
-		});
+		private $cleanupService: ICleanupService) {
 	}
 
 	public async executeActionWithLock<T>(action: () => Promise<T>, lockFilePath?: string, lockOpts?: ILockOptions): Promise<T> {
@@ -51,29 +43,44 @@ export class LockService implements ILockService {
 
 	public async lock(lockFilePath?: string, lockOpts?: ILockOptions): Promise<() => void> {
 		const { filePath, fileOpts } = this.getLockFileSettings(lockFilePath, lockOpts);
-		this.currentlyLockedFiles.push(filePath);
+
+		for (const pathToClean of this.getPathsForCleanupAction(filePath)) {
+			await this.$cleanupService.addCleanupDeleteAction(pathToClean);
+		}
+
 		this.$fs.writeFile(filePath, "");
 
 		try {
 			const releaseFunc = await lockfile.lock(filePath, fileOpts);
 			return async () => {
 				await releaseFunc();
-				this.cleanLock(filePath);
+				await this.cleanLock(filePath);
 			};
 		} catch (err) {
 			throw new Error(`Timeout while waiting for lock "${filePath}"`);
 		}
 	}
 
-	public unlock(lockFilePath?: string): void {
+	public async unlock(lockFilePath?: string): Promise<void> {
 		const { filePath } = this.getLockFileSettings(lockFilePath);
 		lockfile.unlockSync(filePath);
-		this.cleanLock(filePath);
+		await this.cleanLock(filePath);
 	}
 
-	private cleanLock(lockPath: string): void {
-		_.remove(this.currentlyLockedFiles, e => e === lockPath);
+	private async cleanLock(lockPath: string): Promise<void> {
 		this.$fs.deleteFile(lockPath);
+		for (const filePath of this.getPathsForCleanupAction(lockPath)) {
+			await this.$cleanupService.removeCleanupDeleteAction(filePath);
+		}
+	}
+
+	private getPathsForCleanupAction(lockPath: string): string[] {
+		// The proper-lockfile creates directory with the passed name and `.lock` at the end.
+		// Ensure we will take care of it as well.
+		return [
+			lockPath,
+			`${lockPath}.lock`
+		];
 	}
 
 	private getLockFileSettings(filePath?: string, fileOpts?: ILockOptions): { filePath: string, fileOpts: ILockOptions } {
diff --git a/lib/common/services/process-service.ts b/lib/common/services/process-service.ts
deleted file mode 100644
index 25eed30732..0000000000
--- a/lib/common/services/process-service.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-export class ProcessService implements IProcessService {
-	private static PROCESS_EXIT_SIGNALS = ["exit", "SIGINT", "SIGTERM"];
-	private _listeners: IListener[];
-
-	public get listenersCount(): number {
-		return this._listeners.length;
-	}
-
-	constructor() {
-		this._listeners = [];
-	}
-
-	public attachToProcessExitSignals(context: any, callback: () => void): void {
-		const callbackToString = callback.toString();
-
-		if (this._listeners.length === 0) {
-			_.each(ProcessService.PROCESS_EXIT_SIGNALS, (signal: NodeJS.Signals) => {
-				process.on(signal, () => this.executeAllCallbacks.apply(this));
-			});
-		}
-
-		if (!_.some(this._listeners, (listener: IListener) => context === listener.context && callbackToString === listener.callback.toString())) {
-			this._listeners.push({ context, callback });
-		}
-	}
-
-	private executeAllCallbacks(): void {
-		_.each(this._listeners, (listener: IListener) => {
-			try {
-				listener.callback.apply(listener.context);
-			} catch (err) {
-				// ignore the error and let other handlers to be called.
-			}
-		});
-	}
-}
-
-interface IListener {
-	context: any;
-	callback: () => void;
-}
-
-$injector.register("processService", ProcessService);
diff --git a/lib/common/test/unit-tests/analytics-service.ts b/lib/common/test/unit-tests/analytics-service.ts
index 356c6d3e53..46c84f3717 100644
--- a/lib/common/test/unit-tests/analytics-service.ts
+++ b/lib/common/test/unit-tests/analytics-service.ts
@@ -89,10 +89,6 @@ function createTestInjector(testScenario: ITestScenario): IInjector {
 		return testScenario.isInteractive;
 	};
 
-	testInjector.register("processService", {
-		attachToProcessExitSignals: (context: any, callback: () => void): void => (undefined)
-	});
-
 	testInjector.register("childProcess", {});
 	testInjector.register("projectDataService", {});
 	testInjector.register("mobileHelper", {});
diff --git a/lib/common/test/unit-tests/logger.ts b/lib/common/test/unit-tests/logger.ts
index a9b8c0f7fa..058329fb68 100644
--- a/lib/common/test/unit-tests/logger.ts
+++ b/lib/common/test/unit-tests/logger.ts
@@ -1,5 +1,5 @@
 import { Yok } from "../../yok";
-import { Logger } from "../../logger";
+import { Logger } from "../../logger/logger";
 import * as path from "path";
 import { assert } from "chai";
 import * as fileSystemFile from "../../file-system";
@@ -45,6 +45,8 @@ describe("logger", () => {
 			}
 		};
 
+		// Initialize the logger manually, so we can overwrite the log4jsLogger property
+		logger.initialize();
 		logger.log4jsLogger = log4jsLogger;
 	});
 
diff --git a/lib/common/test/unit-tests/mobile/android-device-file-system.ts b/lib/common/test/unit-tests/mobile/android-device-file-system.ts
index afe7fbd854..20e8d0d70d 100644
--- a/lib/common/test/unit-tests/mobile/android-device-file-system.ts
+++ b/lib/common/test/unit-tests/mobile/android-device-file-system.ts
@@ -1,7 +1,7 @@
 import { AndroidDeviceFileSystem } from "../../../mobile/android/android-device-file-system";
 import { Yok } from "../../../yok";
 import { Errors } from "../../../errors";
-import { Logger } from "../../../logger";
+import { Logger } from "../../../logger/logger";
 import { MobileHelper } from "../../../mobile/mobile-helper";
 import { DevicePlatformsConstants } from "../../../mobile/device-platforms-constants";
 
diff --git a/lib/common/test/unit-tests/mobile/android/logcat-helper.ts b/lib/common/test/unit-tests/mobile/android/logcat-helper.ts
index 4e8127fde8..01f8e24426 100644
--- a/lib/common/test/unit-tests/mobile/android/logcat-helper.ts
+++ b/lib/common/test/unit-tests/mobile/android/logcat-helper.ts
@@ -3,34 +3,39 @@ import { Yok } from "../../../../yok";
 import { assert } from "chai";
 import * as path from "path";
 import * as childProcess from "child_process";
+import * as fileSystem from "fs";
+import { EventEmitter } from "events";
+import stream = require("stream");
+
+class ChildProcessMockInstance extends EventEmitter {
+	public stdout: stream.Readable;
+	public stderr: any;
+	public processKillCallCount = 0;
+
+	constructor(pathToSample: string) {
+		super();
+		this.stdout = fileSystem.createReadStream(pathToSample);
+		this.stderr = new EventEmitter();
+	}
+
+	public kill(): void {
+		this.processKillCallCount++;
+	}
+}
 
 class ChildProcessStub {
 	public processSpawnCallCount = 0;
-	public processKillCallCount = 0;
 	public adbProcessArgs: string[] = [];
-	private isWin = /^win/.test(process.platform);
+	public lastSpawnedProcess: ChildProcessMockInstance = null;
 
 	public spawn(command: string, args?: string[], options?: any): childProcess.ChildProcess {
 		this.adbProcessArgs = args;
 		this.processSpawnCallCount++;
-		let pathToExecutable = "";
-		let shell = "";
-		if (this.isWin) {
-			pathToExecutable = "type";
-			shell = "cmd";
-		} else {
-			pathToExecutable = "cat";
-		}
-		pathToExecutable = path.join(pathToExecutable);
 		const pathToSample = path.join(__dirname, "valid-sample.txt");
-		const spawnedProcess = childProcess.spawn(pathToExecutable, [pathToSample], { shell });
-		const spawnedProcessKill = spawnedProcess.kill;
-		spawnedProcess.kill = (signal: string) => {
-			this.processKillCallCount++;
-			spawnedProcessKill.call(spawnedProcessKill, signal);
-		};
-
-		return spawnedProcess;
+
+		this.lastSpawnedProcess = new ChildProcessMockInstance(pathToSample);
+
+		return <any>this.lastSpawnedProcess;
 	}
 }
 
@@ -60,11 +65,6 @@ function createTestInjector(): IInjector {
 		}
 	});
 	injector.register("devicePlatformsConstants", { Android: "Android" });
-	injector.register("processService", {
-		attachToProcessExitSignals(context: any, callback: () => void): void {
-			//left blank intentionally because of lint
-		},
-	});
 	injector.register("deviceLogProvider", {
 		logData(line: string, platform: string, deviceIdentifier: string): void {
 			//left blank intentionally because of lint
@@ -212,7 +212,7 @@ describe("logcat-helper", () => {
 			await logcatHelper.stop(validIdentifier);
 			await logcatHelper.stop(validIdentifier);
 
-			assert.equal(childProcessStub.processKillCallCount, 1);
+			assert.equal(childProcessStub.lastSpawnedProcess.processKillCallCount, 1);
 		});
 
 		it("should not kill the process if started with keepSingleProcess", async () => {
@@ -225,7 +225,7 @@ describe("logcat-helper", () => {
 
 			await logcatHelper.stop(validIdentifier);
 			await logcatHelper.stop(validIdentifier);
-			assert.equal(childProcessStub.processKillCallCount, 0);
+			assert.equal(childProcessStub.lastSpawnedProcess.processKillCallCount, 0);
 		});
 
 		it("should do nothing if called without start", async () => {
@@ -234,7 +234,27 @@ describe("logcat-helper", () => {
 			await logcatHelper.stop(validIdentifier);
 
 			assert.equal(childProcessStub.processSpawnCallCount, 0);
-			assert.equal(childProcessStub.processKillCallCount, 0);
 		});
+
+		for (const keepSingleProcess of [false, true]) {
+			it(`should clear the device identifier cache when the logcat process is killed manually and keepSingleProcess is ${keepSingleProcess}`, async () => {
+				const logcatHelper = injector.resolve<LogcatHelper>("logcatHelper");
+
+				await logcatHelper.start({
+					deviceIdentifier: validIdentifier,
+					keepSingleProcess
+				});
+
+				assert.equal(childProcessStub.processSpawnCallCount, 1);
+
+				childProcessStub.lastSpawnedProcess.emit("close");
+
+				await logcatHelper.start({
+					deviceIdentifier: validIdentifier
+				});
+
+				assert.equal(childProcessStub.processSpawnCallCount, 2);
+			});
+		}
 	});
 });
diff --git a/lib/common/test/unit-tests/mobile/devices-service.ts b/lib/common/test/unit-tests/mobile/devices-service.ts
index 37bd61f4bf..d61a2d0298 100644
--- a/lib/common/test/unit-tests/mobile/devices-service.ts
+++ b/lib/common/test/unit-tests/mobile/devices-service.ts
@@ -14,7 +14,6 @@ import { CommonLoggerStub, ErrorsStub } from "../stubs";
 import { Messages } from "../../../messages/messages";
 import * as constants from "../../../constants";
 import { DevicePlatformsConstants } from "../../../mobile/device-platforms-constants";
-import { Timers } from "../../../timers";
 
 const helpers = require("../../../helpers");
 const originalIsInteractive = helpers.isInteractive;
@@ -160,9 +159,6 @@ function createTestInjector(): IInjector {
 	testInjector.register("iOSEmulatorServices", IOSEmulatorServices);
 	testInjector.register("messages", Messages);
 	testInjector.register("prompter", {});
-	testInjector.register("processService", {
-		attachToProcessExitSignals: (context: any, callback: () => Promise<any>) => { /* no implementation required */ }
-	});
 
 	testInjector.register("mobileHelper", {
 		platformNames: ["ios", "android"],
@@ -186,7 +182,6 @@ function createTestInjector(): IInjector {
 	testInjector.register("androidProcessService", { /* no implementation required */ });
 	testInjector.register("androidEmulatorDiscovery", AndroidEmulatorDiscoveryStub);
 	testInjector.register("emulatorHelper", {});
-	testInjector.register("timers", Timers);
 
 	return testInjector;
 }
diff --git a/lib/common/test/unit-tests/mobile/ios-simulator-discovery.ts b/lib/common/test/unit-tests/mobile/ios-simulator-discovery.ts
index e962305cfe..245e884e15 100644
--- a/lib/common/test/unit-tests/mobile/ios-simulator-discovery.ts
+++ b/lib/common/test/unit-tests/mobile/ios-simulator-discovery.ts
@@ -5,7 +5,7 @@ import { assert } from "chai";
 import { DeviceDiscoveryEventNames, CONNECTED_STATUS } from "../../../constants";
 import { DevicePlatformsConstants } from "../../../mobile/device-platforms-constants";
 import { ErrorsStub, CommonLoggerStub, HooksServiceStub, LockServiceStub } from "../stubs";
-import { FileSystemStub, ChildProcessStub, ProcessServiceStub } from "../../../../../test/stubs";
+import { FileSystemStub, ChildProcessStub } from "../../../../../test/stubs";
 
 let currentlyRunningSimulators: Mobile.IiSimDevice[];
 
@@ -41,7 +41,6 @@ function createTestInjector(): IInjector {
 	injector.register("deviceLogProvider", {});
 	injector.register("iOSEmulatorServices", {});
 	injector.register("iOSNotification", {});
-	injector.register("processService", ProcessServiceStub);
 	injector.register("options", {});
 	injector.register("hooksService", HooksServiceStub);
 	injector.register("logger", CommonLoggerStub);
diff --git a/lib/common/test/unit-tests/mobile/project-files-manager.ts b/lib/common/test/unit-tests/mobile/project-files-manager.ts
index 4df6e5d759..b94972c78d 100644
--- a/lib/common/test/unit-tests/mobile/project-files-manager.ts
+++ b/lib/common/test/unit-tests/mobile/project-files-manager.ts
@@ -7,7 +7,7 @@ import { HostInfo } from "../../../host-info";
 import { LocalToDevicePathDataFactory } from "../../../mobile/local-to-device-path-data-factory";
 import { MobileHelper } from "../../../mobile/mobile-helper";
 import { ProjectFilesManager } from "../../../services/project-files-manager";
-import { Logger } from "../../../logger";
+import { Logger } from "../../../logger/logger";
 import * as path from "path";
 import { Yok } from "../../../yok";
 import { ProjectFilesProviderBase } from "../../../services/project-files-provider-base";
diff --git a/lib/common/test/unit-tests/process-service.ts b/lib/common/test/unit-tests/process-service.ts
deleted file mode 100644
index 8daf0434d4..0000000000
--- a/lib/common/test/unit-tests/process-service.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Yok } from "../../yok";
-import { ProcessService } from "../../services/process-service";
-import { assert } from "chai";
-
-const processExitSignals = ["exit", "SIGINT", "SIGTERM"];
-const emptyFunction = () => { /* no implementation required */ };
-function createTestInjector(): IInjector {
-	const testInjector = new Yok();
-
-	testInjector.register("processService", ProcessService);
-
-	return testInjector;
-}
-
-describe("Process service", () => {
-	let testInjector: IInjector;
-	let $processService: IProcessService;
-
-	beforeEach(() => {
-		testInjector = createTestInjector();
-		$processService = testInjector.resolve("processService");
-	});
-
-	it("should not add only one listener for the exit, SIGIN and SIGTERM events.", () => {
-		$processService.attachToProcessExitSignals({}, emptyFunction);
-		$processService.attachToProcessExitSignals({}, emptyFunction);
-
-		_.each(processExitSignals, (signal: NodeJS.Signals) => {
-			// We need to search only for our listener because each exit signal have different listeners added to it.
-			const actualListeners = _.filter(process.listeners(signal), (listener: Function) => listener.toString().indexOf("executeAllCallbacks") >= 0);
-			assert.deepEqual(actualListeners.length, 1);
-		});
-	});
-
-	it("should add listener with context only once if there already is callback with the same context.", () => {
-		const context = { test: "test" };
-		const listener = () => 42;
-
-		$processService.attachToProcessExitSignals(context, listener);
-		$processService.attachToProcessExitSignals(context, listener);
-
-		assert.deepEqual($processService.listenersCount, 1);
-	});
-
-	it("should add two different listeners for one context.", () => {
-		const context = { test: "test" };
-		const numberListener = () => 42;
-		const booleanListener = () => true;
-
-		$processService.attachToProcessExitSignals(context, numberListener);
-		$processService.attachToProcessExitSignals(context, booleanListener);
-
-		assert.deepEqual($processService.listenersCount, 2);
-	});
-
-	it("should add one listener with different context twice.", () => {
-		const listener = () => 42;
-
-		$processService.attachToProcessExitSignals({}, listener);
-		$processService.attachToProcessExitSignals({}, listener);
-
-		assert.deepEqual($processService.listenersCount, 2);
-	});
-
-	it("should execute all attached listeners.", () => {
-		let hasCalledFirstListener = false;
-		let hasCalledSecondListener = false;
-		let hasCalledThirdListener = false;
-
-		const firstListener = () => {
-			hasCalledFirstListener = true;
-		};
-
-		const secondListener = () => {
-			hasCalledSecondListener = true;
-		};
-
-		const thirdListener = () => {
-			hasCalledThirdListener = true;
-		};
-
-		$processService.attachToProcessExitSignals({}, firstListener);
-		$processService.attachToProcessExitSignals({}, secondListener);
-		$processService.attachToProcessExitSignals({}, thirdListener);
-
-		// Do not use exit or SIGINT because the tests after this one will not be executed.
-		global.process.emit("SIGTERM");
-
-		assert.isTrue(hasCalledFirstListener);
-		assert.isTrue(hasCalledSecondListener);
-		assert.isTrue(hasCalledThirdListener);
-	});
-});
diff --git a/lib/common/test/unit-tests/stubs.ts b/lib/common/test/unit-tests/stubs.ts
index 284c2051e2..075dcb4806 100644
--- a/lib/common/test/unit-tests/stubs.ts
+++ b/lib/common/test/unit-tests/stubs.ts
@@ -2,13 +2,14 @@
 
 import * as util from "util";
 import { EventEmitter } from "events";
+import { LoggerConfigData } from "../../../constants";
 
 export class LockServiceStub implements ILockService {
 	public async lock(lockFilePath?: string, lockOpts?: ILockOptions): Promise<() => void> {
 		return () => { };
 	}
 
-	public unlock(lockFilePath?: string): void {
+	public async unlock(lockFilePath?: string): Promise<void> {
 	}
 
 	public async executeActionWithLock<T>(action: () => Promise<T>, lockFilePath?: string, lockOpts?: ILockOptions): Promise<T> {
@@ -18,46 +19,38 @@ export class LockServiceStub implements ILockService {
 }
 
 export class CommonLoggerStub implements ILogger {
+	initialize(opts?: ILoggerOptions): void { }
+	initializeCliLogger(): void { }
 	getLevel(): string { return undefined; }
-	fatal(...args: string[]): void { }
-	error(...args: string[]): void { }
-	warn(...args: string[]): void {
-		this.out.apply(this, args);
+	fatal(...args: any[]): void { }
+	error(...args: any[]): void { }
+	warn(...args: any[]): void {
+		this.output += util.format.apply(null, args) + "\n";
 	}
-	warnWithLabel(...args: string[]): void { }
-	info(...args: string[]): void {
-		this.out.apply(this, args);
+	info(...args: any[]): void {
+		this.output += util.format.apply(null, args) + "\n";
 	}
-	debug(...args: string[]): void { }
-	trace(...args: string[]): void {
+	debug(...args: any[]): void { }
+	trace(...args: any[]): void {
 		this.traceOutput += util.format.apply(null, args) + "\n";
 	}
 
 	public output = "";
 	public traceOutput = "";
 
-	out(...args: string[]): void {
-		this.output += util.format.apply(null, args) + "\n";
-	}
-
-	write(...args: string[]): void { }
-
 	prepare(item: any): string {
 		return "";
 	}
 
-	printInfoMessageOnSameLine(message: string): void { }
-	async printMsgWithTimeout(message: string, timeout: number): Promise<void> {
-		return null;
-	}
-
 	printMarkdown(message: string): void {
 		this.output += message;
 	}
 
-	printOnStderr(...args: string[]): void {
-		// nothing to do here
-	}
+	out(formatStr?: any, ...args: any[]): void { }
+	write(...args: any[]): void { }
+	printInfoMessageOnSameLine(message: string): void { }
+	async printMsgWithTimeout(message: string, timeout: number): Promise<void> { }
+	printOnStderr(formatStr?: any, ...args: any[]): void { }
 }
 
 export class ErrorsStub implements IErrors {
@@ -170,7 +163,7 @@ export class DeviceLogProviderStub extends EventEmitter implements Mobile.IDevic
 	public currentDeviceProjectNames: IStringDictionary = {};
 
 	logData(line: string, platform: string, deviceIdentifier: string): void {
-		this.logger.write(line, platform, deviceIdentifier);
+		this.logger.info(line, platform, deviceIdentifier, { [LoggerConfigData.skipNewLine]: true });
 	}
 
 	setLogLevel(level: string, deviceIdentifier?: string): void {
diff --git a/lib/common/timers.ts b/lib/common/timers.ts
deleted file mode 100644
index 2325eb7481..0000000000
--- a/lib/common/timers.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-export class Timers implements ITimers {
-	private pendingIntervalIds: NodeJS.Timer[] = [];
-
-	constructor(private $processService: IProcessService) {
-		this.$processService.attachToProcessExitSignals(this, () => {
-			_.each(this.pendingIntervalIds, clearInterval);
-		});
-	}
-
-	public setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer {
-		const timer = setInterval(callback, ms, args);
-
-		this.pendingIntervalIds.push(timer);
-
-		return timer;
-	}
-
-	public clearInterval(intervalId: NodeJS.Timer): void {
-		clearInterval(intervalId);
-
-		_.remove(this.pendingIntervalIds, id => id === intervalId);
-	}
-}
-
-$injector.register("timers", Timers);
diff --git a/lib/common/verify-node-version.ts b/lib/common/verify-node-version.ts
index f95db5578a..7e14722c55 100644
--- a/lib/common/verify-node-version.ts
+++ b/lib/common/verify-node-version.ts
@@ -53,38 +53,43 @@ export function verifyNodeVersion(): void {
 	}
 }
 
+var isGetNodeWarningCalled = false;
 export function getNodeWarning(): ISystemWarning {
-	var verificationOpts = getNodeVersionOpts();
-	var cliName = verificationOpts.cliName;
-	var supportedVersionsRange = verificationOpts.supportedVersionsRange;
-	var deprecatedVersions = verificationOpts.deprecatedVersions;
-	var nodeVer = verificationOpts.nodeVer;
+	if (!isGetNodeWarningCalled) {
+		isGetNodeWarningCalled = true;
+
+		var verificationOpts = getNodeVersionOpts();
+		var cliName = verificationOpts.cliName;
+		var supportedVersionsRange = verificationOpts.supportedVersionsRange;
+		var deprecatedVersions = verificationOpts.deprecatedVersions;
+		var nodeVer = verificationOpts.nodeVer;
 
-	var warningMessage = "";
-	if (deprecatedVersions) {
-		deprecatedVersions.forEach(function (version) {
-			if (semver.satisfies(nodeVer, version)) {
-				warningMessage = "Support for Node.js " + version + " is deprecated and will be removed in one of the next releases of " + cliName +
-					". Please, upgrade to the latest Node.js LTS version. ";
-				return warningMessage;
+		var warningMessage = "";
+		if (deprecatedVersions) {
+			deprecatedVersions.forEach(function (version) {
+				if (semver.satisfies(nodeVer, version)) {
+					warningMessage = "Support for Node.js " + version + " is deprecated and will be removed in one of the next releases of " + cliName +
+						". Please, upgrade to the latest Node.js LTS version. ";
+					return warningMessage;
+				}
+			});
+		}
+
+		if (!warningMessage) {
+			var checkSatisfied = semver.satisfies(nodeVer, supportedVersionsRange);
+			if (!checkSatisfied) {
+				warningMessage = "Support for Node.js " + nodeVer + " is not verified. " + cliName + " CLI might not install or run properly.";
 			}
-		});
-	}
+		}
 
-	if (!warningMessage) {
-		var checkSatisfied = semver.satisfies(nodeVer, supportedVersionsRange);
-		if (!checkSatisfied) {
-			warningMessage = "Support for Node.js " + nodeVer + " is not verified. " + cliName + " CLI might not install or run properly.";
+		if (warningMessage) {
+			return {
+				message: warningMessage,
+				severity: SystemWarningsSeverity.medium
+			};
 		}
-	}
 
-	if (warningMessage) {
-		return {
-			message: warningMessage,
-			severity: SystemWarningsSeverity.medium
-		};
+		return null;
 	}
-
-	return null;
 }
 /* tslint:enable */
diff --git a/lib/constants.ts b/lib/constants.ts
index a1a8961018..e70a951c17 100644
--- a/lib/constants.ts
+++ b/lib/constants.ts
@@ -1,5 +1,6 @@
 require("colors");
 import { PreviewAppLiveSyncEvents } from "./services/livesync/playground/preview-app-constants";
+import { join } from "path";
 
 export const APP_FOLDER_NAME = "app";
 export const APP_RESOURCES_FOLDER_NAME = "App_Resources";
@@ -49,6 +50,8 @@ export const TNS_NATIVE_SOURCE_GROUP_NAME = "TNSNativeSource";
 export const NATIVE_SOURCE_FOLDER = "src";
 export const APPLICATION_RESPONSE_TIMEOUT_SECONDS = 60;
 export const NATIVE_EXTENSION_FOLDER = "extensions";
+export const IOS_WATCHAPP_FOLDER = "watchapp";
+export const IOS_WATCHAPP_EXTENSION_FOLDER = "watchextension";
 
 export class PackageVersion {
 	static NEXT = "next";
@@ -280,3 +283,92 @@ export const LiveSyncEvents = {
 	liveSyncStarted: "liveSyncStarted",
 	liveSyncNotification: "notify"
 };
+
+export enum IOSDeviceTargets {
+	ios = "1,2",
+	watchos = 4
+}
+
+export enum IOSNativeTargetProductTypes {
+	watchApp = "com.apple.product-type.application.watchapp2",
+	watchExtension = "com.apple.product-type.watchkit2-extension",
+	appExtension = "com.apple.product-type.app-extension"
+}
+
+export enum IOSNativeTargetTypes {
+	watchApp = "watch_app",
+	watchExtension = "watch_extension",
+	appExtension = "app_extension"
+}
+
+const pathToLoggerAppendersDir = join(__dirname, "common", "logger", "appenders");
+export const LoggerAppenders = {
+	emitAppender: join(pathToLoggerAppendersDir, "emit-appender"),
+	cliAppender: join(pathToLoggerAppendersDir, "cli-appender")
+};
+
+export enum LoggerLevel {
+	/**
+	 * Show all log messages.
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	ALL = "ALL",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	TRACE = "TRACE",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	DEBUG = "DEBUG",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	INFO = "INFO",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	WARN = "WARN",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	ERROR = "ERROR",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	FATAL = "FATAL",
+
+	/**
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	MARK = "MARK",
+
+	/**
+	 * Disable all logging.
+	 * Log levels are used to assign importance to log messages, with the integer value being used to sort them.
+	 * If you do not specify anything in your configuration, the default values are used (ALL < TRACE < DEBUG < INFO < WARN < ERROR < FATAL < MARK < OFF)
+	 */
+	OFF = "OFF"
+}
+
+export enum LoggerConfigData {
+	useStderr = "useStderr",
+	wrapMessageWithBorders = "wrapMessageWithBorders",
+	skipNewLine = "skipNewLine"
+}
+
+export const EMIT_APPENDER_EVENT_NAME = "logData";
diff --git a/lib/declarations.d.ts b/lib/declarations.d.ts
index e7c4a4456d..24e53f6c37 100644
--- a/lib/declarations.d.ts
+++ b/lib/declarations.d.ts
@@ -493,6 +493,8 @@ interface IPort {
 interface IPluginSeedOptions {
 	username: string;
 	pluginName: string;
+	includeTypeScriptDemo: string;
+	includeAngularDemo: string;
 }
 
 interface IAndroidBundleOptions {
@@ -544,6 +546,7 @@ interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvai
 	copyTo: string;
 	debugTransport: boolean;
 	forDevice: boolean;
+	iCloudContainerEnvironment: string;
 	framework: string;
 	frameworkName: string;
 	frameworkVersion: string;
@@ -568,7 +571,10 @@ interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvai
 	link: boolean;
 	analyticsLogFile: string;
 	performance: Object;
+	cleanupLogFile: string;
+	workflow: any;
 	setupOptions(projectData: IProjectData): void;
+	printMessagesForDeprecatedOptions(logger: ILogger): void;
 }
 
 interface IEnvOptions {
@@ -599,7 +605,7 @@ interface IUpdatePlatformOptions extends IPlatformTemplate {
 	canUpdate: boolean;
 }
 
-interface IInitService {
+interface IProjectInitService {
 	initialize(): Promise<void>;
 }
 
@@ -622,6 +628,11 @@ interface IITMSData extends ICredentials {
 	 * @type {string}
 	 */
 	ipaFilePath: string;
+
+	/**
+	 * Specify if the service should extract the `.ipa` file into `temp` directory in order to get bundleIdentifier from info.plist
+	 */
+	shouldExtractIpa: boolean;
 	/**
 	 * Specifies whether the logging level of the itmstransporter command-line tool should be set to verbose.
 	 * @type {string}
@@ -639,12 +650,6 @@ interface IITMSTransporterService {
 	 * @return {Promise<void>}
 	 */
 	upload(data: IITMSData): Promise<void>;
-	/**
-	 * Queries Apple's content delivery API to get the user's registered iOS applications.
-	 * @param  {ICredentials}                               credentials Credentials for authentication with iTunes Connect.
-	 * @return {Promise<IItunesConnectApplication[]>}          The user's iOS applications.
-	 */
-	getiOSApplications(credentials: ICredentials): Promise<IiTunesConnectApplication[]>;
 }
 
 /**
@@ -891,12 +896,11 @@ interface IXcprojInfo {
 
 interface IXcconfigService {
 	/**
-	 * Returns the path to the xcconfig file
+	 * Returns the paths to the xcconfig files for build configuration (debug/release)
 	 * @param projectRoot The path to root folder of native project (platforms/ios)
-	 * @param opts
-	 * @returns {string}
+	 * @returns {IStringDictionary}
 	 */
-	getPluginsXcconfigFilePath(projectRoot: string, opts: IRelease): string;
+	getPluginsXcconfigFilePaths(projectRoot: string): IStringDictionary;
 
 	/**
 	 * Returns the value of a property from a xcconfig file.
@@ -937,7 +941,13 @@ interface IBundleValidatorHelper {
 	 * @param {string} minSupportedVersion the minimum supported version of nativescript-dev-webpack
 	 * @return {void}
 	 */
-	validate(minSupportedVersion?: string): void;
+	validate(projectData: IProjectData, minSupportedVersion?: string): void;
+
+	/**
+	 * Returns the installed bundler version.
+	 * @return {string}
+	 */
+	getBundlerDependencyVersion(projectData: IProjectData, bundlerName?: string): string;
 }
 
 
diff --git a/lib/definitions/cleanup-service.d.ts b/lib/definitions/cleanup-service.d.ts
new file mode 100644
index 0000000000..abec414790
--- /dev/null
+++ b/lib/definitions/cleanup-service.d.ts
@@ -0,0 +1,59 @@
+/**
+ * Descibes the cleanup service which allows scheduling cleanup actions
+ * The actions will be executed once CLI process exits.
+ */
+interface ICleanupService extends IShouldDispose, IDisposable {
+	/**
+	 * Add new action to be executed when CLI process exits.
+	 * @param {ISpawnCommandInfo} commandInfo The command that should be executed, including command and args.
+	 * @returns {Promise<void>}
+	 */
+	addCleanupCommand(commandInfo: ISpawnCommandInfo): Promise<void>;
+
+	/**
+	 * Remove action to be executed when CLI process exits.
+	 * NOTE: The action should be added in the action list by calling `addCleanupAction` first.
+	 * @param {ISpawnCommandInfo} commandInfo The command that should be removed from cleanup execution, including command and args.
+	 * @returns {Promise<void>}
+	 */
+	removeCleanupCommand(commandInfo: ISpawnCommandInfo): Promise<void>
+
+	/**
+	 * Sets the file in which the cleanup process will write its logs.
+	 * This method must be called before starting the cleanup process, i.e. when CLI is initialized.
+	 * @param {string} filePath Path to file where the logs will be written. The logs are appended to the passed file.
+	 * @returns {void}
+	 */
+	setCleanupLogFile(filePath: string): void;
+
+	/**
+	 * Adds file/dir to be deleted once CLI process exits.
+	 * @param {string} filePath Path to file/directory to be deleted.
+	 * @returns {Promise<void>}
+	 */
+	addCleanupDeleteAction(filePath: string): Promise<void>;
+
+	/**
+	 * Removes file/dir from the list of files to be deleted once CLI process exits.
+	 * NOTE: The file should be first added with `addCleanupDeleteAction`
+	 * @param {string} filePath Path to file/directory to be removed from the list of files to be deleted.
+	 * @returns {Promise<void>}
+	 */
+	removeCleanupDeleteAction(filePath: string): Promise<void>;
+
+	/**
+	 * Adds JS file to be required and executed during cleanup.
+	 * NOTE: The JS file will be required in a new child process, so you can pass timeout for the execution.
+	 * In the child process you can use all injected dependencies of CLI.
+	 * @param {IJSCommand} jsCommand Information about the JS file to be required and the data that should be passed to it.
+	 * @returns {Promise<void>}
+	 */
+	addCleanupJS(jsCommand: IJSCommand): Promise<void>;
+
+	/**
+	 * Removes JS file to be required and executed during cleanup.
+	 * @param {IJSCommand} filePath jsCommand Information about the JS file to be required and the data that should not be passed to it.
+	 * @returns {Promise<void>}
+	 */
+	removeCleanupJS(jsCommand: IJSCommand): Promise<void>;
+}
diff --git a/lib/definitions/file-log-service.d.ts b/lib/definitions/file-log-service.d.ts
new file mode 100644
index 0000000000..1692db207c
--- /dev/null
+++ b/lib/definitions/file-log-service.d.ts
@@ -0,0 +1,19 @@
+/**
+ * Describes message that needs to be logged in the analytics logging file.
+ */
+interface IFileLogMessage {
+	message: string;
+	type?: FileLogMessageType;
+}
+
+/**
+ * Describes methods to get local logs from analytics tracking.
+ */
+interface IFileLogService {
+	/**
+	 * Logs specified message to the previously specified file.
+	 * @param {IFileLogMessage} fileLogMessage The message that has to be written to the logs file.
+	 * @returns {void}
+	 */
+	logData(fileLogMessage: IFileLogMessage): void;
+}
diff --git a/lib/definitions/initialize-service.d.ts b/lib/definitions/initialize-service.d.ts
new file mode 100644
index 0000000000..c2b7b22c09
--- /dev/null
+++ b/lib/definitions/initialize-service.d.ts
@@ -0,0 +1,9 @@
+interface IInitializeOptions {
+	loggerOptions?: ILoggerOptions;
+	settingsServiceOptions?: IConfigurationSettings;
+	extensibilityOptions?: { pathToExtensions: string };
+}
+
+interface IInitializeService {
+	initialize(initOpts?: IInitializeOptions): Promise<void>;
+}
diff --git a/lib/definitions/lock-service.d.ts b/lib/definitions/lock-service.d.ts
index 2bc892da00..bf80586d58 100644
--- a/lib/definitions/lock-service.d.ts
+++ b/lib/definitions/lock-service.d.ts
@@ -34,6 +34,6 @@ declare global {
          * Resolves the specified file lock. Whenever possible you should use the `release` function instead.
          * @param {string} lockFilePath Path to lock file that has to be unlocked. Defaults to `<profile dir>/lockfile.lock`
          */
-        unlock(lockFilePath?: string): void
+        unlock(lockFilePath?: string): Promise<void>
     }
-}
\ No newline at end of file
+}
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
index 6a02997efc..2ded89ea0f 100644
--- a/lib/definitions/platform.d.ts
+++ b/lib/definitions/platform.d.ts
@@ -14,6 +14,23 @@ interface IBuildPlatformAction {
 	buildPlatform(platform: string, buildConfig: IBuildConfig, projectData: IProjectData): Promise<string>;
 }
 
+interface IWorkflowService {
+	handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void>;
+}
+
+interface IHandleLegacyWorkflowOptions {
+	projectDir: string;
+	settings: IWebpackWorkflowSettings;
+	skipWarnings?: boolean;
+	force?: boolean;
+}
+
+interface IWebpackWorkflowSettings {
+	bundle?: boolean | string;
+	useHotModuleReload?: boolean;
+	release?: boolean;
+}
+
 interface IPlatformService extends IBuildPlatformAction, NodeJS.EventEmitter {
 	cleanPlatforms(platforms: string[], platformTemplate: string, projectData: IProjectData, config: IPlatformOptions, framework?: string): Promise<void>;
 
diff --git a/lib/definitions/preview-app-livesync.d.ts b/lib/definitions/preview-app-livesync.d.ts
index 4eef7d8cc7..123ae2e721 100644
--- a/lib/definitions/preview-app-livesync.d.ts
+++ b/lib/definitions/preview-app-livesync.d.ts
@@ -22,7 +22,7 @@ declare global {
 
 	interface IPreviewSdkService extends EventEmitter {
 		getQrCodeUrl(options: IGetQrCodeUrlOptions): string;
-		initialize(getInitialFiles: (device: Device) => Promise<FilesPayload>): void;
+		initialize(projectDir: string, getInitialFiles: (device: Device) => Promise<FilesPayload>): void;
 		applyChanges(filesPayload: FilesPayload): Promise<void>;
 		stop(): void;
 	}
@@ -45,7 +45,7 @@ declare global {
 		printLiveSyncQrCode(options: IPrintLiveSyncOptions): Promise<void>;
 	}
 
-	interface IPlaygroundAppQrCodeOptions {
+	interface IPlaygroundAppQrCodeOptions extends IProjectDir {
 		platform?: string;
 	}
 
@@ -64,4 +64,20 @@ declare global {
 		getDevicesForPlatform(platform: string): Device[];
 		getPluginsUsageWarnings(data: IPreviewAppLiveSyncData, device: Device): string[];
 	}
+
+	interface IPreviewSchemaService {
+		getSchemaData(projectDir: string): IPreviewSchemaData;
+	}
+
+	interface IPreviewSchemaData {
+		name: string;
+		scannerAppId: string;
+		scannerAppStoreId: string;
+		previewAppId: string;
+		previewAppStoreId: string;
+		msvKey: string;
+		publishKey: string;
+		subscribeKey: string;
+		default?: boolean;
+	}
 }
\ No newline at end of file
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
index 05d67d21ab..1b52116980 100644
--- a/lib/definitions/project.d.ts
+++ b/lib/definitions/project.d.ts
@@ -142,6 +142,14 @@ interface IProjectDataService {
 	 */
 	setNSValue(projectDir: string, key: string, value: any): void;
 
+	/**
+	 * Sets a value in the `useLegacyWorkflow` key in a project's nsconfig.json.
+	 * @param {string} projectDir The project directory - the place where the root package.json is located.
+	 * @param {any} value Value of the key to be set to `useLegacyWorkflow` key in project's nsconfig.json.
+	 * @returns {void}
+	 */
+	setUseLegacyWorkflow(projectDir: string, value: any): void;
+
 	/**
 	 * Removes a property from `nativescript` key in project's package.json.
 	 * @param {string} projectDir The project directory - the place where the root package.json is located.
@@ -304,6 +312,10 @@ interface IBuildForDevice {
 	buildForDevice: boolean;
 }
 
+interface IiCloudContainerEnvironment {
+	iCloudContainerEnvironment: string;
+}
+
 interface INativePrepare {
 	skipNativePrepare: boolean;
 }
@@ -317,7 +329,7 @@ interface IBuildConfig extends IAndroidBuildOptionsSettings, IiOSBuildConfig, IP
 /**
  * Describes iOS-specific build configuration properties
  */
-interface IiOSBuildConfig extends IBuildForDevice, IDeviceIdentifier, IProvision, ITeamIdentifier, IRelease {
+interface IiOSBuildConfig extends IBuildForDevice, IiCloudContainerEnvironment, IDeviceIdentifier, IProvision, ITeamIdentifier, IRelease {
 	/**
 	 * Identifier of the mobile provision which will be used for the build. If not set a provision will be selected automatically if possible.
 	 */
@@ -580,17 +592,39 @@ interface IIOSExtensionsService {
 	removeExtensions(options: IRemoveExtensionsOptions): void;
 }
 
-interface IAddExtensionsFromPathOptions{
-	extensionsFolderPath: string;
+/**
+ * Describes a service used to add and remove iOS extension
+ */
+interface IIOSExtensionsService {
+	addExtensionsFromPath(options: IAddExtensionsFromPathOptions): Promise<boolean>;
+	removeExtensions(options: IRemoveExtensionsOptions): void;
+}
+
+interface IIOSWatchAppService {
+	addWatchAppFromPath(options: IAddWatchAppFromPathOptions): Promise<boolean>;
+	removeWatchApp(options: IRemoveWatchAppOptions): void;
+}
+
+interface IAddTargetFromPathOptions {
 	projectData: IProjectData;
 	platformData: IPlatformData;
 	pbxProjPath: string;
 }
 
+interface IAddExtensionsFromPathOptions extends IAddTargetFromPathOptions {
+	extensionsFolderPath: string;
+}
+
+interface IAddWatchAppFromPathOptions extends IAddTargetFromPathOptions {
+	watchAppFolderPath: string;
+}
+
 interface IRemoveExtensionsOptions {
 	pbxProjPath: string
 }
 
+interface IRemoveWatchAppOptions extends IRemoveExtensionsOptions{}
+
 interface IRubyFunction {
 	functionName: string;
 	functionParameters?: string;
diff --git a/lib/definitions/xcode.d.ts b/lib/definitions/xcode.d.ts
index 065fbe2067..01c561dab3 100644
--- a/lib/definitions/xcode.d.ts
+++ b/lib/definitions/xcode.d.ts
@@ -28,7 +28,7 @@ declare module "nativescript-dev-xcode" {
 
         pbxXCBuildConfigurationSection(): any;
 
-        addTarget(targetName: string, targetType: string, targetPath?: string): target;
+        addTarget(targetName: string, targetType: string, targetPath?: string, parentTarget?: string): target;
         addBuildPhase(filePathsArray: string[],
             buildPhaseType: string,
             comment: string,
@@ -47,6 +47,7 @@ declare module "nativescript-dev-xcode" {
         addBuildProperty(prop: string, value: any, build_name?: string, productName?: string): void;
         addToHeaderSearchPaths(file: string|Object, productName?: string): void;
         removeTargetsByProductType(targetType: string): void
+        getFirstTarget(): {uuid: string}
     }
 
     class target {
diff --git a/lib/detached-processes/cleanup-js-subprocess.ts b/lib/detached-processes/cleanup-js-subprocess.ts
new file mode 100644
index 0000000000..c1c5adbd54
--- /dev/null
+++ b/lib/detached-processes/cleanup-js-subprocess.ts
@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+
+// NOTE: This file is used to call JS functions when cleaning resources used by CLI, after the CLI is killed.
+// The instances here are not shared with the ones in main CLI process.
+import * as fs from "fs";
+import * as uuid from "uuid";
+import { FileLogService } from "./file-log-service";
+
+const pathToBootstrap = process.argv[2];
+if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
+	throw new Error("Invalid path to bootstrap.");
+}
+
+// After requiring the bootstrap we can use $injector
+require(pathToBootstrap);
+
+const logFile = process.argv[3];
+const jsFilePath = process.argv[4];
+
+const fileLogService = $injector.resolve<IFileLogService>(FileLogService, { logFile });
+const uniqueId = uuid.v4();
+fileLogService.logData({ message: `Initializing Cleanup process for path: ${jsFilePath} Unique id: ${uniqueId}` });
+
+if (!fs.existsSync(jsFilePath)) {
+	throw new Error(`Unable to find file ${jsFilePath}. Ensure it exists.`);
+}
+
+let data: any;
+try {
+	data = process.argv[5] && JSON.parse(process.argv[5]);
+} catch (err) {
+	throw new Error(`Unable to parse data from argv ${process.argv[5]}.`);
+}
+
+const logMessage = (msg: string, type?: FileLogMessageType): void => {
+	fileLogService.logData({ message: `[${uniqueId}] ${msg}`, type });
+};
+
+/* tslint:disable:no-floating-promises */
+(async () => {
+	try {
+		logMessage(`Requiring file ${jsFilePath}`);
+
+		const func = require(jsFilePath);
+		if (func && typeof func === "function") {
+			try {
+				logMessage(`Passing data: ${JSON.stringify(data)} to the default function exported by currently required file ${jsFilePath}`);
+				await func(data);
+				logMessage(`Finished execution with data: ${JSON.stringify(data)} to the default function exported by currently required file ${jsFilePath}`);
+			} catch (err) {
+				logMessage(`Unable to execute action of file ${jsFilePath} when passed data is ${JSON.stringify(data)}. Error is: ${err}.`, FileLogMessageType.Error);
+			}
+		}
+	} catch (err) {
+		logMessage(`Unable to require file: ${jsFilePath}. Error is: ${err}.`, FileLogMessageType.Error);
+	}
+})();
+/* tslint:enable:no-floating-promises */
diff --git a/lib/detached-processes/cleanup-process-definitions.d.ts b/lib/detached-processes/cleanup-process-definitions.d.ts
new file mode 100644
index 0000000000..24eab593a4
--- /dev/null
+++ b/lib/detached-processes/cleanup-process-definitions.d.ts
@@ -0,0 +1,49 @@
+interface ITimeout {
+	/**
+	 * Timeout to execute the action.
+	 */
+	timeout?: number;
+}
+
+interface IFilePath {
+	/**
+	* Path to file/directory to be deleted or required
+	*/
+	filePath: string;
+}
+
+interface ISpawnCommandInfo extends ITimeout {
+	/**
+	 * Executable to be started.
+	 */
+	command: string;
+
+	/**
+	 * Arguments that will be passed to the child process
+	 */
+	args: string[];
+}
+
+interface ICleanupMessageBase {
+	/**
+	 * Type of the message
+	 */
+	messageType: CleanupProcessMessage;
+}
+
+interface ISpawnCommandCleanupMessage extends ICleanupMessageBase {
+	/**
+	 * Describes the command that must be executed
+	 */
+	commandInfo: ISpawnCommandInfo;
+}
+
+interface IFileCleanupMessage extends ICleanupMessageBase, IFilePath { }
+
+interface IJSCommand extends ITimeout, IFilePath {
+	data: IDictionary<any>;
+}
+
+interface IJSCleanupMessage extends ICleanupMessageBase {
+	jsCommand: IJSCommand;
+ }
diff --git a/lib/detached-processes/cleanup-process.ts b/lib/detached-processes/cleanup-process.ts
new file mode 100644
index 0000000000..a6bd0c7975
--- /dev/null
+++ b/lib/detached-processes/cleanup-process.ts
@@ -0,0 +1,175 @@
+// NOTE: This file is used to clean up resources used by CLI, when the CLI is killed.
+// The instances here are not shared with the ones in main CLI process.
+import * as fs from "fs";
+import * as path from "path";
+import * as shelljs from "shelljs";
+import { FileLogService } from "./file-log-service";
+
+const pathToBootstrap = process.argv[2];
+if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
+	throw new Error("Invalid path to bootstrap.");
+}
+
+const logFile = process.argv[3];
+// After requiring the bootstrap we can use $injector
+require(pathToBootstrap);
+
+const fileLogService = $injector.resolve<IFileLogService>(FileLogService, { logFile });
+fileLogService.logData({ message: "Initializing Cleanup process." });
+
+const commandsInfos: ISpawnCommandInfo[] = [];
+const filesToDelete: string[] = [];
+const jsCommands: IJSCommand[] = [];
+
+const executeJSCleanup = async (jsCommand: IJSCommand) => {
+	const $childProcess = $injector.resolve<IChildProcess>("childProcess");
+
+	try {
+		fileLogService.logData({ message: `Start executing action for file: ${jsCommand.filePath} and data ${JSON.stringify(jsCommand.data)}` });
+
+		await $childProcess.trySpawnFromCloseEvent(process.execPath, [path.join(__dirname, "cleanup-js-subprocess.js"), pathToBootstrap, logFile, jsCommand.filePath, JSON.stringify(jsCommand.data)], {}, { throwError: true, timeout: jsCommand.timeout || 3000 });
+		fileLogService.logData({ message: `Finished xecuting action for file: ${jsCommand.filePath} and data ${JSON.stringify(jsCommand.data)}` });
+
+	} catch (err) {
+		fileLogService.logData({ message: `Unable to execute action for file ${jsCommand.filePath} with data ${JSON.stringify(jsCommand.data)}. Error is: ${err}.`, type: FileLogMessageType.Error });
+	}
+};
+
+const executeCleanup = async () => {
+	const $childProcess = $injector.resolve<IChildProcess>("childProcess");
+
+	for (const jsCommand of jsCommands) {
+		await executeJSCleanup(jsCommand);
+	}
+
+	for (const commandInfo of commandsInfos) {
+		try {
+			fileLogService.logData({ message: `Start executing command: ${JSON.stringify(commandInfo)}` });
+
+			await $childProcess.trySpawnFromCloseEvent(commandInfo.command, commandInfo.args, {}, { throwError: true, timeout: commandInfo.timeout || 3000 });
+			fileLogService.logData({ message: `Successfully executed command: ${JSON.stringify(commandInfo)}` });
+		} catch (err) {
+			fileLogService.logData({ message: `Unable to execute command: ${JSON.stringify(commandInfo)}. Error is: ${err}.`, type: FileLogMessageType.Error });
+		}
+	}
+
+	if (filesToDelete.length) {
+		try {
+			fileLogService.logData({ message: `Deleting files ${filesToDelete.join(" ")}` });
+			shelljs.rm("-Rf", filesToDelete);
+		} catch (err) {
+			fileLogService.logData({ message: `Unable to delete files: ${JSON.stringify(filesToDelete)}. Error is: ${err}.`, type: FileLogMessageType.Error });
+		}
+	}
+
+	fileLogService.logData({ message: `cleanup-process finished` });
+	process.exit();
+};
+
+const addCleanupAction = (commandInfo: ISpawnCommandInfo): void => {
+	if (_.some(commandsInfos, currentCommandInfo => _.isEqual(currentCommandInfo, commandInfo))) {
+		fileLogService.logData({ message: `cleanup-process will not add command for execution as it has been added already: ${JSON.stringify(commandInfo)}` });
+	} else {
+		fileLogService.logData({ message: `cleanup-process added command for execution: ${JSON.stringify(commandInfo)}` });
+		commandsInfos.push(commandInfo);
+	}
+};
+
+const removeCleanupAction = (commandInfo: ISpawnCommandInfo): void => {
+	if (_.some(commandsInfos, currentCommandInfo => _.isEqual(currentCommandInfo, commandInfo))) {
+		_.remove(commandsInfos, currentCommandInfo => _.isEqual(currentCommandInfo, commandInfo));
+		fileLogService.logData({ message: `cleanup-process removed command for execution: ${JSON.stringify(commandInfo)}` });
+	} else {
+		fileLogService.logData({ message: `cleanup-process cannot remove command for execution as it has not been added before: ${JSON.stringify(commandInfo)}` });
+	}
+};
+
+const addDeleteAction = (filePath: string): void => {
+	const fullPath = path.resolve(filePath);
+
+	if (_.some(filesToDelete, f => f === fullPath)) {
+		fileLogService.logData({ message: `cleanup-process will not add ${fullPath} for deletion as it has been added already` });
+	} else {
+		filesToDelete.push(fullPath);
+		fileLogService.logData({ message: `cleanup-process added ${fullPath} for deletion` });
+	}
+};
+
+const removeDeleteAction = (filePath: string): void => {
+	const fullPath = path.resolve(filePath);
+
+	if (_.some(filesToDelete, f => f === fullPath)) {
+		_.remove(filesToDelete, f => f === fullPath);
+		fileLogService.logData({ message: `cleanup-process removed ${fullPath} from the list of files for deletion.` });
+	} else {
+		fileLogService.logData({ message: `cleanup-process cannot remove ${fullPath} for deletion as no such entry is found in the files marked for deletion` });
+	}
+};
+
+const addJSFile = (jsCommand: IJSCommand): void => {
+	const fullPath = path.resolve(jsCommand.filePath);
+
+	jsCommand.filePath = fullPath;
+
+	if (_.some(jsCommands, currentJSCommand => _.isEqual(currentJSCommand, jsCommand))) {
+		fileLogService.logData({ message: `cleanup-process will not add JS file for execution as it has been added already: ${JSON.stringify(jsCommand)}` });
+	} else {
+		fileLogService.logData({ message: `cleanup-process added JS file for execution: ${JSON.stringify(jsCommand)}` });
+		jsCommands.push(jsCommand);
+	}
+};
+
+const removeJSFile = (jsCommand: IJSCommand): void => {
+	const fullPath = path.resolve(jsCommand.filePath);
+
+	jsCommand.filePath = fullPath;
+
+	if (_.some(jsCommands, currentJSCommand => _.isEqual(currentJSCommand, jsCommand))) {
+		_.remove(jsCommands, currentJSCommand => _.isEqual(currentJSCommand, jsCommand));
+		fileLogService.logData({ message: `cleanup-process removed JS action for execution: ${JSON.stringify(jsCommand)}` });
+	} else {
+		fileLogService.logData({ message: `cleanup-process cannot remove JS action for execution as it has not been added before: ${JSON.stringify(jsCommand)}` });
+	}
+};
+
+process.on("message", async (cleanupProcessMessage: ICleanupMessageBase) => {
+	fileLogService.logData({ message: `cleanup-process received message of type: ${JSON.stringify(cleanupProcessMessage)}` });
+
+	switch (cleanupProcessMessage.messageType) {
+		case CleanupProcessMessage.AddCleanCommand:
+			addCleanupAction((<ISpawnCommandCleanupMessage>cleanupProcessMessage).commandInfo);
+			break;
+		case CleanupProcessMessage.RemoveCleanCommand:
+			removeCleanupAction((<ISpawnCommandCleanupMessage>cleanupProcessMessage).commandInfo);
+			break;
+		case CleanupProcessMessage.AddDeleteFileAction:
+			addDeleteAction((<IFileCleanupMessage>cleanupProcessMessage).filePath);
+			break;
+		case CleanupProcessMessage.RemoveDeleteFileAction:
+			removeDeleteAction((<IFileCleanupMessage>cleanupProcessMessage).filePath);
+			break;
+		case CleanupProcessMessage.AddJSFileToRequire:
+			const jsCleanupMessage = <IJSCleanupMessage>cleanupProcessMessage;
+			addJSFile(jsCleanupMessage.jsCommand);
+			break;
+		case CleanupProcessMessage.RemoveJSFileToRequire:
+			const msgToRemove = <IJSCleanupMessage>cleanupProcessMessage;
+			removeJSFile(msgToRemove.jsCommand);
+			break;
+		default:
+			fileLogService.logData({ message: `Unable to handle message of type ${cleanupProcessMessage.messageType}. Full message is ${JSON.stringify(cleanupProcessMessage)}`, type: FileLogMessageType.Error });
+			break;
+	}
+
+});
+
+process.on("disconnect", async () => {
+	fileLogService.logData({ message: "cleanup-process received process.disconnect event" });
+	await executeCleanup();
+	$injector.dispose();
+	process.exit();
+});
+
+fileLogService.logData({ message: `cleanup-process will send ${DetachedProcessMessages.ProcessReadyToReceive} message` });
+
+process.send(DetachedProcessMessages.ProcessReadyToReceive);
diff --git a/lib/detached-processes/detached-process-enums.d.ts b/lib/detached-processes/detached-process-enums.d.ts
new file mode 100644
index 0000000000..c8e27edede
--- /dev/null
+++ b/lib/detached-processes/detached-process-enums.d.ts
@@ -0,0 +1,56 @@
+/**
+ * Defines messages used in communication between CLI's process and analytics subprocesses.
+ */
+declare const enum DetachedProcessMessages {
+	/**
+	 * The detached process is initialized and is ready to receive information for tracking.
+	 */
+	ProcessReadyToReceive = "ProcessReadyToReceive"
+}
+
+/**
+ * Defines the type of the messages that should be written in the local analyitcs log file (in case such is specified).
+ */
+declare const enum FileLogMessageType {
+	/**
+	 * Information message. This is the default value in case type is not specified.
+	 */
+	Info = "Info",
+
+	/**
+	 * Error message - used to indicate that some action did not succeed.
+	 */
+	Error = "Error"
+}
+
+declare const enum CleanupProcessMessage {
+	/**
+	 * This type of message defines that cleanup procedure should execute specific command.
+	 */
+	AddCleanCommand = "AddCleanCommand",
+
+	/**
+	 * This type of message defines that cleanup procedure should not execute previously defined cleanup command.
+	 */
+	RemoveCleanCommand = "RemoveCleanCommand",
+
+	/**
+	 * This type of message defines that cleanup procedure should delete specified files.
+	 */
+	AddDeleteFileAction = "AddDeleteFileAction",
+
+	/**
+	 * This type of message defines that the cleanup procedure should not delete previously specified file.
+	 */
+	RemoveDeleteFileAction = "RemoveDeleteFileAction",
+
+	/**
+	 * This type of message defines that the cleanup procedure will require the specified JS file, which should execute some action.
+	 */
+	AddJSFileToRequire = "AddJSFileToRequire",
+
+	/**
+	 * This type of message defines that the cleanup procedure will not require the previously specified JS file.
+	 */
+	RemoveJSFileToRequire = "RemoveJSFileToRequire",
+}
diff --git a/lib/detached-processes/file-log-service.ts b/lib/detached-processes/file-log-service.ts
new file mode 100644
index 0000000000..ce1308ca36
--- /dev/null
+++ b/lib/detached-processes/file-log-service.ts
@@ -0,0 +1,15 @@
+import { EOL } from "os";
+import { getFixedLengthDateString } from "../common/helpers";
+
+export class FileLogService implements IFileLogService {
+	constructor(private $fs: IFileSystem,
+		private logFile: string) { }
+
+	public logData(fileLoggingMessage: IFileLogMessage): void {
+		if (this.logFile && fileLoggingMessage && fileLoggingMessage.message) {
+			fileLoggingMessage.type = fileLoggingMessage.type || FileLogMessageType.Info;
+			const formattedDate = getFixedLengthDateString();
+			this.$fs.appendFile(this.logFile, `[${formattedDate}] [${fileLoggingMessage.type}] ${fileLoggingMessage.message}${EOL}`);
+		}
+	}
+}
diff --git a/lib/helpers/bundle-validator-helper.ts b/lib/helpers/bundle-validator-helper.ts
index 4eedac652b..d5d8e6de0d 100644
--- a/lib/helpers/bundle-validator-helper.ts
+++ b/lib/helpers/bundle-validator-helper.ts
@@ -7,29 +7,35 @@ export class BundleValidatorHelper extends VersionValidatorHelper implements IBu
 		webpack: "nativescript-dev-webpack"
 	};
 
-	constructor(protected $projectData: IProjectData,
-		protected $errors: IErrors,
+	constructor(protected $errors: IErrors,
 		protected $options: IOptions) {
 		super();
-		this.$projectData.initializeProjectData();
 	}
 
-	public validate(minSupportedVersion?: string): void {
+	public validate(projectData: IProjectData, minSupportedVersion?: string): void {
 		if (this.$options.bundle) {
-			const bundlePluginName = this.bundlersMap[this.$options.bundle];
-			const bundlerVersionInDependencies = this.$projectData.dependencies && this.$projectData.dependencies[bundlePluginName];
-			const bundlerVersionInDevDependencies = this.$projectData.devDependencies && this.$projectData.devDependencies[bundlePluginName];
-			if (!bundlePluginName || (!bundlerVersionInDependencies && !bundlerVersionInDevDependencies)) {
+			const currentVersion = this.getBundlerDependencyVersion(projectData);
+			if (!currentVersion) {
 				this.$errors.failWithoutHelp(BundleValidatorMessages.MissingBundlePlugin);
 			}
 
-			const currentVersion = bundlerVersionInDependencies || bundlerVersionInDevDependencies;
 			const shouldThrowError = minSupportedVersion && this.isValidVersion(currentVersion) && this.isVersionLowerThan(currentVersion, minSupportedVersion);
 			if (shouldThrowError) {
-					this.$errors.failWithoutHelp(util.format(BundleValidatorMessages.NotSupportedVersion, minSupportedVersion));
+				this.$errors.failWithoutHelp(util.format(BundleValidatorMessages.NotSupportedVersion, minSupportedVersion));
 			}
 		}
 	}
+
+	public getBundlerDependencyVersion(projectData: IProjectData, bundlerName?: string): string {
+		let dependencyVersion = null;
+		const bundlePluginName = bundlerName || this.bundlersMap[this.$options.bundle];
+		const bundlerVersionInDependencies = projectData.dependencies && projectData.dependencies[bundlePluginName];
+		const bundlerVersionInDevDependencies = projectData.devDependencies && projectData.devDependencies[bundlePluginName];
+		dependencyVersion = bundlerVersionInDependencies || bundlerVersionInDevDependencies;
+
+		return dependencyVersion;
+
+	}
 }
 
 $injector.register("bundleValidatorHelper", BundleValidatorHelper);
diff --git a/lib/helpers/livesync-command-helper.ts b/lib/helpers/livesync-command-helper.ts
index 2d061a7c10..2760220cdb 100644
--- a/lib/helpers/livesync-command-helper.ts
+++ b/lib/helpers/livesync-command-helper.ts
@@ -15,8 +15,8 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $errors: IErrors,
 		private $iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
-		private $logger: ILogger) {
-		this.$analyticsService.setShouldDispose(this.$options.justlaunch || !this.$options.watch);
+		private $logger: ILogger,
+		private $cleanupService: ICleanupService) {
 	}
 
 	public getPlatformsForOperation(platform: string): string[] {
@@ -59,9 +59,14 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 
 		const workingWithiOSDevices = !platform || this.$mobileHelper.isiOSPlatform(platform);
 		const shouldKeepProcessAlive = this.$options.watch || !this.$options.justlaunch;
-		if (workingWithiOSDevices && shouldKeepProcessAlive) {
-			this.$iosDeviceOperations.setShouldDispose(false);
-			this.$iOSSimulatorLogProvider.setShouldDispose(false);
+		if (shouldKeepProcessAlive) {
+			this.$analyticsService.setShouldDispose(false);
+			this.$cleanupService.setShouldDispose(false);
+
+			if (workingWithiOSDevices) {
+				this.$iosDeviceOperations.setShouldDispose(false);
+				this.$iOSSimulatorLogProvider.setShouldDispose(false);
+			}
 		}
 
 		if (this.$options.release) {
@@ -76,6 +81,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 
 				const buildConfig: IBuildConfig = {
 					buildForDevice: !d.isEmulator,
+					iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
 					projectDir: this.$options.path,
 					clean: this.$options.clean,
 					teamId: this.$options.teamId,
@@ -146,7 +152,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		}
 
 		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
-		this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);
+		this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);
 
 		return result;
 	}
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
index 941367fad7..39b6479e60 100644
--- a/lib/nativescript-cli.ts
+++ b/lib/nativescript-cli.ts
@@ -1,12 +1,22 @@
 require("./bootstrap");
-import { EOL } from "os";
+
 import * as shelljs from "shelljs";
 shelljs.config.silent = true;
 shelljs.config.fatal = true;
 import { installUncaughtExceptionListener } from "./common/errors";
+import { settlePromises } from "./common/helpers";
 installUncaughtExceptionListener(process.exit.bind(process, ErrorCodes.UNCAUGHT));
 
-import { settlePromises } from "./common/helpers";
+const logger: ILogger = $injector.resolve("logger");
+const originalProcessOn = process.on;
+
+process.on = (event: string, listener: any): any => {
+	if (event === "SIGINT") {
+		logger.trace(new Error(`Trying to handle SIGINT event. CLI overrides this behavior and does not allow handling SIGINT as this causes issues with Ctrl + C in terminal`).stack);
+	} else {
+		return originalProcessOn.apply(process, [event, listener]);
+	}
+};
 
 /* tslint:disable:no-floating-promises */
 (async () => {
@@ -14,7 +24,8 @@ import { settlePromises } from "./common/helpers";
 	const err: IErrors = $injector.resolve("$errors");
 	err.printCallStack = config.DEBUG;
 
-	const logger: ILogger = $injector.resolve("logger");
+	const $initializeService = $injector.resolve<IInitializeService>("initializeService");
+	await $initializeService.initialize();
 
 	const extensibilityService: IExtensibilityService = $injector.resolve("extensibilityService");
 	try {
@@ -23,17 +34,6 @@ import { settlePromises } from "./common/helpers";
 		logger.trace("Unable to load extensions. Error is: ", err);
 	}
 
-	const $sysInfo = $injector.resolve<ISysInfo>("sysInfo");
-	const macOSWarning = await $sysInfo.getMacOSWarningMessage();
-	if (macOSWarning) {
-		const message = `${EOL}${macOSWarning.message}${EOL}`;
-		if (macOSWarning.severity === SystemWarningsSeverity.high) {
-			logger.printOnStderr(message.red.bold);
-		} else {
-			logger.warn(message);
-		}
-	}
-
 	const commandDispatcher: ICommandDispatcher = $injector.resolve("commandDispatcher");
 
 	const messages: IMessagesService = $injector.resolve("$messagesService");
diff --git a/lib/options.ts b/lib/options.ts
index 79931e43e7..01936ee917 100644
--- a/lib/options.ts
+++ b/lib/options.ts
@@ -48,6 +48,12 @@ export class Options {
 			this.argv.bundle = undefined;
 			this.argv.hmr = false;
 		}
+
+		if (this.argv.debugBrk) {
+			// we cannot use HMR along with debug-brk because we have to restart the app
+			// on each livesync in order to stop and allow debugging on app start
+			this.argv.hmr = false;
+		}
 	}
 
 	constructor(private $errors: IErrors,
@@ -76,6 +82,7 @@ export class Options {
 			framework: { type: OptionType.String, hasSensitiveValue: false },
 			frameworkVersion: { type: OptionType.String, hasSensitiveValue: false },
 			forDevice: { type: OptionType.Boolean, hasSensitiveValue: false },
+			iCloudContainerEnvironment: { type: OptionType.String, hasSensitiveValue: false },
 			provision: { type: OptionType.Object, hasSensitiveValue: true },
 			client: { type: OptionType.Boolean, default: true, hasSensitiveValue: false },
 			env: { type: OptionType.Object, hasSensitiveValue: false },
@@ -113,6 +120,8 @@ export class Options {
 			background: { type: OptionType.String, hasSensitiveValue: false },
 			username: { type: OptionType.String, hasSensitiveValue: true },
 			pluginName: { type: OptionType.String, hasSensitiveValue: false },
+			includeTypeScriptDemo: { type: OptionType.String, hasSensitiveValue: false },
+			includeAngularDemo: { type: OptionType.String, hasSensitiveValue: false },
 			hmr: { type: OptionType.Boolean, hasSensitiveValue: false },
 			collection: { type: OptionType.String, alias: "c", hasSensitiveValue: false },
 			json: { type: OptionType.Boolean, hasSensitiveValue: false },
@@ -135,6 +144,7 @@ export class Options {
 			file: { type: OptionType.String, hasSensitiveValue: true },
 			force: { type: OptionType.Boolean, alias: "f", hasSensitiveValue: false },
 			// remove legacy
+			workflow: { type: OptionType.Boolean, hasSensitiveValue: false },
 			companion: { type: OptionType.Boolean, hasSensitiveValue: false },
 			emulator: { type: OptionType.Boolean, hasSensitiveValue: false },
 			sdk: { type: OptionType.String, hasSensitiveValue: false },
@@ -146,6 +156,7 @@ export class Options {
 			default: { type: OptionType.Boolean, hasSensitiveValue: false },
 			count: { type: OptionType.Number, hasSensitiveValue: false },
 			analyticsLogFile: { type: OptionType.String, hasSensitiveValue: true },
+			cleanupLogFile: { type: OptionType.String, hasSensitiveValue: true },
 			hooks: { type: OptionType.Boolean, default: true, hasSensitiveValue: false },
 			link: { type: OptionType.Boolean, default: false, hasSensitiveValue: false },
 			aab: { type: OptionType.Boolean, hasSensitiveValue: false },
@@ -201,6 +212,16 @@ export class Options {
 		});
 	}
 
+	public printMessagesForDeprecatedOptions($logger: ILogger) {
+		if (this.argv.platformTemplate) {
+			$logger.warn(`"--platformTemplate" option has been deprecated and will be removed in the upcoming NativeScript CLI v6.0.0. More info can be found in this issue https://github.com/NativeScript/nativescript-cli/issues/4518.`);
+		}
+
+		if (this.argv.syncAllFiles) {
+			$logger.warn(`"--syncAllFiles" option has been deprecated and will be removed in the upcoming NativeScript CLI v6.0.0. More info can be found in this issue https://github.com/NativeScript/nativescript-cli/issues/4518.`);
+		}
+	}
+
 	private getCorrectOptionName(optionName: string): string {
 		const secondaryOptionName = this.getNonDashedOptionName(optionName);
 		return _.includes(this.optionNames, secondaryOptionName) ? secondaryOptionName : optionName;
diff --git a/lib/package-installation-manager.ts b/lib/package-installation-manager.ts
index b2e62e66c4..62ebf0a5f1 100644
--- a/lib/package-installation-manager.ts
+++ b/lib/package-installation-manager.ts
@@ -91,7 +91,7 @@ export class PackageInstallationManager implements IPackageInstallationManager {
 			await this.$childProcess.exec(`npm install ${inspectorNpmPackageName}@${version} --prefix ${cachePath}`, { maxBuffer: 250 * 1024 });
 		}
 
-		this.$logger.out("Using inspector from cache.");
+		this.$logger.info("Using inspector from cache.");
 		return pathToPackageInCache;
 	}
 
@@ -139,7 +139,7 @@ export class PackageInstallationManager implements IPackageInstallationManager {
 	}
 
 	private async npmInstall(packageName: string, pathToSave: string, version: string, dependencyType: string): Promise<INpmInstallResultInfo> {
-		this.$logger.out(`Installing ${packageName}`);
+		this.$logger.info(`Installing ${packageName}`);
 
 		packageName = packageName + (version ? `@${version}` : "");
 
diff --git a/lib/project-data.ts b/lib/project-data.ts
index 328d8a6198..538651f0db 100644
--- a/lib/project-data.ts
+++ b/lib/project-data.ts
@@ -260,7 +260,7 @@ export class ProjectData implements IProjectData {
 
 	@cache()
 	private warnProjectId(): void {
-		this.$logger.warnWithLabel("IProjectData.projectId is deprecated. Please use IProjectData.projectIdentifiers[platform].");
+		this.$logger.warn("[WARNING]: IProjectData.projectId is deprecated. Please use IProjectData.projectIdentifiers[platform].");
 	}
 }
-$injector.register("projectData", ProjectData);
+$injector.register("projectData", ProjectData, true);
diff --git a/lib/services/analytics/analytics-broker-process.ts b/lib/services/analytics/analytics-broker-process.ts
index a687fd87df..5e7439af26 100644
--- a/lib/services/analytics/analytics-broker-process.ts
+++ b/lib/services/analytics/analytics-broker-process.ts
@@ -2,7 +2,7 @@
 // The instances here are not shared with the ones in main CLI process.
 import * as fs from "fs";
 import { AnalyticsBroker } from "./analytics-broker";
-import { AnalyticsLoggingService } from "./analytics-logging-service";
+import { FileLogService } from "../../detached-processes/file-log-service";
 
 const pathToBootstrap = process.argv[2];
 if (!pathToBootstrap || !fs.existsSync(pathToBootstrap)) {
@@ -13,45 +13,24 @@ const logFile = process.argv[3];
 // After requiring the bootstrap we can use $injector
 require(pathToBootstrap);
 
-const analyticsLoggingService = $injector.resolve<IAnalyticsLoggingService>(AnalyticsLoggingService, { logFile });
+const analyticsLoggingService = $injector.resolve<IFileLogService>(FileLogService, { logFile });
 analyticsLoggingService.logData({ message: "Initializing AnalyticsBroker." });
 
 const analyticsBroker = $injector.resolve<IAnalyticsBroker>(AnalyticsBroker, { pathToBootstrap, analyticsLoggingService });
 
 let trackingQueue: Promise<void> = Promise.resolve();
 
-let sentFinishMsg = false;
-let receivedFinishMsg = false;
-
 const sendDataForTracking = async (data: ITrackingInformation) => {
 	trackingQueue = trackingQueue.then(() => analyticsBroker.sendDataForTracking(data));
 	await trackingQueue;
 };
 
 const finishTracking = async (data?: ITrackingInformation) => {
-	analyticsLoggingService.logData({ message: `analytics-broker-process finish tracking started, sentFinishMsg: ${sentFinishMsg}, receivedFinishMsg: ${receivedFinishMsg}` });
-
-	if (!sentFinishMsg) {
-		sentFinishMsg = true;
-
-		data = data || { type: TrackingTypes.Finish };
-		const action = async () => {
-			await trackingQueue;
-			analyticsLoggingService.logData({ message: `analytics-broker-process tracking finished` });
-			process.disconnect();
-		};
-
-		if (receivedFinishMsg) {
-			await action();
-		} else {
-			// In case we've got here without receiving "finish" message from parent (receivedFinishMsg is false)
-			// there might be various reasons, but most probably the parent is dead.
-			// However, there's no guarantee that we've received all messages. So wait some time before sending finish message to children.
-			setTimeout(async () => {
-				await action();
-			}, 1000);
-		}
-	}
+	analyticsLoggingService.logData({ message: `analytics-broker-process finish tracking started` });
+	await trackingQueue;
+	analyticsLoggingService.logData({ message: `analytics-broker-process tracking finished` });
+	$injector.dispose();
+	process.exit();
 };
 
 const trackPreviewAppData = async (data: any) => {
@@ -84,12 +63,6 @@ const trackPreviewAppData = async (data: any) => {
 process.on("message", async (data: ITrackingInformation) => {
 	analyticsLoggingService.logData({ message: `analytics-broker-process received message of type: ${JSON.stringify(data)}` });
 
-	if (data.type === TrackingTypes.Finish) {
-		receivedFinishMsg = true;
-		await finishTracking(data);
-		return;
-	}
-
 	if (data.type === TrackingTypes.PreviewAppData) {
 		await trackPreviewAppData(<IPreviewAppTrackingInformation>data);
 		return;
@@ -103,6 +76,6 @@ process.on("disconnect", async () => {
 	await finishTracking();
 });
 
-analyticsLoggingService.logData({ message: `analytics-broker-process will send ${AnalyticsMessages.BrokerReadyToReceive} message` });
+analyticsLoggingService.logData({ message: `analytics-broker-process will send ${DetachedProcessMessages.ProcessReadyToReceive} message` });
 
-process.send(AnalyticsMessages.BrokerReadyToReceive);
+process.send(DetachedProcessMessages.ProcessReadyToReceive);
diff --git a/lib/services/analytics/analytics-broker.ts b/lib/services/analytics/analytics-broker.ts
index 296ba02ff0..918d41050d 100644
--- a/lib/services/analytics/analytics-broker.ts
+++ b/lib/services/analytics/analytics-broker.ts
@@ -10,14 +10,14 @@ export class AnalyticsBroker implements IAnalyticsBroker {
 
 	constructor(private $analyticsSettingsService: IAnalyticsSettingsService,
 		private $injector: IInjector,
-		private analyticsLoggingService: IAnalyticsLoggingService) { }
+		private analyticsLoggingService: IFileLogService) { }
 
 	public async sendDataForTracking(trackInfo: ITrackingInformation): Promise<void> {
 		try {
 			const googleProvider = await this.getGoogleAnalyticsProvider();
 			await googleProvider.trackHit(<IGoogleAnalyticsTrackingInformation>trackInfo);
 		} catch (err) {
-			this.analyticsLoggingService.logData({ message: `AnalyticsBroker unable to execute action in sendDataForTracking: ${err}`, type: AnalyticsLoggingMessageType.Error });
+			this.analyticsLoggingService.logData({ message: `AnalyticsBroker unable to execute action in sendDataForTracking: ${err}`, type: FileLogMessageType.Error });
 		}
 	}
 }
diff --git a/lib/services/analytics/analytics-constants.d.ts b/lib/services/analytics/analytics-constants.d.ts
deleted file mode 100644
index f2d71ce96a..0000000000
--- a/lib/services/analytics/analytics-constants.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Defines messages used in communication between CLI's process and analytics subprocesses.
- */
-declare const enum AnalyticsMessages {
-	/**
-	 * Analytics Broker is initialized and is ready to receive information for tracking.
-	 */
-	BrokerReadyToReceive = "BrokerReadyToReceive"
-}
-
-/**
- * Defines the type of the messages that should be written in the local analyitcs log file (in case such is specified).
- */
-declare const enum AnalyticsLoggingMessageType {
-	/**
-	 * Information message. This is the default value in case type is not specified.
-	 */
-	Info = "Info",
-
-	/**
-	 * Error message - used to indicate that some action while trying to track information did not succeeded.
-	 */
-	Error = "Error"
-}
diff --git a/lib/services/analytics/analytics-logging-service.ts b/lib/services/analytics/analytics-logging-service.ts
deleted file mode 100644
index 008382f0f8..0000000000
--- a/lib/services/analytics/analytics-logging-service.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { EOL } from "os";
-import { getFixedLengthDateString } from "../../common/helpers";
-
-export class AnalyticsLoggingService implements IAnalyticsLoggingService {
-	constructor(private $fs: IFileSystem,
-		private logFile: string) { }
-
-	public logData(analyticsLoggingMessage: IAnalyticsLoggingMessage): void {
-		if (this.logFile && analyticsLoggingMessage && analyticsLoggingMessage.message) {
-			analyticsLoggingMessage.type = analyticsLoggingMessage.type || AnalyticsLoggingMessageType.Info;
-			const formattedDate = getFixedLengthDateString();
-			this.$fs.appendFile(this.logFile, `[${formattedDate}] [${analyticsLoggingMessage.type}] ${analyticsLoggingMessage.message}${EOL}`);
-		}
-	}
-}
diff --git a/lib/services/analytics/analytics-service.ts b/lib/services/analytics/analytics-service.ts
index 3871e75752..a620f2c209 100644
--- a/lib/services/analytics/analytics-service.ts
+++ b/lib/services/analytics/analytics-service.ts
@@ -13,7 +13,6 @@ export class AnalyticsService implements IAnalyticsService, IDisposable {
 
 	constructor(private $logger: ILogger,
 		private $options: IOptions,
-		private $processService: IProcessService,
 		private $staticConfig: Config.IStaticConfig,
 		private $prompter: IPrompter,
 		private $userSettingsService: UserSettings.IUserSettingsService,
@@ -34,7 +33,7 @@ export class AnalyticsService implements IAnalyticsService, IDisposable {
 			let trackFeatureUsage = initialTrackFeatureUsageStatus === AnalyticsStatus.enabled;
 
 			if (await this.isNotConfirmed(this.$staticConfig.TRACK_FEATURE_USAGE_SETTING_NAME) && isInteractive()) {
-				this.$logger.out("Do you want to help us improve "
+				this.$logger.info("Do you want to help us improve "
 					+ this.$analyticsSettingsService.getClientName()
 					+ " by automatically sending anonymous usage statistics? We will not use this information to identify or contact you."
 					+ " You can read our official Privacy Policy at");
@@ -223,20 +222,12 @@ export class AnalyticsService implements IAnalyticsService, IDisposable {
 			});
 
 			broker.on("message", (data: any) => {
-				if (data === AnalyticsMessages.BrokerReadyToReceive) {
+				if (data === DetachedProcessMessages.ProcessReadyToReceive) {
 					clearTimeout(timeoutId);
 
 					if (!isSettled) {
 						isSettled = true;
-
-						this.$processService.attachToProcessExitSignals(this, () => {
-							broker.send({
-								type: TrackingTypes.Finish
-							});
-						});
-
 						this.brokerProcess = broker;
-
 						resolve(broker);
 					}
 				}
diff --git a/lib/services/analytics/analytics.d.ts b/lib/services/analytics/analytics.d.ts
index 6517ea016f..90d8837383 100644
--- a/lib/services/analytics/analytics.d.ts
+++ b/lib/services/analytics/analytics.d.ts
@@ -50,23 +50,3 @@ interface IGoogleAnalyticsProvider {
 	 */
 	trackHit(data: IGoogleAnalyticsData): Promise<void>;
 }
-
-/**
- * Describes message that needs to be logged in the analytics logging file.
- */
-interface IAnalyticsLoggingMessage {
-	message: string;
-	type?: AnalyticsLoggingMessageType
-}
-
-/**
- * Describes methods to get local logs from analytics tracking.
- */
-interface IAnalyticsLoggingService {
-	/**
-	 * Logs specified message to the file specified with `--analyticsLogFile`.
-	 * @param {IAnalyticsLoggingMessage} analyticsLoggingMessage The message that has to be written to the logs file.
-	 * @returns {void}
-	 */
-	logData(analyticsLoggingMessage: IAnalyticsLoggingMessage): void;
-}
diff --git a/lib/services/analytics/google-analytics-provider.ts b/lib/services/analytics/google-analytics-provider.ts
index a9a3463655..9173318793 100644
--- a/lib/services/analytics/google-analytics-provider.ts
+++ b/lib/services/analytics/google-analytics-provider.ts
@@ -12,7 +12,7 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 		private $logger: ILogger,
 		private $proxyService: IProxyService,
 		private $config: IConfiguration,
-		private analyticsLoggingService: IAnalyticsLoggingService) {
+		private analyticsLoggingService: IFileLogService) {
 	}
 
 	public async trackHit(trackInfo: IGoogleAnalyticsData): Promise<void> {
@@ -21,7 +21,7 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 		try {
 			await this.track(this.$config.GA_TRACKING_ID, trackInfo, sessionId);
 		} catch (e) {
-			this.analyticsLoggingService.logData({ type: AnalyticsLoggingMessageType.Error, message: `Unable to track information ${JSON.stringify(trackInfo)}. Error is: ${e}` });
+			this.analyticsLoggingService.logData({ type: FileLogMessageType.Error, message: `Unable to track information ${JSON.stringify(trackInfo)}. Error is: ${e}` });
 			this.$logger.trace("Analytics exception: ", e);
 		}
 	}
@@ -95,7 +95,7 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 					this.analyticsLoggingService.logData({
 						message: `Unable to track event with category: '${trackInfo.category}', action: '${trackInfo.action}', label: '${trackInfo.label}', ` +
 							`value: '${trackInfo.value}' attached page: ${this.currentPage}. Error is: ${err}.`,
-						type: AnalyticsLoggingMessageType.Error
+						type: FileLogMessageType.Error
 					});
 
 					reject(err);
@@ -121,7 +121,7 @@ export class GoogleAnalyticsProvider implements IGoogleAnalyticsProvider {
 				if (err) {
 					this.analyticsLoggingService.logData({
 						message: `Unable to track pageview with path '${trackInfo.path}' and title: '${trackInfo.title}' Error is: ${err}.`,
-						type: AnalyticsLoggingMessageType.Error
+						type: FileLogMessageType.Error
 					});
 
 					reject(err);
diff --git a/lib/services/android-device-debug-service.ts b/lib/services/android-device-debug-service.ts
index b764e5bd11..b079862778 100644
--- a/lib/services/android-device-debug-service.ts
+++ b/lib/services/android-device-debug-service.ts
@@ -50,6 +50,7 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 		return this.device.adb.executeCommand(["forward", "--remove", `tcp:${port}`]);
 	}
 
+	// TODO: Remove this method and reuse logic from androidProcessService
 	private async getForwardedDebugPort(deviceId: string, packageName: string): Promise<number> {
 		let port = -1;
 		const forwardsResult = await this.device.adb.executeCommand(["forward", "--list"]);
@@ -68,11 +69,15 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 			await this.unixSocketForward(port, `${unixSocketName}`);
 		}
 
+		// TODO: Uncomment for 6.0.0 release
+		// await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", deviceId, "forward", "--remove", `tcp:${port}`] });
+
 		return port;
 	}
 
+	// TODO: Remove this method and reuse logic from androidProcessService
 	private async unixSocketForward(local: number, remote: string): Promise<void> {
-		return this.device.adb.executeCommand(["forward", `tcp:${local}`, `localabstract:${remote}`]);
+		await this.device.adb.executeCommand(["forward", `tcp:${local}`, `localabstract:${remote}`]);
 	}
 
 	@performanceLog()
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.ts
index 380ce5a24f..d1565056a3 100644
--- a/lib/services/android-project-service.ts
+++ b/lib/services/android-project-service.ts
@@ -753,7 +753,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			return true;
 		}
 
-		if (platformVersion === constants.PackageVersion.NEXT || platformVersion === constants.PackageVersion.LATEST || platformVersion === constants.PackageVersion.RC) {
+		if (!semver.valid(platformVersion)) {
 			return true;
 		}
 
diff --git a/lib/services/android-resources-migration-service.ts b/lib/services/android-resources-migration-service.ts
index 2aac57b327..a565bacc22 100644
--- a/lib/services/android-resources-migration-service.ts
+++ b/lib/services/android-resources-migration-service.ts
@@ -27,14 +27,14 @@ export class AndroidResourcesMigrationService implements IAndroidResourcesMigrat
 
 		try {
 			await this.tryMigrate(originalAppResources, appResourcesDestination, appResourcesBackup);
-			this.$logger.out(`Successfully updated your project's application resources '/Android' directory structure.${EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
+			this.$logger.info(`Successfully updated your project's application resources '/Android' directory structure.${EOL}The previous version of your Android application resources has been renamed to '/${AndroidResourcesMigrationService.ANDROID_DIR_OLD}'`);
 		} catch (error) {
 			try {
 				this.recover(originalAppResources, appResourcesDestination, appResourcesBackup);
-				this.$logger.out("Failed to update resources. They should be in their initial state.");
+				this.$logger.info("Failed to update resources. They should be in their initial state.");
 			} catch (err) {
 				this.$logger.trace(err);
-				this.$logger.out(`Failed to update resources.${EOL} Backup of original content is inside "${appResourcesBackup}".${EOL}If "${originalAppResources} is missing copy from backup folder."`);
+				this.$logger.info(`Failed to update resources.${EOL} Backup of original content is inside "${appResourcesBackup}".${EOL}If "${originalAppResources} is missing copy from backup folder."`);
 			} finally {
 				this.$errors.failWithoutHelp(error.message);
 			}
diff --git a/lib/services/apple-portal/apple-portal-application-service.ts b/lib/services/apple-portal/apple-portal-application-service.ts
new file mode 100644
index 0000000000..791e420bb1
--- /dev/null
+++ b/lib/services/apple-portal/apple-portal-application-service.ts
@@ -0,0 +1,54 @@
+export class ApplePortalApplicationService implements IApplePortalApplicationService {
+	constructor(
+		private $applePortalSessionService: IApplePortalSessionService,
+		private $errors: IErrors,
+		private $httpClient: Server.IHttpClient
+	) { }
+
+	public async getApplications(credentials: ICredentials): Promise<IApplePortalApplicationSummary[]> {
+		let result: IApplePortalApplicationSummary[] = [];
+
+		const user = await this.$applePortalSessionService.createUserSession(credentials);
+		for (const account of user.associatedAccounts) {
+			const contentProviderId = account.contentProvider.contentProviderId;
+			const dsId = user.sessionToken.dsId;
+			const applications = await this.getApplicationsByProvider(contentProviderId, dsId);
+			result = result.concat(applications.summaries);
+		}
+
+		return result;
+	}
+
+	public async getApplicationsByProvider(contentProviderId: number, dsId: string): Promise<IApplePortalApplication> {
+		const webSessionCookie = await this.$applePortalSessionService.createWebSession(contentProviderId, dsId);
+		const response = await this.$httpClient.httpRequest({
+			url: "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/apps/manageyourapps/summary/v2",
+			method: "GET",
+			body: JSON.stringify({
+				contentProviderId
+			}),
+			headers: {
+				'Content-Type': 'application/json',
+				'Cookie': webSessionCookie
+			}
+		});
+
+		return JSON.parse(response.body).data;
+	}
+
+	public async getApplicationByBundleId(credentials: ICredentials, bundleId: string): Promise<IApplePortalApplicationSummary> {
+		const applications = await this.getApplications(credentials);
+		if (!applications || !applications.length) {
+			this.$errors.failWithoutHelp(`Cannot find any registered applications for Apple ID ${credentials.username} in iTunes Connect.`);
+		}
+
+		const application = _.find(applications, app => app.bundleId === bundleId);
+
+		if (!application) {
+			this.$errors.failWithoutHelp(`Cannot find registered applications that match the specified identifier ${bundleId} in iTunes Connect.`);
+		}
+
+		return application;
+	}
+}
+$injector.register("applePortalApplicationService", ApplePortalApplicationService);
diff --git a/lib/services/apple-portal/apple-portal-cookie-service.ts b/lib/services/apple-portal/apple-portal-cookie-service.ts
new file mode 100644
index 0000000000..241652cd82
--- /dev/null
+++ b/lib/services/apple-portal/apple-portal-cookie-service.ts
@@ -0,0 +1,41 @@
+export class ApplePortalCookieService implements IApplePortalCookieService {
+	private userSessionCookies: IStringDictionary = {};
+	private validUserSessionCookieNames = ["myacinfo", "dqsid", "itctx", "itcdq", "acn01"];
+	private validWebSessionCookieNames = ["wosid", "woinst", "itctx"];
+
+	public getWebSessionCookie(cookiesData: string[]): string {
+		const webSessionCookies = _.cloneDeep(this.userSessionCookies);
+
+		const parsedCookies = this.parseCookiesData(cookiesData, this.validWebSessionCookieNames);
+		_.each(parsedCookies, parsedCookie => webSessionCookies[parsedCookie.key] = parsedCookie.cookie);
+
+		return _.values(webSessionCookies).join("; ");
+	}
+
+	public getUserSessionCookie(): string {
+		return _.values(this.userSessionCookies).join("; ");
+	}
+
+	public updateUserSessionCookie(cookiesData: string[]): void {
+		const parsedCookies = this.parseCookiesData(cookiesData, this.validUserSessionCookieNames);
+		_.each(parsedCookies, parsedCookie => this.userSessionCookies[parsedCookie.key] = parsedCookie.cookie);
+	}
+
+	private parseCookiesData(cookiesData: string[], validCookieNames: string[]): IDictionary<{key: string, value: string, cookie: string}> {
+		const result: IDictionary<{key: string, value: string, cookie: string}> = {};
+
+		for (const c of cookiesData) {
+			const parts = c.split(";");
+			for (const cookie of parts) {
+				const trimmedCookie = cookie.trim();
+				const [cookieKey, cookieValue] = trimmedCookie.split("=");
+				if (_.includes(validCookieNames, cookieKey)) {
+					result[cookieKey] = { key: cookieKey, value: cookieValue, cookie: trimmedCookie };
+				}
+			}
+		}
+
+		return result;
+	}
+}
+$injector.register("applePortalCookieService", ApplePortalCookieService);
diff --git a/lib/services/apple-portal/apple-portal-session-service.ts b/lib/services/apple-portal/apple-portal-session-service.ts
new file mode 100644
index 0000000000..83adf60272
--- /dev/null
+++ b/lib/services/apple-portal/apple-portal-session-service.ts
@@ -0,0 +1,95 @@
+export class ApplePortalSessionService implements IApplePortalSessionService {
+	private loginConfigEndpoint = "https://appstoreconnect.apple.com/olympus/v1/app/config?hostname=itunesconnect.apple.com";
+	private defaultLoginConfig = {
+		authServiceUrl : "https://idmsa.apple.com/appleautcodh",
+		authServiceKey : "e0b80c3bf78523bfe80974d320935bfa30add02e1bff88ec2166c6bd5a706c42"
+	};
+
+	constructor(
+		private $applePortalCookieService: IApplePortalCookieService,
+		private $httpClient: Server.IHttpClient,
+		private $logger: ILogger
+	) { }
+
+	public async createUserSession(credentials: ICredentials): Promise<IApplePortalUserDetail> {
+		const loginConfig = await this.getLoginConfig();
+		const loginUrl = `${loginConfig.authServiceUrl}/auth/signin`;
+		const loginResponse = await this.$httpClient.httpRequest({
+			url: loginUrl,
+			method: "POST",
+			body: JSON.stringify({
+				accountName: credentials.username,
+				password: credentials.password,
+				rememberMe: true
+			}),
+			headers: {
+				'Content-Type': 'application/json',
+				'X-Requested-With': 'XMLHttpRequest',
+				'X-Apple-Widget-Key': loginConfig.authServiceKey,
+				'Accept': 'application/json, text/javascript'
+			}
+		});
+
+		this.$applePortalCookieService.updateUserSessionCookie(loginResponse.headers["set-cookie"]);
+
+		const sessionResponse = await this.$httpClient.httpRequest({
+			url: "https://appstoreconnect.apple.com/olympus/v1/session",
+			method: "GET",
+			headers: {
+				'Cookie': this.$applePortalCookieService.getUserSessionCookie()
+			}
+		});
+
+		this.$applePortalCookieService.updateUserSessionCookie(sessionResponse.headers["set-cookie"]);
+
+		const userDetailResponse = await this.$httpClient.httpRequest({
+			url: "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/user/detail",
+			method: "GET",
+			headers: {
+				'Content-Type': 'application/json',
+				'Cookie': this.$applePortalCookieService.getUserSessionCookie(),
+			}
+		});
+
+		this.$applePortalCookieService.updateUserSessionCookie(userDetailResponse.headers["set-cookie"]);
+
+		return JSON.parse(userDetailResponse.body).data;
+	}
+
+	public async createWebSession(contentProviderId: number, dsId: string): Promise<string> {
+		const webSessionResponse = await this.$httpClient.httpRequest({
+			url: "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/v1/session/webSession",
+			method: "POST",
+			body: JSON.stringify({
+				contentProviderId,
+				dsId,
+				ipAddress: null
+			}),
+			headers: {
+				'Accept': 'application/json, text/plain, */*',
+				'Accept-Encoding': 'gzip, deflate, br',
+				'X-Csrf-Itc': 'itc',
+				'Content-Type': 'application/json;charset=UTF-8',
+				'Cookie': this.$applePortalCookieService.getUserSessionCookie()
+			}
+		});
+
+		const webSessionCookie = this.$applePortalCookieService.getWebSessionCookie(webSessionResponse.headers["set-cookie"]);
+
+		return webSessionCookie;
+	}
+
+	private async getLoginConfig(): Promise<{authServiceUrl: string, authServiceKey: string}> {
+		let config = null;
+
+		try {
+			const response = await this.$httpClient.httpRequest({ url: this.loginConfigEndpoint, method: "GET" });
+			config = JSON.parse(response.body);
+		} catch (err) {
+			this.$logger.trace(`Error while executing request to ${this.loginConfigEndpoint}. More info: ${err}`);
+		}
+
+		return config || this.defaultLoginConfig;
+	}
+}
+$injector.register("applePortalSessionService", ApplePortalSessionService);
diff --git a/lib/services/apple-portal/definitions.d.ts b/lib/services/apple-portal/definitions.d.ts
new file mode 100644
index 0000000000..fdaf16968e
--- /dev/null
+++ b/lib/services/apple-portal/definitions.d.ts
@@ -0,0 +1,72 @@
+interface IApplePortalSessionService {
+	createUserSession(credentials: ICredentials): Promise<IApplePortalUserDetail>;
+	createWebSession(contentProviderId: number, dsId: string): Promise<string>;
+}
+
+interface IApplePortalCookieService {
+	getWebSessionCookie(cookiesData: string[]): string;
+	getUserSessionCookie(): string;
+	updateUserSessionCookie(cookie: string[]): void;
+}
+
+interface IApplePortalApplicationService {
+	getApplications(credentials: ICredentials): Promise<IApplePortalApplicationSummary[]>
+	getApplicationsByProvider(contentProviderId: number, dsId: string): Promise<IApplePortalApplication>;
+	getApplicationByBundleId(credentials: ICredentials, bundleId: string): Promise<IApplePortalApplicationSummary>;
+}
+
+interface IApplePortalUserDetail {
+	associatedAccounts: IApplePortalAssociatedAccountData[];
+	sessionToken: {
+		dsId: string;
+		contentProviderId: number;
+		ipAddress: string;
+	}
+	contentProviderFeatures: string[];
+	contentProviderId: number;
+	firstname: string;
+	displayName: string;
+	userName: string;
+	userId: string;
+	contentProvider: string;
+	visibility: boolean;
+	DYCVisibility: boolean;
+}
+
+interface IApplePortalAssociatedAccountData {
+	contentProvider: {
+		name: string;
+		contentProviderId: number;
+		contentProviderPublicId: string;
+		contentProviderTypes: string[];
+	};
+	roles: string[];
+	lastLogin: number;
+}
+
+interface IApplePortalApplication {
+	summaries: IApplePortalApplicationSummary[];
+	showSharedSecret: boolean;
+	macBundlesEnabled: boolean;
+	canCreateMacApps: boolean;
+	cloudStorageEnabled: boolean;
+	sharedSecretLink: string;
+	gameCenterGroupLink: string;
+	enabledPlatforms: string[];
+	cloudStorageLink: string;
+	catalogReportsLink: string;
+	canCreateIOSApps: boolean;
+}
+
+interface IApplePortalApplicationSummary {
+	name: string;
+	adamId: string;
+	vendorId: string;
+	bundleId: string;
+	appType: any;
+	versionSets: any[];
+	lastModifiedDate: number;
+	iconUrl: string;
+	issuesCount: number;
+	priceTier: string;
+}
\ No newline at end of file
diff --git a/lib/services/cleanup-service.ts b/lib/services/cleanup-service.ts
new file mode 100644
index 0000000000..953f330e25
--- /dev/null
+++ b/lib/services/cleanup-service.ts
@@ -0,0 +1,126 @@
+import { ChildProcess } from "child_process";
+import * as path from "path";
+import { cache, exported } from "../common/decorators";
+
+export class CleanupService implements ICleanupService {
+	private static CLEANUP_PROCESS_START_TIMEOUT = 10 * 1000;
+	private pathToCleanupLogFile: string;
+	private cleanupProcess: ChildProcess;
+
+	constructor($options: IOptions,
+		private $staticConfig: Config.IStaticConfig,
+		private $childProcess: IChildProcess) {
+		this.pathToCleanupLogFile = $options.cleanupLogFile;
+	}
+
+	public shouldDispose = true;
+
+	public async addCleanupCommand(commandInfo: ISpawnCommandInfo): Promise<void> {
+		const cleanupProcess = await this.getCleanupProcess();
+		cleanupProcess.send(<ISpawnCommandCleanupMessage>{ messageType: CleanupProcessMessage.AddCleanCommand, commandInfo });
+	}
+
+	public async removeCleanupCommand(commandInfo: ISpawnCommandInfo): Promise<void> {
+		const cleanupProcess = await this.getCleanupProcess();
+		cleanupProcess.send(<ISpawnCommandCleanupMessage>{ messageType: CleanupProcessMessage.RemoveCleanCommand, commandInfo });
+	}
+
+	public async addCleanupDeleteAction(filePath: string): Promise<void> {
+		const cleanupProcess = await this.getCleanupProcess();
+		cleanupProcess.send(<IFileCleanupMessage>{ messageType: CleanupProcessMessage.AddDeleteFileAction, filePath });
+	}
+
+	public async removeCleanupDeleteAction(filePath: string): Promise<void> {
+		const cleanupProcess = await this.getCleanupProcess();
+		cleanupProcess.send(<IFileCleanupMessage>{ messageType: CleanupProcessMessage.RemoveDeleteFileAction, filePath });
+	}
+
+	public async addCleanupJS(jsCommand: IJSCommand): Promise<void> {
+		const cleanupProcess = await this.getCleanupProcess();
+		cleanupProcess.send(<IJSCleanupMessage>{ messageType: CleanupProcessMessage.AddJSFileToRequire, jsCommand });
+	}
+
+	public async removeCleanupJS(jsCommand: IJSCommand): Promise<void> {
+		const cleanupProcess = await this.getCleanupProcess();
+		cleanupProcess.send(<IJSCleanupMessage>{ messageType: CleanupProcessMessage.RemoveJSFileToRequire, jsCommand});
+	}
+
+	@exported("cleanupService")
+	public setCleanupLogFile(filePath: string): void {
+		this.pathToCleanupLogFile = filePath;
+	}
+
+	public dispose(): void {
+		if (this.cleanupProcess && this.shouldDispose) {
+			this.cleanupProcess.disconnect();
+		}
+	}
+
+	public setShouldDispose(shouldDispose: boolean): void {
+		this.shouldDispose = shouldDispose;
+	}
+
+	// TODO: Consider extracting this method to a separate service
+	// as it has the same logic as the one used in analytics-service
+	@cache()
+	private getCleanupProcess(): Promise<ChildProcess> {
+		return new Promise<ChildProcess>((resolve, reject) => {
+			const cleanupProcessArgs = this.getCleanupProcessArgs();
+
+			const cleanupProcess = this.$childProcess.spawn(process.execPath,
+				cleanupProcessArgs,
+				{
+					stdio: ["ignore", "ignore", "ignore", "ipc"],
+					detached: true
+				}
+			);
+
+			cleanupProcess.unref();
+
+			let isSettled = false;
+
+			const timeoutId = setTimeout(() => {
+				if (!isSettled) {
+					reject(new Error("Unable to start Cleanup process."));
+				}
+			}, CleanupService.CLEANUP_PROCESS_START_TIMEOUT);
+
+			cleanupProcess.on("error", (err: Error) => {
+				clearTimeout(timeoutId);
+
+				if (!isSettled) {
+					isSettled = true;
+					// In case we throw error here, CLI will break its execution.
+					reject(err);
+				}
+			});
+
+			cleanupProcess.on("message", (data: any) => {
+				if (data === DetachedProcessMessages.ProcessReadyToReceive) {
+					clearTimeout(timeoutId);
+
+					if (!isSettled) {
+						isSettled = true;
+						this.cleanupProcess = cleanupProcess;
+						resolve(cleanupProcess);
+					}
+				}
+			});
+		});
+	}
+
+	private getCleanupProcessArgs(): string[] {
+		const cleanupProcessArgs = [
+			path.join(__dirname, "..", "detached-processes", "cleanup-process.js"),
+			this.$staticConfig.PATH_TO_BOOTSTRAP,
+		];
+
+		if (this.pathToCleanupLogFile) {
+			cleanupProcessArgs.push(path.resolve(this.pathToCleanupLogFile));
+		}
+
+		return cleanupProcessArgs;
+	}
+}
+
+$injector.register("cleanupService", CleanupService);
diff --git a/lib/services/cocoapods-platform-manager.ts b/lib/services/cocoapods-platform-manager.ts
index 6b5bfb3771..4427895418 100644
--- a/lib/services/cocoapods-platform-manager.ts
+++ b/lib/services/cocoapods-platform-manager.ts
@@ -13,10 +13,10 @@ export class CocoaPodsPlatformManager implements ICocoaPodsPlatformManager {
 			if (shouldReplacePlatformSection) {
 				this.$logger.warn(`Multiple identical platforms with different versions have been detected during the processing of podfiles. The current platform's content "${platformSectionData.podfilePlatformData.content}" from ${platformSectionData.podfilePlatformData.path} will be replaced with "${podfilePlatformData.content}" from ${podfilePlatformData.path}`);
 				const newSection = this.buildPlatformSection(podfilePlatformData);
-				projectPodfileContent = projectPodfileContent.replace(platformSectionData.platformSectionContent, newSection);
+				projectPodfileContent = projectPodfileContent.replace(platformSectionData.platformSectionContent, newSection.trim());
 			}
 		} else {
-			projectPodfileContent += this.buildPlatformSection(podfilePlatformData);
+			projectPodfileContent = projectPodfileContent.trim() + EOL + EOL + this.buildPlatformSection(podfilePlatformData);
 		}
 
 		return projectPodfileContent;
@@ -29,7 +29,7 @@ export class CocoaPodsPlatformManager implements ICocoaPodsPlatformManager {
 			const allPodfiles = projectPodfileContent.match(podfileContentRegExp) || [];
 			const selectedPlatformData = this.selectPlatformDataFromProjectPodfile(allPodfiles);
 			const newPlatformSection = selectedPlatformData ? this.buildPlatformSection(selectedPlatformData) : "";
-			const regExp = new RegExp(`\\r?\\n${platformSectionData.platformSectionContent}\\r?\\n`, "mg");
+			const regExp = new RegExp(`${platformSectionData.platformSectionContent}\\r?\\n`, "mg");
 			projectPodfileContent = projectPodfileContent.replace(regExp, newPlatformSection);
 		}
 
diff --git a/lib/services/cocoapods-service.ts b/lib/services/cocoapods-service.ts
index b25a7daa13..129941d913 100644
--- a/lib/services/cocoapods-service.ts
+++ b/lib/services/cocoapods-service.ts
@@ -1,6 +1,7 @@
 import { EOL } from "os";
 import * as path from "path";
 import { PluginNativeDirNames, PODFILE_NAME, NS_BASE_PODFILE } from "../constants";
+import { regExpEscape } from "../common/helpers";
 
 export class CocoaPodsService implements ICocoaPodsService {
 	private static PODFILE_POST_INSTALL_SECTION_NAME = "post_install";
@@ -55,14 +56,16 @@ export class CocoaPodsService implements ICocoaPodsService {
 		return podInstallResult;
 	}
 
-	public async mergePodXcconfigFile(projectData: IProjectData, platformData: IPlatformData, opts: IRelease) {
+	public async mergePodXcconfigFile(projectData: IProjectData, platformData: IPlatformData): Promise<void> {
 		const podFilesRootDirName = path.join("Pods", "Target Support Files", `Pods-${projectData.projectName}`);
 		const podFolder = path.join(platformData.projectRoot, podFilesRootDirName);
 		if (this.$fs.exists(podFolder)) {
-			const podXcconfigFilePath = opts && opts.release ? path.join(podFolder, `Pods-${projectData.projectName}.release.xcconfig`)
-				: path.join(podFolder, `Pods-${projectData.projectName}.debug.xcconfig`);
-			const pluginsXcconfigFilePath = this.$xcconfigService.getPluginsXcconfigFilePath(platformData.projectRoot, opts);
-			await this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
+			const pluginsXcconfigFilePaths = this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot);
+			for (const configuration in pluginsXcconfigFilePaths) {
+				const pluginsXcconfigFilePath = pluginsXcconfigFilePaths[configuration];
+				const podXcconfigFilePath = path.join(podFolder, `Pods-${projectData.projectName}.${configuration}.xcconfig`);
+				await this.$xcconfigService.mergeFiles(podXcconfigFilePath, pluginsXcconfigFilePath);
+			}
 		}
 	}
 
@@ -98,7 +101,7 @@ export class CocoaPodsService implements ICocoaPodsService {
 				finalPodfileContent = this.$cocoaPodsPlatformManager.addPlatformSection(projectData, podfilePlatformData, finalPodfileContent);
 			}
 
-			finalPodfileContent = `${podfileContent}${EOL}${finalPodfileContent}`;
+			finalPodfileContent = `${finalPodfileContent.trim()}${EOL}${EOL}${podfileContent.trim()}${EOL}`;
 			this.saveProjectPodfile(projectData, finalPodfileContent, nativeProjectPath);
 		}
 	}
@@ -113,8 +116,8 @@ export class CocoaPodsService implements ICocoaPodsService {
 			projectPodFileContent = this.$cocoaPodsPlatformManager.removePlatformSection(moduleName, projectPodFileContent, podfilePath);
 
 			const defaultPodfileBeginning = this.getPodfileHeader(projectData.projectName);
-			const defaultContentWithPostInstallHook = `${defaultPodfileBeginning}${EOL}${this.getPostInstallHookHeader()}end${EOL}end`;
-			const defaultContentWithoutPostInstallHook = `${defaultPodfileBeginning}end`;
+			const defaultContentWithPostInstallHook = `${defaultPodfileBeginning}${this.getPostInstallHookHeader()}end${EOL}end`;
+			const defaultContentWithoutPostInstallHook = `${defaultPodfileBeginning}${EOL}end`;
 			const trimmedProjectPodFileContent = projectPodFileContent.trim();
 			if (!trimmedProjectPodFileContent || trimmedProjectPodFileContent === defaultContentWithPostInstallHook || trimmedProjectPodFileContent === defaultContentWithoutPostInstallHook) {
 				this.$fs.deleteFile(this.getProjectPodfilePath(projectRoot));
@@ -145,7 +148,9 @@ export class CocoaPodsService implements ICocoaPodsService {
 		if (postInstallHookContent) {
 			const index = finalPodfileContent.indexOf(postInstallHookStart);
 			if (index !== -1) {
-				finalPodfileContent = finalPodfileContent.replace(postInstallHookStart, `${postInstallHookStart}${postInstallHookContent}`);
+				const regExp = new RegExp(`(${regExpEscape(postInstallHookStart)}[\\s\\S]*?)(\\bend\\b)`, "m");
+				finalPodfileContent = finalPodfileContent.replace(regExp, `$1${postInstallHookContent.trimRight()}${EOL}$2`);
+
 			} else {
 				if (finalPodfileContent.length > 0) {
 					finalPodfileContent += `${EOL}${EOL}`;
diff --git a/lib/services/doctor-service.ts b/lib/services/doctor-service.ts
index e408876713..feda360ebf 100644
--- a/lib/services/doctor-service.ts
+++ b/lib/services/doctor-service.ts
@@ -40,7 +40,7 @@ export class DoctorService implements IDoctorService {
 		if (hasWarnings) {
 			this.$logger.info("There seem to be issues with your configuration.");
 		} else {
-			this.$logger.out("No issues were detected.".bold);
+			this.$logger.info("No issues were detected.".bold);
 			this.printInfosCore(infos);
 		}
 
@@ -74,7 +74,7 @@ export class DoctorService implements IDoctorService {
 			return;
 		}
 
-		this.$logger.out("Running the setup script to try and automatically configure your environment.");
+		this.$logger.info("Running the setup script to try and automatically configure your environment.");
 
 		if (this.$hostInfo.isDarwin) {
 			await this.runSetupScriptCore(DoctorService.DarwinSetupScriptLocation, []);
@@ -186,9 +186,9 @@ export class DoctorService implements IDoctorService {
 
 	private printPackageManagerTip() {
 		if (this.$hostInfo.isWindows) {
-			this.$logger.out("TIP: To avoid setting up the necessary environment variables, you can use the chocolatey package manager to install the Android SDK and its dependencies." + EOL);
+			this.$logger.info("TIP: To avoid setting up the necessary environment variables, you can use the chocolatey package manager to install the Android SDK and its dependencies." + EOL);
 		} else if (this.$hostInfo.isDarwin) {
-			this.$logger.out("TIP: To avoid setting up the necessary environment variables, you can use the Homebrew package manager to install the Android SDK and its dependencies." + EOL);
+			this.$logger.info("TIP: To avoid setting up the necessary environment variables, you can use the Homebrew package manager to install the Android SDK and its dependencies." + EOL);
 		}
 	}
 
@@ -199,7 +199,7 @@ export class DoctorService implements IDoctorService {
 				if (info.type === constants.WARNING_TYPE_NAME) {
 					message = `WARNING: ${info.message.yellow} ${EOL} ${info.additionalInformation} ${EOL}`;
 				}
-				this.$logger.out(message);
+				this.$logger.info(message);
 			});
 		}
 
diff --git a/lib/services/hmr-status-service.ts b/lib/services/hmr-status-service.ts
index 60e65b9fbc..689ea180a5 100644
--- a/lib/services/hmr-status-service.ts
+++ b/lib/services/hmr-status-service.ts
@@ -10,10 +10,8 @@ export class HmrStatusService implements IHmrStatusService {
 	private intervals: IDictionary<any> = {};
 
 	constructor(private $logParserService: ILogParserService,
-		private $processService: IProcessService,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $logger: ILogger) {
-		this.$processService.attachToProcessExitSignals(this, this.dispose);
 	}
 
 	public getHmrStatus(deviceId: string, operationHash: string): Promise<number> {
@@ -106,13 +104,6 @@ export class HmrStatusService implements IHmrStatusService {
 
 		this.hashOperationStatuses[key].status = status;
 	}
-
-	private dispose() {
-		_.forEach(this.intervals, (value, key) => {
-			clearInterval(value);
-			this.intervals[key] = null;
-		});
-	}
 }
 
 $injector.register("hmrStatusService", HmrStatusService);
diff --git a/lib/services/initialize-service.ts b/lib/services/initialize-service.ts
new file mode 100644
index 0000000000..117da1b4c1
--- /dev/null
+++ b/lib/services/initialize-service.ts
@@ -0,0 +1,46 @@
+import { EOL } from "os";
+
+export class InitializeService implements IInitializeService {
+	// NOTE: Do not inject anything here, use $injector.resolve in the code
+	// Injecting something may lead to logger initialization, but we want to initialize it from here.
+	constructor(private $injector: IInjector) { }
+
+	public async initialize(initOpts?: IInitializeOptions): Promise<void> {
+		initOpts = initOpts || {};
+		const $logger = this.$injector.resolve<ILogger>("logger");
+		if (initOpts.loggerOptions) {
+			$logger.initialize(initOpts.loggerOptions);
+		} else {
+			$logger.initializeCliLogger();
+		}
+
+		if (initOpts.settingsServiceOptions) {
+			const $settingsService = this.$injector.resolve<ISettingsService>("settingsService");
+			$settingsService.setSettings(initOpts.settingsServiceOptions);
+		}
+
+		if (initOpts.extensibilityOptions) {
+			if (initOpts.extensibilityOptions.pathToExtensions) {
+				const $extensibilityService = this.$injector.resolve<IExtensibilityService>("extensibilityService");
+				$extensibilityService.pathToExtensions = initOpts.extensibilityOptions.pathToExtensions;
+			}
+		}
+
+		await this.showWarnings($logger);
+	}
+
+	private async showWarnings($logger: ILogger): Promise<void> {
+		const $sysInfo = $injector.resolve<ISysInfo>("sysInfo");
+		const systemWarnings = await $sysInfo.getSystemWarnings();
+		_.each(systemWarnings, systemWarning => {
+			const message = `${EOL}${systemWarning.message}${EOL}`;
+			if (systemWarning.severity === SystemWarningsSeverity.high) {
+				$logger.error(message);
+			} else {
+				$logger.warn(message);
+			}
+		});
+	}
+}
+
+$injector.register("initializeService", InitializeService);
diff --git a/lib/services/ios-device-debug-service.ts b/lib/services/ios-device-debug-service.ts
index 0479006dba..16b34c3207 100644
--- a/lib/services/ios-device-debug-service.ts
+++ b/lib/services/ios-device-debug-service.ts
@@ -17,12 +17,10 @@ export class IOSDeviceDebugService extends DebugServiceBase implements IDeviceDe
 		private $logger: ILogger,
 		private $errors: IErrors,
 		private $packageInstallationManager: IPackageInstallationManager,
-		private $processService: IProcessService,
 		private $appDebugSocketProxyFactory: IAppDebugSocketProxyFactory,
 		private $projectDataService: IProjectDataService) {
 
 		super(device, $devicesService);
-		this.$processService.attachToProcessExitSignals(this, this.debugStop);
 		this.$appDebugSocketProxyFactory.on(CONNECTION_ERROR_EVENT_NAME, (e: Error) => this.emit(CONNECTION_ERROR_EVENT_NAME, e));
 		this.deviceIdentifier = this.device.deviceInfo.identifier;
 	}
diff --git a/lib/services/ios-extensions-service.ts b/lib/services/ios-extensions-service.ts
index e54420b635..fc83e100cf 100644
--- a/lib/services/ios-extensions-service.ts
+++ b/lib/services/ios-extensions-service.ts
@@ -1,9 +1,12 @@
 import * as path from "path";
-
-export class IOSExtensionsService implements IIOSExtensionsService {
-	constructor(private $fs: IFileSystem,
-		private $pbxprojDomXcode: IPbxprojDomXcode,
-		private $xcode: IXcode) {
+import { NativeTargetServiceBase } from "./ios-native-target-service-base";
+import { IOSNativeTargetProductTypes, IOSNativeTargetTypes } from "../constants";
+
+export class IOSExtensionsService extends NativeTargetServiceBase implements IIOSExtensionsService {
+	constructor(protected $fs: IFileSystem,
+		protected $pbxprojDomXcode: IPbxprojDomXcode,
+		protected $xcode: IXcode) {
+			super($fs, $pbxprojDomXcode, $xcode);
 	}
 
 	public async addExtensionsFromPath({extensionsFolderPath, projectData, platformData, pbxProjPath}: IAddExtensionsFromPathOptions): Promise<boolean> {
@@ -14,81 +17,35 @@ export class IOSExtensionsService implements IIOSExtensionsService {
 		}
 		const project = new this.$xcode.project(pbxProjPath);
 		project.parseSync();
-		this.$fs.readDirectory(extensionsFolderPath)
-			.filter(fileName => {
-				const filePath = path.join(extensionsFolderPath, fileName);
-				const stats = this.$fs.getFsStats(filePath);
-
-				return stats.isDirectory() && !fileName.startsWith(".");
-			})
+		this.getTargetDirectories(extensionsFolderPath)
 			.forEach(extensionFolder => {
-				const targetUuid = this.addExtensionToProject(extensionsFolderPath, extensionFolder, project, projectData, platformData);
-				targetUuids.push(targetUuid);
+				const target = this.addTargetToProject(extensionsFolderPath, extensionFolder, IOSNativeTargetTypes.appExtension, project, platformData);
+				this.configureTarget(extensionFolder, path.join(extensionsFolderPath, extensionFolder), target, project, projectData);
+				targetUuids.push(target.uuid);
 				addedExtensions = true;
 			});
 
 		this.$fs.writeFile(pbxProjPath, project.writeSync({omitEmptyValues: true}));
-		this.prepareExtensionSigning(targetUuids, projectData, pbxProjPath);
+		this.prepareSigning(targetUuids, projectData, pbxProjPath);
 
 		return addedExtensions;
 	}
 
-	private addExtensionToProject(extensionsFolderPath: string, extensionFolder: string, project: IXcode.project, projectData: IProjectData, platformData: IPlatformData): string {
-		const extensionPath = path.join(extensionsFolderPath, extensionFolder);
-		const extensionRelativePath = path.relative(platformData.projectRoot, extensionPath);
-		const files = this.$fs.readDirectory(extensionPath)
-				.filter(filePath => !filePath.startsWith("."))
-				.map(filePath => path.join(extensionPath, filePath));
-		const target = project.addTarget(extensionFolder, 'app_extension', extensionRelativePath);
-		project.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid);
-		project.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', target.uuid);
-		project.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', target.uuid);
-
-		const extJsonPath = path.join(extensionsFolderPath, extensionFolder, "extension.json");
-		if (this.$fs.exists(extJsonPath)) {
-			const extensionJson = this.$fs.readJson(extJsonPath);
-			_.forEach(extensionJson.frameworks, framework => {
-				project.addFramework(
-					framework,
-					{ target: target.uuid }
-				);
-			});
-			if (extensionJson.assetcatalogCompilerAppiconName) {
-				project.addToBuildSettings("ASSETCATALOG_COMPILER_APPICON_NAME", extensionJson.assetcatalogCompilerAppiconName, target.uuid);
-			}
-		}
+	private configureTarget(extensionName: string, extensionPath: string, target: IXcode.target, project: IXcode.project, projectData: IProjectData) {
+		const extJsonPath = path.join(extensionPath, "extension.json");
 
-		project.addPbxGroup(files, extensionFolder, extensionPath, null, { isMain: true, target: target.uuid, filesRelativeToProject: true });
-		project.addBuildProperty("PRODUCT_BUNDLE_IDENTIFIER", `${projectData.projectIdentifiers.ios}.${extensionFolder}`, "Debug", extensionFolder);
-		project.addBuildProperty("PRODUCT_BUNDLE_IDENTIFIER", `${projectData.projectIdentifiers.ios}.${extensionFolder}`, "Release", extensionFolder);
-		project.addToHeaderSearchPaths(extensionPath, target.pbxNativeTarget.productName);
+		this.setXcodeTargetBuildConfigurationProperties(
+			[{name: "PRODUCT_BUNDLE_IDENTIFIER", value: `${projectData.projectIdentifiers.ios}.${extensionName}`}],
+			extensionName,
+			project);
 
-		return target.uuid;
-	}
-
-	private prepareExtensionSigning(targetUuids: string[], projectData:IProjectData, projectPath: string) {
-		const xcode = this.$pbxprojDomXcode.Xcode.open(projectPath);
-		const signing = xcode.getSigning(projectData.projectName);
-		if (signing !== undefined) {
-			_.forEach(targetUuids, targetUuid => {
-				if (signing.style === "Automatic") {
-					xcode.setAutomaticSigningStyleByTargetKey(targetUuid, signing.team);
-				} else {
-					for (const config in signing.configurations) {
-						const signingConfiguration = signing.configurations[config];
-						xcode.setManualSigningStyleByTargetKey(targetUuid, signingConfiguration);
-						break;
-					}
-				}
-			});
-		}
-		xcode.save();
+		this.setConfigurationsFromJsonFile(extJsonPath, target.uuid, extensionName, project);
 	}
 
 	public removeExtensions({pbxProjPath}: IRemoveExtensionsOptions): void {
 		const project = new this.$xcode.project(pbxProjPath);
 		project.parseSync();
-		project.removeTargetsByProductType("com.apple.product-type.app-extension");
+		project.removeTargetsByProductType(IOSNativeTargetProductTypes.appExtension);
 		this.$fs.writeFile(pbxProjPath, project.writeSync({omitEmptyValues: true}));
 	}
 }
diff --git a/lib/services/ios-native-target-service-base.ts b/lib/services/ios-native-target-service-base.ts
new file mode 100644
index 0000000000..5f203d405b
--- /dev/null
+++ b/lib/services/ios-native-target-service-base.ts
@@ -0,0 +1,96 @@
+import * as path from "path";
+
+export enum BuildNames {
+	debug = "Debug",
+	release = "Release"
+}
+
+export interface IXcodeTargetBuildConfigurationProperty {
+	name: string;
+	value: any;
+	buildNames?: BuildNames[];
+}
+
+export abstract class NativeTargetServiceBase {
+	constructor(protected $fs: IFileSystem,
+		protected $pbxprojDomXcode: IPbxprojDomXcode,
+		protected $xcode: IXcode) {
+	}
+
+	protected addTargetToProject(extensionsFolderPath: string, extensionFolder: string, targetType: string, project: IXcode.project, platformData: IPlatformData, parentTarget?: string): IXcode.target {
+		const extensionPath = path.join(extensionsFolderPath, extensionFolder);
+		const extensionRelativePath = path.relative(platformData.projectRoot, extensionPath);
+		const files = this.$fs.readDirectory(extensionPath)
+				.filter(filePath => !filePath.startsWith("."))
+				.map(filePath => path.join(extensionPath, filePath));
+		const target = project.addTarget(extensionFolder, targetType, extensionRelativePath, parentTarget);
+		project.addBuildPhase([], 'PBXSourcesBuildPhase', 'Sources', target.uuid);
+		project.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', target.uuid);
+		project.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', target.uuid);
+
+		project.addPbxGroup(files, extensionFolder, extensionPath, null, { isMain: true, target: target.uuid, filesRelativeToProject: true });
+		project.addToHeaderSearchPaths(extensionPath, target.pbxNativeTarget.productName);
+		return target;
+	}
+
+	protected prepareSigning(targetUuids: string[], projectData:IProjectData, projectPath: string) {
+		const xcode = this.$pbxprojDomXcode.Xcode.open(projectPath);
+		const signing = xcode.getSigning(projectData.projectName);
+		if (signing !== undefined) {
+			_.forEach(targetUuids, targetUuid => {
+				if (signing.style === "Automatic") {
+					xcode.setAutomaticSigningStyleByTargetKey(targetUuid, signing.team);
+				} else {
+					for (const config in signing.configurations) {
+						const signingConfiguration = signing.configurations[config];
+						xcode.setManualSigningStyleByTargetKey(targetUuid, signingConfiguration);
+						break;
+					}
+				}
+			});
+		}
+		xcode.save();
+	}
+
+	protected getTargetDirectories(folderPath: string): string[] {
+		return this.$fs.readDirectory(folderPath)
+			.filter(fileName => {
+				const filePath = path.join(folderPath, fileName);
+				const stats = this.$fs.getFsStats(filePath);
+
+				return stats.isDirectory() && !fileName.startsWith(".");
+			});
+	}
+
+	protected setXcodeTargetBuildConfigurationProperties(properties: IXcodeTargetBuildConfigurationProperty[], targetName: string, project: IXcode.project): void {
+		properties.forEach(property => {
+			const buildNames = property.buildNames || [BuildNames.debug, BuildNames.release];
+			buildNames.forEach((buildName) => {
+				project.addBuildProperty(property.name, property.value, buildName, targetName);
+			});
+		});
+	}
+
+	protected setConfigurationsFromJsonFile(jsonPath: string, targetUuid: string, targetName: string, project: IXcode.project) {
+		if (this.$fs.exists(jsonPath)) {
+			const configurationJson = this.$fs.readJson(jsonPath) || {};
+
+			_.forEach(configurationJson.frameworks, framework => {
+				project.addFramework(
+					framework,
+					{ target: targetUuid }
+				);
+			});
+
+			if (configurationJson.assetcatalogCompilerAppiconName) {
+				project.addToBuildSettings("ASSETCATALOG_COMPILER_APPICON_NAME", configurationJson.assetcatalogCompilerAppiconName,  targetUuid);
+			}
+
+			if (configurationJson.targetBuildConfigurationProperties) {
+				const properties: IXcodeTargetBuildConfigurationProperty[] = [];
+				_.forEach(configurationJson.targetBuildConfigurationProperties, (value, name: string) => properties.push({value, name}));
+				this.setXcodeTargetBuildConfigurationProperties(properties, targetName, project);
+			}
+		}
+	}
+}
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts
index 85960e4ec2..2fcf6e9144 100644
--- a/lib/services/ios-project-service.ts
+++ b/lib/services/ios-project-service.ts
@@ -13,7 +13,7 @@ import * as plist from "plist";
 import { IOSProvisionService } from "./ios-provision-service";
 import { IOSEntitlementsService } from "./ios-entitlements-service";
 import * as mobileProvisionFinder from "ios-mobileprovision-finder";
-import { BUILD_XCCONFIG_FILE_NAME, IosProjectConstants } from "../constants";
+import { BUILD_XCCONFIG_FILE_NAME, IosProjectConstants, IOSNativeTargetProductTypes } from "../constants";
 
 interface INativeSourceCodeGroup {
 	name: string;
@@ -21,6 +21,11 @@ interface INativeSourceCodeGroup {
 	files: string[];
 }
 
+enum ProductArgs {
+	target = "target",
+	scheme = "scheme"
+}
+
 const DevicePlatformSdkName = "iphoneos";
 const SimulatorPlatformSdkName = "iphonesimulator";
 
@@ -53,7 +58,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $plistParser: IPlistParser,
 		private $sysInfo: ISysInfo,
 		private $xcconfigService: IXcconfigService,
-		private $iOSExtensionsService: IIOSExtensionsService) {
+		private $iOSExtensionsService: IIOSExtensionsService,
+		private $iOSWatchAppService: IIOSWatchAppService) {
 		super($fs, $projectDataService);
 	}
 
@@ -214,7 +220,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		const archivePath = options && options.archivePath ? path.resolve(options.archivePath) : path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
 		let args = ["archive", "-archivePath", archivePath, "-configuration",
 			getConfigurationName(!buildConfig || buildConfig.release)]
-			.concat(this.xcbuildProjectArgs(projectRoot, projectData, "scheme"));
+			.concat(this.xcbuildProjectArgs(projectRoot, projectData, ProductArgs.scheme));
 
 		if (options && options.additionalArgs) {
 			args = args.concat(options.additionalArgs);
@@ -279,6 +285,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		return exportFile;
 	}
 
+	private iCloudContainerEnvironment(buildConfig: IBuildConfig): string {
+		return buildConfig && buildConfig.iCloudContainerEnvironment ? buildConfig.iCloudContainerEnvironment : null;
+	}
+
 	/**
 	 * Exports .xcarchive for a development device.
 	 */
@@ -287,6 +297,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		const projectRoot = platformData.projectRoot;
 		const archivePath = options.archivePath;
 		const exportOptionsMethod = await this.getExportOptionsMethod(projectData, archivePath);
+		const iCloudContainerEnvironment = this.iCloudContainerEnvironment(buildConfig);
 		let plistTemplate = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -304,7 +315,13 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
     <key>uploadBitcode</key>
     <false/>
     <key>compileBitcode</key>
-    <false/>
+    <false/>`;
+		if (iCloudContainerEnvironment) {
+			plistTemplate += `
+    <key>iCloudContainerEnvironment</key>
+    <string>${iCloudContainerEnvironment}</string>`;
+		}
+		plistTemplate += `
 </dict>
 </plist>`;
 
@@ -328,7 +345,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		return exportFile;
 	}
 
-	private xcbuildProjectArgs(projectRoot: string, projectData: IProjectData, product?: "scheme" | "target"): string[] {
+	private xcbuildProjectArgs(projectRoot: string, projectData: IProjectData, product?: ProductArgs): string[] {
 		const xcworkspacePath = path.join(projectRoot, projectData.projectName + ".xcworkspace");
 		if (this.$fs.exists(xcworkspacePath)) {
 			return ["-workspace", xcworkspacePath, product ? "-" + product : "-scheme", projectData.projectName];
@@ -402,8 +419,13 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 		args = args.concat((buildConfig && buildConfig.architectures) || this.getBuildArchitectures(projectData, buildConfig, ["armv7", "arm64"]));
 
+		if (!this.hasWatchApp(projectData)) {
+			args = args.concat([
+				"-sdk", DevicePlatformSdkName
+			]);
+		}
+
 		args = args.concat([
-			"-sdk", DevicePlatformSdkName,
 			"BUILD_DIR=" + path.join(projectRoot, constants.BUILD_DIR)
 		]);
 
@@ -491,7 +513,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			}
 
 			xcode.setAutomaticSigningStyle(projectData.projectName, teamId);
-			xcode.setAutomaticSigningStyleByTargetProductType("com.apple.product-type.app-extension", teamId);
+			xcode.setAutomaticSigningStyleByTargetProductTypesList([
+				IOSNativeTargetProductTypes.appExtension,
+				IOSNativeTargetProductTypes.watchApp,
+				IOSNativeTargetProductTypes.watchExtension
+			],
+			teamId);
 			xcode.save();
 
 			this.$logger.trace(`Set Automatic signing style and team id ${teamId}.`);
@@ -533,7 +560,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 					identity: mobileprovision.Type === "Development" ? "iPhone Developer" : "iPhone Distribution"
 				};
 				xcode.setManualSigningStyle(projectData.projectName, configuration);
-				xcode.setManualSigningStyleByTargetProductType("com.apple.product-type.app-extension", configuration);
+				xcode.setManualSigningStyleByTargetProductTypesList([
+					IOSNativeTargetProductTypes.appExtension,
+					IOSNativeTargetProductTypes.watchApp,
+					IOSNativeTargetProductTypes.watchExtension
+				],
+				configuration);
 				xcode.save();
 
 				// this.cache(uuid);
@@ -567,18 +599,25 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	private async buildForSimulator(projectRoot: string, args: string[], projectData: IProjectData, buildConfig?: IBuildConfig): Promise<void> {
 		const architectures = this.getBuildArchitectures(projectData, buildConfig, ["i386", "x86_64"]);
+		let product;
 
 		args = args
 			.concat(architectures)
 			.concat([
 				"build",
 				"-configuration", getConfigurationName(buildConfig.release),
-				"-sdk", SimulatorPlatformSdkName,
 				"ONLY_ACTIVE_ARCH=NO",
 				"BUILD_DIR=" + path.join(projectRoot, constants.BUILD_DIR),
-				"CODE_SIGN_IDENTITY=",
-			])
-			.concat(this.xcbuildProjectArgs(projectRoot, projectData));
+			]);
+
+			if (this.hasWatchApp(projectData)) {
+				product = ProductArgs.scheme;
+				args = args.concat(["-destination", "generic/platform=iOS Simulator", "CODE_SIGNING_ALLOWED=NO"]);
+			} else {
+				args = args.concat(["-sdk", SimulatorPlatformSdkName, "CODE_SIGN_IDENTITY="]);
+			}
+
+		args = args.concat(this.xcbuildProjectArgs(projectRoot, projectData, product));
 
 		await this.xcodebuild(args, projectRoot, buildConfig.buildOutputStdio);
 	}
@@ -734,6 +773,8 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 
 	public async prepareProject(projectData: IProjectData, platformSpecificData: IPlatformSpecificData): Promise<void> {
 		const projectRoot = path.join(projectData.platformsDir, "ios");
+		const platformData = this.getPlatformData(projectData);
+		const resourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
 
 		const provision = platformSpecificData && platformSpecificData.provision;
 		const teamId = platformSpecificData && platformSpecificData.teamId;
@@ -772,14 +813,21 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			this.savePbxProj(project, projectData);
 
 			const resourcesNativeCodePath = path.join(
-				projectData.getAppResourcesDirectoryPath(),
-				this.getPlatformData(projectData).normalizedPlatformName,
+				resourcesDirectoryPath,
+				platformData.normalizedPlatformName,
 				constants.NATIVE_SOURCE_FOLDER
 			);
-
 			await this.prepareNativeSourceCode(constants.TNS_NATIVE_SOURCE_GROUP_NAME, resourcesNativeCodePath, projectData);
 		}
 
+		const pbxProjPath = this.getPbxProjPath(projectData);
+		this.$iOSWatchAppService.removeWatchApp({ pbxProjPath });
+		const addedWatchApp = await this.$iOSWatchAppService.addWatchAppFromPath({ watchAppFolderPath: path.join(resourcesDirectoryPath, platformData.normalizedPlatformName), projectData, platformData, pbxProjPath });
+
+		if (addedWatchApp) {
+			this.$logger.warn("The support for Apple Watch App is currently in Beta. For more information about the current development state and any known issues, please check the relevant GitHub issue: https://github.com/NativeScript/nativescript-cli/issues/4589");
+		}
+
 	}
 
 	public prepareAppResources(appResourcesDirectoryPath: string, projectData: IProjectData): void {
@@ -792,6 +840,8 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		// src folder should not be copied as the pbxproject will have references to its files
 		this.$fs.deleteDirectory(path.join(appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_SOURCE_FOLDER));
 		this.$fs.deleteDirectory(path.join(appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, constants.NATIVE_EXTENSION_FOLDER));
+		this.$fs.deleteDirectory(path.join(appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, "watchapp"));
+		this.$fs.deleteDirectory(path.join(appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, "watchextension"));
 
 		this.$fs.deleteDirectory(this.getAppResourcesDestinationDirectoryPath(projectData));
 	}
@@ -799,7 +849,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 	public async processConfigurationFilesFromAppResources(projectData: IProjectData, opts: IRelease): Promise<void> {
 		await this.mergeInfoPlists(projectData, opts);
 		await this.$iOSEntitlementsService.merge(projectData);
-		await this.mergeProjectXcconfigFiles(projectData, opts);
+		await this.mergeProjectXcconfigFiles(projectData);
 		for (const pluginData of await this.getAllInstalledPlugins(projectData)) {
 			await this.$pluginVariablesService.interpolatePluginVariables(pluginData, this.getPlatformData(projectData).configurationFilePath, projectData.projectDir);
 		}
@@ -1216,10 +1266,13 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		this.$fs.writeFile(path.join(headersFolderPath, "module.modulemap"), modulemap);
 	}
 
-	private async mergeProjectXcconfigFiles(projectData: IProjectData, opts: IRelease): Promise<void> {
+	private async mergeProjectXcconfigFiles(projectData: IProjectData): Promise<void> {
 		const platformData = this.getPlatformData(projectData);
-		const pluginsXcconfigFilePath = this.$xcconfigService.getPluginsXcconfigFilePath(platformData.projectRoot, opts);
-		this.$fs.deleteFile(pluginsXcconfigFilePath);
+		const pluginsXcconfigFilePaths = _.values(this.$xcconfigService.getPluginsXcconfigFilePaths(platformData.projectRoot));
+
+		for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+			this.$fs.deleteFile(pluginsXcconfigFilePath);
+		}
 
 		const pluginsService = <IPluginsService>this.$injector.resolve("pluginsService");
 		const allPlugins: IPluginData[] = await pluginsService.getAllInstalledPlugins(projectData);
@@ -1227,32 +1280,40 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			const pluginPlatformsFolderPath = plugin.pluginPlatformsFolderPath(IOSProjectService.IOS_PLATFORM_NAME);
 			const pluginXcconfigFilePath = path.join(pluginPlatformsFolderPath, BUILD_XCCONFIG_FILE_NAME);
 			if (this.$fs.exists(pluginXcconfigFilePath)) {
-				await this.$xcconfigService.mergeFiles(pluginXcconfigFilePath, pluginsXcconfigFilePath);
+				for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+					await this.$xcconfigService.mergeFiles(pluginXcconfigFilePath, pluginsXcconfigFilePath);
+				}
 			}
 		}
 
 		const appResourcesXcconfigPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName, BUILD_XCCONFIG_FILE_NAME);
 		if (this.$fs.exists(appResourcesXcconfigPath)) {
-			await this.$xcconfigService.mergeFiles(appResourcesXcconfigPath, pluginsXcconfigFilePath);
+			for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+				await this.$xcconfigService.mergeFiles(appResourcesXcconfigPath, pluginsXcconfigFilePath);
+			}
 		}
 
-		if (!this.$fs.exists(pluginsXcconfigFilePath)) {
-			// We need the pluginsXcconfig file to exist in platforms dir as it is required in the native template:
-			// https://github.com/NativeScript/ios-runtime/blob/9c2b7b5f70b9bee8452b7a24aa6b646214c7d2be/build/project-template/__PROJECT_NAME__/build-debug.xcconfig#L3
-			// From Xcode 10 in case the file is missing, this include fails and the build itself fails (was a warning in previous Xcode versions).
-			this.$fs.writeFile(pluginsXcconfigFilePath, "");
+		for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+			if (!this.$fs.exists(pluginsXcconfigFilePath)) {
+				// We need the pluginsXcconfig file to exist in platforms dir as it is required in the native template:
+				// https://github.com/NativeScript/ios-runtime/blob/9c2b7b5f70b9bee8452b7a24aa6b646214c7d2be/build/project-template/__PROJECT_NAME__/build-debug.xcconfig#L3
+				// From Xcode 10 in case the file is missing, this include fails and the build itself fails (was a warning in previous Xcode versions).
+				this.$fs.writeFile(pluginsXcconfigFilePath, "");
+			}
 		}
 
-		// Set Entitlements Property to point to default file if not set explicitly by the user.
-		const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
-		if (entitlementsPropertyValue === null && this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
-			temp.track();
-			const tempEntitlementsDir = temp.mkdirSync("entitlements");
-			const tempEntitlementsFilePath = path.join(tempEntitlementsDir, "set-entitlements.xcconfig");
-			const entitlementsRelativePath = this.$iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData);
-			this.$fs.writeFile(tempEntitlementsFilePath, `CODE_SIGN_ENTITLEMENTS = ${entitlementsRelativePath}${EOL}`);
-
-			await this.$xcconfigService.mergeFiles(tempEntitlementsFilePath, pluginsXcconfigFilePath);
+		for (const pluginsXcconfigFilePath of pluginsXcconfigFilePaths) {
+			// Set Entitlements Property to point to default file if not set explicitly by the user.
+			const entitlementsPropertyValue = this.$xcconfigService.readPropertyValue(pluginsXcconfigFilePath, constants.CODE_SIGN_ENTITLEMENTS);
+			if (entitlementsPropertyValue === null && this.$fs.exists(this.$iOSEntitlementsService.getPlatformsEntitlementsPath(projectData))) {
+				temp.track();
+				const tempEntitlementsDir = temp.mkdirSync("entitlements");
+				const tempEntitlementsFilePath = path.join(tempEntitlementsDir, "set-entitlements.xcconfig");
+				const entitlementsRelativePath = this.$iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData);
+				this.$fs.writeFile(tempEntitlementsFilePath, `CODE_SIGN_ENTITLEMENTS = ${entitlementsRelativePath}${EOL}`);
+
+				await this.$xcconfigService.mergeFiles(tempEntitlementsFilePath, pluginsXcconfigFilePath);
+			}
 		}
 	}
 
@@ -1363,7 +1424,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		const mergedPlist = plist.parse(this.$fs.readText(mergedPlistPath));
 
 		if (infoPlist.CFBundleIdentifier && infoPlist.CFBundleIdentifier !== mergedPlist.CFBundleIdentifier) {
-			this.$logger.warnWithLabel("The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' inside 'package.json'.");
+			this.$logger.warn("[WARNING]: The CFBundleIdentifier key inside the 'Info.plist' will be overriden by the 'id' inside 'package.json'.");
 		}
 	}
 
@@ -1378,6 +1439,17 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			"Enterprise": "enterprise"
 		}[provision.Type];
 	}
+
+	private hasWatchApp(projectData: IProjectData) {
+		const platformData = this.getPlatformData(projectData);
+		const watchAppPath = path.join(
+			projectData.getAppResourcesDirectoryPath(),
+			platformData.normalizedPlatformName,
+			constants.IOS_WATCHAPP_FOLDER
+		);
+
+		return this.$fs.exists(watchAppPath);
+	}
 }
 
 $injector.register("iOSProjectService", IOSProjectService);
diff --git a/lib/services/ios-provision-service.ts b/lib/services/ios-provision-service.ts
index 19c0ba380c..1df007ac6a 100644
--- a/lib/services/ios-provision-service.ts
+++ b/lib/services/ios-provision-service.ts
@@ -55,16 +55,16 @@ export class IOSProvisionService {
 		}
 		match.eligable.forEach(prov => pushProvision(prov));
 
-		this.$logger.out(table.toString());
-		this.$logger.out();
-		this.$logger.out("There are also " + match.nonEligable.length + " non-eligable provisioning profiles.");
-		this.$logger.out();
+		this.$logger.info(table.toString());
+		this.$logger.info();
+		this.$logger.info("There are also " + match.nonEligable.length + " non-eligable provisioning profiles.");
+		this.$logger.info();
 	}
 
 	public async listTeams(): Promise<void> {
 		const teams = await this.getDevelopmentTeams();
 		const table = createTable(["Team Name", "Team ID"], teams.map(team => [quoteString(team.name), team.id]));
-		this.$logger.out(table.toString());
+		this.$logger.info(table.toString());
 	}
 
 	private async queryProvisioningProfilesAndDevices(projectId: string): Promise<{ devices: string[], match: mobileprovision.provision.Result }> {
diff --git a/lib/services/ios-watch-app-service.ts b/lib/services/ios-watch-app-service.ts
new file mode 100644
index 0000000000..dae287e9fb
--- /dev/null
+++ b/lib/services/ios-watch-app-service.ts
@@ -0,0 +1,84 @@
+import * as path from "path";
+import { NativeTargetServiceBase } from "./ios-native-target-service-base";
+import { IOSDeviceTargets, IOS_WATCHAPP_FOLDER, IOS_WATCHAPP_EXTENSION_FOLDER, IOSNativeTargetProductTypes, IOSNativeTargetTypes } from "../constants";
+
+export class IOSWatchAppService extends NativeTargetServiceBase implements IIOSWatchAppService {
+	private static WATCH_APP_IDENTIFIER = "watchkitapp";
+	private static WACTCH_EXTENSION_IDENTIFIER = "watchkitextension";
+	constructor(protected $fs: IFileSystem,
+		protected $pbxprojDomXcode: IPbxprojDomXcode,
+		protected $xcode: IXcode) {
+			super($fs, $pbxprojDomXcode, $xcode);
+	}
+
+	public async addWatchAppFromPath({watchAppFolderPath, projectData, platformData, pbxProjPath}: IAddWatchAppFromPathOptions): Promise<boolean> {
+		const targetUuids: string[] = [];
+		const appPath = path.join(watchAppFolderPath, IOS_WATCHAPP_FOLDER);
+		const extensionPath = path.join(watchAppFolderPath, IOS_WATCHAPP_EXTENSION_FOLDER);
+
+		if (!this.$fs.exists(appPath) || !this.$fs.exists(extensionPath)) {
+			return false;
+		}
+
+		const appFolder = this.getTargetDirectories(appPath)[0];
+		const extensionFolder = this.getTargetDirectories(extensionPath)[0];
+
+		const project = new this.$xcode.project(pbxProjPath);
+		project.parseSync();
+
+		const watchApptarget = this.addTargetToProject(appPath, appFolder, IOSNativeTargetTypes.watchApp, project, platformData, project.getFirstTarget().uuid);
+		this.configureTarget(
+			appFolder,
+			path.join(appPath, appFolder),
+			`${projectData.projectIdentifiers.ios}.${IOSWatchAppService.WATCH_APP_IDENTIFIER}`,
+			"watchapp.json",
+			watchApptarget,
+			project
+		);
+		targetUuids.push(watchApptarget.uuid);
+
+		const watchExtensionTarget = this.addTargetToProject(extensionPath, extensionFolder, IOSNativeTargetTypes.watchExtension, project, platformData, watchApptarget.uuid);
+		this.configureTarget(
+			extensionFolder,
+			path.join(extensionPath, extensionFolder),
+			`${projectData.projectIdentifiers.ios}.${IOSWatchAppService.WATCH_APP_IDENTIFIER}.${IOSWatchAppService.WACTCH_EXTENSION_IDENTIFIER}`,
+			"extension.json",
+			watchExtensionTarget,
+			project);
+		targetUuids.push(watchExtensionTarget.uuid);
+
+		this.$fs.writeFile(pbxProjPath, project.writeSync({omitEmptyValues: true}));
+		this.prepareSigning(targetUuids, projectData, pbxProjPath);
+
+		return true;
+	}
+
+	public removeWatchApp({pbxProjPath}: IRemoveWatchAppOptions): void {
+		const project = new this.$xcode.project(pbxProjPath);
+		project.parseSync();
+		project.removeTargetsByProductType(IOSNativeTargetProductTypes.watchApp);
+		project.removeTargetsByProductType(IOSNativeTargetProductTypes.watchExtension);
+		this.$fs.writeFile(pbxProjPath, project.writeSync({omitEmptyValues: true}));
+	}
+
+	private configureTarget(targetName: string, targetPath: string, identifier: string, configurationFileName: string, target: IXcode.target, project: IXcode.project) {
+		const targetConfigurationJsonPath = path.join(targetPath, configurationFileName);
+
+		const identifierParts = identifier.split(".");
+		identifierParts.pop();
+		const wkAppBundleIdentifier = identifierParts.join(".");
+
+		this.setXcodeTargetBuildConfigurationProperties([
+			{name: "PRODUCT_BUNDLE_IDENTIFIER", value: identifier},
+			{name: "SDKROOT", value: "watchos"},
+			{name: "TARGETED_DEVICE_FAMILY", value: IOSDeviceTargets.watchos},
+			{name: "WATCHOS_DEPLOYMENT_TARGET", value: 5.2},
+			{name: "WK_APP_BUNDLE_IDENTIFIER", value: wkAppBundleIdentifier}
+		], targetName, project);
+
+		this.setConfigurationsFromJsonFile(targetConfigurationJsonPath, target.uuid, targetName, project);
+		project.addToHeaderSearchPaths(targetPath, target.pbxNativeTarget.productName);
+	}
+}
+
+$injector.register("iOSWatchAppService", IOSWatchAppService);
diff --git a/lib/services/itmstransporter-service.ts b/lib/services/itmstransporter-service.ts
index 1536c4d1d8..c129e9332f 100644
--- a/lib/services/itmstransporter-service.ts
+++ b/lib/services/itmstransporter-service.ts
@@ -1,23 +1,18 @@
 import * as path from "path";
 import * as temp from "temp";
-import { EOL } from "os";
 import { ITMSConstants, INFO_PLIST_FILE_NAME } from "../constants";
-import { ItunesConnectApplicationTypes } from "../constants";
-import { quoteString, versionCompare } from "../common/helpers";
+import { quoteString } from "../common/helpers";
+import { cache } from "../common/decorators";
 
 export class ITMSTransporterService implements IITMSTransporterService {
-	private _itmsTransporterPath: string = null;
-	private _itunesConnectApplications: IiTunesConnectApplication[] = null;
-	private _bundleIdentifier: string = null;
-
-	constructor(private $plistParser: IPlistParser,
+	constructor(
+		private	$applePortalApplicationService: IApplePortalApplicationService,
 		private $childProcess: IChildProcess,
 		private $errors: IErrors,
 		private $fs: IFileSystem,
-		private $hostInfo: IHostInfo,
-		private $httpClient: Server.IHttpClient,
 		private $injector: IInjector,
 		private $logger: ILogger,
+		private $plistParser: IPlistParser,
 		private $xcodeSelectService: IXcodeSelectService) { }
 
 	private get $projectData(): IProjectData {
@@ -25,171 +20,81 @@ export class ITMSTransporterService implements IITMSTransporterService {
 	}
 
 	public async upload(data: IITMSData): Promise<void> {
-		if (!this.$hostInfo.isDarwin) {
-			this.$errors.failWithoutHelp("iOS publishing is only available on Mac OS X.");
-		}
-
 		temp.track();
-		const itmsTransporterPath = await this.getITMSTransporterPath(),
-			ipaFileName = "app.ipa",
-			itmsDirectory = temp.mkdirSync("itms-"),
-			innerDirectory = path.join(itmsDirectory, "mybundle.itmsp"),
-			ipaFileLocation = path.join(innerDirectory, ipaFileName),
-			loggingLevel = data.verboseLogging ? ITMSConstants.VerboseLoggingLevels.Verbose : ITMSConstants.VerboseLoggingLevels.Informational,
-			bundleId = await this.getBundleIdentifier(data.ipaFilePath),
-			iOSApplication = await this.getiOSApplication(data.username, data.password, bundleId);
+		const itmsTransporterPath = await this.getITMSTransporterPath();
+		const ipaFileName = "app.ipa";
+		const itmsDirectory = temp.mkdirSync("itms-");
+		const innerDirectory = path.join(itmsDirectory, "mybundle.itmsp");
+		const ipaFileLocation = path.join(innerDirectory, ipaFileName);
+		const loggingLevel = data.verboseLogging ? ITMSConstants.VerboseLoggingLevels.Verbose : ITMSConstants.VerboseLoggingLevels.Informational;
+		const bundleId = await this.getBundleIdentifier(data);
+		const application = await this.$applePortalApplicationService.getApplicationByBundleId(data, bundleId);
 
 		this.$fs.createDirectory(innerDirectory);
 
 		this.$fs.copyFile(data.ipaFilePath, ipaFileLocation);
 
-		const ipaFileHash = await this.$fs.getFileShasum(ipaFileLocation, { algorithm: "md5" }),
-			ipaFileSize = this.$fs.getFileSize(ipaFileLocation),
-			metadata = this.getITMSMetadataXml(iOSApplication.adamId, ipaFileName, ipaFileHash, ipaFileSize);
+		const ipaFileHash = await this.$fs.getFileShasum(ipaFileLocation, { algorithm: "md5" });
+		const ipaFileSize = this.$fs.getFileSize(ipaFileLocation);
+		const metadata = this.getITMSMetadataXml(application.adamId, ipaFileName, ipaFileHash, ipaFileSize);
 
 		this.$fs.writeFile(path.join(innerDirectory, ITMSConstants.ApplicationMetadataFile), metadata);
 
 		await this.$childProcess.spawnFromEvent(itmsTransporterPath, ["-m", "upload", "-f", itmsDirectory, "-u", quoteString(data.username), "-p", quoteString(data.password), "-v", loggingLevel], "close", { stdio: "inherit" });
 	}
 
-	public async getiOSApplications(credentials: ICredentials): Promise<IiTunesConnectApplication[]> {
-		if (!this._itunesConnectApplications) {
-			const requestBody = this.getContentDeliveryRequestBody(credentials),
-				contentDeliveryResponse = await this.$httpClient.httpRequest({
-					url: "https://contentdelivery.itunes.apple.com/WebObjects/MZLabelService.woa/json/MZITunesProducerService",
-					method: "POST",
-					body: requestBody,
-					headers: {
-						"Content-Length": requestBody.length
-					}
-				}),
-				contentDeliveryBody: IContentDeliveryBody = JSON.parse(contentDeliveryResponse.body);
-
-			if (!contentDeliveryBody.result.Success || !contentDeliveryBody.result.Applications) {
-				let errorMessage = ["Unable to connect to iTunes Connect"];
-				if (contentDeliveryBody.result.Errors && contentDeliveryBody.result.Errors.length) {
-					errorMessage = errorMessage.concat(contentDeliveryBody.result.Errors);
-				}
-
-				this.$errors.failWithoutHelp(errorMessage.join(EOL));
+	private async getBundleIdentifier(data: IITMSData): Promise<string> {
+		const { shouldExtractIpa, ipaFilePath } = data;
+
+		if (shouldExtractIpa) {
+			if (!this.$fs.exists(ipaFilePath) || path.extname(ipaFilePath) !== ".ipa") {
+				this.$errors.failWithoutHelp(`Cannot use specified ipa file ${ipaFilePath}. File either does not exist or is not an ipa file.`);
 			}
 
-			this._itunesConnectApplications = contentDeliveryBody.result.Applications.filter(app => app.type === ItunesConnectApplicationTypes.iOS);
-		}
+			this.$logger.trace("--ipa set - extracting .ipa file to get app's bundle identifier");
+			temp.track();
+			const destinationDir = temp.mkdirSync("ipa-");
+			await this.$fs.unzip(ipaFilePath, destinationDir);
 
-		return this._itunesConnectApplications;
-	}
+			const payloadDir = path.join(destinationDir, "Payload");
+			let allFiles = this.$fs.readDirectory(payloadDir);
 
-	/**
-	 * Gets iTunes Connect application corresponding to the given bundle identifier.
-	 * @param  {string}                             username For authentication with iTunes Connect.
-	 * @param  {string}                             password For authentication with iTunes Connect.
-	 * @param  {string}                             bundleId Application's Bundle Identifier
-	 * @return {IFuture<IiTunesConnectApplication>}          The iTunes Connect application.
-	 */
-	private async getiOSApplication(username: string, password: string, bundleId: string): Promise<IiTunesConnectApplication> {
-		const iOSApplications = await this.getiOSApplications({ username, password });
-		if (!iOSApplications || !iOSApplications.length) {
-			this.$errors.failWithoutHelp(`Cannot find any registered applications for Apple ID ${username} in iTunes Connect.`);
-		}
+			this.$logger.debug("ITMSTransporter .ipa Payload files:");
+			allFiles.forEach(f => this.$logger.debug(" - " + f));
 
-		const iOSApplication = _.find(iOSApplications, app => app.bundleId === bundleId);
+			allFiles = allFiles.filter(f => path.extname(f).toLowerCase() === ".app");
+			if (allFiles.length > 1) {
+				this.$errors.failWithoutHelp("In the .ipa the ITMSTransporter is uploading there is more than one .app file. We don't know which one to upload.");
+			} else if (allFiles.length <= 0) {
+				this.$errors.failWithoutHelp("In the .ipa the ITMSTransporter is uploading there must be at least one .app file.");
+			}
+			const appFile = path.join(payloadDir, allFiles[0]);
 
-		if (!iOSApplication) {
-			this.$errors.failWithoutHelp(`Cannot find registered applications that match the specified identifier ${bundleId} in iTunes Connect.`);
-		}
+			const plistObject = await this.$plistParser.parseFile(path.join(appFile, INFO_PLIST_FILE_NAME));
+			const bundleId = plistObject && plistObject.CFBundleIdentifier;
+			if (!bundleId) {
+				this.$errors.failWithoutHelp(`Unable to determine bundle identifier from ${ipaFilePath}.`);
+			}
 
-		return iOSApplication;
-	}
+			this.$logger.trace(`bundle identifier determined to be ${bundleId}`);
 
-	/**
-	 * Gets the application's bundle identifier. If ipaFileFullPath is provided will extract the bundle identifier from the .ipa file.
-	 * @param  {string}          ipaFileFullPath Optional full path to .ipa file
-	 * @return {IFuture<string>}                 Application's bundle identifier.
-	 */
-	private async getBundleIdentifier(ipaFileFullPath?: string): Promise<string> {
-		if (!this._bundleIdentifier) {
-			if (!ipaFileFullPath) {
-				this._bundleIdentifier = this.$projectData.projectIdentifiers.ios;
-			} else {
-				if (!this.$fs.exists(ipaFileFullPath) || path.extname(ipaFileFullPath) !== ".ipa") {
-					this.$errors.failWithoutHelp(`Cannot use specified ipa file ${ipaFileFullPath}. File either does not exist or is not an ipa file.`);
-				}
-
-				this.$logger.trace("--ipa set - extracting .ipa file to get app's bundle identifier");
-				temp.track();
-				const destinationDir = temp.mkdirSync("ipa-");
-				await this.$fs.unzip(ipaFileFullPath, destinationDir);
-
-				const payloadDir = path.join(destinationDir, "Payload");
-				let allApps = this.$fs.readDirectory(payloadDir);
-
-				this.$logger.debug("ITMSTransporter .ipa Payload files:");
-				allApps.forEach(f => this.$logger.debug(" - " + f));
-
-				allApps = allApps.filter(f => path.extname(f).toLowerCase() === ".app");
-				if (allApps.length > 1) {
-					this.$errors.failWithoutHelp("In the .ipa the ITMSTransporter is uploading there is more than one .app file. We don't know which one to upload.");
-				} else if (allApps.length <= 0) {
-					this.$errors.failWithoutHelp("In the .ipa the ITMSTransporter is uploading there must be at least one .app file.");
-				}
-				const appFile = path.join(payloadDir, allApps[0]);
-
-				const plistObject = await this.$plistParser.parseFile(path.join(appFile, INFO_PLIST_FILE_NAME));
-				const bundleId = plistObject && plistObject.CFBundleIdentifier;
-				if (!bundleId) {
-					this.$errors.failWithoutHelp(`Unable to determine bundle identifier from ${ipaFileFullPath}.`);
-				}
-
-				this.$logger.trace(`bundle identifier determined to be ${bundleId}`);
-				this._bundleIdentifier = bundleId;
-			}
+			return bundleId;
 		}
 
-		return this._bundleIdentifier;
+		return this.$projectData.projectIdentifiers.ios;
 	}
 
+	@cache()
 	private async getITMSTransporterPath(): Promise<string> {
-		if (!this._itmsTransporterPath) {
-			const xcodePath = await this.$xcodeSelectService.getContentsDirectoryPath();
-			const xcodeVersion = await this.$xcodeSelectService.getXcodeVersion();
-			let result = path.join(xcodePath, "Applications", "Application Loader.app", "Contents");
-
-			xcodeVersion.patch = xcodeVersion.patch || "0";
-			// iTMS Transporter's path has been modified in Xcode 6.3
-			// https://github.com/nomad/shenzhen/issues/243
-			if (xcodeVersion.major && xcodeVersion.minor &&
-				versionCompare(xcodeVersion, "6.3.0") < 0) {
-				result = path.join(result, "MacOS");
-			}
+		const xcodePath = await this.$xcodeSelectService.getContentsDirectoryPath();
+		const loaderAppContentsPath = path.join(xcodePath, "Applications", "Application Loader.app", "Contents");
+		const itmsTransporterPath = path.join(loaderAppContentsPath, ITMSConstants.iTMSDirectoryName, "bin", ITMSConstants.iTMSExecutableName);
 
-			this._itmsTransporterPath = path.join(result, ITMSConstants.iTMSDirectoryName, "bin", ITMSConstants.iTMSExecutableName);
-		}
-
-		if (!this.$fs.exists(this._itmsTransporterPath)) {
+		if (!this.$fs.exists(itmsTransporterPath)) {
 			this.$errors.failWithoutHelp('iTMS Transporter not found on this machine - make sure your Xcode installation is not damaged.');
 		}
 
-		return this._itmsTransporterPath;
-	}
-
-	private getContentDeliveryRequestBody(credentials: ICredentials): Buffer {
-		// All of those values except credentials are hardcoded
-		// Apple's content delivery API is very picky with handling requests
-		// and if only one of these ends up missing the API returns
-		// a response with 200 status code and an error
-		return Buffer.from(JSON.stringify({
-			id: "1", // magic number
-			jsonrpc: "2.0",
-			method: "lookupSoftwareApplications",
-			params: {
-				Username: credentials.username,
-				Password: credentials.password,
-				Version: "2.9.1 (441)",
-				Application: "Application Loader",
-				OSIdentifier: "Mac OS X 10.8.5 (x86_64)"
-			}
-		}), "utf8");
+		return itmsTransporterPath;
 	}
 
 	private getITMSMetadataXml(appleId: string, ipaFileName: string, ipaFileHash: string, ipaFileSize: number): string {
diff --git a/lib/services/livesync/android-device-livesync-sockets-service.ts b/lib/services/livesync/android-device-livesync-sockets-service.ts
index 3f5da8422a..f9efc9d11a 100644
--- a/lib/services/livesync/android-device-livesync-sockets-service.ts
+++ b/lib/services/livesync/android-device-livesync-sockets-service.ts
@@ -19,7 +19,7 @@ export class AndroidDeviceSocketsLiveSyncService extends AndroidDeviceLiveSyncSe
 		$logger: ILogger,
 		protected device: Mobile.IAndroidDevice,
 		private $options: IOptions,
-		private $processService: IProcessService,
+		private $cleanupService: ICleanupService,
 		private $fs: IFileSystem,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$filesHashService: IFilesHashService) {
@@ -59,6 +59,18 @@ export class AndroidDeviceSocketsLiveSyncService extends AndroidDeviceLiveSyncSe
 		}
 	}
 
+	private async getCleanupCommand(appIdentifier: string): Promise<ISpawnCommandInfo> {
+		return {
+			command: await this.$staticConfig.getAdbFilePath(), args: [
+				"-s",
+				this.device.deviceInfo.identifier,
+				"shell",
+				"rm",
+				"-rf",
+				appIdentifier
+			]
+		};
+	}
 	private async doSync(liveSyncInfo: ILiveSyncResultInfo, projectData: IProjectData): Promise<IAndroidLivesyncSyncOperationResult> {
 		const operationId = this.livesyncTool.generateOperationIdentifier();
 
@@ -74,12 +86,14 @@ export class AndroidDeviceSocketsLiveSyncService extends AndroidDeviceLiveSyncSe
 				}
 			}, AndroidDeviceSocketsLiveSyncService.STATUS_UPDATE_INTERVAL);
 
+			const cleanupCommand = await this.getCleanupCommand(liveSyncInfo.deviceAppData.appIdentifier);
 			const actionOnEnd = async () => {
 				clearInterval(syncInterval);
 				await this.device.fileSystem.deleteFile(this.getPathToLiveSyncFileOnDevice(liveSyncInfo.deviceAppData.appIdentifier), liveSyncInfo.deviceAppData.appIdentifier);
+				await this.$cleanupService.removeCleanupCommand(cleanupCommand);
 			};
 
-			this.$processService.attachToProcessExitSignals(this, actionOnEnd);
+			await this.$cleanupService.addCleanupCommand(cleanupCommand);
 			// We need to clear resources when the action fails
 			// But we also need the real result of the action.
 			await doSyncPromise.then(actionOnEnd.bind(this), actionOnEnd.bind(this));
diff --git a/lib/services/livesync/android-livesync-tool.ts b/lib/services/livesync/android-livesync-tool.ts
index 4f77096869..d55d010aec 100644
--- a/lib/services/livesync/android-livesync-tool.ts
+++ b/lib/services/livesync/android-livesync-tool.ts
@@ -41,12 +41,10 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 		private $fs: IFileSystem,
 		private $logger: ILogger,
 		private $mobileHelper: Mobile.IMobileHelper,
-		private $processService: IProcessService,
 		private $injector: IInjector) {
 			this.operationPromises = Object.create(null);
 			this.socketError = null;
 			this.socketConnection = null;
-			this.$processService.attachToProcessExitSignals(this, this.dispose);
 	}
 
 	public async connect(configuration: IAndroidLivesyncToolConfiguration): Promise<void> {
@@ -445,28 +443,6 @@ export class AndroidLivesyncTool implements IAndroidLivesyncTool {
 		return this.$mobileHelper.buildDevicePath(relativeFilePath);
 	}
 
-	private dispose(): void {
-		if (this.pendingConnectionData) {
-			clearTimeout(this.pendingConnectionData.connectionTimer);
-
-			if (this.pendingConnectionData.socketTimer) {
-				clearTimeout(this.pendingConnectionData.socketTimer);
-			}
-			if (this.pendingConnectionData.socket) {
-				this.pendingConnectionData.socket.removeAllListeners();
-			}
-
-			this.pendingConnectionData.rejectHandler("LiveSync aborted.");
-		}
-		this.end();
-
-		_.keys(this.operationPromises)
-			.forEach(operationId => {
-				const operationPromise = this.operationPromises[operationId];
-				clearTimeout(operationPromise.timeoutId);
-			});
-	}
-
 	private async writeToSocket(data: Buffer): Promise<Boolean> {
 		this.verifyActiveConnection();
 		const result = await this.socketConnection.writeAsync(data);
diff --git a/lib/services/livesync/ios-device-livesync-service.ts b/lib/services/livesync/ios-device-livesync-service.ts
index 249ec41a1e..af027caffd 100644
--- a/lib/services/livesync/ios-device-livesync-service.ts
+++ b/lib/services/livesync/ios-device-livesync-service.ts
@@ -11,7 +11,6 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 
 	constructor(
 		private $logger: ILogger,
-		private $processService: IProcessService,
 		protected $platformsData: IPlatformsData,
 		protected device: Mobile.IiOSDevice) {
 		super($platformsData, device);
@@ -108,8 +107,6 @@ export class IOSDeviceLiveSyncService extends DeviceLiveSyncServiceBase implemen
 	}
 
 	private attachEventHandlers(): void {
-		this.$processService.attachToProcessExitSignals(this, this.destroySocket);
-
 		this.socket.on("close", (hadError: boolean) => {
 			this.$logger.trace(`Socket closed, hadError is ${hadError}.`);
 			this.socket = null;
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
index fa1eb1502b..4bb3837a4a 100644
--- a/lib/services/livesync/livesync-service.ts
+++ b/lib/services/livesync/livesync-service.ts
@@ -28,7 +28,6 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $nodeModulesDependenciesBuilder: INodeModulesDependenciesBuilder,
 		private $logger: ILogger,
-		private $processService: IProcessService,
 		private $hooksService: IHooksService,
 		private $pluginsService: IPluginsService,
 		private $debugService: IDebugService,
@@ -810,15 +809,6 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 
 			this.liveSyncProcessesInfo[liveSyncData.projectDir].watcherInfo = { watcher, patterns };
 			this.liveSyncProcessesInfo[liveSyncData.projectDir].timer = timeoutTimer;
-
-			this.$processService.attachToProcessExitSignals(this, () => {
-				_.keys(this.liveSyncProcessesInfo).forEach(projectDir => {
-					// Do not await here, we are in process exit's handler.
-					/* tslint:disable:no-floating-promises */
-					this.stopLiveSync(projectDir);
-					/* tslint:enable:no-floating-promises */
-				});
-			});
 		}
 	}
 
@@ -858,6 +848,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 	private getInstallApplicationBuildConfig(deviceIdentifier: string, projectDir: string, opts: { isEmulator: boolean }): IBuildConfig {
 		const buildConfig: IBuildConfig = {
 			buildForDevice: !opts.isEmulator,
+			iCloudContainerEnvironment: null,
 			release: false,
 			device: deviceIdentifier,
 			provision: null,
diff --git a/lib/services/livesync/playground/preview-app-constants.ts b/lib/services/livesync/playground/preview-app-constants.ts
index fd8ac000e6..084a9db3b3 100644
--- a/lib/services/livesync/playground/preview-app-constants.ts
+++ b/lib/services/livesync/playground/preview-app-constants.ts
@@ -8,11 +8,6 @@ export class PubnubKeys {
 	public static SUBSCRIBE_KEY = "sub-c-3dad1ebe-aaa3-11e8-8027-363023237e0b";
 }
 
-export class PlaygroundStoreUrls {
-	public static GOOGLE_PLAY_URL = "https://play.google.com/store/apps/details?id=org.nativescript.play";
-	public static APP_STORE_URL = "https://itunes.apple.com/us/app/nativescript-playground/id1263543946?mt=8&ls=1";
-}
-
 export class PluginComparisonMessages {
 	public static PLUGIN_NOT_INCLUDED_IN_PREVIEW_APP = "Plugin %s is not included in preview app on device %s and will not work.";
 	public static LOCAL_PLUGIN_WITH_DIFFERENCE_IN_MAJOR_VERSION = "Local plugin %s differs in major version from plugin in preview app. The local plugin has version %s and the plugin in preview app has version %s. Some features might not work as expected.";
diff --git a/lib/services/livesync/playground/preview-app-livesync-service.ts b/lib/services/livesync/playground/preview-app-livesync-service.ts
index b1d2d6537d..1b18380916 100644
--- a/lib/services/livesync/playground/preview-app-livesync-service.ts
+++ b/lib/services/livesync/playground/preview-app-livesync-service.ts
@@ -22,13 +22,15 @@ export class PreviewAppLiveSyncService extends EventEmitter implements IPreviewA
 		private $previewAppFilesService: IPreviewAppFilesService,
 		private $previewAppPluginsService: IPreviewAppPluginsService,
 		private $previewDevicesService: IPreviewDevicesService,
-		private $hmrStatusService: IHmrStatusService) {
-			super();
-		}
+		private $hmrStatusService: IHmrStatusService,
+		protected $workflowService: IWorkflowService) {
+		super();
+	}
 
 	@performanceLog()
 	public async initialize(data: IPreviewAppLiveSyncData): Promise<void> {
-		await this.$previewSdkService.initialize(async (device: Device) => {
+		await this.$previewSdkService.initialize(data.projectDir, async (device: Device) => {
+			await this.$workflowService.handleLegacyWorkflow({ projectDir: data.projectDir, settings: data });
 			try {
 				if (!device) {
 					this.$errors.failWithoutHelp("Sending initial preview files without a specified device is not supported.");
@@ -177,7 +179,7 @@ export class PreviewAppLiveSyncService extends EventEmitter implements IPreviewA
 						if (status === HmrConstants.HMR_ERROR_STATUS) {
 							const originalUseHotModuleReload = data.useHotModuleReload;
 							data.useHotModuleReload = false;
-							await this.syncFilesForPlatformSafe(data, { filesToSync: platformHmrData.fallbackFiles }, platform, previewDevice.id );
+							await this.syncFilesForPlatformSafe(data, { filesToSync: platformHmrData.fallbackFiles }, platform, previewDevice.id);
 							data.useHotModuleReload = originalUseHotModuleReload;
 						}
 					}));
diff --git a/lib/services/livesync/playground/preview-qr-code-service.ts b/lib/services/livesync/playground/preview-qr-code-service.ts
index 5d5048b8a3..2609a2cd55 100644
--- a/lib/services/livesync/playground/preview-qr-code-service.ts
+++ b/lib/services/livesync/playground/preview-qr-code-service.ts
@@ -1,6 +1,5 @@
 import * as util from "util";
 import { EOL } from "os";
-import { PlaygroundStoreUrls } from "./preview-app-constants";
 import { exported } from "../../../common/decorators";
 
 export class PreviewQrCodeService implements IPreviewQrCodeService {
@@ -10,20 +9,22 @@ export class PreviewQrCodeService implements IPreviewQrCodeService {
 		private $logger: ILogger,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $previewSdkService: IPreviewSdkService,
+		private $previewSchemaService: IPreviewSchemaService,
 		private $qrCodeTerminalService: IQrCodeTerminalService,
 		private $qr: IQrCodeGenerator
 	) { }
 
 	@exported("previewQrCodeService")
 	public async getPlaygroundAppQrCode(options?: IPlaygroundAppQrCodeOptions): Promise<IDictionary<IQrCodeImageData>> {
+		const { projectDir } = options || <any>{ };
 		const result = Object.create(null);
 
 		if (!options || !options.platform || this.$mobileHelper.isAndroidPlatform(options.platform)) {
-			result.android = await this.getLiveSyncQrCode(PlaygroundStoreUrls.GOOGLE_PLAY_URL);
+			result.android = await this.getLiveSyncQrCode(this.getGooglePlayUrl(projectDir));
 		}
 
 		if (!options || !options.platform || this.$mobileHelper.isiOSPlatform(options.platform)) {
-			result.ios = await this.getLiveSyncQrCode(PlaygroundStoreUrls.APP_STORE_URL);
+			result.ios = await this.getLiveSyncQrCode(this.getAppStoreUrl(projectDir));
 		}
 
 		return result;
@@ -56,8 +57,8 @@ export class PreviewQrCodeService implements IPreviewQrCodeService {
 			this.$logger.printMarkdown(`# Use \`NativeScript Playground app\` and scan the \`QR code\` above to preview the application on your device.`);
 			this.$logger.printMarkdown(`
 To scan the QR code and deploy your app on a device, you need to have the \`NativeScript Playground app\`:
-	App Store (iOS): ${PlaygroundStoreUrls.APP_STORE_URL}
-	Google Play (Android): ${PlaygroundStoreUrls.GOOGLE_PLAY_URL}`);
+	App Store (iOS): ${this.getAppStoreUrl(options.projectDir)}
+	Google Play (Android): ${this.getGooglePlayUrl(options.projectDir)}`);
 		}
 	}
 
@@ -73,5 +74,15 @@ To scan the QR code and deploy your app on a device, you need to have the \`Nati
 
 		return url;
 	}
+
+	private getGooglePlayUrl(projectDir: string): string {
+		const schema = this.$previewSchemaService.getSchemaData(projectDir);
+		return `https://play.google.com/store/apps/details?id=${schema.scannerAppId}`;
+	}
+
+	private getAppStoreUrl(projectDir: string): string {
+		const schema = this.$previewSchemaService.getSchemaData(projectDir);
+		return `https://itunes.apple.com/us/app/nativescript-playground/id${schema.scannerAppStoreId}?mt=8&ls=1`;
+	}
 }
 $injector.register("previewQrCodeService", PreviewQrCodeService);
diff --git a/lib/services/livesync/playground/preview-schema-service.ts b/lib/services/livesync/playground/preview-schema-service.ts
new file mode 100644
index 0000000000..45e8ccb89b
--- /dev/null
+++ b/lib/services/livesync/playground/preview-schema-service.ts
@@ -0,0 +1,54 @@
+import { PubnubKeys } from "./preview-app-constants";
+
+export class PreviewSchemaService implements IPreviewSchemaService {
+	private previewSchemas: IDictionary<IPreviewSchemaData> = {
+		"nsplay": {
+			name: "nsplay",
+			scannerAppId: "org.nativescript.play",
+			scannerAppStoreId: "1263543946",
+			previewAppId: "org.nativescript.preview",
+			previewAppStoreId: "1264484702",
+			msvKey: "cli",
+			publishKey: PubnubKeys.PUBLISH_KEY,
+			subscribeKey: PubnubKeys.SUBSCRIBE_KEY,
+			default: true
+		},
+		"kspreview": {
+			name: "kspreview",
+			scannerAppId: "com.kinvey.scanner",
+			scannerAppStoreId: "1458317125",
+			previewAppId: "com.kinvey.preview",
+			previewAppStoreId: "1458502055",
+			msvKey: "kinveyStudio",
+			publishKey: PubnubKeys.PUBLISH_KEY,
+			subscribeKey: PubnubKeys.SUBSCRIBE_KEY
+		}
+	};
+
+	constructor(private $errors: IErrors,
+		private $projectDataService: IProjectDataService) { }
+
+	public getSchemaData(projectDir: string): IPreviewSchemaData {
+		let schemaName = this.getSchemaNameFromProject(projectDir);
+		if (!schemaName) {
+			schemaName = _.findKey(this.previewSchemas, previewSchema => previewSchema.default);
+		}
+
+		const result = this.previewSchemas[schemaName];
+		if (!result) {
+			this.$errors.failWithoutHelp(`Invalid schema. The valid schemas are ${_.keys(this.previewSchemas)}.`);
+		}
+
+		return result;
+	}
+
+	private getSchemaNameFromProject(projectDir: string): string {
+		try {
+			const projectData = this.$projectDataService.getProjectData(projectDir);
+			return projectData.previewAppSchema;
+		} catch (err) { /* ignore the error */ }
+
+		return null;
+	}
+}
+$injector.register("previewSchemaService", PreviewSchemaService);
diff --git a/lib/services/livesync/playground/preview-sdk-service.ts b/lib/services/livesync/playground/preview-sdk-service.ts
index fc9565184a..63e805b067 100644
--- a/lib/services/livesync/playground/preview-sdk-service.ts
+++ b/lib/services/livesync/playground/preview-sdk-service.ts
@@ -1,5 +1,4 @@
 import { MessagingService, Config, Device, DeviceConnectedMessage, SdkCallbacks, ConnectedDevices, FilesPayload } from "nativescript-preview-sdk";
-import { PubnubKeys } from "./preview-app-constants";
 import { EventEmitter } from "events";
 const pako = require("pako");
 
@@ -13,24 +12,20 @@ export class PreviewSdkService extends EventEmitter implements IPreviewSdkServic
 		private $logger: ILogger,
 		private $previewDevicesService: IPreviewDevicesService,
 		private $previewAppLogProvider: IPreviewAppLogProvider,
-		private $projectDataService: IProjectDataService) {
+		private $previewSchemaService: IPreviewSchemaService) {
 			super();
 	}
 
 	public getQrCodeUrl(options: IGetQrCodeUrlOptions): string {
 		const { projectDir, useHotModuleReload } = options;
-		const projectData = this.$projectDataService.getProjectData(projectDir);
-		const schema = projectData.previewAppSchema || "nsplay";
-		// TODO: Use the correct keys for the schema
-		const publishKey = PubnubKeys.PUBLISH_KEY;
-		const subscribeKey = PubnubKeys.SUBSCRIBE_KEY;
+		const schema = this.$previewSchemaService.getSchemaData(projectDir);
 		const hmrValue = useHotModuleReload ? "1" : "0";
-		const result = `${schema}://boot?instanceId=${this.instanceId}&pKey=${publishKey}&sKey=${subscribeKey}&template=play-ng&hmr=${hmrValue}`;
+		const result = `${schema.name}://boot?instanceId=${this.instanceId}&pKey=${schema.publishKey}&sKey=${schema.subscribeKey}&template=play-ng&hmr=${hmrValue}`;
 		return result;
 	}
 
-	public async initialize(getInitialFiles: (device: Device) => Promise<FilesPayload>): Promise<void> {
-		const initConfig = this.getInitConfig(getInitialFiles);
+	public async initialize(projectDir: string, getInitialFiles: (device: Device) => Promise<FilesPayload>): Promise<void> {
+		const initConfig = this.getInitConfig(projectDir, getInitialFiles);
 		this.messagingService = new MessagingService();
 		this.instanceId = await this.messagingService.initialize(initConfig);
 	}
@@ -51,15 +46,18 @@ export class PreviewSdkService extends EventEmitter implements IPreviewSdkServic
 		this.messagingService.stop();
 	}
 
-	private getInitConfig(getInitialFiles: (device: Device) => Promise<FilesPayload>): Config {
+	private getInitConfig(projectDir: string, getInitialFiles: (device: Device) => Promise<FilesPayload>): Config {
+		const schema = this.$previewSchemaService.getSchemaData(projectDir);
+
 		return {
-			pubnubPublishKey: PubnubKeys.PUBLISH_KEY,
-			pubnubSubscribeKey: PubnubKeys.SUBSCRIBE_KEY,
-			msvKey: "cli",
+			pubnubPublishKey: schema.publishKey,
+			pubnubSubscribeKey: schema.subscribeKey,
+			msvKey: schema.msvKey,
 			msvEnv: this.$config.PREVIEW_APP_ENVIRONMENT,
-			showLoadingPage: false,
 			callbacks: this.getCallbacks(),
-			getInitialFiles
+			getInitialFiles,
+			previewAppStoreId: schema.previewAppStoreId,
+			previewAppGooglePlayId: schema.previewAppId
 		};
 	}
 
diff --git a/lib/services/nativescript-cloud-extension-service.ts b/lib/services/nativescript-cloud-extension-service.ts
index 3ff6c90a24..04c99c8bdc 100644
--- a/lib/services/nativescript-cloud-extension-service.ts
+++ b/lib/services/nativescript-cloud-extension-service.ts
@@ -11,7 +11,7 @@ export class NativeScriptCloudExtensionService implements INativeScriptCloudExte
 			return this.$extensibilityService.installExtension(constants.NATIVESCRIPT_CLOUD_EXTENSION_NAME);
 		}
 
-		this.$logger.out(`Extension ${constants.NATIVESCRIPT_CLOUD_EXTENSION_NAME} is already installed.`);
+		this.$logger.info(`Extension ${constants.NATIVESCRIPT_CLOUD_EXTENSION_NAME} is already installed.`);
 	}
 
 	public isInstalled(): boolean {
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
index e481600407..500ca4df7a 100644
--- a/lib/services/platform-service.ts
+++ b/lib/services/platform-service.ts
@@ -36,7 +36,8 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		private $terminalSpinnerService: ITerminalSpinnerService,
 		private $pacoteService: IPacoteService,
 		private $usbLiveSyncService: any,
-		public $hooksService: IHooksService
+		public $hooksService: IHooksService,
+		public $workflowService: IWorkflowService
 	) {
 		super();
 	}
@@ -96,7 +97,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		this.$logger.trace("Package: %s", projectData.projectIdentifiers[platform]);
 		this.$logger.trace("Name: %s", projectData.projectName);
 
-		this.$logger.out("Copying template files...");
+		this.$logger.info("Copying template files...");
 
 		let packageToInstall = "";
 		if (frameworkPath) {
@@ -135,7 +136,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		}
 
 		this.$fs.ensureDirectoryExists(platformPath);
-		this.$logger.out(`Platform ${platform} successfully added. v${installedPlatformVersion}`);
+		this.$logger.info(`Platform ${platform} successfully added. v${installedPlatformVersion}`);
 	}
 
 	private async addPlatformCore(platformData: IPlatformData, frameworkDir: string, platformTemplate: string, projectData: IProjectData, config: IPlatformOptions, nativePrepare?: INativePrepare): Promise<string> {
@@ -221,6 +222,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 	@performanceLog()
 	public async preparePlatform(platformInfo: IPreparePlatformInfo): Promise<boolean> {
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: platformInfo.projectData.projectDir, settings: platformInfo.appFilesUpdaterOptions });
 		const changesInfo = await this.getChangesInfo(platformInfo);
 		const shouldPrepare = await this.shouldPrepare({ platformInfo, changesInfo });
 
@@ -247,7 +249,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			);
 			this.$projectChangesService.savePrepareInfo(platformInfo.platform, platformInfo.projectData);
 		} else {
-			this.$logger.out("Skipping prepare.");
+			this.$logger.info("Skipping prepare.");
 		}
 
 		return true;
@@ -314,9 +316,14 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		filesToRemove?: string[],
 		nativePrepare?: INativePrepare): Promise<void> {
 
-		this.$logger.out("Preparing project...");
+		this.$logger.info("Preparing project...");
 
 		const platformData = this.$platformsData.getPlatformData(platform, projectData);
+		const frameworkVersion = this.getCurrentPlatformVersion(platform, projectData);
+		if (semver.lt(semver.coerce(frameworkVersion), semver.coerce('5.1.0'))) {
+			this.$logger.warn(`Runtime versions lower than 5.1.0 have been deprecated and will not be supported as of v6.0.0 of NativeScript CLI. More info can be found in this issue https://github.com/NativeScript/nativescript-cli/issues/4518.`);
+		}
+
 		const projectFilesConfig = helpers.getProjectFilesConfig({ isReleaseBuild: appFilesUpdaterOptions.release });
 		await this.$preparePlatformJSService.preparePlatform({
 			platform,
@@ -354,7 +361,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		this.$projectFilesManager.processPlatformSpecificFiles(directoryPath, platform, projectFilesConfig, excludedDirs);
 
-		this.$logger.out(`Project successfully prepared (${platform})`);
+		this.$logger.info(`Project successfully prepared (${platform})`);
 	}
 
 	public async shouldBuild(platform: string, projectData: IProjectData, buildConfig: IBuildConfig, outputPath?: string): Promise<boolean> {
@@ -397,7 +404,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 	@performanceLog()
 	public async buildPlatform(platform: string, buildConfig: IBuildConfig, projectData: IProjectData): Promise<string> {
-		this.$logger.out("Building project...");
+		this.$logger.info("Building project...");
 
 		const action = constants.TrackActionNames.Build;
 		const isForDevice = this.$mobileHelper.isAndroidPlatform(platform) ? null : buildConfig && buildConfig.buildForDevice;
@@ -417,7 +424,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 		const handler = (data: any) => {
 			this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
-			this.$logger.printInfoMessageOnSameLine(data.data.toString());
+			this.$logger.info(data.data.toString(), { [constants.LoggerConfigData.skipNewLine]: true });
 		};
 
 		await attachAwaitDetach(constants.BUILD_OUTPUT_EVENT_NAME, platformData.platformProjectService, handler, platformData.platformProjectService.buildProject(platformData.projectRoot, projectData, buildConfig));
@@ -425,7 +432,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		const buildInfoFilePath = this.getBuildOutputPath(platform, platformData, buildConfig);
 		this.saveBuildInfoFile(platform, projectData.projectDir, buildInfoFilePath);
 
-		this.$logger.out("Project successfully built.");
+		this.$logger.info("Project successfully built.");
 		return this.lastOutputPath(platform, buildConfig, projectData);
 	}
 
@@ -473,7 +480,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	}
 
 	public async installApplication(device: Mobile.IDevice, buildConfig: IBuildConfig, projectData: IProjectData, packageFile?: string, outputFilePath?: string): Promise<void> {
-		this.$logger.out(`Installing on device ${device.deviceInfo.identifier}...`);
+		this.$logger.info(`Installing on device ${device.deviceInfo.identifier}...`);
 
 		await this.$analyticsService.trackEventActionInGoogleAnalytics({
 			action: constants.TrackActionNames.Deploy,
@@ -512,7 +519,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			await device.fileSystem.putFile(path.join(buildInfoFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
 		}
 
-		this.$logger.out(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
+		this.$logger.info(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
 	}
 
 	private async updateHashesOnDevice(data: { device: Mobile.IDevice, appIdentifier: string, outputFilePath: string, platformData: IPlatformData }): Promise<void> {
@@ -548,6 +555,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		const action = async (device: Mobile.IDevice): Promise<void> => {
 			const buildConfig: IBuildConfig = {
 				buildForDevice: !this.$devicesService.isiOSSimulator(device),
+				iCloudContainerEnvironment: null,
 				projectDir: deployInfo.deployOptions.projectDir,
 				release: deployInfo.deployOptions.release,
 				device: deployInfo.deployOptions.device,
@@ -565,13 +573,13 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 			if (shouldBuild) {
 				installPackageFile = await deployInfo.buildPlatform(deployInfo.platform, buildConfig, deployInfo.projectData);
 			} else {
-				this.$logger.out("Skipping package build. No changes detected on the native side. This will be fast!");
+				this.$logger.info("Skipping package build. No changes detected on the native side. This will be fast!");
 			}
 
 			if (deployInfo.deployOptions.forceInstall || shouldBuild || (await this.shouldInstall(device, deployInfo.projectData, buildConfig))) {
 				await this.installApplication(device, buildConfig, deployInfo.projectData, installPackageFile, deployInfo.outputPath);
 			} else {
-				this.$logger.out("Skipping install.");
+				this.$logger.info("Skipping install.");
 			}
 
 		};
@@ -585,11 +593,11 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 	}
 
 	public async startApplication(platform: string, runOptions: IRunPlatformOptions, appData: Mobile.IStartApplicationData): Promise<void> {
-		this.$logger.out("Starting...");
+		this.$logger.info("Starting...");
 
 		const action = async (device: Mobile.IDevice) => {
 			await device.applicationManager.startApplication(appData);
-			this.$logger.out(`Successfully started on device with identifier '${device.deviceInfo.identifier}'.`);
+			this.$logger.info(`Successfully started on device with identifier '${device.deviceInfo.identifier}'.`);
 		};
 
 		await this.$devicesService.initialize({ platform: platform, deviceId: runOptions.device });
@@ -705,7 +713,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 				this.$fs.deleteDirectory(platformDir);
 				this.$projectDataService.removeNSProperty(projectData.projectDir, platformData.frameworkPackageName);
 
-				this.$logger.out(`Platform ${platform} successfully removed.`);
+				this.$logger.info(`Platform ${platform} successfully removed.`);
 			} catch (err) {
 				this.$logger.error(`Failed to remove ${platform} platform with errors:`);
 				if (gradleErrorMessage) {
@@ -940,7 +948,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 		await this.removePlatforms([packageName], projectData);
 		packageName = updateOptions.newVersion ? `${packageName}@${updateOptions.newVersion}` : packageName;
 		await this.addPlatform(packageName, updateOptions.platformTemplate, projectData, config);
-		this.$logger.out("Successfully updated to version ", updateOptions.newVersion);
+		this.$logger.info("Successfully updated to version ", updateOptions.newVersion);
 	}
 
 	// TODO: Remove this method from here. It has nothing to do with platform
diff --git a/lib/services/plugins-service.ts b/lib/services/plugins-service.ts
index f18a9e8e7f..857e05dbbc 100644
--- a/lib/services/plugins-service.ts
+++ b/lib/services/plugins-service.ts
@@ -70,7 +70,7 @@ export class PluginsService implements IPluginsService {
 				throw err;
 			}
 
-			this.$logger.out(`Successfully installed plugin ${realNpmPackageJson.name}.`);
+			this.$logger.info(`Successfully installed plugin ${realNpmPackageJson.name}.`);
 		} else {
 			await this.$packageManager.uninstall(realNpmPackageJson.name, { save: true }, projectData.projectDir);
 			this.$errors.failWithoutHelp(`${plugin} is not a valid NativeScript plugin. Verify that the plugin package.json file contains a nativescript key and try again.`);
@@ -93,14 +93,14 @@ export class PluginsService implements IPluginsService {
 		const action = async (modulesDestinationPath: string, platform: string, platformData: IPlatformData): Promise<void> => {
 			shelljs.rm("-rf", path.join(modulesDestinationPath, pluginName));
 
-			this.$logger.out(`Successfully removed plugin ${pluginName} for ${platform}.`);
+			this.$logger.info(`Successfully removed plugin ${pluginName} for ${platform}.`);
 			showMessage = false;
 		};
 
 		await this.executeForAllInstalledPlatforms(action, projectData);
 
 		if (showMessage) {
-			this.$logger.out(`Successfully removed plugin ${pluginName}`);
+			this.$logger.info(`Successfully removed plugin ${pluginName}`);
 		}
 	}
 
@@ -119,7 +119,7 @@ export class PluginsService implements IPluginsService {
 			await this.preparePluginNativeCode(pluginData, platform, projectData);
 
 			// Show message
-			this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
+			this.$logger.info(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
 		}
 	}
 
@@ -318,12 +318,12 @@ export class PluginsService implements IPluginsService {
 		const installedFrameworkVersion = this.getInstalledFrameworkVersion(platform, projectData);
 		const pluginPlatformsData = pluginData.platformsData;
 		if (pluginPlatformsData) {
-			const pluginVersion = (<any>pluginPlatformsData)[platform];
-			if (!pluginVersion) {
+			const versionRequiredByPlugin = (<any>pluginPlatformsData)[platform];
+			if (!versionRequiredByPlugin) {
 				this.$logger.warn(`${pluginData.name} is not supported for ${platform}.`);
 				isValid = false;
-			} else if (semver.gt(pluginVersion, installedFrameworkVersion)) {
-				this.$logger.warn(`${pluginData.name} ${pluginVersion} for ${platform} is not compatible with the currently installed framework version ${installedFrameworkVersion}.`);
+			} else if (semver.gt(versionRequiredByPlugin, installedFrameworkVersion)) {
+				this.$logger.warn(`${pluginData.name} requires at least version ${versionRequiredByPlugin} of platform ${platform}. Currently installed version is ${installedFrameworkVersion}.`);
 				isValid = false;
 			}
 		}
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
index 6a4cb20bbd..9a443bbc12 100644
--- a/lib/services/project-data-service.ts
+++ b/lib/services/project-data-service.ts
@@ -1,4 +1,5 @@
 import * as path from "path";
+import * as constants from "../constants";
 import { ProjectData } from "../project-data";
 import { exported } from "../common/decorators";
 import {
@@ -17,7 +18,9 @@ interface IProjectFileData {
 }
 
 export class ProjectDataService implements IProjectDataService {
+	private defaultProjectDir: string;
 	private static DEPENDENCIES_KEY_NAME = "dependencies";
+	private projectDataCache: IDictionary<IProjectData> = {};
 
 	constructor(private $fs: IFileSystem,
 		private $staticConfig: IStaticConfig,
@@ -25,6 +28,15 @@ export class ProjectDataService implements IProjectDataService {
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
 		private $injector: IInjector) {
+		try {
+			// add the ProjectData of the default projectDir to the projectData cache
+			const projectData = this.$injector.resolve("projectData");
+			projectData.initializeProjectData();
+			this.defaultProjectDir = projectData.projectDir;
+			this.projectDataCache[this.defaultProjectDir] = projectData;
+		} catch (e) {
+			// the CLI is required as a lib from a non-project folder
+		}
 	}
 
 	public getNSValue(projectDir: string, propertyName: string): any {
@@ -49,16 +61,19 @@ export class ProjectDataService implements IProjectDataService {
 	// TODO: Remove $projectData and replace it with $projectDataService.getProjectData
 	@exported("projectDataService")
 	public getProjectData(projectDir: string): IProjectData {
-		const projectDataInstance = this.$injector.resolve<IProjectData>(ProjectData);
-		projectDataInstance.initializeProjectData(projectDir);
-		return projectDataInstance;
+		projectDir = projectDir || this.defaultProjectDir;
+		this.projectDataCache[projectDir] = this.projectDataCache[projectDir] || this.$injector.resolve<IProjectData>(ProjectData);
+		this.projectDataCache[projectDir].initializeProjectData(projectDir);
+
+		return this.projectDataCache[projectDir];
 	}
 
 	@exported("projectDataService")
 	public getProjectDataFromContent(packageJsonContent: string, nsconfigContent: string, projectDir?: string): IProjectData {
-		const projectDataInstance = this.$injector.resolve<IProjectData>(ProjectData);
-		projectDataInstance.initializeProjectDataFromContent(packageJsonContent, nsconfigContent, projectDir);
-		return projectDataInstance;
+		projectDir = projectDir || this.defaultProjectDir;
+		this.projectDataCache[projectDir] = this.projectDataCache[projectDir] || this.$injector.resolve<IProjectData>(ProjectData);
+		this.projectDataCache[projectDir].initializeProjectDataFromContent(packageJsonContent, nsconfigContent, projectDir);
+		return this.projectDataCache[projectDir];
 	}
 
 	@exported("projectDataService")
@@ -124,6 +139,13 @@ export class ProjectDataService implements IProjectDataService {
 		};
 	}
 
+	public setUseLegacyWorkflow(projectDir: string, value: any): void {
+		this.$logger.trace(`useLegacyWorkflow will be set to ${value}`);
+		this.updateNsConfigValue(projectDir, { useLegacyWorkflow: value });
+		this.refreshProjectData(projectDir);
+		this.$logger.trace(`useLegacyWorkflow was set to ${value}`);
+	}
+
 	public getAppExecutableFiles(projectDir: string): string[] {
 		const projectData = this.getProjectData(projectDir);
 
@@ -157,6 +179,33 @@ export class ProjectDataService implements IProjectDataService {
 		return files;
 	}
 
+	private refreshProjectData(projectDir: string) {
+		if (this.projectDataCache[projectDir]) {
+			this.projectDataCache[projectDir].initializeProjectData(projectDir);
+		}
+	}
+
+	private updateNsConfigValue(projectDir: string, updateObject: INsConfig): void {
+		const nsConfigPath = path.join(projectDir, constants.CONFIG_NS_FILE_NAME);
+		const currentNsConfig = this.getNsConfig(nsConfigPath);
+		const newNsConfig = Object.assign(currentNsConfig, updateObject);
+
+		this.$fs.writeJson(nsConfigPath, newNsConfig);
+	}
+
+	private getNsConfig(nsConfigPath: string): INsConfig {
+		let result = this.getNsConfigDefaultObject();
+		if (this.$fs.exists(nsConfigPath)) {
+			try {
+				result = <INsConfig>this.$fs.readJson(nsConfigPath);
+			} catch (e) {
+				// default
+			}
+		}
+
+		return result;
+	}
+
 	private getImageDefinitions(): IImageDefinitionsStructure {
 		const pathToImageDefinitions = path.join(__dirname, "..", "..", CLI_RESOURCES_DIR_NAME, AssetConstants.assets, AssetConstants.imageDefinitionsFileName);
 		const imageDefinitions = this.$fs.readJson(pathToImageDefinitions);
@@ -308,10 +357,16 @@ export class ProjectDataService implements IProjectDataService {
 		};
 	}
 
+	private getNsConfigDefaultObject(data?: Object): INsConfig {
+		const config: INsConfig = { useLegacyWorkflow: false };
+		Object.assign(config, data);
+
+		return config;
+	}
+
 	@exported("projectDataService")
 	public getNsConfigDefaultContent(data?: Object): string {
-		const config: INsConfig = {};
-		Object.assign(config, data);
+		const config = this.getNsConfigDefaultObject(data);
 
 		return JSON.stringify(config);
 	}
diff --git a/lib/services/init-service.ts b/lib/services/project-init-service.ts
similarity index 94%
rename from lib/services/init-service.ts
rename to lib/services/project-init-service.ts
index 8a35b0af0f..24937a1f5c 100644
--- a/lib/services/init-service.ts
+++ b/lib/services/project-init-service.ts
@@ -3,7 +3,7 @@ import * as helpers from "../common/helpers";
 import * as path from "path";
 import * as semver from "semver";
 
-export class InitService implements IInitService {
+export class ProjectInitService implements IProjectInitService {
 	private static MIN_SUPPORTED_FRAMEWORK_VERSIONS: IStringDictionary = {
 		"tns-ios": "1.1.0",
 		"tns-android": "1.1.0",
@@ -74,7 +74,7 @@ export class InitService implements IInitService {
 			throw err;
 		}
 
-		this.$logger.out("Project successfully initialized.");
+		this.$logger.info("Project successfully initialized.");
 	}
 
 	private get projectFilePath(): string {
@@ -107,7 +107,7 @@ export class InitService implements IInitService {
 		}
 
 		const allVersions: any = await this.$packageManager.view(packageName, { "versions": true });
-		const versions = _.filter(allVersions, (v: string) => semver.gte(v, InitService.MIN_SUPPORTED_FRAMEWORK_VERSIONS[packageName]));
+		const versions = _.filter(allVersions, (v: string) => semver.gte(v, ProjectInitService.MIN_SUPPORTED_FRAMEWORK_VERSIONS[packageName]));
 		if (versions.length === 1) {
 			this.$logger.info(`Only ${versions[0]} version is available for ${packageName}.`);
 			return this.buildVersionData(versions[0]);
@@ -121,7 +121,7 @@ export class InitService implements IInitService {
 	private buildVersionData(version: string): IStringDictionary {
 		const result: IStringDictionary = {};
 
-		result[InitService.VERSION_KEY_NAME] = version;
+		result[ProjectInitService.VERSION_KEY_NAME] = version;
 
 		return result;
 	}
@@ -130,4 +130,4 @@ export class InitService implements IInitService {
 		return !helpers.isInteractive() || this.$options.force;
 	}
 }
-$injector.register("initService", InitService);
+$injector.register("projectInitService", ProjectInitService);
diff --git a/lib/services/test-execution-service.ts b/lib/services/test-execution-service.ts
index 04f6590be2..b8fc54f05b 100644
--- a/lib/services/test-execution-service.ts
+++ b/lib/services/test-execution-service.ts
@@ -84,6 +84,7 @@ export class TestExecutionService implements ITestExecutionService {
 							buildAction: async (): Promise<string> => {
 								const buildConfig: IBuildConfig = {
 									buildForDevice: !d.isEmulator,
+									iCloudContainerEnvironment: this.$options.iCloudContainerEnvironment,
 									projectDir: this.$options.path,
 									clean: this.$options.clean,
 									teamId: this.$options.teamId,
@@ -124,7 +125,7 @@ export class TestExecutionService implements ITestExecutionService {
 				await this.$liveSyncService.liveSync(deviceDescriptors, liveSyncInfo);
 			};
 
-		karmaRunner.on("message",  (karmaData: any) => {
+		karmaRunner.on("message", (karmaData: any) => {
 			this.$logger.trace(`The received message from karma is: `, karmaData);
 			if (!karmaData.launcherConfig && !karmaData.url) {
 				return;
@@ -218,6 +219,7 @@ export class TestExecutionService implements ITestExecutionService {
 
 		karmaConfig.projectDir = projectData.projectDir;
 		karmaConfig.bundle = this.$options.bundle;
+		karmaConfig.debugBrk = this.$options.debugBrk;
 		karmaConfig.platform = platform.toLowerCase();
 		this.$logger.debug(JSON.stringify(karmaConfig, null, 4));
 
diff --git a/lib/services/versions-service.ts b/lib/services/versions-service.ts
index e5d566e2cd..9f5ef644a2 100644
--- a/lib/services/versions-service.ts
+++ b/lib/services/versions-service.ts
@@ -135,7 +135,7 @@ class VersionsService implements IVersionsService {
 		}, () => this.getAllComponentsVersions());
 
 		if (!helpers.isInteractive()) {
-			versionsInformation.map(componentInformation => this.$logger.out(componentInformation.message));
+			versionsInformation.map(componentInformation => this.$logger.info(componentInformation.message));
 		}
 
 		_.forEach(versionsInformation, componentInformation => {
diff --git a/lib/services/workflow-service.ts b/lib/services/workflow-service.ts
new file mode 100644
index 0000000000..c9d36308a4
--- /dev/null
+++ b/lib/services/workflow-service.ts
@@ -0,0 +1,120 @@
+import * as helpers from "../common/helpers";
+import * as path from "path";
+import * as semver from "semver";
+import { EOL } from "os";
+import { LoggerConfigData } from "../constants";
+
+export class WorkflowService implements IWorkflowService {
+	private legacyWorkflowDeprecationMessage = `With the upcoming NativeScript 6.0 the Webpack workflow will become the only way of building apps.
+More info about the reasons for this change and how to migrate your project can be found in the link below:
+https://www.nativescript.org/blog/the-future-of-building-nativescript-apps`;
+	private webpackWorkflowConfirmMessage = `Do you want to switch your app to the Webpack workflow?`;
+
+	constructor(private $bundleValidatorHelper: IBundleValidatorHelper,
+		private $fs: IFileSystem,
+		private $logger: ILogger,
+		private $packageManager: INodePackageManager,
+		private $projectDataService: IProjectDataService,
+		private $prompter: IPrompter,
+		private $options: IOptions
+	) {
+	}
+
+	public async handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void> {
+		const { projectDir, settings, skipWarnings, force } = options;
+		if (!settings.bundle || force) {
+			const projectData = this.$projectDataService.getProjectData(projectDir);
+			if (typeof (projectData.useLegacyWorkflow) !== "boolean" || force) {
+				const hasSwitched = await this.handleWebpackWorkflowSwitch(projectData, skipWarnings, force);
+				if (hasSwitched) {
+					this.$options.bundle = "webpack";
+					this.$options.hmr = !settings.release;
+					if (typeof (settings.bundle) === "boolean") {
+						settings.bundle = true;
+					} else {
+						settings.bundle = this.$options.bundle;
+					}
+					settings.useHotModuleReload = this.$options.hmr;
+				}
+			} else if (!skipWarnings && projectData.useLegacyWorkflow === true) {
+				this.showLegacyWorkflowWarning();
+			} else if (!skipWarnings && projectData.useLegacyWorkflow === false) {
+				this.showNoBundleWarning();
+			}
+		}
+	}
+
+	private async handleWebpackWorkflowSwitch(projectData: IProjectData, skipWarnings: boolean, force: boolean): Promise<boolean> {
+		let hasSwitched = force;
+		if (force || helpers.isInteractive()) {
+			if (!force) {
+				this.$logger.info();
+				this.$logger.printMarkdown(`
+__Improve your project by switching to the Webpack workflow.__
+
+\`${this.legacyWorkflowDeprecationMessage}\``);
+				hasSwitched = await this.$prompter.confirm(this.webpackWorkflowConfirmMessage, () => true);
+			}
+
+			if (hasSwitched) {
+				this.$projectDataService.setUseLegacyWorkflow(projectData.projectDir, false);
+				await this.ensureWebpackPluginInstalled(projectData);
+			} else {
+				this.$projectDataService.setUseLegacyWorkflow(projectData.projectDir, true);
+			}
+		} else if (!skipWarnings) {
+			await this.showLegacyWorkflowWarning();
+		}
+
+		return hasSwitched;
+	}
+
+	private showLegacyWorkflowWarning() {
+		const legacyWorkflowWarning = `You are using the Legacy Workflow.${EOL}${EOL}${this.legacyWorkflowDeprecationMessage}`;
+
+		this.$logger.warn(legacyWorkflowWarning, { [LoggerConfigData.wrapMessageWithBorders]: true });
+	}
+
+	private showNoBundleWarning() {
+		const legacyWorkflowWarning = `You are using the '--no-bundle' flag which is switching to the Legacy Workflow.${EOL}${EOL}${this.legacyWorkflowDeprecationMessage}`;
+
+		this.$logger.warn(legacyWorkflowWarning, { [LoggerConfigData.wrapMessageWithBorders]: true });
+	}
+
+	private async ensureWebpackPluginInstalled(projectData: IProjectData) {
+		const hmrOutOfBetaWebpackPluginVersion = "0.21.0";
+		const webpackPluginName = "nativescript-dev-webpack";
+		const webpackConfigFileName = "webpack.config.js";
+		const validWebpackPluginTags = ["*", "latest", "next", "rc"];
+
+		let isInstalledVersionSupported = true;
+		const installedVersion = this.$bundleValidatorHelper.getBundlerDependencyVersion(projectData, webpackPluginName);
+		this.$logger.trace(`Updating to webpack workflow: Found ${webpackPluginName} v${installedVersion}`);
+		if (validWebpackPluginTags.indexOf(installedVersion) === -1) {
+			const isInstalledVersionValid = !!semver.valid(installedVersion) || !!semver.coerce(installedVersion);
+			isInstalledVersionSupported =
+				isInstalledVersionValid && semver.gte(semver.coerce(installedVersion), hmrOutOfBetaWebpackPluginVersion);
+			this.$logger.trace(`Updating to webpack workflow: Is installed version valid?: ${isInstalledVersionValid}`);
+		}
+
+		this.$logger.trace(`Updating to webpack workflow: Is installed version supported?: ${isInstalledVersionSupported}`);
+		if (!isInstalledVersionSupported) {
+			const webpackConfigPath = path.join(projectData.projectDir, webpackConfigFileName);
+			if (this.$fs.exists(webpackConfigPath)) {
+				this.$fs.rename(webpackConfigPath, `${webpackConfigPath}.bak`);
+				this.$logger.warn(`The 'nativescript-dev-webpack' plugin was updated and your '${webpackConfigFileName}' was replaced. You can find your old '${webpackConfigPath}' in '${webpackConfigPath}.bak'.`);
+			}
+
+			const installResult = await this.$packageManager.install(`${webpackPluginName}@latest`, projectData.projectDir, {
+				'save-dev': true,
+				'save-exact': true,
+				disableNpmInstall: false,
+				frameworkPath: null,
+				ignoreScripts: false,
+			});
+			this.$logger.trace(`Updating to webpack workflow: The ${webpackPluginName} was updated to v${installResult.version}`);
+		}
+	}
+}
+
+$injector.register("workflowService", WorkflowService);
diff --git a/lib/services/xcconfig-service.ts b/lib/services/xcconfig-service.ts
index 59a33353ec..896778536f 100644
--- a/lib/services/xcconfig-service.ts
+++ b/lib/services/xcconfig-service.ts
@@ -1,4 +1,5 @@
 import * as path from "path";
+import { Configurations } from "../common/constants";
 
 export class XcconfigService implements IXcconfigService {
 	constructor(
@@ -6,12 +7,11 @@ export class XcconfigService implements IXcconfigService {
 		private $fs: IFileSystem,
 		private $xcprojService: IXcprojService) { }
 
-	public getPluginsXcconfigFilePath(projectRoot: string, opts: IRelease): string {
-		if (opts && opts.release) {
-			return this.getPluginsReleaseXcconfigFilePath(projectRoot);
-		}
-
-		return this.getPluginsDebugXcconfigFilePath(projectRoot);
+	public getPluginsXcconfigFilePaths(projectRoot: string): IStringDictionary {
+		return {
+			[Configurations.Debug.toLowerCase()]: this.getPluginsDebugXcconfigFilePath(projectRoot),
+			[Configurations.Release.toLowerCase()]: this.getPluginsReleaseXcconfigFilePath(projectRoot)
+		};
 	}
 
 	private getPluginsDebugXcconfigFilePath(projectRoot: string): string {
diff --git a/lib/tools/node-modules/node-modules-dest-copy.ts b/lib/tools/node-modules/node-modules-dest-copy.ts
index 55bcaaedc4..afcd8ccbf4 100644
--- a/lib/tools/node-modules/node-modules-dest-copy.ts
+++ b/lib/tools/node-modules/node-modules-dest-copy.ts
@@ -184,7 +184,7 @@ export class NpmPluginPrepare {
 				if (appFolderExists) {
 					this.$pluginsService.preparePluginScripts(pluginData, platform, projectData, projectFilesConfig);
 					// Show message
-					this.$logger.out(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
+					this.$logger.info(`Successfully prepared plugin ${pluginData.name} for ${platform}.`);
 				}
 			}
 		}
diff --git a/lib/xml-validator.ts b/lib/xml-validator.ts
index 6d33e1ca28..08970a745e 100644
--- a/lib/xml-validator.ts
+++ b/lib/xml-validator.ts
@@ -15,7 +15,7 @@ export class XmlValidator implements IXmlValidator {
 				xmlHasErrors = xmlHasErrors || hasErrors;
 				if (hasErrors) {
 					this.$logger.info(`${file} has syntax errors.`.red.bold);
-					this.$logger.out(errorOutput.yellow);
+					this.$logger.info(errorOutput.yellow);
 				}
 			});
 		return !xmlHasErrors;
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 338ec4afb6..067e08dfb0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript",
-  "version": "5.4.0",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -141,8 +141,7 @@
     "@types/node": {
       "version": "8.10.30",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.30.tgz",
-      "integrity": "sha512-Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==",
-      "dev": true
+      "integrity": "sha512-Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q=="
     },
     "@types/ora": {
       "version": "1.3.3",
@@ -1453,13 +1452,6 @@
       "integrity": "sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw==",
       "requires": {
         "@types/node": "^8.0.7"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "8.10.45",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz",
-          "integrity": "sha512-tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ=="
-        }
       }
     },
     "date-format": {
@@ -5324,9 +5316,9 @@
       }
     },
     "nativescript-dev-xcode": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/nativescript-dev-xcode/-/nativescript-dev-xcode-0.1.0.tgz",
-      "integrity": "sha512-auQd2/qVdOwD/8v+rHKLflYE8jpT4o1wMwtEFkFGp7sewLkBQz7y9pH79oNM7ztyw0gnL/cFAhLT/ViGLWdw6w==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/nativescript-dev-xcode/-/nativescript-dev-xcode-0.2.0.tgz",
+      "integrity": "sha512-UKX+AS3rF/HNQ7777GunT9SaVQJXmcYnol9yKxVXWM1uRNXiQUgLaUmhjYUkHw7voqNN+FCqqRZQlB8mHUPA9g==",
       "requires": {
         "simple-plist": "^1.0.0",
         "uuid": "^3.3.2"
@@ -5378,9 +5370,9 @@
       }
     },
     "nativescript-doctor": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-1.9.1.tgz",
-      "integrity": "sha512-qdluBILhzAQhnIg8Y83syyjy63rTt5pvx0SFpbtwj7kE+LsXJJRhHNa+1KEtznxh7jcTfdLEZjxxWDTIAIK5oA==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-1.9.2.tgz",
+      "integrity": "sha512-HEBQS7eqycO3TzY3He94dM0AgPCQy3YMT6ZdHSVGDfxA5DhnhMgB0OWOvHPwR3TyL0BJhtLJnjrW4/hJjUw2SQ==",
       "requires": {
         "osenv": "0.1.3",
         "semver": "5.5.1",
@@ -5402,9 +5394,9 @@
       }
     },
     "nativescript-preview-sdk": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/nativescript-preview-sdk/-/nativescript-preview-sdk-0.3.3.tgz",
-      "integrity": "sha512-QHi4SbDblN+dSZCIztx1xVdrB4cP911OXV92REIVOqDHXyAFYUZeWu5DH0/3IHdC9fnMgXMeJ0WZEpgGgieqtQ==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/nativescript-preview-sdk/-/nativescript-preview-sdk-0.3.4.tgz",
+      "integrity": "sha512-Dw4Nn6MXbZMW8dkQIf1NfXSSNtu3rDOw0z1KE159lwPEVMM8F7qxrqqT57XTiQP5pnqXMARhoQvkgW55qTVx6Q==",
       "requires": {
         "@types/axios": "0.14.0",
         "@types/pubnub": "4.0.2",
@@ -6074,9 +6066,9 @@
       "dev": true
     },
     "pbxproj-dom": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pbxproj-dom/-/pbxproj-dom-1.1.0.tgz",
-      "integrity": "sha512-ti2ZuXEptfYbkkUweP6sBtLBlRjTcWkxWG450lbJ+PwNMk8nvhhAtV7lIuQPHR29h7hPUHOIvUBAIljIx8ygxg=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pbxproj-dom/-/pbxproj-dom-1.2.0.tgz",
+      "integrity": "sha512-K2czrWqA68AR0q1UXz5EBi/zoxcljrkO4RSJX0jPnVn3iyE0HYnYOzaEEDYMpueczkT/Vtdm3SCc3NM+12kMaQ=="
     },
     "pend": {
       "version": "1.2.0",
diff --git a/package.json b/package.json
index 9e1ad4cf53..557a0e14b0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "5.4.0",
+  "version": "6.0.0",
   "author": "Telerik <support@telerik.com>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {
@@ -56,15 +56,15 @@
     "minimatch": "3.0.2",
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
-    "nativescript-dev-xcode": "0.1.0",
-    "nativescript-doctor": "1.9.1",
-    "nativescript-preview-sdk": "0.3.3",
+    "nativescript-dev-xcode": "0.2.0",
+    "nativescript-doctor": "1.9.2",
+    "nativescript-preview-sdk": "0.3.4",
     "open": "0.0.5",
     "ora": "2.0.0",
     "osenv": "0.1.3",
     "pacote": "8.1.6",
     "pako": "1.0.6",
-    "pbxproj-dom": "1.1.0",
+    "pbxproj-dom": "1.2.0",
     "plist": "1.1.0",
     "plist-merge-patch": "0.1.1",
     "proper-lockfile": "3.2.0",
diff --git a/resources/test/example.jasmine.ts b/resources/test/example.jasmine.ts
new file mode 100644
index 0000000000..c31134716f
--- /dev/null
+++ b/resources/test/example.jasmine.ts
@@ -0,0 +1,6 @@
+// A sample Jasmine test
+describe("A suite", function() {
+  it("contains spec with an expectation", function() {
+    expect(true).toBe(true);
+  });
+});
diff --git a/resources/test/example.mocha.ts b/resources/test/example.mocha.ts
new file mode 100644
index 0000000000..a287a2eba2
--- /dev/null
+++ b/resources/test/example.mocha.ts
@@ -0,0 +1,9 @@
+// A sample Mocha test
+describe('Array', function () {
+	describe('#indexOf()', function () {
+		it('should return -1 when the value is not present', function () {
+			assert.equal(-1, [1, 2, 3].indexOf(5));
+			assert.equal(-1, [1, 2, 3].indexOf(0));
+		});
+	});
+});
diff --git a/resources/test/example.qunit.ts b/resources/test/example.qunit.ts
new file mode 100644
index 0000000000..6933144e37
--- /dev/null
+++ b/resources/test/example.qunit.ts
@@ -0,0 +1,7 @@
+// A sample QUnit test
+QUnit.test("equal test", function (assert) {
+  assert.equal( 0, 0, "Zero, Zero; equal succeeds" );
+  assert.equal( "", 0, "Empty, Zero; equal succeeds" );
+  assert.equal( "", "", "Empty, Empty; equal succeeds" );
+  assert.equal( 0, false, "Zero, false; equal succeeds" );
+});
diff --git a/resources/test/karma.conf.js b/resources/test/karma.conf.js
index 1cc877d6e4..705b5a713e 100644
--- a/resources/test/karma.conf.js
+++ b/resources/test/karma.conf.js
@@ -1,4 +1,4 @@
-module.exports = function(config) {
+module.exports = function (config) {
   const options = {
 
     // base path that will be used to resolve all patterns (eg. files, exclude)
@@ -11,9 +11,7 @@ module.exports = function(config) {
 
 
     // list of files / patterns to load in the browser
-    files: [
-      ${ testFiles }
-    ],
+    files: [${ testFiles }],
 
 
     // list of files to exclude
@@ -77,7 +75,7 @@ module.exports = function(config) {
 
   setWebpackPreprocessor(config, options);
   setWebpack(config, options);
-  
+
   config.set(options);
 }
 
@@ -100,6 +98,7 @@ function setWebpack(config, options) {
   if (config && config.bundle) {
     const env = {};
     env[config.platform] = true;
+    env.sourceMap = config.debugBrk;
     options.webpack = require('./webpack.config')(env);
     delete options.webpack.entry;
     delete options.webpack.output.libraryTarget;
diff --git a/test/cocoapods-service.ts b/test/cocoapods-service.ts
index 03deeef262..c511e70804 100644
--- a/test/cocoapods-service.ts
+++ b/test/cocoapods-service.ts
@@ -119,6 +119,10 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1_with_special_symbols_0 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -135,10 +139,6 @@ def post_installplugin1_with_special_symbols_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1_with_special_symbols_0 installer
-end
 end`,
 				projectPodfileContent: "",
 				pluginData: <any>{
@@ -165,6 +165,10 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1_with_special_symbols___and___underscore_0 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -181,10 +185,6 @@ def post_installplugin1_with_special_symbols___and___underscore_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1_with_special_symbols___and___underscore_0 installer
-end
 end`,
 				projectPodfileContent: "",
 				pluginData: <any>{
@@ -207,6 +207,10 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1___plugin_0 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -219,14 +223,13 @@ def post_installplugin1___plugin_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1___plugin_0 installer
-end
 end`,
 				projectPodfileContent: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1___plugin_0 installer
+end
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -239,10 +242,6 @@ def post_installplugin1___plugin_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1___plugin_0 installer
-end
 end`,
 				pluginData: <any>{
 					name: "plugin1_plugin",
@@ -268,6 +267,10 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1_0 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -284,14 +287,13 @@ def post_installplugin1_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1_0 installer
-end
 end`,
 				projectPodfileContent: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+	post_installplugin1_0 installer
+end
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -308,10 +310,6 @@ def post_installplugin1_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-	post_installplugin1_0 installer
-end
 end`,
 			},
 			{
@@ -329,6 +327,14 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+# Begin Podfile - secondPluginPlatformsFolderPath/Podfile
+pod 'OCMock', '~> 2.0.1'
+# End Podfile
+
+post_install do |installer|
+  post_installplugin1_0 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -341,14 +347,6 @@ def post_installplugin1_0 (installer)
 	end
 end
 # End Podfile
-
-# Begin Podfile - secondPluginPlatformsFolderPath/Podfile
-pod 'OCMock', '~> 2.0.1'
-# End Podfile
-
-post_install do |installer|
-  post_installplugin1_0 installer
-end
 end`,
 				projectPodfileContent: `use_frameworks!
 
@@ -387,6 +385,12 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1_0 installer
+  post_installplugin1_1 installer
+  post_installplugin1_2 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -413,12 +417,6 @@ def post_installplugin1_2 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1_0 installer
-  post_installplugin1_1 installer
-  post_installplugin1_2 installer
-end
 end`,
 			},
 			{
@@ -443,6 +441,11 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1_0 installer
+  post_installplugin1_1
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -462,11 +465,6 @@ target 'MyApp' do
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1_0 installer
-  post_installplugin1_1
-end
 end`,
 			},
 			{
@@ -489,6 +487,10 @@ end`,
 				projectPodfileContent: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+  post_installplugin1_0 installer
+end
+
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -505,10 +507,6 @@ def post_installplugin1_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-  post_installplugin1_0 installer
-end
 end`,
 			}
 		];
@@ -540,6 +538,7 @@ target "projectName" do
 pod 'GoogleAnalytics', '~> 3.1'
 
 # End Podfile
+
 end`
 			},
 			{
@@ -562,6 +561,9 @@ end`,
 				projectPodfileContent: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+post_installplugin1_0 installer
+end
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -578,10 +580,6 @@ def post_installplugin1_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-post_installplugin1_0 installer
-end
 end`
 			},
 			{
@@ -614,6 +612,11 @@ end`,
 				projectPodfileContent: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+	post_installplugin1_0 installer
+	post_installplugin1_1 installer
+	post_installplugin1_2 installer
+end
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -640,12 +643,6 @@ def post_installplugin1_2 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-	post_installplugin1_0 installer
-	post_installplugin1_1 installer
-	post_installplugin1_2 installer
-end
 end`
 			},
 			{
@@ -667,6 +664,9 @@ end`,
 				output: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+	post_installplugin2_0 installer
+end
 
 # Begin Podfile - pluginPlatformsFolderPath1/Podfile
 
@@ -678,14 +678,14 @@ def post_installplugin2_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-post_installplugin2_0 installer
-end
 end`,
 				projectPodfileContent: `use_frameworks!
 
 target "projectName" do
+post_install do |installer|
+	post_installplugin1_0 installer
+	post_installplugin2_0 installer
+end
 # Begin Podfile - pluginPlatformsFolderPath/Podfile
 
 target 'MyApp' do
@@ -713,11 +713,6 @@ def post_installplugin2_0 (installer)
 	end
 end
 # End Podfile
-
-post_install do |installer|
-post_installplugin1_0 installer
-post_installplugin2_0 installer
-end
 end`
 			}
 		];
@@ -975,44 +970,45 @@ end`
 				expectedProjectPodfileContentAfterApply: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - my/full/path/to/app/App_Resources/iOS/Podfile
-# platform :ios, '8.0'
-# End Podfile
+# NativeScriptPlatformSection my/full/path/to/app/App_Resources/iOS/Podfile with 8.0
+platform :ios, '8.0'
+# End NativeScriptPlatformSection
 
-# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
-# platform :ios, '11.0'
+# Begin Podfile - node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile
+# platform :ios, '10.0'
 # End Podfile
 
 # Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
 pod 'myPod' ~> 0.3.4
 # End Podfile
 
-# Begin Podfile - node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile
-# platform :ios, '10.0'
+# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
+# platform :ios, '11.0'
 # End Podfile
 
-# NativeScriptPlatformSection my/full/path/to/app/App_Resources/iOS/Podfile with 8.0
-platform :ios, '8.0'
-# End NativeScriptPlatformSection
+# Begin Podfile - my/full/path/to/app/App_Resources/iOS/Podfile
+# platform :ios, '8.0'
+# End Podfile
 end`,
 				expectedProjectPodfileContentAfterRemove: `use_frameworks!
 
 target "projectName" do
+# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with 11.0
+platform :ios, '11.0'
+# End NativeScriptPlatformSection
 
-# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
-# platform :ios, '11.0'
+# Begin Podfile - node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile
+# platform :ios, '10.0'
 # End Podfile
 
 # Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
 pod 'myPod' ~> 0.3.4
 # End Podfile
 
-# Begin Podfile - node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile
-# platform :ios, '10.0'
+# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
+# platform :ios, '11.0'
 # End Podfile
-# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with 11.0
-platform :ios, '11.0'
-# End NativeScriptPlatformSection
+
 end`
 			}
 		];
@@ -1061,13 +1057,13 @@ end`
 				expectedProjectPodfileContent: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - path/to/my/plugin2/platforms/ios/Podfile
-# platform :ios, '9.0'
-# End Podfile
-
 # NativeScriptPlatformSection path/to/my/plugin2/platforms/ios/Podfile with 9.0
 platform :ios, '9.0'
 # End NativeScriptPlatformSection
+
+# Begin Podfile - path/to/my/plugin2/platforms/ios/Podfile
+# platform :ios, '9.0'
+# End Podfile
 end`
 			},
 			{
@@ -1088,21 +1084,21 @@ end`
 				expectedProjectPodfileContent: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - my/full/path/to/app/App_Resources/iOS/Podfile
-# platform :ios, '9.0'
+# NativeScriptPlatformSection my/full/path/to/app/App_Resources/iOS/Podfile with 9.0
+platform :ios, '9.0'
+# End NativeScriptPlatformSection
+
+# Begin Podfile - my/full/path/to/plugin1/platforms/ios/Podfile
+# platform :ios, '10.0'
 # End Podfile
 
 # Begin Podfile - my/full/path/to/plugin2/platforms/ios/Podfile
 pod 'myPod' ~> 0.3.4
 # End Podfile
 
-# Begin Podfile - my/full/path/to/plugin1/platforms/ios/Podfile
-# platform :ios, '10.0'
+# Begin Podfile - my/full/path/to/app/App_Resources/iOS/Podfile
+# platform :ios, '9.0'
 # End Podfile
-
-# NativeScriptPlatformSection my/full/path/to/app/App_Resources/iOS/Podfile with 9.0
-platform :ios, '9.0'
-# End NativeScriptPlatformSection
 end`
 			},
 			{
@@ -1123,21 +1119,21 @@ end`
 				expectedProjectPodfileContent: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
-pod 'myPod' ~> 0.3.4
+# NativeScriptPlatformSection node_modules/mySecondPluginWithPlatform/Podfile with 10.0
+platform :ios, '10.0'
+# End NativeScriptPlatformSection
+
+# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
+# platform :ios, '9.0'
 # End Podfile
 
 # Begin Podfile - node_modules/mySecondPluginWithPlatform/Podfile
 # platform :ios, '10.0'
 # End Podfile
 
-# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
-# platform :ios, '9.0'
+# Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
+pod 'myPod' ~> 0.3.4
 # End Podfile
-
-# NativeScriptPlatformSection node_modules/mySecondPluginWithPlatform/Podfile with 10.0
-platform :ios, '10.0'
-# End NativeScriptPlatformSection
 end`
 			},
 			{
@@ -1158,19 +1154,21 @@ end`
 				expectedProjectPodfileContent: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
-# platform :ios
+# Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
+pod 'myPod' ~> 0.3.4
 # End Podfile
 
+# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with
+platform :ios
+# End NativeScriptPlatformSection
+
 # Begin Podfile - node_modules/mySecondPluginWithPlatform/Podfile
 # platform :ios, '10.0'
 # End Podfile
 
-# Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
-pod 'myPod' ~> 0.3.4
-# End Podfile# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with
-platform :ios
-# End NativeScriptPlatformSection
+# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
+# platform :ios
+# End Podfile
 end`
 			},
 			{
@@ -1191,19 +1189,21 @@ end`
 				expectedProjectPodfileContent: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - node_modules/mySecondPluginWithPlatform/Podfile
-# platform :ios, '10.0'
+# Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
+pod 'myPod' ~> 0.3.4
 # End Podfile
 
+# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with
+platform :ios
+# End NativeScriptPlatformSection
+
 # Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
 # platform :ios
 # End Podfile
 
-# Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
-pod 'myPod' ~> 0.3.4
-# End Podfile# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with
-platform :ios
-# End NativeScriptPlatformSection
+# Begin Podfile - node_modules/mySecondPluginWithPlatform/Podfile
+# platform :ios, '10.0'
+# End Podfile
 end`
 			},
 			{
@@ -1228,26 +1228,26 @@ end`
 				expectedProjectPodfileContent: `use_frameworks!
 
 target "projectName" do
-# Begin Podfile - my/full/path/to/app/App_Resources/iOS/Podfile
-pod: 'mySecondPlatformPod' ~> 2.0.0
-pod: 'platformKit' ~> 1.0
-# End Podfile
+# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with 11.0
+platform :ios, '11.0'
+# End NativeScriptPlatformSection
 
-# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
-# platform :ios, '11.0'
+# Begin Podfile - node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile
+# platform :ios, '10.0'
 # End Podfile
 
 # Begin Podfile - node_modules/myPluginWithoutPlatform/Podfile
 pod 'myPod' ~> 0.3.4
 # End Podfile
 
-# Begin Podfile - node_modules/  mypath  with spaces/mySecondPluginWithPlatform/Podfile
-# platform :ios, '10.0'
+# Begin Podfile - node_modules/myFirstPluginWithPlatform/Podfile
+# platform :ios, '11.0'
 # End Podfile
 
-# NativeScriptPlatformSection node_modules/myFirstPluginWithPlatform/Podfile with 11.0
-platform :ios, '11.0'
-# End NativeScriptPlatformSection
+# Begin Podfile - my/full/path/to/app/App_Resources/iOS/Podfile
+pod: 'mySecondPlatformPod' ~> 2.0.0
+pod: 'platformKit' ~> 1.0
+# End Podfile
 end`
 			}
 		];
diff --git a/test/commands/post-install.ts b/test/commands/post-install.ts
index ecfb2070f4..39640112ea 100644
--- a/test/commands/post-install.ts
+++ b/test/commands/post-install.ts
@@ -35,7 +35,7 @@ const createTestInjector = (): IInjector => {
 	});
 
 	testInjector.register("logger", {
-		out: (formatStr?: any, ...args: any[]): void => undefined,
+		info: (formatStr?: any, ...args: any[]): void => undefined,
 		printMarkdown: (...args: any[]): void => undefined
 	});
 
@@ -49,6 +49,14 @@ const createTestInjector = (): IInjector => {
 };
 
 describe("post-install command", () => {
+	const originalNpmArgv = process.env.npm_config_argv;
+	const originalSudoUser = process.env.SUDO_USER;
+
+	afterEach(() => {
+		process.env.npm_config_argv = originalNpmArgv;
+		process.env.SUDO_USER = originalSudoUser;
+	});
+
 	it("calls subscriptionService.subscribeForNewsletter method", async () => {
 		const testInjector = createTestInjector();
 		const subscriptionService = testInjector.resolve<ISubscriptionService>("subscriptionService");
@@ -61,4 +69,62 @@ describe("post-install command", () => {
 		await postInstallCommand.execute([]);
 		assert.isTrue(isSubscribeForNewsletterCalled, "post-install-cli command must call subscriptionService.subscribeForNewsletter");
 	});
+
+	const verifyResult = async (opts: { shouldCallMethod: boolean }): Promise<void> => {
+		const testInjector = createTestInjector();
+		const subscriptionService = testInjector.resolve<ISubscriptionService>("subscriptionService");
+		let isSubscribeForNewsletterCalled = false;
+		subscriptionService.subscribeForNewsletter = async (): Promise<void> => {
+			isSubscribeForNewsletterCalled = true;
+		};
+
+		const helpService = testInjector.resolve<IHelpService>("helpService");
+		let isGenerateHtmlPagesCalled = false;
+		helpService.generateHtmlPages = async (): Promise<void> => {
+			isGenerateHtmlPagesCalled = true;
+		};
+
+		const analyticsService = testInjector.resolve<IAnalyticsService>("analyticsService");
+		let isCheckConsentCalled = false;
+		analyticsService.checkConsent = async (): Promise<void> => {
+			isCheckConsentCalled = true;
+		};
+
+		const commandsService = testInjector.resolve<ICommandsService>("commandsService");
+		let isTryExecuteCommandCalled = false;
+		commandsService.tryExecuteCommand = async (): Promise<void> => {
+			isTryExecuteCommandCalled = true;
+		};
+
+		const postInstallCommand = testInjector.resolveCommand("post-install-cli");
+		await postInstallCommand.execute([]);
+
+		process.env.npm_config_argv = originalNpmArgv;
+		process.env.SUDO_USER = originalSudoUser;
+
+		const hasNotInMsg = opts.shouldCallMethod ? "" : "NOT";
+
+		assert.equal(isSubscribeForNewsletterCalled, opts.shouldCallMethod, `post-install-cli command must ${hasNotInMsg} call subscriptionService.subscribeForNewsletter`);
+		assert.equal(isGenerateHtmlPagesCalled, opts.shouldCallMethod, `post-install-cli command must ${hasNotInMsg} call helpService.generateHtmlPages`);
+		assert.equal(isCheckConsentCalled, opts.shouldCallMethod, `post-install-cli command must ${hasNotInMsg} call analyticsService.checkConsent`);
+		assert.equal(isTryExecuteCommandCalled, opts.shouldCallMethod, `post-install-cli command must ${hasNotInMsg} call commandsService.tryExecuteCommand`);
+	};
+
+	it("does not call specific methods when CLI is installed with sudo without `--unsafe-perm`", () => {
+		process.env.npm_config_argv = JSON.stringify({});
+		process.env.SUDO_USER = "user1";
+		return verifyResult({ shouldCallMethod: false });
+	});
+
+	it("calls specific methods when CLI is installed with sudo with `--unsafe-perm`", async () => {
+		process.env.npm_config_argv = JSON.stringify({ original: ["--unsafe-perm"] });
+		process.env.SUDO_USER = "user1";
+		return verifyResult({ shouldCallMethod: true });
+	});
+
+	it("calls specific methods when CLI is installed without sudo", async () => {
+		process.env.npm_config_argv = JSON.stringify({});
+		delete process.env.SUDO_USER;
+		return verifyResult({ shouldCallMethod: true });
+	});
 });
diff --git a/test/debug.ts b/test/debug.ts
index a3de9409d4..e41315dacc 100644
--- a/test/debug.ts
+++ b/test/debug.ts
@@ -15,6 +15,7 @@ import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 function createTestInjector(): IInjector {
 	const testInjector: IInjector = new yok.Yok();
 
+	testInjector.register("workflowService", stubs.WorkflowServiceStub);
 	testInjector.register("debug|android", DebugAndroidCommand);
 	testInjector.register("config", Configuration);
 	testInjector.register("staticConfig", StaticConfig);
diff --git a/test/helpers/bundle-validator-helper.ts b/test/helpers/bundle-validator-helper.ts
index 2edd2568b2..3feee9c4c2 100644
--- a/test/helpers/bundle-validator-helper.ts
+++ b/test/helpers/bundle-validator-helper.ts
@@ -90,17 +90,18 @@ describe("BundleValidatorHelper", () => {
 			]);
 		});
 
-		_.each(testCases, (testCase: any) => {
-			const deps = {
-				"nativescript-dev-webpack": testCase.currentWebpackVersion
-			};
+	_.each(testCases, (testCase: any) => {
+		const deps = {
+			"nativescript-dev-webpack": testCase.currentWebpackVersion
+		};
 
-			it(`${testCase.name}`, async () => {
-				const injector = createTestInjector({ dependencies: testCase.isDependency ? deps : null, devDependencies: !testCase.isDependency ? deps : null });
-				const bundleValidatorHelper = injector.resolve("bundleValidatorHelper");
-				bundleValidatorHelper.validate(testCase.minSupportedWebpackVersion);
+		it(`${testCase.name}`, async () => {
+			const injector = createTestInjector({ dependencies: testCase.isDependency ? deps : null, devDependencies: !testCase.isDependency ? deps : null });
+			const bundleValidatorHelper = injector.resolve("bundleValidatorHelper");
+			const projectData = injector.resolve("projectData");
+			bundleValidatorHelper.validate(projectData, testCase.minSupportedWebpackVersion);
 
-				assert.deepEqual(error, testCase.expectedError);
-			});
+			assert.deepEqual(error, testCase.expectedError);
 		});
+	});
 });
diff --git a/test/ios-project-service.ts b/test/ios-project-service.ts
index 74468e6e6b..0fad626fd0 100644
--- a/test/ios-project-service.ts
+++ b/test/ios-project-service.ts
@@ -9,7 +9,7 @@ import * as iOSProjectServiceLib from "../lib/services/ios-project-service";
 import { IOSProjectService } from "../lib/services/ios-project-service";
 import { IOSEntitlementsService } from "../lib/services/ios-entitlements-service";
 import { XcconfigService } from "../lib/services/xcconfig-service";
-import * as LoggerLib from "../lib/common/logger";
+import * as LoggerLib from "../lib/common/logger/logger";
 import * as OptionsLib from "../lib/options";
 import * as yok from "../lib/common/yok";
 import { DevicesService } from "../lib/common/mobile/mobile-core/devices-service";
@@ -119,7 +119,6 @@ function createTestInjector(projectPath: string, projectName: string, xCode?: IX
 		getAllInstalledPlugins: (): string[] => []
 	});
 	testInjector.register("androidProcessService", {});
-	testInjector.register("processService", {});
 	testInjector.register("sysInfo", {
 		getXcodeVersion: async () => ""
 	});
@@ -160,7 +159,10 @@ function createTestInjector(projectPath: string, projectName: string, xCode?: IX
 		removeExtensions: () => { /* */ },
 		addExtensionsFromPath: () => Promise.resolve()
 	});
-	testInjector.register("timers", {});
+	testInjector.register("iOSWatchAppService", {
+		removeWatchApp: () => { /* */ },
+		addWatchAppFromPath: () => Promise.resolve()
+	});
 	return testInjector;
 }
 
@@ -407,14 +409,14 @@ describe("Cocoapods support", () => {
 			const expectedPlatformSection = [
 				`# NativeScriptPlatformSection ${basePodfilePath} with 8.1`,
 				"platform :ios, '8.1'",
-				"# End NativeScriptPlatformSection",
+				"# End NativeScriptPlatformSection\n"
 			].join("\n");
 			const expectedProjectPodfileContent = ["use_frameworks!\n",
 				`target "${projectName}" do`,
+				expectedPlatformSection,
 				`# Begin Podfile - ${basePodfilePath}`,
 				expectedPluginPodfileContent,
-				"# End Podfile\n",
-				expectedPlatformSection,
+				"# End Podfile",
 				"end"]
 				.join("\n");
 			assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
@@ -485,14 +487,14 @@ describe("Cocoapods support", () => {
 			const expectedPlatformSection = [
 				`# NativeScriptPlatformSection ${pluginPodfilePath} with 8.1`,
 				"platform :ios, '8.1'",
-				"# End NativeScriptPlatformSection",
+				"# End NativeScriptPlatformSection\n",
 			].join("\n");
 			const expectedProjectPodfileContent = ["use_frameworks!\n",
 				`target "${projectName}" do`,
+				expectedPlatformSection,
 				`# Begin Podfile - ${pluginPodfilePath}`,
 				expectedPluginPodfileContent,
-				"# End Podfile\n",
-				expectedPlatformSection,
+				"# End Podfile",
 				"end"]
 				.join("\n");
 			assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
@@ -567,14 +569,14 @@ describe("Cocoapods support", () => {
 			const expectedPlatformSection = [
 				`# NativeScriptPlatformSection ${pluginPodfilePath} with 8.1`,
 				"platform :ios, '8.1'",
-				"# End NativeScriptPlatformSection",
+				"# End NativeScriptPlatformSection\n",
 			].join("\n");
 			const expectedProjectPodfileContent = ["use_frameworks!\n",
 				`target "${projectName}" do`,
+				expectedPlatformSection,
 				`# Begin Podfile - ${pluginPodfilePath}`,
 				expectedPluginPodfileContent,
-				"# End Podfile\n",
-				expectedPlatformSection,
+				"# End Podfile",
 				"end"]
 				.join("\n");
 			assert.equal(actualProjectPodfileContent, expectedProjectPodfileContent);
@@ -1066,6 +1068,7 @@ describe("iOS Project Service Signing", () => {
 							stack.push({ targetName, manualSigning });
 						},
 						setManualSigningStyleByTargetProductType: () => ({}),
+						setManualSigningStyleByTargetProductTypesList: () => ({}),
 						setManualSigningStyleByTargetKey: () => ({})
 					};
 				};
@@ -1087,6 +1090,7 @@ describe("iOS Project Service Signing", () => {
 							stack.push({ targetName, manualSigning });
 						},
 						setManualSigningStyleByTargetProductType: () => ({}),
+						setManualSigningStyleByTargetProductTypesList: () => ({}),
 						setManualSigningStyleByTargetKey: () => ({})
 					};
 				};
@@ -1108,6 +1112,7 @@ describe("iOS Project Service Signing", () => {
 							stack.push({ targetName, manualSigning });
 						},
 						setManualSigningStyleByTargetProductType: () => ({}),
+						setManualSigningStyleByTargetProductTypesList: () => ({}),
 						setManualSigningStyleByTargetKey: () => ({})
 					};
 				};
@@ -1178,17 +1183,19 @@ describe("Merge Project XCConfig files", () => {
 
 		// run merge for all release: debug|release
 		for (const release in [true, false]) {
-			await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData, { release });
+			await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData);
 
-			const destinationFilePath = xcconfigService.getPluginsXcconfigFilePath(projectRoot, { release: !!release });
+			const destinationFilePaths = xcconfigService.getPluginsXcconfigFilePaths(projectRoot);
 
-			assert.isTrue(fs.exists(destinationFilePath), 'Target build xcconfig is missing for release: ' + release);
-			const expected = {
-				'ASSETCATALOG_COMPILER_APPICON_NAME': 'AppIcon',
-				'ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME': 'LaunchImage',
-				'CODE_SIGN_IDENTITY': 'iPhone Distribution'
-			};
-			assertPropertyValues(expected, destinationFilePath, testInjector);
+			_.each(destinationFilePaths, destinationFilePath => {
+				assert.isTrue(fs.exists(destinationFilePath), 'Target build xcconfig is missing for release: ' + release);
+				const expected = {
+					'ASSETCATALOG_COMPILER_APPICON_NAME': 'AppIcon',
+					'ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME': 'LaunchImage',
+					'CODE_SIGN_IDENTITY': 'iPhone Distribution'
+				};
+				assertPropertyValues(expected, destinationFilePath, testInjector);
+			});
 		}
 	});
 
@@ -1206,13 +1213,15 @@ describe("Merge Project XCConfig files", () => {
 
 			await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData, { release });
 
-			const destinationFilePath = xcconfigService.getPluginsXcconfigFilePath(projectRoot, { release: !!release });
+			const destinationFilePaths = xcconfigService.getPluginsXcconfigFilePaths(projectRoot);
 
-			assert.isTrue(fs.exists(destinationFilePath), 'Target build xcconfig is missing for release: ' + release);
-			const expected = {
-				'CODE_SIGN_ENTITLEMENTS': iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData)
-			};
-			assertPropertyValues(expected, destinationFilePath, testInjector);
+			_.each(destinationFilePaths, destinationFilePath => {
+				assert.isTrue(fs.exists(destinationFilePath), 'Target build xcconfig is missing for release: ' + release);
+				const expected = {
+					'CODE_SIGN_ENTITLEMENTS': iOSEntitlementsService.getPlatformsEntitlementsRelativePath(projectData)
+				};
+				assertPropertyValues(expected, destinationFilePath, testInjector);
+			});
 		}
 	});
 
@@ -1222,13 +1231,12 @@ describe("Merge Project XCConfig files", () => {
 		const xcconfigEntitlements = appResourceXCConfigContent + `${EOL}CODE_SIGN_ENTITLEMENTS = ${expectedEntitlementsFile}`;
 		fs.writeFile(appResourcesXcconfigPath, xcconfigEntitlements);
 
-		// run merge for all release: debug|release
-		for (const release in [true, false]) {
-			await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData, { release });
+		await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData);
 
-			const destinationFilePath = xcconfigService.getPluginsXcconfigFilePath(projectRoot, { release: !!release });
+		const destinationFilePaths = xcconfigService.getPluginsXcconfigFilePaths(projectRoot);
 
-			assert.isTrue(fs.exists(destinationFilePath), 'Target build xcconfig is missing for release: ' + release);
+		_.each(destinationFilePaths, destinationFilePath => {
+			assert.isTrue(fs.exists(destinationFilePath), `Target build xcconfig ${destinationFilePath} is missing.`);
 			const expected = {
 				'ASSETCATALOG_COMPILER_APPICON_NAME': 'AppIcon',
 				'ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME': 'LaunchImage',
@@ -1236,20 +1244,19 @@ describe("Merge Project XCConfig files", () => {
 				'CODE_SIGN_ENTITLEMENTS': expectedEntitlementsFile
 			};
 			assertPropertyValues(expected, destinationFilePath, testInjector);
-		}
+		});
 	});
 
 	it("creates empty plugins-<config>.xcconfig in case there are no build.xcconfig in App_Resources and in plugins", async () => {
-		// run merge for all release: debug|release
-		for (const release in [true, false]) {
-			await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData, { release });
+		await (<any>iOSProjectService).mergeProjectXcconfigFiles(projectData);
 
-			const destinationFilePath = xcconfigService.getPluginsXcconfigFilePath(projectRoot, { release: !!release });
+		const destinationFilePaths = xcconfigService.getPluginsXcconfigFilePaths(projectRoot);
 
-			assert.isTrue(fs.exists(destinationFilePath), 'Target build xcconfig is missing for release: ' + release);
+		_.each(destinationFilePaths, destinationFilePath => {
+			assert.isTrue(fs.exists(destinationFilePath), `Target build xcconfig ${destinationFilePath} is missing.`);
 			const content = fs.readFile(destinationFilePath).toString();
 			assert.equal(content, "");
-		}
+		});
 	});
 });
 
@@ -1298,6 +1305,7 @@ describe("buildProject", () => {
 				getSigning: () => ({}),
 				setAutomaticSigningStyle: () => ({}),
 				setAutomaticSigningStyleByTargetProductType: () => ({}),
+				setAutomaticSigningStyleByTargetProductTypesList: () => ({}),
 				setAutomaticSigningStyleByTargetKey: () => ({}),
 				save: () => ({})
 			})
diff --git a/test/nativescript-cli-lib.ts b/test/nativescript-cli-lib.ts
index 9238cfcc61..33b08b031c 100644
--- a/test/nativescript-cli-lib.ts
+++ b/test/nativescript-cli-lib.ts
@@ -23,7 +23,7 @@ describe("nativescript-cli-lib", () => {
 			"getIOSAssetsStructure",
 			"getAndroidAssetsStructure"
 		],
-		constants: ["CONFIG_NS_APP_RESOURCES_ENTRY", "CONFIG_NS_APP_ENTRY", "CONFIG_NS_FILE_NAME"],
+		constants: ["CONFIG_NS_APP_RESOURCES_ENTRY", "CONFIG_NS_APP_ENTRY", "CONFIG_NS_FILE_NAME", "LoggerLevel", "LoggerAppenders"],
 		localBuildService: ["build"],
 		deviceLogProvider: null,
 		packageManager: ["install", "uninstall", "view", "search"],
@@ -59,6 +59,17 @@ describe("nativescript-cli-lib", () => {
 		sysInfo: [
 			"getSupportedNodeVersionRange",
 			"getSystemWarnings"
+		],
+		cleanupService: [
+			"setCleanupLogFile"
+		],
+		logger: [
+			"initialize",
+			"getLevel",
+			"info"
+		],
+		initializeService: [
+			"initialize"
 		]
 	};
 
diff --git a/test/package-installation-manager.ts b/test/package-installation-manager.ts
index fa35296680..242324f26e 100644
--- a/test/package-installation-manager.ts
+++ b/test/package-installation-manager.ts
@@ -3,7 +3,7 @@ import * as ConfigLib from "../lib/config";
 import * as ErrorsLib from "../lib/common/errors";
 import * as FsLib from "../lib/common/file-system";
 import * as HostInfoLib from "../lib/common/host-info";
-import * as LoggerLib from "../lib/common/logger";
+import * as LoggerLib from "../lib/common/logger/logger";
 import * as NpmLib from "../lib/node-package-manager";
 import * as YarnLib from "../lib/yarn-package-manager";
 import * as PackageManagerLib from "../lib/package-manager";
@@ -14,10 +14,13 @@ import * as yok from "../lib/common/yok";
 import ChildProcessLib = require("../lib/common/child-process");
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 import { ProjectDataService } from "../lib/services/project-data-service";
+import { WorkflowServiceStub, ProjectDataStub } from "./stubs";
 
 function createTestInjector(): IInjector {
 	const testInjector = new yok.Yok();
 
+	testInjector.register("workflowService", WorkflowServiceStub);
+	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("config", ConfigLib.Configuration);
 	testInjector.register("logger", LoggerLib.Logger);
 	testInjector.register("errors", ErrorsLib.Errors);
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
index fa19182278..9b593a1b73 100644
--- a/test/platform-commands.ts
+++ b/test/platform-commands.ts
@@ -20,6 +20,7 @@ import * as ChildProcessLib from "../lib/common/child-process";
 import ProjectChangesLib = require("../lib/services/project-changes-service");
 import { Messages } from "../lib/common/messages/messages";
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
+import { WorkflowServiceStub } from "./stubs";
 
 let isCommandExecuted = true;
 
@@ -97,6 +98,7 @@ function createTestInjector() {
 	const testInjector = new yok.Yok();
 
 	testInjector.register("injector", testInjector);
+	testInjector.register("workflowService", WorkflowServiceStub);
 	testInjector.register("hooksService", stubs.HooksServiceStub);
 	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);
 	testInjector.register("nodeModulesDependenciesBuilder", {});
@@ -179,6 +181,9 @@ function createTestInjector() {
 	testInjector.register("doctorService", {
 		checkForDeprecatedShortImportsInAppDir: (projectDir: string): void => undefined
 	});
+	testInjector.register("cleanupService", {
+		setShouldDispose: (shouldDispose: boolean): void => undefined
+	});
 
 	return testInjector;
 }
diff --git a/test/platform-service.ts b/test/platform-service.ts
index 8503a71a06..5ae8e12f63 100644
--- a/test/platform-service.ts
+++ b/test/platform-service.ts
@@ -32,6 +32,7 @@ temp.track();
 function createTestInjector() {
 	const testInjector = new yok.Yok();
 
+	testInjector.register("workflowService", stubs.WorkflowServiceStub);
 	testInjector.register('platformService', PlatformServiceLib.PlatformService);
 	testInjector.register('errors', stubs.ErrorsStub);
 	testInjector.register('logger', stubs.LoggerStub);
@@ -121,6 +122,9 @@ function createTestInjector() {
 	testInjector.register("doctorService", {
 		checkForDeprecatedShortImportsInAppDir: (projectDir: string): void => undefined
 	});
+	testInjector.register("cleanupService", {
+		setShouldDispose: (shouldDispose: boolean): void => undefined
+	});
 
 	return testInjector;
 }
@@ -512,6 +516,7 @@ describe('Platform Service Tests', () => {
 
 			platformService = testInjector.resolve("platformService");
 			const appFilesUpdaterOptions: IAppFilesUpdaterOptions = { bundle: false, release: release, useHotModuleReload: false };
+			platformService.getCurrentPlatformVersion = () => "5.1.1";
 			await platformService.preparePlatform({
 				platform: platformToTest,
 				appFilesUpdaterOptions,
@@ -946,6 +951,7 @@ describe('Platform Service Tests', () => {
 			projectData.appResourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
 
 			platformService = testInjector.resolve("platformService");
+			platformService.getCurrentPlatformVersion = () => "5.1.1";
 			const oldLoggerWarner = testInjector.resolve("$logger").warn;
 			let warnings: string = "";
 			try {
diff --git a/test/plugin-create.ts b/test/plugin-create.ts
index 60f037006d..68cd613539 100644
--- a/test/plugin-create.ts
+++ b/test/plugin-create.ts
@@ -19,6 +19,8 @@ const dummyProjectName = "dummyProjectName";
 const dummyArgs = [dummyProjectName];
 const dummyUser = "devUsername";
 const dummyName = "devPlugin";
+const createDemoProjectAnswer = true;
+const creteDemoProjectOption = "y";
 const dummyPacote: IPacoteOutput = { packageName: "", destinationDirectory: "" };
 
 function createTestInjector() {
@@ -104,48 +106,99 @@ describe("Plugin create command tests", () => {
 			await createPluginCommand.execute(dummyArgs);
 		});
 
-		it("should pass when only project name is set with prompts in interactive shell.", async () => {
+		it("should pass when all options are set with prompts in interactive shell.", async () => {
 			const prompter = testInjector.resolve("$prompter");
 			const strings: IDictionary<string> = {};
+			const confirmQuestions: IDictionary<boolean> = {};
 			strings[createPluginCommand.userMessage] = dummyUser;
 			strings[createPluginCommand.nameMessage] = dummyName;
+			confirmQuestions[createPluginCommand.includeTypeScriptDemoMessage] = createDemoProjectAnswer;
+			confirmQuestions[createPluginCommand.includeAngularDemoMessage] = createDemoProjectAnswer;
 
 			prompter.expect({
-				strings: strings
+				strings: strings,
+				confirmQuestions
 			});
 			await createPluginCommand.execute(dummyArgs);
 			prompter.assert();
 		});
 
-		it("should pass with project name and username set with one prompt in interactive shell.", async () => {
+		it("should pass when username is passed with command line option and all other options are populated with prompts in interactive shell.", async () => {
 			options.username = dummyUser;
 			const prompter = testInjector.resolve("$prompter");
 			const strings: IDictionary<string> = {};
+			const confirmQuestions: IDictionary<boolean> = {};
 			strings[createPluginCommand.nameMessage] = dummyName;
+			confirmQuestions[createPluginCommand.includeTypeScriptDemoMessage] = createDemoProjectAnswer;
+			confirmQuestions[createPluginCommand.includeAngularDemoMessage] = createDemoProjectAnswer;
 
 			prompter.expect({
-				strings: strings
+				strings: strings,
+				confirmQuestions
 			});
 			await createPluginCommand.execute(dummyArgs);
 			prompter.assert();
 		});
 
-		it("should pass with project name and pluginName set with one prompt in interactive shell.", async () => {
+		it("should pass when plugin name is passed with command line option and all other options are populated with prompts in interactive shell.", async () => {
 			options.pluginName = dummyName;
 			const prompter = testInjector.resolve("$prompter");
 			const strings: IDictionary<string> = {};
+			const confirmQuestions: IDictionary<boolean> = {};
+
 			strings[createPluginCommand.userMessage] = dummyUser;
+			confirmQuestions[createPluginCommand.includeTypeScriptDemoMessage] = createDemoProjectAnswer;
+			confirmQuestions[createPluginCommand.includeAngularDemoMessage] = createDemoProjectAnswer;
 
 			prompter.expect({
-				strings: strings
+				strings,
+				confirmQuestions
 			});
 			await createPluginCommand.execute(dummyArgs);
 			prompter.assert();
 		});
 
-		it("should pass with project name, username and pluginName set with no prompt in interactive shell.", async () => {
+		it("should pass when includeTypeScriptDemo is passed with command line option and all other options are populated with prompts in interactive shell.", async () => {
+			options.includeTypeScriptDemo = creteDemoProjectOption;
+			const prompter = testInjector.resolve("$prompter");
+			const strings: IDictionary<string> = {};
+			const confirmQuestions: IDictionary<boolean> = {};
+			strings[createPluginCommand.userMessage] = dummyUser;
+			strings[createPluginCommand.nameMessage] = dummyName;
+			confirmQuestions[createPluginCommand.includeAngularDemoMessage] = createDemoProjectAnswer;
+
+			prompter.expect({
+				strings: strings,
+				confirmQuestions
+			});
+			await createPluginCommand.execute(dummyArgs);
+			prompter.assert();
+		});
+
+		it("should pass when includeAngularDemo is passed with command line option and all other options are populated with prompts in interactive shell.", async () => {
+			options.includeAngularDemo = creteDemoProjectOption;
+			const prompter = testInjector.resolve("$prompter");
+			const strings: IDictionary<string> = {};
+			const confirmQuestions: IDictionary<boolean> = {};
+
+			strings[createPluginCommand.userMessage] = dummyUser;
+			strings[createPluginCommand.nameMessage] = dummyName;
+			confirmQuestions[createPluginCommand.includeTypeScriptDemoMessage] = createDemoProjectAnswer;
+
+			prompter.expect({
+				strings: strings,
+				confirmQuestions
+			});
+			await createPluginCommand.execute(dummyArgs);
+			prompter.assert();
+		});
+
+		it("should pass with all options passed through command line opts with no prompt in interactive shell.", async () => {
 			options.username = dummyUser;
 			options.pluginName = dummyName;
+			options.includeTypeScriptDemo = creteDemoProjectOption;
+			options.includeAngularDemo = creteDemoProjectOption;
+
 			await createPluginCommand.execute(dummyArgs);
 		});
 
diff --git a/test/plugins-service.ts b/test/plugins-service.ts
index f2530b2e73..e36966e1aa 100644
--- a/test/plugins-service.ts
+++ b/test/plugins-service.ts
@@ -107,13 +107,6 @@ function createTestInjector() {
 		showCommandLineHelp: async (): Promise<void> => (undefined)
 	});
 	testInjector.register("settingsService", SettingsService);
-	testInjector.register("progressIndicator", {
-		getSpinner: (msg: string) => ({
-			start: (): void => undefined,
-			stop: (): void => undefined,
-			message: (): void => undefined
-		})
-	});
 	testInjector.register("httpClient", {});
 	testInjector.register("extensibilityService", {});
 	testInjector.register("androidPluginBuildService", stubs.AndroidPluginBuildServiceStub);
@@ -150,6 +143,11 @@ function createTestInjector() {
 		},
 		extractPackage: async (packageName: string, destinationDirectory: string, options?: IPacoteExtractOptions): Promise<void> => undefined
 	});
+
+	testInjector.register("cleanupService", {
+		setShouldDispose: (shouldDispose: boolean): void => undefined
+	});
+
 	return testInjector;
 }
 
@@ -274,7 +272,7 @@ describe("Plugins service", () => {
 			});
 			it("fails when the plugin does not support the installed framework", async () => {
 				let isWarningMessageShown = false;
-				const expectedWarningMessage = "mySamplePlugin 1.5.0 for android is not compatible with the currently installed framework version 1.4.0.";
+				const expectedWarningMessage = "mySamplePlugin requires at least version 1.5.0 of platform android. Currently installed version is 1.4.0.";
 
 				// Creates plugin in temp folder
 				const pluginName = "mySamplePlugin";
diff --git a/test/project-commands.ts b/test/project-commands.ts
index 034c6c8207..68b66d0803 100644
--- a/test/project-commands.ts
+++ b/test/project-commands.ts
@@ -23,6 +23,10 @@ const expectedTemplateChoices = [
 	{ key: "SideDrawer", description: "An app with pre-built pages that uses a drawer for navigation" },
 	{ key: "Tabs", description: "An app with pre-built pages that uses tabs for navigation" }
 ];
+const expectedTemplateChoicesVue = [
+	{ key: "Blank", description: "A blank app" },
+	{ key: "SideDrawer", description: "An app with pre-built pages that uses a drawer for navigation" }
+];
 
 class ProjectServiceMock implements IProjectService {
 	async validateProjectName(opts: { projectName: string, force: boolean, pathToProject: string }): Promise<string> {
@@ -92,7 +96,7 @@ describe("Project commands tests", () => {
 		if (opts.templateAnswer) {
 			const templateQuestion = opts.projectNameAnswer ? "Finally" : "Next, which template would you like to start from:";
 			answers[templateQuestion] = opts.templateAnswer;
-			questionChoices[templateQuestion] = expectedTemplateChoices;
+			questionChoices[templateQuestion] = opts.flavorAnswer === constants.VueFlavorName ? expectedTemplateChoicesVue : expectedTemplateChoices;
 		}
 
 		prompterStub.expect({
@@ -207,12 +211,14 @@ describe("Project commands tests", () => {
 			assert.isTrue(createProjectCalledWithForce);
 		});
 
-		it("should select the default vue template when the vue flavor is selected.", async () => {
-			setupAnswers({ flavorAnswer: constants.VueFlavorName });
+		it("should ask for a template when vue flavor is selected.", async () => {
+			setupAnswers({ flavorAnswer: constants.VueFlavorName, templateAnswer:  "SideDrawer" });
 
 			await createProjectCommand.execute(dummyArgs);
 
-			assert.deepEqual(selectedTemplateName, "tns-template-blank-vue");
+			assert.deepEqual(selectedTemplateName, "tns-template-drawer-navigation-vue");
+			assert.equal(validateProjectCallsCount, 1);
+			assert.isTrue(createProjectCalledWithForce);
 		});
 	});
 });
diff --git a/test/services/analytics/analytics-service.ts b/test/services/analytics/analytics-service.ts
index ed626f64dc..2247e1b286 100644
--- a/test/services/analytics/analytics-service.ts
+++ b/test/services/analytics/analytics-service.ts
@@ -36,9 +36,6 @@ const createTestInjector = (opts?: { projectHelperErrorMsg?: string, projectDir?
 	});
 	testInjector.register("osInfo", {});
 	testInjector.register("childProcess", {});
-	testInjector.register("processService", {
-		attachToProcessExitSignals: (context: any, callback: () => void): void => undefined
-	});
 	testInjector.register("projectDataService", {
 		getProjectData: (projectDir?: string): IProjectData => {
 			return <any>{
@@ -194,7 +191,7 @@ describe("analyticsService", () => {
 
 					spawnedProcess.connected = false;
 					spawnedProcess.send = (): void => undefined;
-					setTimeout(() => spawnedProcess.emit("message", AnalyticsMessages.BrokerReadyToReceive), 1);
+					setTimeout(() => spawnedProcess.emit("message", DetachedProcessMessages.ProcessReadyToReceive), 1);
 					return spawnedProcess;
 				};
 
@@ -213,7 +210,7 @@ describe("analyticsService", () => {
 						throw new Error("Failed to sent data.");
 					};
 
-					setTimeout(() => spawnedProcess.emit("message", AnalyticsMessages.BrokerReadyToReceive), 1);
+					setTimeout(() => spawnedProcess.emit("message", DetachedProcessMessages.ProcessReadyToReceive), 1);
 					return spawnedProcess;
 				};
 
@@ -233,7 +230,7 @@ describe("analyticsService", () => {
 						action();
 					};
 
-					setTimeout(() => spawnedProcess.emit("message", AnalyticsMessages.BrokerReadyToReceive), 1);
+					setTimeout(() => spawnedProcess.emit("message", DetachedProcessMessages.ProcessReadyToReceive), 1);
 					return spawnedProcess;
 				};
 
@@ -264,7 +261,7 @@ describe("analyticsService", () => {
 						action();
 					};
 
-					setTimeout(() => spawnedProcess.emit("message", AnalyticsMessages.BrokerReadyToReceive), 1);
+					setTimeout(() => spawnedProcess.emit("message", DetachedProcessMessages.ProcessReadyToReceive), 1);
 
 					return spawnedProcess;
 				};
diff --git a/test/services/android-device-debug-service.ts b/test/services/android-device-debug-service.ts
index 0b3076062a..e3b208008c 100644
--- a/test/services/android-device-debug-service.ts
+++ b/test/services/android-device-debug-service.ts
@@ -31,6 +31,8 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("net", {});
 	testInjector.register("projectDataService", {});
 	testInjector.register("deviceLogProvider", {});
+	testInjector.register("cleanupService", {});
+	testInjector.register("staticConfig", {});
 
 	return testInjector;
 };
diff --git a/test/services/android-project-service.ts b/test/services/android-project-service.ts
index aad86d5916..8d33c84642 100644
--- a/test/services/android-project-service.ts
+++ b/test/services/android-project-service.ts
@@ -43,6 +43,7 @@ const getDefautlBuildConfig = (): IBuildConfig => {
 	return {
 		release: true,
 		buildForDevice: false,
+		iCloudContainerEnvironment: null,
 		device: "testDevice",
 		provision: null,
 		teamId: "",
diff --git a/test/services/ios-debugger-port-service.ts b/test/services/ios-debugger-port-service.ts
index 6af66967e7..512ea74ebf 100644
--- a/test/services/ios-debugger-port-service.ts
+++ b/test/services/ios-debugger-port-service.ts
@@ -45,9 +45,6 @@ function createTestInjector() {
 		iOSSim: () => ({})
 	});
 	injector.register("logger", LoggerStub);
-	injector.register("processService", {
-		attachToProcessExitSignals: () => ({})
-	});
 	injector.register("projectDataService", {
 		getProjectData: (projectDir: string) => ({
 			projectName: "test",
diff --git a/test/services/ios-device-debug-service.ts b/test/services/ios-device-debug-service.ts
index bfdffe1153..d97f37863d 100644
--- a/test/services/ios-device-debug-service.ts
+++ b/test/services/ios-device-debug-service.ts
@@ -12,11 +12,10 @@ class IOSDeviceDebugServiceInheritor extends IOSDeviceDebugService {
 		$logger: ILogger,
 		$errors: IErrors,
 		$packageInstallationManager: IPackageInstallationManager,
-		$processService: IProcessService,
 		$appDebugSocketProxyFactory: IAppDebugSocketProxyFactory,
 		$projectDataService: IProjectDataService) {
 		super(<any>{ deviceInfo: { identifier: "123" } }, $devicesService, $childProcess, $hostInfo, $logger, $errors,
-			$packageInstallationManager, $processService, $appDebugSocketProxyFactory, $projectDataService);
+			$packageInstallationManager, $appDebugSocketProxyFactory, $projectDataService);
 	}
 
 	public getChromeDebugUrl(debugOptions: IDebugOptions, port: number): string {
@@ -37,10 +36,6 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("packageInstallationManager", {});
 	testInjector.register("iOSNotification", {});
 	testInjector.register("iOSSocketRequestExecutor", {});
-	testInjector.register("processService", {
-		attachToProcessExitSignals: (context: any, callback: () => void): void => undefined
-	});
-
 	testInjector.register("appDebugSocketProxyFactory", {
 		on: (event: string | symbol, listener: Function): any => undefined
 	});
diff --git a/test/services/livesync-service.ts b/test/services/livesync-service.ts
index 65e4284b86..9a4008ce8c 100644
--- a/test/services/livesync-service.ts
+++ b/test/services/livesync-service.ts
@@ -17,7 +17,6 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("devicePlatformsConstants", {});
 	testInjector.register("nodeModulesDependenciesBuilder", {});
 	testInjector.register("logger", LoggerStub);
-	testInjector.register("processService", {});
 	testInjector.register("debugService", {});
 	testInjector.register("errors", {});
 	testInjector.register("debugDataService", {});
@@ -52,7 +51,6 @@ class LiveSyncServiceInheritor extends LiveSyncService {
 		$devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		$nodeModulesDependenciesBuilder: INodeModulesDependenciesBuilder,
 		$logger: ILogger,
-		$processService: IProcessService,
 		$hooksService: IHooksService,
 		$pluginsService: IPluginsService,
 		$debugService: IDebugService,
@@ -75,7 +73,6 @@ class LiveSyncServiceInheritor extends LiveSyncService {
 			$devicePlatformsConstants,
 			$nodeModulesDependenciesBuilder,
 			$logger,
-			$processService,
 			$hooksService,
 			$pluginsService,
 			$debugService,
diff --git a/test/services/livesync/android-livesync-tool.ts b/test/services/livesync/android-livesync-tool.ts
index bb5c0e62f1..49f14905bc 100644
--- a/test/services/livesync/android-livesync-tool.ts
+++ b/test/services/livesync/android-livesync-tool.ts
@@ -1,7 +1,7 @@
 import { Yok } from "../../../lib/common/yok";
 import { assert } from "chai";
 import * as sinon from "sinon";
-import { LoggerStub, ProcessServiceStub } from "../../stubs";
+import { LoggerStub } from "../../stubs";
 import { AndroidLivesyncTool } from "../../../lib/services/livesync/android-livesync-tool";
 import { LiveSyncSocket } from "../../../lib/services/livesync/livesync-socket";
 import { MobileHelper } from "../../../lib/common/mobile/mobile-helper";
@@ -67,7 +67,6 @@ const createTestInjector = (socket: INetSocket, fileStreams: IDictionary<NodeJS.
 
 	testInjector.register("fs", FileSystem);
 	testInjector.register("logger", LoggerStub);
-	testInjector.register("processService", ProcessServiceStub);
 	testInjector.register("injector", testInjector);
 	testInjector.register("mobileHelper", MobileHelper);
 	testInjector.register("androidProcessService", {
diff --git a/test/services/playground/preview-app-livesync-service.ts b/test/services/playground/preview-app-livesync-service.ts
index 42f097a24e..8eab7ee01e 100644
--- a/test/services/playground/preview-app-livesync-service.ts
+++ b/test/services/playground/preview-app-livesync-service.ts
@@ -1,6 +1,6 @@
 import { Yok } from "../../../lib/common/yok";
 import * as _ from 'lodash';
-import { LoggerStub, ErrorsStub } from "../../stubs";
+import { LoggerStub, ErrorsStub, WorkflowServiceStub } from "../../stubs";
 import { FilePayload, Device, FilesPayload } from "nativescript-preview-sdk";
 import { PreviewAppLiveSyncService } from "../../../lib/services/livesync/playground/preview-app-livesync-service";
 import * as chai from "chai";
@@ -73,7 +73,7 @@ class PreviewSdkServiceMock extends EventEmitter implements IPreviewSdkService {
 		return "my_cool_qr_code_url";
 	}
 
-	public initialize(getInitialFiles: (device: Device) => Promise<FilesPayload>) {
+	public initialize(projectDir: string, getInitialFiles: (device: Device) => Promise<FilesPayload>) {
 		this.getInitialFiles = async (device) => {
 			const filesPayload = await getInitialFiles(device);
 			initialFiles.push(...filesPayload.files);
@@ -101,6 +101,7 @@ function createTestInjector(options?: {
 	options = options || {};
 
 	const injector = new Yok();
+	injector.register("workflowService", WorkflowServiceStub);
 	injector.register("logger", LoggerMock);
 	injector.register("hmrStatusService", {});
 	injector.register("errors", ErrorsStub);
diff --git a/test/services/playground/preview-schema-service.ts b/test/services/playground/preview-schema-service.ts
new file mode 100644
index 0000000000..abcb4c191d
--- /dev/null
+++ b/test/services/playground/preview-schema-service.ts
@@ -0,0 +1,89 @@
+import { Yok } from "../../../lib/common/yok";
+import { PreviewSchemaService } from "../../../lib/services/livesync/playground/preview-schema-service";
+import { PubnubKeys } from "../../../lib/services/livesync/playground/preview-app-constants";
+import { assert } from "chai";
+
+function createTestInjector(): IInjector {
+	const injector = new Yok();
+	injector.register("previewSchemaService", PreviewSchemaService);
+	injector.register("projectDataService", () => ({}));
+	injector.register("errors", () => ({}));
+
+	return injector;
+}
+
+const nsPlaySchema = {
+	name: 'nsplay',
+	scannerAppId: 'org.nativescript.play',
+	scannerAppStoreId: '1263543946',
+	previewAppId: 'org.nativescript.preview',
+	previewAppStoreId: '1264484702',
+	msvKey: 'cli',
+	publishKey: PubnubKeys.PUBLISH_KEY,
+	subscribeKey: PubnubKeys.SUBSCRIBE_KEY,
+	default: true
+};
+
+const ksPreviewSchema = {
+	name: 'kspreview',
+	scannerAppId: 'com.kinvey.scanner',
+	scannerAppStoreId: '1458317125',
+	previewAppId: 'com.kinvey.preview',
+	previewAppStoreId: '1458502055',
+	msvKey: 'kinveyStudio',
+	publishKey: PubnubKeys.PUBLISH_KEY,
+	subscribeKey: PubnubKeys.SUBSCRIBE_KEY
+};
+
+describe("PreviewSchemaService", () => {
+	let injector: IInjector;
+	let previewSchemaService: IPreviewSchemaService;
+
+	beforeEach(() => {
+		injector = createTestInjector();
+		previewSchemaService = injector.resolve("previewSchemaService");
+	});
+
+	const testCases = [
+		{
+			name: "should return default nsplay schema when no previewAppSchema in nsconfig",
+			previewAppSchema: <any>null,
+			expectedSchema: nsPlaySchema
+		},
+		{
+			name: "should return nsplay schema when { 'previewAppSchema': 'nsplay' } in nsconfig",
+			previewAppSchema: "nsplay",
+			expectedSchema: nsPlaySchema
+		},
+		{
+			name: "should return kspreview schema when { 'previewAppSchema': 'kspreview' } in nsconfig",
+			previewAppSchema: "kspreview",
+			expectedSchema: ksPreviewSchema
+		},
+		{
+			name: "should throw an error when invalid previewAppSchema is specified in nsconfig",
+			previewAppSchema: "someInvalidSchema",
+			expectedToThrow: true
+		}
+	];
+
+	_.each(testCases, testCase => {
+		it(`${testCase.name}`, () => {
+			const projectDataService = injector.resolve("projectDataService");
+			projectDataService.getProjectData = () => ({ previewAppSchema: testCase.previewAppSchema });
+
+			let actualError = null;
+			if (testCase.expectedToThrow) {
+				const errors = injector.resolve("errors");
+				errors.failWithoutHelp = (err: string) => actualError = err;
+			}
+
+			const schemaData = previewSchemaService.getSchemaData("someTestProjectDir");
+
+			assert.deepEqual(schemaData, testCase.expectedSchema);
+			if (testCase.expectedToThrow) {
+				assert.isNotNull(actualError);
+			}
+		});
+	});
+});
diff --git a/test/services/preview-sdk-service.ts b/test/services/preview-sdk-service.ts
index c129ead91d..464cd570ec 100644
--- a/test/services/preview-sdk-service.ts
+++ b/test/services/preview-sdk-service.ts
@@ -2,6 +2,7 @@ import { PreviewSdkService } from "../../lib/services/livesync/playground/previe
 import { Yok } from "../../lib/common/yok";
 import { assert } from "chai";
 import { LoggerStub } from "../stubs";
+import { PreviewSchemaService } from "../../lib/services/livesync/playground/preview-schema-service";
 
 const createTestInjector = (): IInjector => {
 	const testInjector = new Yok();
@@ -9,6 +10,7 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("config", {});
 	testInjector.register("previewSdkService", PreviewSdkService);
 	testInjector.register("previewDevicesService", {});
+	testInjector.register("previewSchemaService", PreviewSchemaService);
 	testInjector.register("previewAppLogProvider", {});
 	testInjector.register("httpClient", {
 		httpRequest: async (options: any, proxySettings?: IProxySettings): Promise<Server.IResponse> => undefined
@@ -16,6 +18,7 @@ const createTestInjector = (): IInjector => {
 	testInjector.register("projectDataService", {
 		getProjectData: () => ({})
 	});
+	testInjector.register("errors", {});
 
 	return testInjector;
 };
@@ -51,8 +54,8 @@ describe('PreviewSdkService', () => {
 				},
 				{
 					name: "should return the schema from nsconfig",
-					schemaFromNsConfig: "ksplay",
-					expectedSchemaName: "ksplay"
+					schemaFromNsConfig: "kspreview",
+					expectedSchemaName: "kspreview"
 				},
 				{
 					name: "should return the default schema",
diff --git a/test/services/project-data-service.ts b/test/services/project-data-service.ts
index 414276b1e8..72f1db2b95 100644
--- a/test/services/project-data-service.ts
+++ b/test/services/project-data-service.ts
@@ -1,7 +1,7 @@
 import { Yok } from "../../lib/common/yok";
 import { assert } from "chai";
 import { ProjectDataService } from "../../lib/services/project-data-service";
-import { LoggerStub } from "../stubs";
+import { LoggerStub, WorkflowServiceStub, ProjectDataStub } from "../stubs";
 import { NATIVESCRIPT_PROPS_INTERNAL_DELIMITER, PACKAGE_JSON_FILE_NAME, AssetConstants, ProjectTypes } from '../../lib/constants';
 import { DevicePlatformsConstants } from "../../lib/common/mobile/device-platforms-constants";
 import { basename, join } from "path";
@@ -43,6 +43,8 @@ const testData: any = [
 
 const createTestInjector = (readTextData?: string): IInjector => {
 	const testInjector = new Yok();
+	testInjector.register("workflowService", WorkflowServiceStub);
+	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("staticConfig", {
 		CLIENT_NAME_KEY_IN_PROJECT_FILE: CLIENT_NAME_KEY_IN_PROJECT_FILE,
 		PROJECT_FILE_NAME: "package.json"
diff --git a/test/services/subscription-service.ts b/test/services/subscription-service.ts
index c4cbb9b529..30effd389c 100644
--- a/test/services/subscription-service.ts
+++ b/test/services/subscription-service.ts
@@ -135,7 +135,7 @@ describe("subscriptionService", () => {
 			subscriptionService.shouldAskForEmailResult = false;
 			const logger = testInjector.resolve<LoggerStub>("logger");
 			let loggerOutput = "";
-			logger.out = (...args: string[]): void => {
+			logger.info = (...args: string[]): void => {
 				loggerOutput += args.join(" ");
 			};
 
@@ -151,7 +151,7 @@ describe("subscriptionService", () => {
 			const logger = testInjector.resolve<LoggerStub>("logger");
 			let loggerOutput = "";
 
-			logger.out = (...args: string[]): void => {
+			logger.info = (...args: string[]): void => {
 				loggerOutput += args.join(" ");
 			};
 
diff --git a/test/stubs.ts b/test/stubs.ts
index 7746d4b4b8..3e2fee32b2 100644
--- a/test/stubs.ts
+++ b/test/stubs.ts
@@ -11,12 +11,16 @@ import { HostInfo } from "./../lib/common/host-info";
 import { DevicePlatformsConstants } from "./../lib/common/mobile/device-platforms-constants";
 
 export class LoggerStub implements ILogger {
+	initialize(opts?: ILoggerOptions): void { }
+	initializeCliLogger(): void { }
 	getLevel(): string { return undefined; }
 	fatal(...args: string[]): void { }
 	error(...args: string[]): void { }
 	warn(...args: string[]): void { }
-	warnWithLabel(...args: string[]): void { }
-	info(...args: string[]): void { }
+	info(...args: string[]): void {
+		this.output += util.format.apply(null, args) + "\n";
+	}
+
 	debug(...args: string[]): void { }
 	trace(...args: string[]): void {
 		this.traceOutput += util.format.apply(null, args) + "\n";
@@ -25,34 +29,17 @@ export class LoggerStub implements ILogger {
 	public output = "";
 	public traceOutput = "";
 
-	out(...args: string[]): void {
-		this.output += util.format.apply(null, args) + "\n";
-	}
-
-	write(...args: string[]): void { }
-
 	prepare(item: any): string {
 		return "";
 	}
 
-	printInfoMessageOnSameLine(message: string): void { }
-	async printMsgWithTimeout(message: string, timeout: number): Promise<void> {
-		return null;
-	}
-
 	printMarkdown(message: string): void { }
 
-	printOnStderr(...args: string[]): void {
-		// nothing to do here
-	}
-}
-
-export class ProcessServiceStub implements IProcessService {
-	public listenersCount: number;
-
-	public attachToProcessExitSignals(context: any, callback: () => void): void {
-		return undefined;
-	}
+	out(formatStr?: any, ...args: any[]): void { }
+	write(...args: any[]): void { }
+	printInfoMessageOnSameLine(message: string): void { }
+	async printMsgWithTimeout(message: string, timeout: number): Promise<void> { }
+	printOnStderr(formatStr?: any, ...args: any[]): void { }
 }
 
 export class FileSystemStub implements IFileSystem {
@@ -505,6 +492,9 @@ export class PlatformsDataStub extends EventEmitter implements IPlatformsData {
 }
 
 export class ProjectDataService implements IProjectDataService {
+	setUseLegacyWorkflow(projectDir: string, value: any): Promise<void> {
+		return;
+	}
 	getNSValue(propertyName: string): any {
 		return {};
 	}
@@ -581,13 +571,15 @@ export class PrompterStub implements IPrompter {
 	private passwords: IDictionary<string> = {};
 	private answers: IDictionary<string> = {};
 	private questionChoices: IDictionary<any[]> = {};
+	private confirmQuestions: IDictionary<boolean> = {};
 
-	expect(options?: { strings?: IDictionary<string>, passwords?: IDictionary<string>, answers?: IDictionary<string>, questionChoices?: IDictionary<any[]> }) {
+	expect(options?: { strings?: IDictionary<string>, passwords?: IDictionary<string>, answers?: IDictionary<string>, questionChoices?: IDictionary<any[]>, confirmQuestions?: IDictionary<boolean> }) {
 		if (options) {
 			this.strings = options.strings || this.strings;
 			this.passwords = options.passwords || this.passwords;
 			this.answers = options.answers || this.answers;
 			this.questionChoices = options.questionChoices || this.questionChoices;
+			this.confirmQuestions = options.confirmQuestions || this.confirmQuestions;
 		}
 	}
 
@@ -617,7 +609,10 @@ export class PrompterStub implements IPrompter {
 		return result;
 	}
 	async confirm(message: string, defaultAction?: () => boolean): Promise<boolean> {
-		throw unreachable();
+		chai.assert.ok(message in this.confirmQuestions, `PrompterStub didn't expect to be asked for: ${message}`);
+		const result = this.confirmQuestions[message];
+		delete this.confirmQuestions[message];
+		return result;
 	}
 	dispose(): void {
 		throw unreachable();
@@ -630,6 +625,9 @@ export class PrompterStub implements IPrompter {
 		for (const key in this.passwords) {
 			throw unexpected(`PrompterStub was instructed to reply with "${this.passwords[key]}" to a "${key}" password request, but was never asked!`);
 		}
+		for (const key in this.confirmQuestions) {
+			throw unexpected(`PrompterStub was instructed to reply with "${this.confirmQuestions[key]}" to a "${key}" confirm question, but was never asked!`);
+		}
 	}
 }
 
@@ -921,6 +919,12 @@ export class PerformanceService implements IPerformanceService {
 	processExecutionData() { }
 }
 
+export class WorkflowServiceStub implements IWorkflowService {
+	handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void> {
+		return;
+	}
+}
+
 export class InjectorStub extends Yok implements IInjector {
 	constructor() {
 		super();
@@ -959,5 +963,6 @@ export class InjectorStub extends Yok implements IInjector {
 			getDevice: (): Mobile.IDevice => undefined,
 			getDeviceByIdentifier: (): Mobile.IDevice => undefined
 		});
+		this.register("workflowService", WorkflowServiceStub);
 	}
 }
diff --git a/test/update.ts b/test/update.ts
index 65b162c48a..f6a2052017 100644
--- a/test/update.ts
+++ b/test/update.ts
@@ -25,6 +25,7 @@ function createTestInjector(
 ): IInjector {
 	const testInjector: IInjector = new yok.Yok();
 	testInjector.register("logger", stubs.LoggerStub);
+	testInjector.register("workflowService", stubs.WorkflowServiceStub);
 	testInjector.register("options", Options);
 	testInjector.register('fs', stubs.FileSystemStub);
 	testInjector.register("analyticsService", {
@@ -49,10 +50,10 @@ function createTestInjector(
 	});
 	testInjector.register("pluginVariablesService", {});
 	testInjector.register("platformService", {
-		getInstalledPlatforms: function(): string[] {
+		getInstalledPlatforms: function (): string[] {
 			return installedPlatforms;
 		},
-		getAvailablePlatforms: function(): string[] {
+		getAvailablePlatforms: function (): string[] {
 			return availablePlatforms;
 		},
 		removePlatforms: async (): Promise<void> => undefined,
@@ -66,9 +67,9 @@ function createTestInjector(
 		getPlatformData: () => {
 			return {
 				platformProjectService: {
-						validate
-					}
-				};
+					validate
+				}
+			};
 		}
 	});
 	testInjector.register("settingsService", SettingsService);
@@ -161,7 +162,7 @@ describe("update command method tests", () => {
 			const fs = testInjector.resolve("fs");
 			const copyFileStub = sandbox.stub(fs, "copyFile");
 			const updateCommand = testInjector.resolve<UpdateCommand>(UpdateCommand);
-			return updateCommand.execute(["3.3.0"]).then( () => {
+			return updateCommand.execute(["3.3.0"]).then(() => {
 				assert.isTrue(copyFileStub.calledWith(path.join(projectFolder, "package.json")));
 				for (const folder of UpdateCommand.folders) {
 					assert.isTrue(copyFileStub.calledWith(path.join(projectFolder, folder)));
diff --git a/tsconfig.json b/tsconfig.json
index d3eeb57049..3253e8f14e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,7 @@
 		"node_modules",
 		"lib/common/node_modules",
 		"scratch",
-		"coverage"
+		"coverage",
+		"resources/test"
 	]
 }
diff --git a/yarn.lock b/yarn.lock
index 63d36a2c42..ed440e5120 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3745,10 +3745,10 @@ nativescript-dev-xcode@0.1.0:
     simple-plist "^1.0.0"
     uuid "^3.3.2"
 
-nativescript-doctor@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/nativescript-doctor/-/nativescript-doctor-1.9.1.tgz#42ac6b15f7b1531d2fe07d32a30e50b89cf46bbb"
-  integrity sha512-qdluBILhzAQhnIg8Y83syyjy63rTt5pvx0SFpbtwj7kE+LsXJJRhHNa+1KEtznxh7jcTfdLEZjxxWDTIAIK5oA==
+nativescript-doctor@1.9.2:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/nativescript-doctor/-/nativescript-doctor-1.9.2.tgz#a3b5b06c82bc20bf7bfde04552f3d52739229e85"
+  integrity sha512-HEBQS7eqycO3TzY3He94dM0AgPCQy3YMT6ZdHSVGDfxA5DhnhMgB0OWOvHPwR3TyL0BJhtLJnjrW4/hJjUw2SQ==
   dependencies:
     osenv "0.1.3"
     semver "5.5.1"
@@ -3756,10 +3756,10 @@ nativescript-doctor@1.9.1:
     winreg "1.2.2"
     yauzl "2.10.0"
 
-nativescript-preview-sdk@0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/nativescript-preview-sdk/-/nativescript-preview-sdk-0.3.3.tgz#0e95e5a92db8d4566d9bb9767a2a849217574787"
-  integrity sha512-QHi4SbDblN+dSZCIztx1xVdrB4cP911OXV92REIVOqDHXyAFYUZeWu5DH0/3IHdC9fnMgXMeJ0WZEpgGgieqtQ==
+nativescript-preview-sdk@0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/nativescript-preview-sdk/-/nativescript-preview-sdk-0.3.4.tgz#bb0dc3ce7da2be7e1e91cd2836b61b3699555f95"
+  integrity sha512-Dw4Nn6MXbZMW8dkQIf1NfXSSNtu3rDOw0z1KE159lwPEVMM8F7qxrqqT57XTiQP5pnqXMARhoQvkgW55qTVx6Q==
   dependencies:
     "@types/axios" "0.14.0"
     "@types/pubnub" "4.0.2"