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/PublicAPI.md b/PublicAPI.md
index 1dd590f933..d9faad77eb 100644
--- a/PublicAPI.md
+++ b/PublicAPI.md
@@ -72,6 +72,16 @@ const tns = require("nativescript");
 	* [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
 
@@ -1509,6 +1519,176 @@ 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/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/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/lib/bootstrap.ts b/lib/bootstrap.ts
index 6e24271e22..ddd9ce8278 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!
@@ -16,6 +16,7 @@ $injector.require("gradleBuildService", "./services/android/gradle-build-service
 $injector.require("gradleBuildArgsService", "./services/android/gradle-build-args-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");
@@ -40,9 +41,7 @@ $injector.require("platformValidationService", "./services/platform/platform-val
 
 $injector.require("buildArtefactsService", "./services/build-artefacts-service");
 
-$injector.require("deviceDebugAppService", "./services/device/device-debug-app-service");
 $injector.require("deviceInstallAppService", "./services/device/device-install-app-service");
-$injector.require("deviceRefreshAppService", "./services/device/device-refresh-app-service");
 
 $injector.require("runEmitter", "./emitters/run-emitter");
 $injector.require("previewAppEmitter", "./emitters/preview-app-emitter");
@@ -52,6 +51,7 @@ $injector.require("prepareController", "./controllers/prepare-controller");
 $injector.require("buildController", "./controllers/build-controller");
 $injector.require("deployController", "./controllers/deploy-controller");
 $injector.require("runController", "./controllers/run-controller");
+$injector.require("debugController", "./controllers/debug-controller");
 $injector.require("previewAppController", "./controllers/preview-app-controller");
 
 $injector.require("prepareDataService", "./services/prepare-data-service");
@@ -134,7 +134,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");
@@ -221,3 +221,9 @@ $injector.require("networkConnectivityValidator", "./helpers/network-connectivit
 $injector.requirePublic("cleanupService", "./services/cleanup-service");
 
 $injector.require("webpackCompilerService", "./services/webpack/webpack-compiler-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 128d9b8a3f..94acbabec3 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 a34019cc93..949c15c372 100644
--- a/lib/commands/appstore-upload.ts
+++ b/lib/commands/appstore-upload.ts
@@ -7,7 +7,7 @@ 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,
@@ -15,6 +15,8 @@ export class PublishIOS implements ICommand {
 		private $options: IOptions,
 		private $prompter: IPrompter,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
+		private $hostInfo: IHostInfo,
+		private $errors: IErrors,
 		private $buildController: BuildController,
 		private $platformValidationService: IPlatformValidationService
 	) {
@@ -70,11 +72,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.$platformValidationService.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 11b02b7e0b..8ab88e7672 100644
--- a/lib/commands/build.ts
+++ b/lib/commands/build.ts
@@ -33,7 +33,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> {
@@ -79,7 +79,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);
 		}
@@ -123,7 +123,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/debug.ts b/lib/commands/debug.ts
index fab91e8499..bb80ed752a 100644
--- a/lib/commands/debug.ts
+++ b/lib/commands/debug.ts
@@ -1,7 +1,6 @@
 import { cache } from "../common/decorators";
 import { ValidatePlatformCommandBase } from "./command-base";
 import { LiveSyncCommandHelper } from "../helpers/livesync-command-helper";
-import { DeviceDebugAppService } from "../services/device/device-debug-app-service";
 
 export class DebugPlatformCommand extends ValidatePlatformCommandBase implements ICommand {
 	public allowedParameters: ICommandParameter[] = [];
@@ -17,7 +16,7 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 		protected $logger: ILogger,
 		protected $errors: IErrors,
 		private $debugDataService: IDebugDataService,
-		private $deviceDebugAppService: DeviceDebugAppService,
+		private $debugController: IDebugController,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
 		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) {
 		super($options, $platformsDataService, $platformValidationService, $projectData);
@@ -31,8 +30,6 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 			skipDeviceDetectionInterval: true
 		});
 
-		const debugOptions = <IDebugOptions>_.cloneDeep(this.$options.argv);
-
 		const selectedDeviceForDebug = await this.$devicesService.pickSingleDevice({
 			onlyEmulators: this.$options.emulator,
 			onlyDevices: this.$options.forDevice,
@@ -42,11 +39,12 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 		const debugData = this.$debugDataService.createDebugData(this.$projectData, { device: selectedDeviceForDebug.deviceInfo.identifier });
 
 		if (this.$options.start) {
-			await this.$deviceDebugAppService.printDebugInformation(await this.$debugService.debug(debugData, debugOptions));
+			const debugOptions = <IDebugOptions>_.cloneDeep(this.$options.argv);
+			await this.$debugController.printDebugInformation(await this.$debugService.debug(debugData, debugOptions));
 			return;
 		}
 
-		await this.$liveSyncCommandHelper.executeLiveSyncOperation([selectedDeviceForDebug], this.platform, {
+		await this.$liveSyncCommandHelper.executeLiveSyncOperationWithDebug([selectedDeviceForDebug], this.platform, {
 			deviceDebugMap: {
 				[selectedDeviceForDebug.deviceInfo.identifier]: true
 			},
@@ -68,7 +66,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;
diff --git a/lib/commands/deploy.ts b/lib/commands/deploy.ts
index bedfa975be..739ba5384d 100644
--- a/lib/commands/deploy.ts
+++ b/lib/commands/deploy.ts
@@ -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 f21f067ee0..f8ee41f87a 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.$platformCommandHelper.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.$platformCommandHelper.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 f9539d84f3..aa07aee4f0 100644
--- a/lib/commands/post-install.ts
+++ b/lib/commands/post-install.ts
@@ -38,7 +38,7 @@ export class PostInstallCliCommand implements ICommand {
 		}
 
 		// 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`.");
 
 		if (canExecutePostInstallTask) {
diff --git a/lib/commands/preview.ts b/lib/commands/preview.ts
index 1194f6e620..08dccb9994 100644
--- a/lib/commands/preview.ts
+++ b/lib/commands/preview.ts
@@ -16,9 +16,9 @@ export class PreviewCommand implements ICommand {
 		private $previewAppLogProvider: IPreviewAppLogProvider,
 		private $previewQrCodeService: IPreviewQrCodeService,
 		$cleanupService: ICleanupService) {
-			this.$analyticsService.setShouldDispose(false);
-			$cleanupService.setShouldDispose(false);
-		}
+		this.$analyticsService.setShouldDispose(false);
+		$cleanupService.setShouldDispose(false);
+	}
 
 	public async execute(): Promise<void> {
 		this.$previewAppLogProvider.on(DEVICE_LOG_EVENT_NAME, (deviceId: string, message: string) => {
@@ -44,7 +44,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 b5465736b7..32985e65d5 100644
--- a/lib/commands/run.ts
+++ b/lib/commands/run.ts
@@ -13,7 +13,7 @@ export class RunCommandBase implements ICommand {
 		private $errors: IErrors,
 		private $hostInfo: IHostInfo,
 		private $liveSyncCommandHelper: ILiveSyncCommandHelper,
-		private $projectData: IProjectData,
+		private $projectData: IProjectData
 	) { }
 
 	public allowedParameters: ICommandParameter[] = [];
diff --git a/lib/commands/test.ts b/lib/commands/test.ts
index 2d45a126ef..7a47e2904b 100644
--- a/lib/commands/test.ts
+++ b/lib/commands/test.ts
@@ -83,7 +83,6 @@ class TestAndroidCommand extends TestCommandBase implements ICommand {
 		protected $devicesService: Mobile.IDevicesService) {
 		super();
 	}
-
 }
 
 class TestIosCommand extends TestCommandBase implements ICommand {
diff --git a/lib/commands/update.ts b/lib/commands/update.ts
index 50b3c00d7b..c60aef2b81 100644
--- a/lib/commands/update.ts
+++ b/lib/commands/update.ts
@@ -14,8 +14,7 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma
 		$platformValidationService: IPlatformValidationService,
 		private $pluginsService: IPluginsService,
 		$projectData: IProjectData,
-		private $projectDataService: IProjectDataService,
-	) {
+		private $projectDataService: IProjectDataService) {
 		super($options, $platformsDataService, $platformValidationService, $projectData);
 		this.$projectData.initializeProjectData();
 	}
diff --git a/lib/common/bootstrap.ts b/lib/common/bootstrap.ts
index 2aa2c255c8..d5276f5ae4 100644
--- a/lib/common/bootstrap.ts
+++ b/lib/common/bootstrap.ts
@@ -27,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");
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/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/declarations.d.ts b/lib/common/declarations.d.ts
index fb97c9c52c..815b5c1d72 100644
--- a/lib/common/declarations.d.ts
+++ b/lib/common/declarations.d.ts
@@ -1276,20 +1276,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
  */
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..6077c31d7d 100644
--- a/lib/common/definitions/logger.d.ts
+++ b/lib/common/definitions/logger.d.ts
@@ -1,19 +1,37 @@
-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;
+import { Layout, LoggingEvent, Configuration, Level } from "log4js";
+import { EventEmitter } from "events";
+import { LoggerLevel } from "../../constants";
 
-	out(formatStr?: any, ...args: any[]): void;
-	write(...args: any[]): void;
+declare global {
+	interface IAppenderOptions extends IDictionary<any> {
+		type: string;
+		layout?: Layout;
+	}
 
-	prepare(item: any): string;
-	printInfoMessageOnSameLine(message: string): void;
-	printMsgWithTimeout(message: string, timeout: number): Promise<void>;
-	printOnStderr(formatStr?: any, ...args: any[]): void;
+	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;
+	}
+
+	interface Log4JSAppenderConfiguration extends Configuration {
+		layout: Layout;
+	}
+
+	interface Log4JSEmitAppenderConfiguration extends Log4JSAppenderConfiguration {
+		emitter: EventEmitter;
+	}
 }
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 82860f25a0..52b731e146 100644
--- a/lib/common/helpers.ts
+++ b/lib/common/helpers.ts
@@ -381,6 +381,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 6aaec22c5d..5c970b7eea 100644
--- a/lib/common/http-client.ts
+++ b/lib/common/http-client.ts
@@ -289,7 +289,9 @@ private defaultUserAgent: string;
 	 * @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..cd105e4969
--- /dev/null
+++ b/lib/common/logger/logger.ts
@@ -0,0 +1,196 @@
+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;
+		});
+	}
+}
+
+$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 9c7fb9b05c..f95117a47a 100644
--- a/lib/common/mobile/android/logcat-helper.ts
+++ b/lib/common/mobile/android/logcat-helper.ts
@@ -39,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());
 					}
@@ -76,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/mobile-core/android-process-service.ts b/lib/common/mobile/mobile-core/android-process-service.ts
index ee6b4e5c88..f8a8f3397e 100644
--- a/lib/common/mobile/mobile-core/android-process-service.ts
+++ b/lib/common/mobile/mobile-core/android-process-service.ts
@@ -8,8 +8,10 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 	private _forwardedLocalPorts: IDictionary<number>;
 
 	constructor(private $errors: IErrors,
+		private $cleanupService: ICleanupService,
 		private $injector: IInjector,
-		private $net: INet) {
+		private $net: INet,
+		private $staticConfig: IStaticConfig) {
 		this._devicesAdbs = {};
 		this._forwardedLocalPorts = {};
 	}
@@ -120,8 +122,7 @@ export class AndroidProcessService implements Mobile.IAndroidProcessService {
 		}
 
 		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}`] });
+		await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", portForwardInputData.deviceIdentifier, "forward", "--remove", `tcp:${localPort}`] });
 		return localPort && +localPort;
 	}
 
diff --git a/lib/common/mobile/mobile-core/devices-service.ts b/lib/common/mobile/mobile-core/devices-service.ts
index d71df7cd0a..41190f2fae 100644
--- a/lib/common/mobile/mobile-core/devices-service.ts
+++ b/lib/common/mobile/mobile-core/devices-service.ts
@@ -616,7 +616,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..8b3283e773 100644
--- a/lib/common/services/commands-service.ts
+++ b/lib/common/services/commands-service.ts
@@ -27,16 +27,8 @@ export class CommandsService implements ICommandsService {
 		private $staticConfig: Config.IStaticConfig,
 		private $helpService: IHelpService,
 		private $extensibilityService: IExtensibilityService,
-		private $optionsTracker: IOptionsTracker,
-		private $projectDataService: IProjectDataService) {
-			let projectData = null;
-			try {
-				projectData = this.$projectDataService.getProjectData();
-			} catch (err) {
-				this.$logger.trace(`Error while trying to get project data. More info: ${err}`);
-			}
-
-			this.$options.setupOptions(projectData);
+		private $optionsTracker: IOptionsTracker) {
+			this.$options.setupOptions();
 	}
 
 	public allCommands(opts: { includeDevCommands: boolean }): string[] {
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 561a7b1114..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;
 	}
 }
 
@@ -207,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 () => {
@@ -220,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 () => {
@@ -229,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/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/stubs.ts b/lib/common/test/unit-tests/stubs.ts
index ba0609a2b8..075dcb4806 100644
--- a/lib/common/test/unit-tests/stubs.ts
+++ b/lib/common/test/unit-tests/stubs.ts
@@ -2,6 +2,7 @@
 
 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> {
@@ -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/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 65280f1197..83aa5e3fbb 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";
@@ -288,3 +291,92 @@ export const RunOnDeviceEvents = {
 	runOnDeviceStarted: "runOnDeviceStarted",
 	runOnDeviceNotification: "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/controllers/build-controller.ts b/lib/controllers/build-controller.ts
index a0acfd296c..1818f6e564 100644
--- a/lib/controllers/build-controller.ts
+++ b/lib/controllers/build-controller.ts
@@ -29,7 +29,7 @@ export class BuildController extends EventEmitter implements IBuildController {
 	}
 
 	public async build(buildData: IBuildData): Promise<string> {
-		this.$logger.out("Building project...");
+		this.$logger.info("Building project...");
 
 		const platform = buildData.platform.toLowerCase();
 		const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
@@ -52,20 +52,20 @@ export class BuildController extends EventEmitter implements IBuildController {
 
 		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, buildData));
 
 		const buildInfoFileDir = platformData.getBuildOutputPath(buildData);
-		this.$buildInfoFileService.saveBuildInfoFile(platformData, buildInfoFileDir);
+		this.$buildInfoFileService.saveLocalBuildInfo(platformData, buildInfoFileDir);
 
-		this.$logger.out("Project successfully built.");
+		this.$logger.info("Project successfully built.");
 
-		const result = await this.$buildArtefactsService.getLatestApplicationPackagePath(platformData, buildData);
+		const result = await this.$buildArtefactsService.getLatestAppPackagePath(platformData, buildData);
 
 		if (buildData.copyTo) {
-			this.$buildArtefactsService.copyLastOutput(buildData.copyTo, platformData, buildData);
+			this.$buildArtefactsService.copyLatestAppPackage(buildData.copyTo, platformData, buildData);
 			this.$logger.info(`The build result is located at: ${buildInfoFileDir}`);
 		}
 
@@ -102,13 +102,13 @@ export class BuildController extends EventEmitter implements IBuildController {
 		}
 
 		const validBuildOutputData = platformData.getValidBuildOutputData(buildData);
-		const packages = this.$buildArtefactsService.getAllApplicationPackages(outputPath, validBuildOutputData);
+		const packages = this.$buildArtefactsService.getAllAppPackages(outputPath, validBuildOutputData);
 		if (packages.length === 0) {
 			return true;
 		}
 
 		const prepareInfo = this.$projectChangesService.getPrepareInfo(platformData);
-		const buildInfo = this.$buildInfoFileService.getBuildInfoFromFile(platformData, buildData);
+		const buildInfo = this.$buildInfoFileService.getLocalBuildInfo(platformData, buildData);
 		if (!prepareInfo || !buildInfo) {
 			return true;
 		}
diff --git a/lib/services/device/device-debug-app-service.ts b/lib/controllers/debug-controller.ts
similarity index 67%
rename from lib/services/device/device-debug-app-service.ts
rename to lib/controllers/debug-controller.ts
index 2b1f767f14..3e7c23c91a 100644
--- a/lib/services/device/device-debug-app-service.ts
+++ b/lib/controllers/debug-controller.ts
@@ -1,17 +1,50 @@
-import { performanceLog } from "../../common/decorators";
-import { RunEmitter } from "../../emitters/run-emitter";
+import { performanceLog } from "../common/decorators";
 import { EOL } from "os";
+import { RunController } from "./run-controller";
+
+export class DebugController extends RunController implements IDebugController {
 
-export class DeviceDebugAppService {
 	constructor(
+		$analyticsService: IAnalyticsService,
+		$buildDataService: IBuildDataService,
+		$buildController: IBuildController,
 		private $debugDataService: IDebugDataService,
 		private $debugService: IDebugService,
-		private $devicesService: Mobile.IDevicesService,
-		private $errors: IErrors,
-		private $logger: ILogger,
-		private $projectDataService: IProjectDataService,
-		private $runEmitter: RunEmitter
-	) { }
+		$deviceInstallAppService: IDeviceInstallAppService,
+		$devicesService: Mobile.IDevicesService,
+		$errors: IErrors,
+		$hmrStatusService: IHmrStatusService,
+		$hooksService: IHooksService,
+		$liveSyncServiceResolver: ILiveSyncServiceResolver,
+		$logger: ILogger,
+		$platformsDataService: IPlatformsDataService,
+		$pluginsService: IPluginsService,
+		$prepareController: IPrepareController,
+		$prepareDataService: IPrepareDataService,
+		$prepareNativePlatformService: IPrepareNativePlatformService,
+		$projectDataService: IProjectDataService,
+		$runEmitter: IRunEmitter
+	) {
+		super(
+			$analyticsService,
+			$buildDataService,
+			$buildController,
+			$deviceInstallAppService,
+			$devicesService,
+			$errors,
+			$hmrStatusService,
+			$hooksService,
+			$liveSyncServiceResolver,
+			$logger,
+			$platformsDataService,
+			$pluginsService,
+			$prepareController,
+			$prepareDataService,
+			$prepareNativePlatformService,
+			$projectDataService,
+			$runEmitter
+		);
+	}
 
 	@performanceLog()
 	public async enableDebugging(projectData: IProjectData, deviceDescriptor: ILiveSyncDeviceInfo, refreshInfo: IRestartApplicationInfo): Promise<IDebugInformation> {
@@ -64,6 +97,17 @@ export class DeviceDebugAppService {
 		return debugInformation;
 	}
 
+	// IMPORTANT: This method overrides the refresh logic of runController as enables debugging for provided deviceDescriptor
+	public async refreshApplication(projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, deviceDescriptor: ILiveSyncDeviceInfo): Promise<IRestartApplicationInfo> {
+		liveSyncResultInfo.waitForDebugger = deviceDescriptor.debugOptions && deviceDescriptor.debugOptions.debugBrk;
+
+		const refreshInfo = await super.refreshApplication(projectData, liveSyncResultInfo, deviceDescriptor);
+
+		await this.enableDebugging(projectData, deviceDescriptor, refreshInfo);
+
+		return refreshInfo;
+	}
+
 	@performanceLog()
 	private async enableDebuggingCoreWithoutWaitingCurrentAction(deviceOption: IEnableDebuggingDeviceOptions, deviceDescriptor: ILiveSyncDeviceInfo, debuggingAdditionalOptions: IDebuggingAdditionalOptions): Promise<IDebugInformation> {
 		if (!deviceDescriptor) {
@@ -99,4 +143,4 @@ export class DeviceDebugAppService {
 		return debugInformation;
 	}
 }
-$injector.register("deviceDebugAppService", DeviceDebugAppService);
+$injector.register("debugController", DebugController);
diff --git a/lib/controllers/platform-controller.ts b/lib/controllers/platform-controller.ts
index fb7142d109..b8dbb690c6 100644
--- a/lib/controllers/platform-controller.ts
+++ b/lib/controllers/platform-controller.ts
@@ -23,14 +23,14 @@ export class PlatformController implements IPlatformController {
 		this.$logger.trace(`Package: ${projectData.projectIdentifiers[platform]}`);
 		this.$logger.trace(`Name: ${projectData.projectName}`);
 
-		this.$logger.out("Copying template files...");
+		this.$logger.info("Copying template files...");
 
 		const packageToInstall = await this.getPackageToInstall(platformData, projectData, addPlatformData.frameworkPath, version);
 
 		const installedPlatformVersion = await this.$addPlatformService.addPlatformSafe(projectData, platformData, packageToInstall, addPlatformData.nativePrepare);
 
 		this.$fs.ensureDirectoryExists(path.join(projectData.platformsDir, platform));
-		this.$logger.out(`Platform ${platform} successfully added. v${installedPlatformVersion}`);
+		this.$logger.info(`Platform ${platform} successfully added. v${installedPlatformVersion}`);
 	}
 
 	public async addPlatformIfNeeded(addPlatformData: IAddPlatformData): Promise<void> {
diff --git a/lib/controllers/prepare-controller.ts b/lib/controllers/prepare-controller.ts
index aea42ebccb..095ac6c622 100644
--- a/lib/controllers/prepare-controller.ts
+++ b/lib/controllers/prepare-controller.ts
@@ -32,7 +32,7 @@ export class PrepareController extends EventEmitter {
 	public async prepare(prepareData: IPrepareData): Promise<IPrepareResultData> {
 		await this.$platformController.addPlatformIfNeeded(prepareData);
 
-		this.$logger.out("Preparing project...");
+		this.$logger.info("Preparing project...");
 		let result = null;
 
 		const projectData = this.$projectDataService.getProjectData(prepareData.projectDir);
@@ -47,7 +47,7 @@ export class PrepareController extends EventEmitter {
 
 		this.$projectChangesService.savePrepareInfo(platformData);
 
-		this.$logger.out(`Project successfully prepared (${prepareData.platform.toLowerCase()})`);
+		this.$logger.info(`Project successfully prepared (${prepareData.platform.toLowerCase()})`);
 
 		return result;
 	}
diff --git a/lib/controllers/run-controller.ts b/lib/controllers/run-controller.ts
index 686183f846..ae88eea96d 100644
--- a/lib/controllers/run-controller.ts
+++ b/lib/controllers/run-controller.ts
@@ -1,33 +1,29 @@
-import { EventEmitter } from "events";
-import { LiveSyncServiceResolver } from "../resolvers/livesync-service-resolver";
 import { HmrConstants, DeviceDiscoveryEventNames } from "../common/constants";
 import { PREPARE_READY_EVENT_NAME, TrackActionNames } from "../constants";
-import { cache } from "../common/decorators";
+import { cache, performanceLog } from "../common/decorators";
 
-export class RunController extends EventEmitter {
+export class RunController implements IRunController {
 	private processesInfo: IDictionary<IRunOnDeviceProcessInfo> = {};
 
 	constructor(
 		private $analyticsService: IAnalyticsService,
 		private $buildDataService: IBuildDataService,
 		private $buildController: IBuildController,
-		private $deviceDebugAppService: IDeviceDebugAppService,
 		private $deviceInstallAppService: IDeviceInstallAppService,
-		private $deviceRefreshAppService: IDeviceRefreshAppService,
-		private $devicesService: Mobile.IDevicesService,
-		private $errors: IErrors,
+		protected $devicesService: Mobile.IDevicesService,
+		protected $errors: IErrors,
 		private $hmrStatusService: IHmrStatusService,
 		public $hooksService: IHooksService,
-		private $liveSyncServiceResolver: LiveSyncServiceResolver,
-		private $logger: ILogger,
+		private $liveSyncServiceResolver: ILiveSyncServiceResolver,
+		protected $logger: ILogger,
 		private $platformsDataService: IPlatformsDataService,
 		private $pluginsService: IPluginsService,
 		private $prepareController: IPrepareController,
 		private $prepareDataService: IPrepareDataService,
 		private $prepareNativePlatformService: IPrepareNativePlatformService,
-		private $projectDataService: IProjectDataService,
-		private $runEmitter: IRunEmitter
-	) { super(); }
+		protected $projectDataService: IProjectDataService,
+		protected $runEmitter: IRunEmitter
+	) { }
 
 	public async run(runData: IRunData): Promise<void> {
 		const { projectDir, liveSyncInfo, deviceDescriptors } = runData;
@@ -115,6 +111,40 @@ export class RunController extends EventEmitter {
 		return currentDescriptors || [];
 	}
 
+	@performanceLog()
+	protected async refreshApplication(projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, deviceDescriptor: ILiveSyncDeviceInfo, settings?: IRefreshApplicationSettings): Promise<IRestartApplicationInfo> {
+		const result = { didRestart: false };
+		const platform = liveSyncResultInfo.deviceAppData.platform;
+		const applicationIdentifier = projectData.projectIdentifiers[platform.toLowerCase()];
+		const platformLiveSyncService = this.$liveSyncServiceResolver.resolveLiveSyncService(platform);
+
+		try {
+			let shouldRestart = await platformLiveSyncService.shouldRestart(projectData, liveSyncResultInfo);
+			if (!shouldRestart) {
+				shouldRestart = !await platformLiveSyncService.tryRefreshApplication(projectData, liveSyncResultInfo);
+			}
+
+			if (shouldRestart) {
+				this.$runEmitter.emitDebuggerDetachedEvent(liveSyncResultInfo.deviceAppData.device);
+				await platformLiveSyncService.restartApplication(projectData, liveSyncResultInfo);
+				result.didRestart = true;
+			}
+		} catch (err) {
+			this.$logger.info(`Error while trying to start application ${applicationIdentifier} on device ${liveSyncResultInfo.deviceAppData.device.deviceInfo.identifier}. Error is: ${err.message || err}`);
+			const msg = `Unable to start application ${applicationIdentifier} on device ${liveSyncResultInfo.deviceAppData.device.deviceInfo.identifier}. Try starting it manually.`;
+			this.$logger.warn(msg);
+			if (!settings || !settings.shouldSkipEmitLiveSyncNotification) {
+				this.$runEmitter.emitRunNotificationEvent(projectData, liveSyncResultInfo.deviceAppData.device, msg);
+			}
+
+			if (settings && settings.shouldCheckDeveloperDiscImage && (err.message || err) === "Could not find developer disk image") {
+				this.$runEmitter.emitUserInteractionNeededEvent(projectData, liveSyncResultInfo.deviceAppData.device, deviceDescriptor);
+			}
+		}
+
+		return result;
+	}
+
 	private getDeviceDescriptorsForInitialSync(projectDir: string, deviceDescriptors: ILiveSyncDeviceInfo[]) {
 		const currentRunData = this.processesInfo[projectDir];
 		const isAlreadyLiveSyncing = currentRunData && !currentRunData.isStopped;
@@ -178,17 +208,13 @@ export class RunController extends EventEmitter {
 				const { force, useHotModuleReload, skipWatcher } = liveSyncInfo;
 				const liveSyncResultInfo = await platformLiveSyncService.fullSync({ force, useHotModuleReload, projectData, device, watch: !skipWatcher, liveSyncDeviceInfo: deviceDescriptor });
 
-				const refreshInfo = await this.$deviceRefreshAppService.refreshApplication(projectData, liveSyncResultInfo, deviceDescriptor);
+				await this.refreshApplication(projectData, liveSyncResultInfo, deviceDescriptor);
 
 				this.$runEmitter.emitRunExecutedEvent(projectData, device, {
 					syncedFiles: liveSyncResultInfo.modifiedFilesData.map(m => m.getLocalPath()),
 					isFullSync: liveSyncResultInfo.isFullSync
 				});
 
-				if (liveSyncResultInfo && deviceDescriptor.debuggingEnabled) {
-					await this.$deviceDebugAppService.enableDebugging(projectData, deviceDescriptor, refreshInfo);
-				}
-
 				this.$logger.info(`Successfully synced application ${liveSyncResultInfo.deviceAppData.appIdentifier} on device ${liveSyncResultInfo.deviceAppData.device.deviceInfo.identifier}.`);
 
 				this.$runEmitter.emitRunStartedEvent(projectData, device);
@@ -236,6 +262,11 @@ export class RunController extends EventEmitter {
 
 				await this.refreshApplication(projectData, liveSyncResultInfo, deviceDescriptor);
 
+				this.$runEmitter.emitRunExecutedEvent(projectData, liveSyncResultInfo.deviceAppData.device, {
+					syncedFiles: liveSyncResultInfo.modifiedFilesData.map(m => m.getLocalPath()),
+					isFullSync: liveSyncResultInfo.isFullSync
+				});
+
 				if (!liveSyncResultInfo.didRecover && isInHMRMode) {
 					const status = await this.$hmrStatusService.getHmrStatus(device.deviceInfo.identifier, data.hmrData.hash);
 					if (status === HmrConstants.HMR_ERROR_STATUS) {
@@ -244,6 +275,11 @@ export class RunController extends EventEmitter {
 						// We want to force a restart of the application.
 						liveSyncResultInfo.isFullSync = true;
 						await this.refreshApplication(projectData, liveSyncResultInfo, deviceDescriptor);
+
+						this.$runEmitter.emitRunExecutedEvent(projectData, liveSyncResultInfo.deviceAppData.device, {
+							syncedFiles: liveSyncResultInfo.modifiedFilesData.map(m => m.getLocalPath()),
+							isFullSync: liveSyncResultInfo.isFullSync
+						});
 					}
 				}
 
@@ -266,19 +302,6 @@ export class RunController extends EventEmitter {
 		}));
 	}
 
-	private async refreshApplication(projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, deviceDescriptor: ILiveSyncDeviceInfo) {
-		const refreshInfo = await this.$deviceRefreshAppService.refreshApplication(projectData, liveSyncResultInfo, deviceDescriptor);
-
-		this.$runEmitter.emitRunExecutedEvent(projectData, liveSyncResultInfo.deviceAppData.device, {
-			syncedFiles: liveSyncResultInfo.modifiedFilesData.map(m => m.getLocalPath()),
-			isFullSync: liveSyncResultInfo.isFullSync
-		});
-
-		if (liveSyncResultInfo && deviceDescriptor.debuggingEnabled) {
-			await this.$deviceDebugAppService.enableDebugging(projectData, deviceDescriptor, refreshInfo);
-		}
-	}
-
 	private async addActionToChain<T>(projectDir: string, action: () => Promise<T>): Promise<T> {
 		const liveSyncInfo = this.processesInfo[projectDir];
 		if (liveSyncInfo) {
diff --git a/lib/data/build-data.ts b/lib/data/build-data.ts
index 9ab809739b..dfc736afab 100644
--- a/lib/data/build-data.ts
+++ b/lib/data/build-data.ts
@@ -54,6 +54,6 @@ export class AndroidBuildData extends BuildData {
 		this.keyStorePath = data.keyStorePath;
 		this.keyStoreAliasPassword = data.keyStoreAliasPassword;
 		this.keyStorePassword = data.keyStorePassword;
-		this.androidBundle = data.androidBundle;
+		this.androidBundle = data.androidBundle || data.aab;
 	}
 }
diff --git a/lib/declarations.d.ts b/lib/declarations.d.ts
index 604cac288a..1372cda3ff 100644
--- a/lib/declarations.d.ts
+++ b/lib/declarations.d.ts
@@ -480,6 +480,8 @@ interface IPort {
 interface IPluginSeedOptions {
 	username: string;
 	pluginName: string;
+	includeTypeScriptDemo: string;
+	includeAngularDemo: string;
 }
 
 interface IAndroidBundleOptions {
@@ -515,7 +517,6 @@ interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvai
 	file: string;
 	analyticsClient: string;
 	force: boolean;
-	companion: boolean;
 	sdk: string;
 	template: string;
 	certificate: string;
@@ -555,8 +556,8 @@ interface IOptions extends IRelease, IDeviceIdentifier, IJustLaunch, IAvd, IAvai
 	link: boolean;
 	analyticsLogFile: string;
 	performance: Object;
-	setupOptions(projectData: IProjectData): void;
 	cleanupLogFile: string;
+	setupOptions(): void;
 }
 
 interface IEnvOptions {
@@ -585,7 +586,7 @@ interface IUpdatePlatformOptions {
 	canUpdate: boolean;
 }
 
-interface IInitService {
+interface IProjectInitService {
 	initialize(): Promise<void>;
 }
 
@@ -608,6 +609,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}
@@ -625,12 +631,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[]>;
 }
 
 /**
@@ -877,12 +877,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.
@@ -911,7 +910,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/build.d.ts b/lib/definitions/build.d.ts
index fffc6fa53e..0733fbed91 100644
--- a/lib/definitions/build.d.ts
+++ b/lib/definitions/build.d.ts
@@ -36,12 +36,14 @@ interface IBuildDataService {
 }
 
 interface IBuildArtefactsService {
-	getLatestApplicationPackagePath(platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): Promise<string>;
-	getAllApplicationPackages(buildOutputPath: string, validBuildOutputData: IValidBuildOutputData): IApplicationPackage[];
-	copyLastOutput(targetPath: string, platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): void;
+	getAllAppPackages(buildOutputPath: string, validBuildOutputData: IValidBuildOutputData): IApplicationPackage[];
+	getLatestAppPackagePath(platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): Promise<string>;
+	copyLatestAppPackage(targetPath: string, platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): void;
 }
 
 interface IBuildInfoFileService {
-	saveBuildInfoFile(platformData: IPlatformData, buildInfoFileDirname: string): void;
-	getBuildInfoFromFile(platformData: IPlatformData, buildData: IBuildData): IBuildInfo;
+	getLocalBuildInfo(platformData: IPlatformData, buildData: IBuildData): IBuildInfo;
+	getDeviceBuildInfo(device: Mobile.IDevice, projectData: IProjectData): Promise<IBuildInfo>;
+	saveLocalBuildInfo(platformData: IPlatformData, buildInfoFileDirname: string): void;
+	saveDeviceBuildInfo(device: Mobile.IDevice, projectData: IProjectData, outputFilePath: string): Promise<void>;
 }
\ No newline at end of file
diff --git a/lib/definitions/cleanup-service.d.ts b/lib/definitions/cleanup-service.d.ts
index 59e56a350f..abec414790 100644
--- a/lib/definitions/cleanup-service.d.ts
+++ b/lib/definitions/cleanup-service.d.ts
@@ -40,4 +40,20 @@ interface ICleanupService extends IShouldDispose, IDisposable {
 	 * @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/debug.d.ts b/lib/definitions/debug.d.ts
index 469ddacd9e..2cf4700bc8 100644
--- a/lib/definitions/debug.d.ts
+++ b/lib/definitions/debug.d.ts
@@ -107,7 +107,7 @@ interface IDebugDataService {
 	 * @param {IOptions} options The options based on which debugData will be created
 	 * @returns {IDebugData} Data describing the required information for starting debug process.
 	 */
-	createDebugData(projectData: IProjectData, options: IDeviceIdentifier): IDebugData;
+	 createDebugData(projectData: IProjectData, options: IDeviceIdentifier): IDebugData;
 }
 
 /**
@@ -154,3 +154,10 @@ interface IDeviceDebugService extends IPlatform, NodeJS.EventEmitter {
 interface IDebugResultInfo {
 	debugUrl: string;
 }
+
+interface IDebugController extends IRunController {
+	// TODO: add disableDebugging method
+	enableDebugging(projectData: IProjectData, deviceDescriptor: ILiveSyncDeviceInfo, refreshInfo: IRestartApplicationInfo): Promise<IDebugInformation>;
+	attachDebugger(settings: IAttachDebuggerOptions): Promise<IDebugInformation>;
+	printDebugInformation(debugInformation: IDebugInformation, fireDebuggerAttachedEvent?: boolean): IDebugInformation;
+}
diff --git a/lib/definitions/deploy.d.ts b/lib/definitions/deploy.d.ts
index e69de29bb2..9dc839421a 100644
--- a/lib/definitions/deploy.d.ts
+++ b/lib/definitions/deploy.d.ts
@@ -0,0 +1,3 @@
+interface IDeployController {
+	deploy(data: IRunData): Promise<void>;
+}
\ No newline at end of file
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/livesync.d.ts b/lib/definitions/livesync.d.ts
index 38ca7a93ba..d55b1a88c7 100644
--- a/lib/definitions/livesync.d.ts
+++ b/lib/definitions/livesync.d.ts
@@ -468,6 +468,7 @@ declare global {
 		 * @returns {Promise<void>}
 		 */
 		executeLiveSyncOperation(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<void>;
+		executeLiveSyncOperationWithDebug(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<void>;
 		getPlatformsForOperation(platform: string): string[];
 
 		/**
@@ -486,4 +487,7 @@ declare global {
 		executeCommandLiveSync(platform?: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<void>;
 	}
 
+	interface ILiveSyncServiceResolver {
+		resolveLiveSyncService(platform: string): IPlatformLiveSyncService;
+	}
 }
\ No newline at end of file
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
index e19e5fb7d8..4e6008991a 100644
--- a/lib/definitions/project.d.ts
+++ b/lib/definitions/project.d.ts
@@ -455,17 +455,40 @@ 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;
+	hasWatchApp(platformData: IPlatformData, projectData: IProjectData): boolean;
+}
+
+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/run.d.ts b/lib/definitions/run.d.ts
index 5ef09b0ab1..b2014cf661 100644
--- a/lib/definitions/run.d.ts
+++ b/lib/definitions/run.d.ts
@@ -5,7 +5,9 @@ interface IRunData {
 }
 
 interface IRunController {
-
+	run(runData: IRunData): Promise<void>;
+	stop(projectDir: string, deviceIdentifiers?: string[], stopOptions?: { shouldAwaitAllActions: boolean }): Promise<void>;
+	getDeviceDescriptors(projectDir: string): ILiveSyncDeviceInfo[];
 }
 
 interface IRunEmitter {
@@ -22,16 +24,5 @@ interface IRunEmitter {
 interface IDeviceInstallAppService {
 	installOnDevice(device: Mobile.IDevice, buildData: IBuildData, packageFile?: string): Promise<void>;
 	installOnDeviceIfNeeded(device: Mobile.IDevice, buildData: IBuildData, packageFile?: string): Promise<void>;
-	getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string>;
 	shouldInstall(device: Mobile.IDevice, buildData: IBuildData): Promise<boolean>;
 }
-
-interface IDeviceRefreshAppService {
-	refreshApplication(projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, deviceDescriptor: ILiveSyncDeviceInfo, settings?: IRefreshApplicationSettings): Promise<IRestartApplicationInfo>;
-}
-
-interface IDeviceDebugAppService {
-	enableDebugging(projectData: IProjectData, deviceDescriptor: ILiveSyncDeviceInfo, refreshInfo: IRestartApplicationInfo): Promise<IDebugInformation>;
-	attachDebugger(settings: IAttachDebuggerOptions): Promise<IDebugInformation>;
-	printDebugInformation(debugInformation: IDebugInformation, fireDebuggerAttachedEvent: boolean): IDebugInformation;
-}
\ No newline at end of file
diff --git a/lib/definitions/xcode.d.ts b/lib/definitions/xcode.d.ts
index 7bcf86ca6e..861f14b309 100644
--- a/lib/definitions/xcode.d.ts
+++ b/lib/definitions/xcode.d.ts
@@ -17,7 +17,7 @@ declare module "nativescript-dev-xcode" {
 
 		addFramework(filepath: string, options?: Options): void;
 		removeFramework(filePath: string, options?: Options): void;
-		
+	
 		addPbxGroup(filePathsArray: any[], name: string, path: string, sourceTree: string): void;
 		
 		removePbxGroup(groupName: string, path: string): void;
@@ -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,
@@ -46,7 +46,8 @@ declare module "nativescript-dev-xcode" {
 		): group;
 		addBuildProperty(prop: string, value: any, build_name?: string, productName?: string): void;
 		addToHeaderSearchPaths(file: string|Object, productName?: string): void;
-		removeTargetsByProductType(targetType: 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
index 72ed39579a..24eab593a4 100644
--- a/lib/detached-processes/cleanup-process-definitions.d.ts
+++ b/lib/detached-processes/cleanup-process-definitions.d.ts
@@ -1,4 +1,18 @@
-interface ISpawnCommandInfo {
+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.
 	 */
@@ -8,11 +22,6 @@ interface ISpawnCommandInfo {
 	 * Arguments that will be passed to the child process
 	 */
 	args: string[];
-
-	/**
-	 * Timeout to execute the action.
-	 */
-	timeout?: number;
 }
 
 interface ICleanupMessageBase {
@@ -29,9 +38,12 @@ interface ISpawnCommandCleanupMessage extends ICleanupMessageBase {
 	commandInfo: ISpawnCommandInfo;
 }
 
-interface IDeleteFileCleanupMessage extends ICleanupMessageBase {
-	/**
-	 * Path to file/directory to be deleted.
-	 */
-	filePath: string;
+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
index 705c266c6f..a6bd0c7975 100644
--- a/lib/detached-processes/cleanup-process.ts
+++ b/lib/detached-processes/cleanup-process.ts
@@ -19,9 +19,29 @@ 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)}` });
@@ -29,13 +49,17 @@ const executeCleanup = async () => {
 			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)}`, type: FileLogMessageType.Error });
+			fileLogService.logData({ message: `Unable to execute command: ${JSON.stringify(commandInfo)}. Error is: ${err}.`, type: FileLogMessageType.Error });
 		}
 	}
 
 	if (filesToDelete.length) {
-		fileLogService.logData({ message: `Deleting files ${filesToDelete.join(" ")}` });
-		shelljs.rm("-Rf", filesToDelete);
+		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` });
@@ -56,7 +80,7 @@ const removeCleanupAction = (commandInfo: ISpawnCommandInfo): void => {
 		_.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 note been added before: ${JSON.stringify(commandInfo)}` });
+		fileLogService.logData({ message: `cleanup-process cannot remove command for execution as it has not been added before: ${JSON.stringify(commandInfo)}` });
 	}
 };
 
@@ -82,6 +106,32 @@ const removeDeleteAction = (filePath: string): void => {
 	}
 };
 
+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)}` });
 
@@ -93,10 +143,18 @@ process.on("message", async (cleanupProcessMessage: ICleanupMessageBase) => {
 			removeCleanupAction((<ISpawnCommandCleanupMessage>cleanupProcessMessage).commandInfo);
 			break;
 		case CleanupProcessMessage.AddDeleteFileAction:
-			addDeleteAction((<IDeleteFileCleanupMessage>cleanupProcessMessage).filePath);
+			addDeleteAction((<IFileCleanupMessage>cleanupProcessMessage).filePath);
 			break;
 		case CleanupProcessMessage.RemoveDeleteFileAction:
-			removeDeleteAction((<IDeleteFileCleanupMessage>cleanupProcessMessage).filePath);
+			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 });
@@ -108,6 +166,8 @@ process.on("message", async (cleanupProcessMessage: ICleanupMessageBase) => {
 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` });
diff --git a/lib/detached-processes/detached-process-enums.d.ts b/lib/detached-processes/detached-process-enums.d.ts
index 1e3a16f5d6..c8e27edede 100644
--- a/lib/detached-processes/detached-process-enums.d.ts
+++ b/lib/detached-processes/detached-process-enums.d.ts
@@ -40,8 +40,17 @@ declare const enum CleanupProcessMessage {
 	AddDeleteFileAction = "AddDeleteFileAction",
 
 	/**
-	 * This type of message defines the cleanup procedure should not delete previously specified file.
+	 * 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/helpers/bundle-validator-helper.ts b/lib/helpers/bundle-validator-helper.ts
index 241ac84598..657208e038 100644
--- a/lib/helpers/bundle-validator-helper.ts
+++ b/lib/helpers/bundle-validator-helper.ts
@@ -7,27 +7,33 @@ 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 {
-		const bundlePluginName = this.bundlersMap["webpack"];
-		const bundlerVersionInDependencies = this.$projectData.dependencies && this.$projectData.dependencies[bundlePluginName];
-		const bundlerVersionInDevDependencies = this.$projectData.devDependencies && this.$projectData.devDependencies[bundlePluginName];
-		if (!bundlePluginName || (!bundlerVersionInDependencies && !bundlerVersionInDevDependencies)) {
+	public validate(projectData: IProjectData, minSupportedVersion?: string): void {
+		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 9c6a1dc7fd..2413dd749c 100644
--- a/lib/helpers/livesync-command-helper.ts
+++ b/lib/helpers/livesync-command-helper.ts
@@ -1,30 +1,28 @@
-import { RunController } from "../controllers/run-controller";
-import { BuildController } from "../controllers/build-controller";
-import { BuildDataService } from "../services/build-data-service";
-import { DeployController } from "../controllers/deploy-controller";
 import { RunOnDeviceEvents } from "../constants";
 import { RunEmitter } from "../emitters/run-emitter";
+import { DeployController } from "../controllers/deploy-controller";
 
 export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 	public static MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR = "0.17.0";
 
 	constructor(
-		private $buildDataService: BuildDataService,
+		private $buildDataService: IBuildDataService,
 		private $projectData: IProjectData,
 		private $options: IOptions,
-		private $runController: RunController,
 		private $runEmitter: RunEmitter,
 		private $deployController: DeployController,
 		private $iosDeviceOperations: IIOSDeviceOperations,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $devicesService: Mobile.IDevicesService,
 		private $injector: IInjector,
-		private $buildController: BuildController,
+		private $buildController: IBuildController,
 		private $analyticsService: IAnalyticsService,
 		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $errors: IErrors,
 		private $iOSSimulatorLogProvider: Mobile.IiOSSimulatorLogProvider,
-		private $cleanupService: ICleanupService
+		private $cleanupService: ICleanupService,
+		private $debugController: IDebugController,
+		private $runController: IRunController
 	) { }
 
 	private get $platformsDataService(): IPlatformsDataService {
@@ -63,26 +61,6 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 	}
 
 	public async createDeviceDescriptors(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<ILiveSyncDeviceInfo[]> {
-		if (!devices || !devices.length) {
-			if (platform) {
-				this.$errors.failWithoutHelp("Unable to find applicable devices to execute operation. Ensure connected devices are trusted and try again.");
-			} else {
-				this.$errors.failWithoutHelp("Unable to find applicable devices to execute operation and unable to start emulator when platform is not specified.");
-			}
-		}
-
-		const workingWithiOSDevices = !platform || this.$mobileHelper.isiOSPlatform(platform);
-		const shouldKeepProcessAlive = this.$options.watch || !this.$options.justlaunch;
-		if (shouldKeepProcessAlive) {
-			this.$analyticsService.setShouldDispose(false);
-			this.$cleanupService.setShouldDispose(false);
-
-			if (workingWithiOSDevices) {
-				this.$iosDeviceOperations.setShouldDispose(false);
-				this.$iOSSimulatorLogProvider.setShouldDispose(false);
-			}
-		}
-
 		// Now let's take data for each device:
 		const deviceDescriptors: ILiveSyncDeviceInfo[] = devices
 			.map(d => {
@@ -139,42 +117,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 	}
 
 	public async executeLiveSyncOperation(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<void> {
-		const deviceDescriptors = await this.createDeviceDescriptors(devices, platform, additionalOptions);
-
-		const liveSyncInfo: ILiveSyncInfo = {
-			projectDir: this.$projectData.projectDir,
-			skipWatcher: !this.$options.watch || this.$options.justlaunch,
-			clean: this.$options.clean,
-			release: this.$options.release,
-			env: this.$options.env,
-			timeout: this.$options.timeout,
-			useHotModuleReload: this.$options.hmr,
-			force: this.$options.force,
-			emulator: this.$options.emulator
-		};
-
-		if (this.$options.release) {
-			await this.$deployController.deploy({
-				projectDir: this.$projectData.projectDir,
-				liveSyncInfo: { ...liveSyncInfo, clean: true, skipWatcher: true },
-				deviceDescriptors
-			});
-
-			await this.$devicesService.initialize({
-				platform,
-				deviceId: this.$options.device,
-				emulator: this.$options.emulator,
-				skipInferPlatform: !platform,
-				sdk: this.$options.sdk
-			});
-
-			for (const deviceDescriptor of deviceDescriptors) {
-				const device = this.$devicesService.getDeviceByIdentifier(deviceDescriptor.identifier);
-				await device.applicationManager.startApplication({ appId: this.$projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()], projectName: this.$projectData.projectName });
-			}
-
-			return;
-		}
+		const { liveSyncInfo, deviceDescriptors } = await this.executeLiveSyncOperationCore(devices, platform, additionalOptions);
 
 		await this.$runController.run({
 			projectDir: this.$projectData.projectDir,
@@ -204,10 +147,83 @@ 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;
 	}
+
+	public async executeLiveSyncOperationWithDebug(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<void> {
+		const { liveSyncInfo, deviceDescriptors } = await this.executeLiveSyncOperationCore(devices, platform, additionalOptions);
+
+		await this.$debugController.run({
+			projectDir: this.$projectData.projectDir,
+			liveSyncInfo,
+			deviceDescriptors
+		});
+
+		const remainingDevicesToSync = devices.map(d => d.deviceInfo.identifier);
+		this.$runEmitter.on(RunOnDeviceEvents.runOnDeviceStopped, (data: { projectDir: string, deviceIdentifier: string }) => {
+			_.remove(remainingDevicesToSync, d => d === data.deviceIdentifier);
+
+			if (remainingDevicesToSync.length === 0) {
+				process.exit(ErrorCodes.ALL_DEVICES_DISCONNECTED);
+			}
+		});
+	}
+
+	private async executeLiveSyncOperationCore(devices: Mobile.IDevice[], platform: string, additionalOptions?: ILiveSyncCommandHelperAdditionalOptions): Promise<{liveSyncInfo: ILiveSyncInfo, deviceDescriptors: ILiveSyncDeviceInfo[]}> {
+		if (!devices || !devices.length) {
+			if (platform) {
+				this.$errors.failWithoutHelp("Unable to find applicable devices to execute operation. Ensure connected devices are trusted and try again.");
+			} else {
+				this.$errors.failWithoutHelp("Unable to find applicable devices to execute operation and unable to start emulator when platform is not specified.");
+			}
+		}
+
+		const workingWithiOSDevices = !platform || this.$mobileHelper.isiOSPlatform(platform);
+		const shouldKeepProcessAlive = this.$options.watch || !this.$options.justlaunch;
+		if (shouldKeepProcessAlive) {
+			this.$analyticsService.setShouldDispose(false);
+			this.$cleanupService.setShouldDispose(false);
+
+			if (workingWithiOSDevices) {
+				this.$iosDeviceOperations.setShouldDispose(false);
+				this.$iOSSimulatorLogProvider.setShouldDispose(false);
+			}
+		}
+
+		// Extract this to 2 separate services -> deviceDescriptorsService, liveSyncDataService -> getLiveSyncData()
+		const deviceDescriptors = await this.createDeviceDescriptors(devices, platform, additionalOptions);
+		const liveSyncInfo = this.createLiveSyncInfo();
+
+		if (this.$options.release) {
+			await this.runInRelease(platform, deviceDescriptors, liveSyncInfo);
+			return;
+		}
+
+		return { liveSyncInfo, deviceDescriptors };
+	}
+
+	private async runInRelease(platform: string, deviceDescriptors: ILiveSyncDeviceInfo[], liveSyncInfo: ILiveSyncInfo): Promise<void> {
+		await this.$devicesService.initialize({
+			platform,
+			deviceId: this.$options.device,
+			emulator: this.$options.emulator,
+			skipInferPlatform: !platform,
+			sdk: this.$options.sdk
+		});
+
+		await this.$deployController.deploy({
+			projectDir: this.$projectData.projectDir,
+			liveSyncInfo: { ...liveSyncInfo, clean: true, skipWatcher: true },
+			deviceDescriptors
+		});
+
+		for (const deviceDescriptor of deviceDescriptors) {
+			const device = this.$devicesService.getDeviceByIdentifier(deviceDescriptor.identifier);
+			await device.applicationManager.startApplication({ appId: this.$projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()], projectName: this.$projectData.projectName });
+		}
+	}
 }
 
 $injector.register("liveSyncCommandHelper", LiveSyncCommandHelper);
diff --git a/lib/helpers/platform-command-helper.ts b/lib/helpers/platform-command-helper.ts
index 6b76864bf4..106d6034c4 100644
--- a/lib/helpers/platform-command-helper.ts
+++ b/lib/helpers/platform-command-helper.ts
@@ -68,7 +68,7 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 				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 (errorMessage) {
@@ -179,7 +179,7 @@ export class PlatformCommandHelper implements IPlatformCommandHelper {
 			projectDir: projectData.projectDir,
 			platform: packageName
 		});
-		this.$logger.out("Successfully updated to version ", updateOptions.newVersion);
+		this.$logger.info("Successfully updated to version ", updateOptions.newVersion);
 	}
 
 	private isPlatformPrepared(platform: string, projectData: IProjectData): boolean {
diff --git a/lib/nativescript-cli.ts b/lib/nativescript-cli.ts
index 431413ca28..39b6479e60 100644
--- a/lib/nativescript-cli.ts
+++ b/lib/nativescript-cli.ts
@@ -1,6 +1,5 @@
 require("./bootstrap");
 
-import { EOL } from "os";
 import * as shelljs from "shelljs";
 shelljs.config.silent = true;
 shelljs.config.fatal = true;
@@ -25,6 +24,9 @@ process.on = (event: string, listener: any): any => {
 	const err: IErrors = $injector.resolve("$errors");
 	err.printCallStack = config.DEBUG;
 
+	const $initializeService = $injector.resolve<IInitializeService>("initializeService");
+	await $initializeService.initialize();
+
 	const extensibilityService: IExtensibilityService = $injector.resolve("extensibilityService");
 	try {
 		await settlePromises<IExtensionData>(extensibilityService.loadExtensions());
@@ -32,17 +34,6 @@ process.on = (event: string, listener: any): any => {
 		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 c63e9b8909..9dd4d1fc9c 100644
--- a/lib/options.ts
+++ b/lib/options.ts
@@ -21,31 +21,23 @@ export class Options {
 
 	public options: IDictionary<IDashedOption>;
 
-	public setupOptions(projectData: IProjectData): void {
+	public setupOptions(): void {
 		if (this.argv.release && this.argv.hmr) {
 			this.$errors.failWithoutHelp("The options --release and --hmr cannot be used simultaneously.");
 		}
 
-		// HACK: temporary solution for 5.3.0 release (until the webpack only feature)
-		const parsed = require("yargs-parser")(process.argv.slice(2), { 'boolean-negation': false });
-		const noBundle = parsed && (parsed.bundle === false || parsed.bundle === 'false');
-		if (noBundle && this.argv.hmr) {
-			this.$errors.failWithoutHelp("The options --no-bundle and --hmr cannot be used simultaneously.");
-		}
-
-		if (projectData && projectData.useLegacyWorkflow === false) {
-			this.argv.bundle = this.argv.bundle !== undefined ? this.argv.bundle : "webpack";
-			this.argv.hmr = !this.argv.release;
-		}
+		this.argv.bundle = "webpack";
 
+		const parsed = require("yargs-parser")(process.argv.slice(2), { 'boolean-negation': false });
 		// --no-hmr -> hmr: false or --hmr false -> hmr: 'false'
 		const noHmr = parsed && (parsed.hmr === false || parsed.hmr === 'false');
-		if (noHmr) {
-			this.argv.hmr = false;
+		if (!noHmr) {
+			this.argv.hmr = !this.argv.release;
 		}
 
-		if (noBundle) {
-			this.argv.bundle = undefined;
+		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;
 		}
 	}
@@ -112,6 +104,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 },
@@ -133,8 +127,6 @@ export class Options {
 			justlaunch: { type: OptionType.Boolean, hasSensitiveValue: false },
 			file: { type: OptionType.String, hasSensitiveValue: true },
 			force: { type: OptionType.Boolean, alias: "f", hasSensitiveValue: false },
-			// remove legacy
-			companion: { type: OptionType.Boolean, hasSensitiveValue: false },
 			emulator: { type: OptionType.Boolean, hasSensitiveValue: false },
 			sdk: { type: OptionType.String, hasSensitiveValue: false },
 			template: { type: OptionType.String, hasSensitiveValue: true },
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/resolvers/livesync-service-resolver.ts b/lib/resolvers/livesync-service-resolver.ts
index 5d97b1d2c9..d6eebdef7d 100644
--- a/lib/resolvers/livesync-service-resolver.ts
+++ b/lib/resolvers/livesync-service-resolver.ts
@@ -1,4 +1,4 @@
-export class LiveSyncServiceResolver {
+export class LiveSyncServiceResolver implements ILiveSyncServiceResolver {
 	constructor(
 		private $errors: IErrors,
 		private $injector: IInjector,
diff --git a/lib/services/analytics/analytics-broker-process.ts b/lib/services/analytics/analytics-broker-process.ts
index 9fee55b3a5..5e7439af26 100644
--- a/lib/services/analytics/analytics-broker-process.ts
+++ b/lib/services/analytics/analytics-broker-process.ts
@@ -29,7 +29,7 @@ const finishTracking = async (data?: ITrackingInformation) => {
 	analyticsLoggingService.logData({ message: `analytics-broker-process finish tracking started` });
 	await trackingQueue;
 	analyticsLoggingService.logData({ message: `analytics-broker-process tracking finished` });
-	process.disconnect();
+	$injector.dispose();
 	process.exit();
 };
 
diff --git a/lib/services/analytics/analytics-service.ts b/lib/services/analytics/analytics-service.ts
index f160359193..a620f2c209 100644
--- a/lib/services/analytics/analytics-service.ts
+++ b/lib/services/analytics/analytics-service.ts
@@ -33,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");
diff --git a/lib/services/android-device-debug-service.ts b/lib/services/android-device-debug-service.ts
index b079862778..bb1bf5c5e1 100644
--- a/lib/services/android-device-debug-service.ts
+++ b/lib/services/android-device-debug-service.ts
@@ -13,9 +13,11 @@ export class AndroidDeviceDebugService extends DebugServiceBase implements IDevi
 
 	constructor(protected device: Mobile.IAndroidDevice,
 		protected $devicesService: Mobile.IDevicesService,
+		protected $cleanupService: ICleanupService,
 		private $errors: IErrors,
 		private $logger: ILogger,
 		private $androidProcessService: Mobile.IAndroidProcessService,
+		private $staticConfig: IStaticConfig,
 		private $net: INet,
 		private $deviceLogProvider: Mobile.IDeviceLogProvider) {
 
@@ -69,8 +71,7 @@ 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}`] });
+		await this.$cleanupService.addCleanupCommand({ command: await this.$staticConfig.getAdbFilePath(), args: ["-s", deviceId, "forward", "--remove", `tcp:${port}`] });
 
 		return port;
 	}
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/build-artefacts-service.ts b/lib/services/build-artefacts-service.ts
index 5a62f83c76..a05f083d82 100644
--- a/lib/services/build-artefacts-service.ts
+++ b/lib/services/build-artefacts-service.ts
@@ -7,7 +7,7 @@ export class BuildArtefactsService implements IBuildArtefactsService {
 		private $logger: ILogger
 	) { }
 
-	public async getLatestApplicationPackagePath(platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): Promise<string> {
+	public async getLatestAppPackagePath(platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): Promise<string> {
 		const outputPath = buildOutputOptions.outputPath || platformData.getBuildOutputPath(buildOutputOptions);
 		const applicationPackage = this.getLatestApplicationPackage(outputPath, platformData.getValidBuildOutputData(buildOutputOptions));
 		const packageFile = applicationPackage.packageName;
@@ -19,7 +19,7 @@ export class BuildArtefactsService implements IBuildArtefactsService {
 		return packageFile;
 	}
 
-	public getAllApplicationPackages(buildOutputPath: string, validBuildOutputData: IValidBuildOutputData): IApplicationPackage[] {
+	public getAllAppPackages(buildOutputPath: string, validBuildOutputData: IValidBuildOutputData): IApplicationPackage[] {
 		const rootFiles = this.$fs.readDirectory(buildOutputPath).map(filename => path.join(buildOutputPath, filename));
 		let result = this.getApplicationPackagesCore(rootFiles, validBuildOutputData.packageNames);
 		if (result) {
@@ -40,7 +40,7 @@ export class BuildArtefactsService implements IBuildArtefactsService {
 		return [];
 	}
 
-	public copyLastOutput(targetPath: string, platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): void {
+	public copyLatestAppPackage(targetPath: string, platformData: IPlatformData, buildOutputOptions: IBuildOutputOptions): void {
 		targetPath = path.resolve(targetPath);
 
 		const outputPath = buildOutputOptions.outputPath || platformData.getBuildOutputPath(buildOutputOptions);
@@ -59,7 +59,7 @@ export class BuildArtefactsService implements IBuildArtefactsService {
 	}
 
 	private getLatestApplicationPackage(buildOutputPath: string, validBuildOutputData: IValidBuildOutputData): IApplicationPackage {
-		let packages = this.getAllApplicationPackages(buildOutputPath, validBuildOutputData);
+		let packages = this.getAllAppPackages(buildOutputPath, validBuildOutputData);
 		const packageExtName = path.extname(validBuildOutputData.packageNames[0]);
 		if (packages.length === 0) {
 			this.$errors.fail(`No ${packageExtName} found in ${buildOutputPath} directory.`);
diff --git a/lib/services/build-info-file-service.ts b/lib/services/build-info-file-service.ts
index f23679b195..707caaaffe 100644
--- a/lib/services/build-info-file-service.ts
+++ b/lib/services/build-info-file-service.ts
@@ -1,26 +1,17 @@
 import * as path from "path";
+import * as helpers from "../common/helpers";
 
 const buildInfoFileName = ".nsbuildinfo";
 
 export class BuildInfoFileService implements IBuildInfoFileService {
 	constructor(
+		private $devicePathProvider: IDevicePathProvider,
 		private $fs: IFileSystem,
+		private $mobileHelper: Mobile.IMobileHelper,
 		private $projectChangesService: IProjectChangesService
 	) { }
 
-	public saveBuildInfoFile(platformData: IPlatformData, buildInfoFileDirname: string): void {
-		const buildInfoFile = path.join(buildInfoFileDirname, buildInfoFileName);
-
-		const prepareInfo = this.$projectChangesService.getPrepareInfo(platformData);
-		const buildInfo: IBuildInfo = {
-			prepareTime: prepareInfo.changesRequireBuildTime,
-			buildTime: new Date().toString()
-		};
-
-		this.$fs.writeJson(buildInfoFile, buildInfo);
-	}
-
-	public getBuildInfoFromFile(platformData: IPlatformData, buildData: IBuildData): IBuildInfo {
+	public getLocalBuildInfo(platformData: IPlatformData, buildData: IBuildData): IBuildInfo {
 		const outputPath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
 		const buildInfoFile = path.join(outputPath, buildInfoFileName);
 		if (this.$fs.exists(buildInfoFile)) {
@@ -34,5 +25,45 @@ export class BuildInfoFileService implements IBuildInfoFileService {
 
 		return null;
 	}
+
+	public async getDeviceBuildInfo(device: Mobile.IDevice, projectData: IProjectData): Promise<IBuildInfo> {
+		const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
+		try {
+			const deviceFileContent = await this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
+			return JSON.parse(deviceFileContent);
+		} catch (e) {
+			return null;
+		}
+	}
+
+	public saveLocalBuildInfo(platformData: IPlatformData, buildInfoFileDirname: string): void {
+		const buildInfoFile = path.join(buildInfoFileDirname, buildInfoFileName);
+
+		const prepareInfo = this.$projectChangesService.getPrepareInfo(platformData);
+		const buildInfo: IBuildInfo = {
+			prepareTime: prepareInfo.changesRequireBuildTime,
+			buildTime: new Date().toString()
+		};
+
+		this.$fs.writeJson(buildInfoFile, buildInfo);
+	}
+
+	public async saveDeviceBuildInfo(device: Mobile.IDevice, projectData: IProjectData, outputFilePath: string): Promise<void> {
+		const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
+		const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform];
+
+		await device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
+	}
+
+	private async getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string> {
+		const platform = device.deviceInfo.platform.toLowerCase();
+		const deviceRootPath = await this.$devicePathProvider.getDeviceProjectRootPath(device, {
+			appIdentifier: projectData.projectIdentifiers[platform],
+			getDirname: true
+		});
+		const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
+
+		return result;
+	}
 }
 $injector.register("buildInfoFileService", BuildInfoFileService);
diff --git a/lib/services/cleanup-service.ts b/lib/services/cleanup-service.ts
index 671f6afed6..953f330e25 100644
--- a/lib/services/cleanup-service.ts
+++ b/lib/services/cleanup-service.ts
@@ -27,12 +27,22 @@ export class CleanupService implements ICleanupService {
 
 	public async addCleanupDeleteAction(filePath: string): Promise<void> {
 		const cleanupProcess = await this.getCleanupProcess();
-		cleanupProcess.send(<IDeleteFileCleanupMessage>{ messageType: CleanupProcessMessage.AddDeleteFileAction, filePath });
+		cleanupProcess.send(<IFileCleanupMessage>{ messageType: CleanupProcessMessage.AddDeleteFileAction, filePath });
 	}
 
 	public async removeCleanupDeleteAction(filePath: string): Promise<void> {
 		const cleanupProcess = await this.getCleanupProcess();
-		cleanupProcess.send(<IDeleteFileCleanupMessage>{ messageType: CleanupProcessMessage.RemoveDeleteFileAction, filePath });
+		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")
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/debug-service.ts b/lib/services/debug-service.ts
index a52cecce2a..eca19315b1 100644
--- a/lib/services/debug-service.ts
+++ b/lib/services/debug-service.ts
@@ -1,4 +1,3 @@
-import { platform } from "os";
 import { parse } from "url";
 import { EventEmitter } from "events";
 import { CONNECTION_ERROR_EVENT_NAME, DebugCommandErrors } from "../constants";
@@ -11,13 +10,13 @@ export class DebugService extends EventEmitter implements IDebugService {
 	constructor(private $devicesService: Mobile.IDevicesService,
 		private $errors: IErrors,
 		private $injector: IInjector,
-		private $hostInfo: IHostInfo,
 		private $mobileHelper: Mobile.IMobileHelper,
 		private $analyticsService: IAnalyticsService) {
 		super();
 		this._platformDebugServices = {};
 	}
 
+	// TODO: Move this logic to debugController
 	@performanceLog()
 	public async debug(debugData: IDebugData, options: IDebugOptions): Promise<IDebugInformation> {
 		const device = this.$devicesService.getDeviceByIdentifier(debugData.deviceIdentifier);
@@ -47,24 +46,14 @@ export class DebugService extends EventEmitter implements IDebugService {
 			this.$errors.failWithoutHelp(`Unsupported device OS: ${device.deviceInfo.platform}. You can debug your applications only on iOS or Android.`);
 		}
 
-		// TODO: Consider to move this code to ios-device-debug-service
-		if (this.$mobileHelper.isiOSPlatform(device.deviceInfo.platform)) {
-			if (device.isEmulator && debugOptions.debugBrk) {
-				this.$errors.failWithoutHelp("To debug on iOS simulator you need to provide path to the app package.");
-			}
-
-			if (!this.$hostInfo.isWindows && !this.$hostInfo.isDarwin) {
-				this.$errors.failWithoutHelp(`Debugging on iOS devices is not supported for ${platform()} yet.`);
-			}
-		}
-
 		const debugResultInfo = await debugService.debug(debugData, debugOptions);
 
 		return this.getDebugInformation(debugResultInfo, device.deviceInfo.identifier);
 	}
 
 	public debugStop(deviceIdentifier: string): Promise<void> {
-		const debugService = this.getDeviceDebugServiceByIdentifier(deviceIdentifier);
+		const device = this.$devicesService.getDeviceByIdentifier(deviceIdentifier);
+		const debugService = this.getDeviceDebugService(device);
 		return debugService.debugStop();
 	}
 
@@ -85,11 +74,6 @@ export class DebugService extends EventEmitter implements IDebugService {
 		return this._platformDebugServices[device.deviceInfo.identifier];
 	}
 
-	private getDeviceDebugServiceByIdentifier(deviceIdentifier: string): IDeviceDebugService {
-		const device = this.$devicesService.getDeviceByIdentifier(deviceIdentifier);
-		return this.getDeviceDebugService(device);
-	}
-
 	private attachConnectionErrorHandlers(platformDebugService: IDeviceDebugService) {
 		let connectionErrorHandler = (e: Error) => this.emit(CONNECTION_ERROR_EVENT_NAME, e);
 		connectionErrorHandler = connectionErrorHandler.bind(this);
diff --git a/lib/services/device/device-install-app-service.ts b/lib/services/device/device-install-app-service.ts
index 3cd6853e9b..02fe9ecd71 100644
--- a/lib/services/device/device-install-app-service.ts
+++ b/lib/services/device/device-install-app-service.ts
@@ -1,27 +1,24 @@
 import { TrackActionNames, HASHES_FILE_NAME } from "../../constants";
-import * as helpers from "../../common/helpers";
 import * as path from "path";
 
-const buildInfoFileName = ".nsbuildinfo";
-
 export class DeviceInstallAppService {
 	constructor(
 		private $analyticsService: IAnalyticsService,
 		private $buildArtefactsService: IBuildArtefactsService,
-		private $devicePathProvider: IDevicePathProvider,
+		private $buildInfoFileService: IBuildInfoFileService,
 		private $fs: IFileSystem,
 		private $logger: ILogger,
 		private $mobileHelper: Mobile.IMobileHelper,
-		private $buildInfoFileService: IBuildInfoFileService,
 		private $projectDataService: IProjectDataService,
 		private $platformsDataService: IPlatformsDataService
 	) { }
 
 	public async installOnDevice(device: Mobile.IDevice, buildData: IBuildData, packageFile?: string): Promise<void> {
-		this.$logger.out(`Installing on device ${device.deviceInfo.identifier}...`);
+		this.$logger.info(`Installing on device ${device.deviceInfo.identifier}...`);
 
+		const platform = device.deviceInfo.platform.toLowerCase();
 		const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
-		const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
+		const platformData = this.$platformsDataService.getPlatformData(platform, projectData);
 
 		await this.$analyticsService.trackEventActionInGoogleAnalytics({
 			action: TrackActionNames.Deploy,
@@ -30,34 +27,28 @@ export class DeviceInstallAppService {
 		});
 
 		if (!packageFile) {
-			packageFile = await this.$buildArtefactsService.getLatestApplicationPackagePath(platformData, buildData);
+			packageFile = await this.$buildArtefactsService.getLatestAppPackagePath(platformData, buildData);
 		}
 
 		await platformData.platformProjectService.cleanDeviceTempFolder(device.deviceInfo.identifier, projectData);
 
-		const platform = device.deviceInfo.platform.toLowerCase();
-		await device.applicationManager.reinstallApplication(projectData.projectIdentifiers[platform], packageFile);
+		const appIdentifier = projectData.projectIdentifiers[platform];
+		const outputFilePath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
 
-		const outputFilePath = buildData.outputPath;
+		await device.applicationManager.reinstallApplication(appIdentifier, packageFile);
 
 		await this.updateHashesOnDevice({
 			device,
-			appIdentifier: projectData.projectIdentifiers[platform],
+			appIdentifier,
 			outputFilePath,
 			platformData
 		});
 
 		if (!buildData.release) {
-			const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
-			const options = buildData;
-			options.buildForDevice = !device.isEmulator;
-			const buildInfoFilePath = outputFilePath || platformData.getBuildOutputPath(buildData);
-			const appIdentifier = projectData.projectIdentifiers[platform];
-
-			await device.fileSystem.putFile(path.join(buildInfoFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
+			await this.$buildInfoFileService.saveDeviceBuildInfo(device, projectData, outputFilePath);
 		}
 
-		this.$logger.out(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
+		this.$logger.info(`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`);
 	}
 
 	public async installOnDeviceIfNeeded(device: Mobile.IDevice, buildData: IBuildData, packageFile?: string): Promise<void> {
@@ -67,15 +58,6 @@ export class DeviceInstallAppService {
 		}
 	}
 
-	public async getDeviceBuildInfoFilePath(device: Mobile.IDevice, projectData: IProjectData): Promise<string> {
-		const platform = device.deviceInfo.platform.toLowerCase();
-		const deviceRootPath = await this.$devicePathProvider.getDeviceProjectRootPath(device, {
-			appIdentifier: projectData.projectIdentifiers[platform],
-			getDirname: true
-		});
-		return helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
-	}
-
 	public async shouldInstall(device: Mobile.IDevice, buildData: IBuildData): Promise<boolean> {
 		const projectData = this.$projectDataService.getProjectData(buildData.projectDir);
 		const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
@@ -84,8 +66,8 @@ export class DeviceInstallAppService {
 			return true;
 		}
 
-		const deviceBuildInfo: IBuildInfo = await this.getDeviceBuildInfo(device, projectData);
-		const localBuildInfo = this.$buildInfoFileService.getBuildInfoFromFile(platformData, { ...buildData, buildForDevice: !device.isEmulator });
+		const deviceBuildInfo: IBuildInfo = await this.$buildInfoFileService.getDeviceBuildInfo(device, projectData);
+		const localBuildInfo = this.$buildInfoFileService.getLocalBuildInfo(platformData, { ...buildData, buildForDevice: !device.isEmulator });
 
 		return !localBuildInfo || !deviceBuildInfo || deviceBuildInfo.buildTime !== localBuildInfo.buildTime;
 	}
@@ -98,22 +80,12 @@ export class DeviceInstallAppService {
 		}
 
 		let hashes = {};
-		const hashesFilePath = path.join(outputFilePath || platformData.getBuildOutputPath(null), HASHES_FILE_NAME);
+		const hashesFilePath = path.join(outputFilePath, HASHES_FILE_NAME);
 		if (this.$fs.exists(hashesFilePath)) {
 			hashes = this.$fs.readJson(hashesFilePath);
 		}
 
 		await device.fileSystem.updateHashesOnDevice(hashes, appIdentifier);
 	}
-
-	private async getDeviceBuildInfo(device: Mobile.IDevice, projectData: IProjectData): Promise<IBuildInfo> {
-		const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
-		try {
-			const deviceFileContent = await this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
-			return JSON.parse(deviceFileContent);
-		} catch (e) {
-			return null;
-		}
-	}
 }
 $injector.register("deviceInstallAppService", DeviceInstallAppService);
diff --git a/lib/services/device/device-refresh-app-service.ts b/lib/services/device/device-refresh-app-service.ts
deleted file mode 100644
index db2656f3a9..0000000000
--- a/lib/services/device/device-refresh-app-service.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { performanceLog } from "../../common/decorators";
-import { RunEmitter } from "../../emitters/run-emitter";
-import { LiveSyncServiceResolver } from "../../resolvers/livesync-service-resolver";
-
-export class DeviceRefreshAppService implements IDeviceRefreshAppService {
-
-	constructor(
-		private $liveSyncServiceResolver: LiveSyncServiceResolver,
-		private $logger: ILogger,
-		private $runEmitter: RunEmitter
-	) { }
-
-	@performanceLog()
-	public async refreshApplication(projectData: IProjectData, liveSyncResultInfo: ILiveSyncResultInfo, deviceDescriptor: ILiveSyncDeviceInfo, settings?: IRefreshApplicationSettings): Promise<IRestartApplicationInfo> {
-		if (deviceDescriptor && deviceDescriptor.debuggingEnabled) {
-			liveSyncResultInfo.waitForDebugger = deviceDescriptor.debugOptions && deviceDescriptor.debugOptions.debugBrk;
-		}
-
-		const result = { didRestart: false };
-		const platform = liveSyncResultInfo.deviceAppData.platform;
-		const applicationIdentifier = projectData.projectIdentifiers[platform.toLowerCase()];
-		const platformLiveSyncService = this.$liveSyncServiceResolver.resolveLiveSyncService(platform);
-
-		try {
-			let shouldRestart = await platformLiveSyncService.shouldRestart(projectData, liveSyncResultInfo);
-			if (!shouldRestart) {
-				shouldRestart = !await platformLiveSyncService.tryRefreshApplication(projectData, liveSyncResultInfo);
-			}
-
-			if (shouldRestart) {
-				this.$runEmitter.emitDebuggerDetachedEvent(liveSyncResultInfo.deviceAppData.device);
-				await platformLiveSyncService.restartApplication(projectData, liveSyncResultInfo);
-				result.didRestart = true;
-			}
-		} catch (err) {
-			this.$logger.info(`Error while trying to start application ${applicationIdentifier} on device ${liveSyncResultInfo.deviceAppData.device.deviceInfo.identifier}. Error is: ${err.message || err}`);
-			const msg = `Unable to start application ${applicationIdentifier} on device ${liveSyncResultInfo.deviceAppData.device.deviceInfo.identifier}. Try starting it manually.`;
-			this.$logger.warn(msg);
-			if (!settings || !settings.shouldSkipEmitLiveSyncNotification) {
-				this.$runEmitter.emitRunNotificationEvent(projectData, liveSyncResultInfo.deviceAppData.device, msg);
-			}
-
-			if (settings && settings.shouldCheckDeveloperDiscImage && (err.message || err) === "Could not find developer disk image") {
-				this.$runEmitter.emitUserInteractionNeededEvent(projectData, liveSyncResultInfo.deviceAppData.device, deviceDescriptor);
-			}
-		}
-
-		return result;
-	}
-}
-$injector.register("deviceRefreshAppService", DeviceRefreshAppService);
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/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 16b34c3207..1205d7a50d 100644
--- a/lib/services/ios-device-debug-service.ts
+++ b/lib/services/ios-device-debug-service.ts
@@ -6,6 +6,7 @@ const inspectorAppName = "NativeScript Inspector.app";
 const inspectorNpmPackageName = "tns-ios-inspector";
 const inspectorUiDir = "WebInspectorUI/";
 import { performanceLog } from "../common/decorators";
+import { platform } from "os";
 
 export class IOSDeviceDebugService extends DebugServiceBase implements IDeviceDebugService {
 	private deviceIdentifier: string;
@@ -44,6 +45,10 @@ export class IOSDeviceDebugService extends DebugServiceBase implements IDeviceDe
 	}
 
 	private validateOptions(debugOptions: IDebugOptions) {
+		if (!this.$hostInfo.isWindows && !this.$hostInfo.isDarwin) {
+			this.$errors.failWithoutHelp(`Debugging on iOS devices is not supported for ${platform()} yet.`);
+		}
+
 		if (debugOptions.debugBrk && debugOptions.start) {
 			this.$errors.failWithoutHelp("Expected exactly one of the --debug-brk or --start options.");
 		}
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 32afea3cdb..dd4d1ff697 100644
--- a/lib/services/ios-project-service.ts
+++ b/lib/services/ios-project-service.ts
@@ -11,9 +11,9 @@ import * as temp from "temp";
 import * as plist from "plist";
 import { IOSProvisionService } from "./ios-provision-service";
 import { IOSEntitlementsService } from "./ios-entitlements-service";
-import { BUILD_XCCONFIG_FILE_NAME, IosProjectConstants } from "../constants";
 import { IOSBuildData } from "../data/build-data";
 import { IOSPrepareData } from "../data/prepare-data";
+import { BUILD_XCCONFIG_FILE_NAME, IosProjectConstants } from "../constants";
 
 interface INativeSourceCodeGroup {
 	name: string;
@@ -50,7 +50,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		private $plistParser: IPlistParser,
 		private $xcconfigService: IXcconfigService,
 		private $xcodebuildService: IXcodebuildService,
-		private $iOSExtensionsService: IIOSExtensionsService) {
+		private $iOSExtensionsService: IIOSExtensionsService,
+		private $iOSWatchAppService: IIOSWatchAppService) {
 		super($fs, $projectDataService);
 	}
 
@@ -190,6 +191,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	public async buildProject(projectRoot: string, projectData: IProjectData, iOSBuildData: IOSBuildData): Promise<void> {
 		const platformData = this.getPlatformData(projectData);
+
 		const handler = (data: any) => {
 			this.emit(constants.BUILD_OUTPUT_EVENT_NAME, data);
 		};
@@ -279,6 +281,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 
 	public async prepareProject(projectData: IProjectData, prepareData: IOSPrepareData): Promise<void> {
 		const projectRoot = path.join(projectData.platformsDir, "ios");
+		const platformData = this.getPlatformData(projectData);
+		const resourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
 
 		const provision = prepareData && prepareData.provision;
 		const teamId = prepareData && prepareData.teamId;
@@ -315,13 +319,20 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			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 {
@@ -334,6 +345,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		// 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));
 	}
@@ -341,7 +354,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	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);
 	}
 
 	public ensureConfigurationFileInAppResources(): void {
@@ -724,10 +737,13 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		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);
@@ -735,32 +751,40 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			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}`);
+		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);
+				await this.$xcconfigService.mergeFiles(tempEntitlementsFilePath, pluginsXcconfigFilePath);
+			}
 		}
 	}
 
@@ -782,7 +806,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		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'.");
 		}
 	}
 }
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..d5b6886e45
--- /dev/null
+++ b/lib/services/ios-watch-app-service.ts
@@ -0,0 +1,94 @@
+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}));
+	}
+
+	public hasWatchApp(platformData: IPlatformData, projectData: IProjectData): boolean {
+		const watchAppPath = path.join(
+			projectData.getAppResourcesDirectoryPath(),
+			platformData.normalizedPlatformName,
+			IOS_WATCHAPP_FOLDER
+		);
+
+		return this.$fs.exists(watchAppPath);
+	}
+
+	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/ios/ios-signing-service.ts b/lib/services/ios/ios-signing-service.ts
index 3669f53a6d..58ea06b2b0 100644
--- a/lib/services/ios/ios-signing-service.ts
+++ b/lib/services/ios/ios-signing-service.ts
@@ -1,6 +1,6 @@
 import * as path from "path";
 import * as mobileProvisionFinder from "ios-mobileprovision-finder";
-import { BUILD_XCCONFIG_FILE_NAME, iOSAppResourcesFolderName } from "../../constants";
+import { BUILD_XCCONFIG_FILE_NAME, iOSAppResourcesFolderName, IOSNativeTargetProductTypes } from "../../constants";
 import * as helpers from "../../common/helpers";
 import { IOSProvisionService } from "../ios-provision-service";
 import { IOSBuildData } from "../../data/build-data";
@@ -61,7 +61,12 @@ export class IOSSigningService implements IiOSSigningService {
 			}
 
 			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}.`);
@@ -107,7 +112,12 @@ export class IOSSigningService implements IiOSSigningService {
 				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);
diff --git a/lib/services/ios/xcodebuild-args-service.ts b/lib/services/ios/xcodebuild-args-service.ts
index 5165534428..8471d58873 100644
--- a/lib/services/ios/xcodebuild-args-service.ts
+++ b/lib/services/ios/xcodebuild-args-service.ts
@@ -4,6 +4,10 @@ import { Configurations } from "../../common/constants";
 
 const DevicePlatformSdkName = "iphoneos";
 const SimulatorPlatformSdkName = "iphonesimulator";
+enum ProductArgs {
+	target = "target",
+	scheme = "scheme"
+}
 
 export class XcodebuildArgsService implements IXcodebuildArgsService {
 
@@ -11,21 +15,29 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $devicesService: Mobile.IDevicesService,
 		private $fs: IFileSystem,
+		private $iOSWatchAppService: IIOSWatchAppService,
 		private $logger: ILogger
 	) { }
 
 	public async getBuildForSimulatorArgs(platformData: IPlatformData, projectData: IProjectData, buildConfig: IBuildConfig): Promise<string[]> {
 		let args = await this.getArchitecturesArgs(buildConfig);
 
+		let productType: ProductArgs;
+		if (this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
+			productType = ProductArgs.scheme;
+			args = args.concat(["-destination", "generic/platform=iOS Simulator", "CODE_SIGNING_ALLOWED=NO"]);
+		} else {
+			args = args.concat(["CODE_SIGN_IDENTITY="]);
+		}
+
 		args = args
 			.concat([
 				"build",
-				"-configuration", buildConfig.release ? Configurations.Release : Configurations.Debug,
-				"CODE_SIGN_IDENTITY="
+				"-configuration", buildConfig.release ? Configurations.Release : Configurations.Debug
 			])
-			.concat(this.getBuildCommonArgs(platformData.projectRoot, SimulatorPlatformSdkName))
+			.concat(this.getBuildCommonArgs(platformData, projectData, SimulatorPlatformSdkName))
 			.concat(this.getBuildLoggingArgs())
-			.concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData));
+			.concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData, productType));
 
 		return args;
 	}
@@ -38,9 +50,9 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
 			"-archivePath", archivePath,
 			"-configuration", buildConfig.release ? Configurations.Release : Configurations.Debug
 		]
-			.concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData, "scheme"))
+			.concat(this.getXcodeProjectArgs(platformData.projectRoot, projectData, ProductArgs.scheme))
 			.concat(architectures)
-			.concat(this.getBuildCommonArgs(platformData.projectRoot, DevicePlatformSdkName))
+			.concat(this.getBuildCommonArgs(platformData, projectData, DevicePlatformSdkName))
 			.concat(this.getBuildLoggingArgs());
 
 		return args;
@@ -57,7 +69,7 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
 		return args;
 	}
 
-	private getXcodeProjectArgs(projectRoot: string, projectData: IProjectData, product?: "scheme" | "target"): string[] {
+	private getXcodeProjectArgs(projectRoot: string, projectData: IProjectData, product?: ProductArgs): string[] {
 		const xcworkspacePath = path.join(projectRoot, `${projectData.projectName}.xcworkspace`);
 		if (this.$fs.exists(xcworkspacePath)) {
 			return [ "-workspace", xcworkspacePath, "-scheme", projectData.projectName ];
@@ -71,13 +83,18 @@ export class XcodebuildArgsService implements IXcodebuildArgsService {
 		return this.$logger.getLevel() === "INFO" ? ["-quiet"] : [];
 	}
 
-	private getBuildCommonArgs(projectRoot: string, platformSdkName: string): string[] {
-		const args = [
-			"-sdk", platformSdkName,
-			"BUILD_DIR=" + path.join(projectRoot, constants.BUILD_DIR),
-			'SHARED_PRECOMPS_DIR=' + path.join(projectRoot, 'build', 'sharedpch'),
+	private getBuildCommonArgs(platformData: IPlatformData, projectData: IProjectData, platformSdkName: string): string[] {
+		let args: string[] = [];
+
+		if (!this.$iOSWatchAppService.hasWatchApp(platformData, projectData)) {
+			args = args.concat([ "-sdk", platformSdkName ]);
+		}
+
+		args = args.concat([
+			"BUILD_DIR=" + path.join(platformData.projectRoot, constants.BUILD_DIR),
+			'SHARED_PRECOMPS_DIR=' + path.join(platformData.projectRoot, 'build', 'sharedpch'),
 			'-allowProvisioningUpdates'
-		];
+		]);
 
 		return args;
 	}
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/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/plugins-service.ts b/lib/services/plugins-service.ts
index b9ff50db08..99bb566ac0 100644
--- a/lib/services/plugins-service.ts
+++ b/lib/services/plugins-service.ts
@@ -55,7 +55,7 @@ export class PluginsService implements IPluginsService {
 
 			await this.executeForAllInstalledPlatforms(action, projectData);
 
-			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.`);
@@ -77,14 +77,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}`);
 		}
 	}
 
@@ -266,12 +266,12 @@ export class PluginsService implements IPluginsService {
 		const installedFrameworkVersion = this.getInstalledFrameworkVersion(platform, projectData);
 		const pluginPlatformsData = pluginData.platformsDataService;
 		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..8815582329 100644
--- a/lib/services/project-data-service.ts
+++ b/lib/services/project-data-service.ts
@@ -17,7 +17,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 +27,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 +60,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")
@@ -308,10 +322,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 b902b8df17..81ee369093 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",
@@ -75,7 +75,7 @@ export class InitService implements IInitService {
 			throw err;
 		}
 
-		this.$logger.out("Project successfully initialized.");
+		this.$logger.info("Project successfully initialized.");
 	}
 
 	private get projectFilePath(): string {
@@ -108,7 +108,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]);
@@ -122,7 +122,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;
 	}
@@ -131,4 +131,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 c4a91cb97e..1a050404a1 100644
--- a/lib/services/test-execution-service.ts
+++ b/lib/services/test-execution-service.ts
@@ -63,7 +63,7 @@ export class TestExecutionService implements ITestExecutionService {
 				});
 			};
 
-		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;
@@ -157,6 +157,7 @@ export class TestExecutionService implements ITestExecutionService {
 
 		karmaConfig.projectDir = projectData.projectDir;
 		karmaConfig.bundle = true;
+		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/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/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 2c6008a7fe..d69765b45d 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": {
@@ -2547,7 +2547,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2565,11 +2566,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2582,15 +2585,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2693,7 +2699,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2703,6 +2710,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2715,17 +2723,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2742,6 +2753,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2814,7 +2826,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2824,6 +2837,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2899,7 +2913,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2929,6 +2944,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2946,6 +2962,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2984,11 +3001,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -5316,9 +5335,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"
@@ -6066,9 +6085,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 b0f3dee87b..557a0e14b0 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "minimatch": "3.0.2",
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
-    "nativescript-dev-xcode": "0.1.0",
+    "nativescript-dev-xcode": "0.2.0",
     "nativescript-doctor": "1.9.2",
     "nativescript-preview-sdk": "0.3.4",
     "open": "0.0.5",
@@ -64,7 +64,7 @@
     "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/karma.conf.js b/resources/test/karma.conf.js
index 918a6cee93..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,7 +11,7 @@ module.exports = function(config) {
 
 
     // list of files / patterns to load in the browser
-    files: [ ${ testFiles } ],
+    files: [${ testFiles }],
 
 
     // list of files to exclude
@@ -75,7 +75,7 @@ module.exports = function(config) {
 
   setWebpackPreprocessor(config, options);
   setWebpack(config, options);
-  
+
   config.set(options);
 }
 
@@ -98,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 6be24a78bc..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
 	});
 
diff --git a/test/controllers/add-platform-controller.ts b/test/controllers/add-platform-controller.ts
index 6ab114fa5a..4da557ea4c 100644
--- a/test/controllers/add-platform-controller.ts
+++ b/test/controllers/add-platform-controller.ts
@@ -22,7 +22,7 @@ function createInjector(data?: { latestFrameworkVersion: string }) {
 	});
 
 	const logger = injector.resolve("logger");
-	logger.out = (message: string) => actualMessage = message;
+	logger.info = (message: string) => actualMessage = message;
 
 	const packageInstallationManager = injector.resolve("packageInstallationManager");
 	packageInstallationManager.getLatestCompatibleVersion = async () => version;
diff --git a/test/controllers/run-controller.ts b/test/controllers/run-controller.ts
index 6c4c4eeda0..bfdc76caff 100644
--- a/test/controllers/run-controller.ts
+++ b/test/controllers/run-controller.ts
@@ -77,12 +77,6 @@ function createTestInjector() {
 	injector.register("deviceInstallAppService", {
 		installOnDeviceIfNeeded: () => ({})
 	});
-	injector.register("deviceRefreshAppService", {
-		refreshApplication: () => ({})
-	});
-	injector.register("deviceDebugAppService", {
-		enableDebugging: () => ({})
-	});
 	injector.register("iOSLiveSyncService", {
 		fullSync: async () => getFullSyncResult(),
 		liveSyncWatchAction: () => ({})
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 f443b533a6..edd04e0fce 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";
@@ -166,6 +166,10 @@ function createTestInjector(projectPath: string, projectName: string, xCode?: IX
 	testInjector.register("xcodebuildArgsService", XcodebuildArgsService);
 	testInjector.register("exportOptionsPlistService", ExportOptionsPlistService);
 
+	testInjector.register("iOSWatchAppService", {
+		removeWatchApp: () => { /* */ },
+		addWatchAppFromPath: () => Promise.resolve()
+	});
 	return testInjector;
 }
 
@@ -240,14 +244,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);
@@ -318,14 +322,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);
@@ -400,14 +404,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);
@@ -710,158 +714,6 @@ describe("Relative paths", () => {
 	});
 });
 
-// describe("iOS Project Service Signing", () => {
-// 	let testInjector: IInjector;
-// 	let projectName: string;
-// 	let projectDirName: string;
-// 	let projectPath: string;
-// 	let files: any;
-// 	let iOSProvisionService: IOSProvisionService;
-
-// 	// beforeEach(() => {
-// 	// 	files = {};
-// 	// 	projectName = "TNSApp" + Math.ceil(Math.random() * 1000);
-// 	// 	projectDirName = projectName + "Dir";
-// 	// 	projectPath = temp.mkdirSync(projectDirName);
-// 	// 	testInjector = createTestInjector(projectPath, projectDirName);
-// 	// 	testInjector.register("fs", {
-// 	// 		files: {},
-// 	// 		readJson(path: string): any {
-// 	// 			if (this.exists(path)) {
-// 	// 				return JSON.stringify(files[path]);
-// 	// 			} else {
-// 	// 				return null;
-// 	// 			}
-// 	// 		},
-// 	// 		exists(path: string): boolean {
-// 	// 			return path in files;
-// 	// 		}
-// 	// 	});
-// 	// 	testInjector.register("pbxprojDomXcode", { Xcode: {} });
-// 	// 	pbxproj = join(projectPath, `platforms/ios/${projectDirName}.xcodeproj/project.pbxproj`);
-// 	// 	iOSProjectService = testInjector.resolve("iOSProjectService");
-// 	// 	iOSProvisionService = testInjector.resolve("iOSProvisionService");
-// 	// 	pbxprojDomXcode = testInjector.resolve("pbxprojDomXcode");
-// 	// 	projectData = testInjector.resolve("projectData");
-// 	// 	iOSProvisionService.pick = async (uuidOrName: string, projId: string) => {
-// 	// 		return (<any>{
-// 	// 			"NativeScriptDev": {
-// 	// 				Name: "NativeScriptDev",
-// 	// 				CreationDate: null,
-// 	// 				ExpirationDate: null,
-// 	// 				TeamName: "Telerik AD",
-// 	// 				TeamIdentifier: ["TKID101"],
-// 	// 				ProvisionedDevices: [],
-// 	// 				Entitlements: {
-// 	// 					"application-identifier": "*",
-// 	// 					"com.apple.developer.team-identifier": "ABC"
-// 	// 				},
-// 	// 				UUID: "12345",
-// 	// 				ProvisionsAllDevices: false,
-// 	// 				ApplicationIdentifierPrefix: null,
-// 	// 				DeveloperCertificates: null,
-// 	// 				Type: "Development"
-// 	// 			},
-// 	// 			"NativeScriptDist": {
-// 	// 				Name: "NativeScriptDist",
-// 	// 				CreationDate: null,
-// 	// 				ExpirationDate: null,
-// 	// 				TeamName: "Telerik AD",
-// 	// 				TeamIdentifier: ["TKID202"],
-// 	// 				ProvisionedDevices: [],
-// 	// 				Entitlements: {
-// 	// 					"application-identifier": "*",
-// 	// 					"com.apple.developer.team-identifier": "ABC"
-// 	// 				},
-// 	// 				UUID: "6789",
-// 	// 				ProvisionsAllDevices: true,
-// 	// 				ApplicationIdentifierPrefix: null,
-// 	// 				DeveloperCertificates: null,
-// 	// 				Type: "Distribution"
-// 	// 			},
-// 	// 			"NativeScriptAdHoc": {
-// 	// 				Name: "NativeScriptAdHoc",
-// 	// 				CreationDate: null,
-// 	// 				ExpirationDate: null,
-// 	// 				TeamName: "Telerik AD",
-// 	// 				TeamIdentifier: ["TKID303"],
-// 	// 				ProvisionedDevices: [],
-// 	// 				Entitlements: {
-// 	// 					"application-identifier": "*",
-// 	// 					"com.apple.developer.team-identifier": "ABC"
-// 	// 				},
-// 	// 				UUID: "1010",
-// 	// 				ProvisionsAllDevices: true,
-// 	// 				ApplicationIdentifierPrefix: null,
-// 	// 				DeveloperCertificates: null,
-// 	// 				Type: "Distribution"
-// 	// 			}
-// 	// 		})[uuidOrName];
-// 	// 	};
-// 	// });
-
-// 	// describe("Check for Changes", () => {
-// 	// 	it("sets signingChanged if no Xcode project exists", async () => {
-// 	// 		const changes = <IProjectChangesInfo>{};
-// 	// 		await iOSProjectService.checkForChanges(changes, { release: false, provision: "NativeScriptDev", teamId: undefined, useHotModuleReload: false }, projectData);
-// 	// 		assert.isTrue(!!changes.signingChanged);
-// 	// 	});
-// 	// 	it("sets signingChanged if the Xcode projects is configured with Automatic signing, but proivsion is specified", async () => {
-// 	// 		files[pbxproj] = "";
-// 	// 		pbxprojDomXcode.Xcode.open = <any>function (path: string) {
-// 	// 			assert.equal(path, pbxproj);
-// 	// 			return {
-// 	// 				getSigning(x: string) {
-// 	// 					return { style: "Automatic" };
-// 	// 				}
-// 	// 			};
-// 	// 		};
-// 	// 		const changes = <IProjectChangesInfo>{};
-// 	// 		await iOSProjectService.checkForChanges(changes, { release: false, provision: "NativeScriptDev", teamId: undefined, useHotModuleReload: false }, projectData);
-// 	// 		assert.isTrue(!!changes.signingChanged);
-// 	// 	});
-// 	// 	it("sets signingChanged if the Xcode projects is configured with Manual signing, but the proivsion specified differs the selected in the pbxproj", async () => {
-// 	// 		files[pbxproj] = "";
-// 	// 		pbxprojDomXcode.Xcode.open = <any>function (path: string) {
-// 	// 			assert.equal(path, pbxproj);
-// 	// 			return {
-// 	// 				getSigning() {
-// 	// 					return {
-// 	// 						style: "Manual", configurations: {
-// 	// 							Debug: { name: "NativeScriptDev2" },
-// 	// 							Release: { name: "NativeScriptDev2" }
-// 	// 						}
-// 	// 					};
-// 	// 				}
-// 	// 			};
-// 	// 		};
-// 	// 		const changes = <IProjectChangesInfo>{};
-// 	// 		await iOSProjectService.checkForChanges(changes, { release: false, provision: "NativeScriptDev", teamId: undefined, useHotModuleReload: false }, projectData);
-// 	// 		assert.isTrue(!!changes.signingChanged);
-// 	// 	});
-// 	// 	it("does not set signingChanged if the Xcode projects is configured with Manual signing and proivsion matches", async () => {
-// 	// 		files[pbxproj] = "";
-// 	// 		pbxprojDomXcode.Xcode.open = <any>function (path: string) {
-// 	// 			assert.equal(path, pbxproj);
-// 	// 			return {
-// 	// 				getSigning() {
-// 	// 					return {
-// 	// 						style: "Manual", configurations: {
-// 	// 							Debug: { name: "NativeScriptDev" },
-// 	// 							Release: { name: "NativeScriptDev" }
-// 	// 						}
-// 	// 					};
-// 	// 				}
-// 	// 			};
-// 	// 		};
-// 	// 		const changes = <IProjectChangesInfo>{};
-// 	// 		await iOSProjectService.checkForChanges(changes, { release: false, provision: "NativeScriptDev", teamId: undefined, useHotModuleReload: false }, projectData);
-// 	// 		console.log("CHANGES !!!! ", changes);
-// 	// 		assert.isFalse(!!changes.signingChanged);
-// 	// 	});
-// 	// });
-// });
-
 describe("Merge Project XCConfig files", () => {
 	if (require("os").platform() !== "darwin") {
 		console.log("Skipping 'Merge Project XCConfig files' tests. They can work only on macOS");
@@ -922,17 +774,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);
+			});
 		}
 	});
 
@@ -950,13 +804,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);
+			});
 		}
 	});
 
@@ -966,13 +822,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',
@@ -980,20 +835,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, "");
-		}
+		});
 	});
 });
 
diff --git a/test/nativescript-cli-lib.ts b/test/nativescript-cli-lib.ts
index f50dffe8f8..1b6cb50e0e 100644
--- a/test/nativescript-cli-lib.ts
+++ b/test/nativescript-cli-lib.ts
@@ -23,8 +23,8 @@ describe("nativescript-cli-lib", () => {
 			"getIOSAssetsStructure",
 			"getAndroidAssetsStructure"
 		],
-		constants: ["CONFIG_NS_APP_RESOURCES_ENTRY", "CONFIG_NS_APP_ENTRY", "CONFIG_NS_FILE_NAME"],
 		// localBuildService: ["build"],
+		constants: ["CONFIG_NS_APP_RESOURCES_ENTRY", "CONFIG_NS_APP_ENTRY", "CONFIG_NS_FILE_NAME", "LoggerLevel", "LoggerAppenders"],
 		deviceLogProvider: null,
 		packageManager: ["install", "uninstall", "view", "search"],
 		extensibilityService: ["loadExtensions", "loadExtension", "getInstalledExtensions", "installExtension", "uninstallExtension"],
@@ -62,6 +62,14 @@ describe("nativescript-cli-lib", () => {
 		],
 		cleanupService: [
 			"setCleanupLogFile"
+		],
+		logger: [
+			"initialize",
+			"getLevel",
+			"info"
+		],
+		initializeService: [
+			"initialize"
 		]
 	};
 
diff --git a/test/options.ts b/test/options.ts
index 1727991746..4b88dcd5eb 100644
--- a/test/options.ts
+++ b/test/options.ts
@@ -268,9 +268,9 @@ describe("options", () => {
 				name: "no options are provided",
 				args: [],
 				data: [
-					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: false },
+					{ useLegacyWorkflow: undefined, expectedHmr: true, expectedBundle: true },
 					{ useLegacyWorkflow: false, expectedHmr: true, expectedBundle: true },
-					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: false }
+					{ useLegacyWorkflow: true, expectedHmr: true, expectedBundle: true }
 				]
 			},
 			{
@@ -286,36 +286,27 @@ describe("options", () => {
 				name: " --no-hmr is provided",
 				args: ["--no-hmr"],
 				data: [
-					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: false },
+					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: true },
 					{ useLegacyWorkflow: false, expectedHmr: false, expectedBundle: true },
-					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: false }
+					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: true }
 				]
 			},
 			{
 				name: " --bundle is provided",
 				args: ["--bundle"],
 				data: [
-					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: true },
+					{ useLegacyWorkflow: undefined, expectedHmr: true, expectedBundle: true },
 					{ useLegacyWorkflow: false, expectedHmr: true, expectedBundle: true },
-					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: true }
-				]
-			},
-			{
-				name: " --no-bundle is provided",
-				args: ["--no-bundle"],
-				data: [
-					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: false },
-					{ useLegacyWorkflow: false, expectedHmr: false, expectedBundle: false },
-					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: false }
+					{ useLegacyWorkflow: true, expectedHmr: true, expectedBundle: true }
 				]
 			},
 			{
 				name: " --release is provided",
 				args: ["--release"],
 				data: [
-					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: false },
+					{ useLegacyWorkflow: undefined, expectedHmr: false, expectedBundle: true },
 					{ useLegacyWorkflow: false, expectedHmr: false, expectedBundle: true },
-					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: false }
+					{ useLegacyWorkflow: true, expectedHmr: false, expectedBundle: true }
 				]
 			}
 		];
@@ -326,8 +317,7 @@ describe("options", () => {
 					(testCase.args || []).forEach(arg => process.argv.push(arg));
 
 					const options = createOptions(testInjector);
-					const projectData = <IProjectData>{ useLegacyWorkflow };
-					options.setupOptions(projectData);
+					options.setupOptions();
 
 					(testCase.args || []).forEach(arg => process.argv.pop());
 
@@ -344,11 +334,6 @@ describe("options", () => {
 				name: "--release --hmr",
 				args: ["--release", "--hmr"],
 				expectedError: "The options --release and --hmr cannot be used simultaneously."
-			},
-			{
-				name: "--no-bundle --hmr",
-				args: ["--no-bundle", "--hmr"],
-				expectedError: "The options --no-bundle and --hmr cannot be used simultaneously."
 			}
 		];
 
@@ -360,7 +345,7 @@ describe("options", () => {
 				(testCase.args || []).forEach(arg => process.argv.push(arg));
 
 				const options = createOptions(testInjector);
-				options.setupOptions(null);
+				options.setupOptions();
 
 				(testCase.args || []).forEach(arg => process.argv.pop());
 
diff --git a/test/package-installation-manager.ts b/test/package-installation-manager.ts
index fa35296680..d4b303f4ad 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,12 @@ 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 { ProjectDataStub } from "./stubs";
 
 function createTestInjector(): IInjector {
 	const testInjector = new yok.Yok();
 
+	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("config", ConfigLib.Configuration);
 	testInjector.register("logger", LoggerLib.Logger);
 	testInjector.register("errors", ErrorsLib.Errors);
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 700be07c6c..cb44b1436f 100644
--- a/test/plugins-service.ts
+++ b/test/plugins-service.ts
@@ -108,13 +108,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);
@@ -282,7 +275,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/services/android-device-debug-service.ts b/test/services/android-device-debug-service.ts
index e3b208008c..438fa77c5e 100644
--- a/test/services/android-device-debug-service.ts
+++ b/test/services/android-device-debug-service.ts
@@ -7,12 +7,14 @@ const expectedDevToolsCommitSha = "02e6bde1bbe34e43b309d4ef774b1168d25fd024";
 
 class AndroidDeviceDebugServiceInheritor extends AndroidDeviceDebugService {
 	constructor(protected $devicesService: Mobile.IDevicesService,
+		$cleanupService: ICleanupService,
 		$errors: IErrors,
 		$logger: ILogger,
 		$androidProcessService: Mobile.IAndroidProcessService,
+		$staticConfig: IStaticConfig,
 		$net: INet,
 		$deviceLogProvider: Mobile.IDeviceLogProvider) {
-		super(<any>{ deviceInfo: { identifier: "123" } }, $devicesService, $errors, $logger, $androidProcessService, $net, $deviceLogProvider);
+		super(<any>{ deviceInfo: { identifier: "123" } }, $devicesService, $cleanupService, $errors, $logger, $androidProcessService, $staticConfig, $net, $deviceLogProvider);
 	}
 
 	public getChromeDebugUrl(debugOptions: IDebugOptions, port: number): string {
diff --git a/test/services/debug-service.ts b/test/services/debug-service.ts
index f839043e28..0fe938a557 100644
--- a/test/services/debug-service.ts
+++ b/test/services/debug-service.ts
@@ -138,14 +138,6 @@ describe("debugService", () => {
 				await assertIsRejected(testData, "is not installed on device with identifier");
 			});
 
-			it("the OS is neither Windows or macOS and device is iOS", async () => {
-				const testData = getDefaultTestData();
-				testData.deviceInformation.deviceInfo.platform = "iOS";
-				testData.hostInfo.isDarwin = testData.hostInfo.isWindows = false;
-
-				await assertIsRejected(testData, "Debugging on iOS devices is not supported for");
-			});
-
 			it("device is neither iOS or Android", async () => {
 				const testData = getDefaultTestData();
 				testData.deviceInformation.deviceInfo.platform = "WP8";
@@ -153,14 +145,6 @@ describe("debugService", () => {
 				await assertIsRejected(testData, DebugCommandErrors.UNSUPPORTED_DEVICE_OS_FOR_DEBUGGING);
 			});
 
-			it("when trying to debug on iOS Simulator on macOS, debug-brk is passed, but pathToAppPackage is not", async () => {
-				const testData = getDefaultTestData();
-				testData.deviceInformation.deviceInfo.platform = "iOS";
-				testData.deviceInformation.isEmulator = true;
-
-				await assertIsRejected(testData, "To debug on iOS simulator you need to provide path to the app package.", { debugBrk: true });
-			});
-
 			const assertIsRejectedWhenPlatformDebugServiceFails = async (platform: string): Promise<void> => {
 				const testData = getDefaultTestData();
 				testData.deviceInformation.deviceInfo.platform = platform;
diff --git a/test/services/ios-device-debug-service.ts b/test/services/ios-device-debug-service.ts
index df52aaf7cd..cff0409d54 100644
--- a/test/services/ios-device-debug-service.ts
+++ b/test/services/ios-device-debug-service.ts
@@ -188,4 +188,14 @@ describe("iOSDeviceDebugService", () => {
 		}
 
 	});
+	describe("validate", () => {
+		it("the OS is neither Windows or macOS and device is iOS", async () => {
+			const testInjector = createTestInjector();
+			const hostInfo = testInjector.resolve("hostInfo");
+			hostInfo.isDarwin = hostInfo.isWindows = false;
+
+			const iOSDeviceDebugService = testInjector.resolve<IOSDeviceDebugServiceInheritor>(IOSDeviceDebugServiceInheritor);
+			assert.isRejected(iOSDeviceDebugService.debug(null, null), "Debugging on iOS devices is not supported for");
+		});
+	});
 });
diff --git a/test/services/ios/ios-signing-service.ts b/test/services/ios/ios-signing-service.ts
index c38f518094..4fb176bcea 100644
--- a/test/services/ios/ios-signing-service.ts
+++ b/test/services/ios/ios-signing-service.ts
@@ -6,9 +6,9 @@ import { Errors } from "../../../lib/common/errors";
 
 interface IXcodeMock {
 	isSetManualSigningStyleCalled: boolean;
-	isSetManualSigningStyleByTargetProductTypeCalled: boolean;
 	isSetAutomaticSigningStyleCalled: boolean;
-	isSetAutomaticSigningStyleByTargetProductTypeCalled: boolean;
+	isSetManualSigningStyleByTargetProductTypesListCalled: boolean;
+	isSetAutomaticSigningStyleByTargetProductTypesListCalled: boolean;
 	isSaveCalled: boolean;
 }
 
@@ -60,9 +60,9 @@ const NativeScriptAdHoc = {
 
 class XcodeMock implements IXcodeMock {
 	public isSetManualSigningStyleCalled = false;
-	public isSetManualSigningStyleByTargetProductTypeCalled = false;
 	public isSetAutomaticSigningStyleCalled = false;
-	public isSetAutomaticSigningStyleByTargetProductTypeCalled = false;
+	public isSetManualSigningStyleByTargetProductTypesListCalled = false;
+	public isSetAutomaticSigningStyleByTargetProductTypesListCalled = false;
 	public isSaveCalled = false;
 
 	constructor(private data: { signing: { style: string, team?: string } }) { }
@@ -75,16 +75,16 @@ class XcodeMock implements IXcodeMock {
 		this.isSetManualSigningStyleCalled = true;
 	}
 
-	public setManualSigningStyleByTargetProductType() {
-		this.isSetManualSigningStyleByTargetProductTypeCalled = true;
-	}
-
 	public setAutomaticSigningStyle() {
 		this.isSetAutomaticSigningStyleCalled = true;
 	}
 
-	public setAutomaticSigningStyleByTargetProductType() {
-		this.isSetAutomaticSigningStyleByTargetProductTypeCalled = true;
+	public setManualSigningStyleByTargetProductTypesList() {
+		this.isSetManualSigningStyleByTargetProductTypesListCalled = true;
+	}
+
+	public setAutomaticSigningStyleByTargetProductTypesList() {
+		this.isSetAutomaticSigningStyleByTargetProductTypesListCalled = true;
 	}
 
 	public save() {
@@ -174,7 +174,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { hasXCConfigrovisioning: false, hasXCConfigDevelopmentTeam: true, signing: null },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 				}
 			},
@@ -183,7 +183,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { hasXCConfigrovisioning: false, hasXCConfigDevelopmentTeam: true, signing: { style: "Automatic" } },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 				}
 			},
@@ -192,7 +192,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { hasXCConfigrovisioning: false, hasXCConfigDevelopmentTeam: true, signing: { style: "Manual" } },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
 					assert.isFalse(xcodeMock.isSaveCalled);
 				}
@@ -217,7 +217,7 @@ describe("IOSSigningService", () => {
 				arrangeData: <any>{ signing: null },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
 				}
@@ -227,7 +227,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { signing: { style: "Automatic" } },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
 				}
@@ -237,7 +237,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { signing: { style: "Automatic", team: teamId }},
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isFalse(xcodeMock.isSaveCalled);
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
 				}
@@ -247,7 +247,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { signing: { style: "Automatic", team: "anotherTeamId" }, teamIdsForName: [ "anotherTeamId" ] },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isFalse(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isFalse(xcodeMock.isSaveCalled);
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
 				}
@@ -257,7 +257,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { signing: { style: "Manual" }},
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetAutomaticSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
 				}
@@ -282,7 +282,7 @@ describe("IOSSigningService", () => {
 				arrangeData: <any>{ signing: null },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetManualSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetManualSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetManualSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 				}
 			},
@@ -291,7 +291,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { signing: { style: "Automatic" } },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isTrue(xcodeMock.isSetManualSigningStyleCalled);
-					assert.isTrue(xcodeMock.isSetManualSigningStyleByTargetProductTypeCalled);
+					assert.isTrue(xcodeMock.isSetManualSigningStyleByTargetProductTypesListCalled);
 					assert.isTrue(xcodeMock.isSaveCalled);
 				}
 			},
@@ -300,7 +300,7 @@ describe("IOSSigningService", () => {
 				arrangeData: { signing: { style: "Manual" } },
 				assert: (xcodeMock: IXcodeMock) => {
 					assert.isFalse(xcodeMock.isSetManualSigningStyleCalled);
-					assert.isFalse(xcodeMock.isSetManualSigningStyleByTargetProductTypeCalled);
+					assert.isFalse(xcodeMock.isSetManualSigningStyleByTargetProductTypesListCalled);
 					assert.isFalse(xcodeMock.isSaveCalled);
 				}
 			}
diff --git a/test/services/ios/xcodebuild-args-service.ts b/test/services/ios/xcodebuild-args-service.ts
index 84f477c027..8a284347e0 100644
--- a/test/services/ios/xcodebuild-args-service.ts
+++ b/test/services/ios/xcodebuild-args-service.ts
@@ -18,6 +18,9 @@ function createTestInjector(data: { logLevel: string, hasProjectWorkspace: boole
 		getLevel: () => data.logLevel
 	});
 	injector.register("xcodebuildArgsService", XcodebuildArgsService);
+	injector.register("iOSWatchAppService", {
+		hasWatchApp: () => false
+	});
 
 	return injector;
 }
@@ -66,9 +69,9 @@ describe("xcodebuildArgsService", () => {
 
 						const expectedArgs = [
 							"ONLY_ACTIVE_ARCH=NO",
+							"CODE_SIGN_IDENTITY=",
 							"build",
 							"-configuration", configuration,
-							"CODE_SIGN_IDENTITY=",
 							"-sdk", "iphonesimulator"
 						]
 							.concat(getCommonArgs())
diff --git a/test/services/project-data-service.ts b/test/services/project-data-service.ts
index 414276b1e8..98c304e431 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, 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,7 @@ const testData: any = [
 
 const createTestInjector = (readTextData?: string): IInjector => {
 	const testInjector = new Yok();
+	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 947a60dd1b..a1ba362197 100644
--- a/test/stubs.ts
+++ b/test/stubs.ts
@@ -12,12 +12,16 @@ import { DevicePlatformsConstants } from "./../lib/common/mobile/device-platform
 import { PrepareData } from "../lib/data/prepare-data";
 
 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";
@@ -26,26 +30,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
-	}
+	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 {
@@ -585,13 +580,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;
 		}
 	}
 
@@ -621,7 +618,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();
@@ -634,6 +634,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!`);
+		}
 	}
 }
 
diff --git a/test/update.ts b/test/update.ts
index 2577812e38..33df3b302b 100644
--- a/test/update.ts
+++ b/test/update.ts
@@ -51,7 +51,7 @@ function createTestInjector(
 		getInstalledPlatforms: function(): string[] {
 			return installedPlatforms;
 		},
-		getAvailablePlatforms: function(): string[] {
+		getAvailablePlatforms: function (): string[] {
 			return availablePlatforms;
 		},
 		removePlatforms: async (): Promise<void> => undefined,
@@ -66,9 +66,9 @@ function createTestInjector(
 		getPlatformData: () => {
 			return {
 				platformProjectService: {
-						validate
-					}
-				};
+					validate
+				}
+			};
 		}
 	});
 	testInjector.register("settingsService", SettingsService);