diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 45a6250c77..8c0f8787b1 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,12 +1,8 @@
-Dear friend, we, the rest of the NativeScript community really
-appreciate your feedback! While we are doing all we can to take care of every
-issue, sometimes we get overwhelmed. Because of that, we will consider issues
-that are not constructive or problems that cannot be reproduced "dead".
-Additionally, we will treat feature requests or bug reports with unanswered
-questions regarding the behavior/reproduction for more than 20 days "dead". All
-"dead" issues will get closed.
-
-## Please, provide the details below:
+<!--
+We appreciate your feedback! While we are doing all we can to take care of every issue, sometimes we get overwhelmed. That's why
+ - issues that are not constructive or describe problems that cannot be reproduced will be closed
+ - feature requests or bug reports with unanswered questions regarding the behavior/reproduction for more than 20 days will be closed 
+-->
 
 ### Did you verify this is a real problem by searching the [NativeScript Forum](http://forum.nativescript.org) and the [other open issues in this repo](https://github.com/NativeScript/nativescript/issues)?
 
@@ -31,3 +27,5 @@ The best approach would be to get your code running in the [NativeScript Playgro
 
 ### Is there code involved? If so, please share the minimal amount of code needed to recreate the problem.
 
+
+
diff --git a/.gitignore b/.gitignore
index e6feee8444..f5c1f603a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,41 @@
-# generated files
+# Folders
+dist
+hooks
+libs
+node_modules
+package
+platforms
+reports
+tags
+
+# Files
+package-lock.json
+.DS_Store
+.nsbuildinfo
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# Appium files
+e2e/**/*.trace/
+e2e/**/test-results.xml
+
+# Webpack configuration files
+webpack.config.js
+
+# Generated files
 *.map
 *.tgz
 .baseDir.ts
@@ -6,10 +43,7 @@
 tscommand*.tmp.txt
 .tscache
 
-node_modules/
-dist/
-package/
-
+# Other
 *.js
 !tests/hooks/**/*.*
 !gruntfile.js
@@ -19,44 +53,14 @@ package/
 !fetch/**/*.*
 !apps/TelerikNEXT/lib/**/*.*
 !build/**/*.*
-CrossPlatformModules.sln.ide/
-*.suo
-CrossPlatformModules.suo
-CrossPlatformModules.v14.suo
-CrossPlatformModules.csproj.user
-bin/
-obj/
 .vs/
-.idea/
 
 .baseDir.ts
 .ctags-exclude
-tags
 
 TestRunResult.txt
 .testsapprun
 
 tns-core-modules.base.d.ts
 tns-core-modules.d.ts
-tns-core-modules.es6.d.ts
-
-tests/platforms/
-tests/lib/
-*.log
-
-.DS_Store
-
-apps/platforms/
-apps/lib/
-apps/hooks/
-apps/node_modules/
-
-e2e/**/platforms
-!e2e/**/webpack.config.js
-e2e/**/reports/
-e2e/**/*.trace/
-e2e/**/test-results.xml
-
-package-lock.json
-
-.nsbuildinfo
+tns-core-modules.es6.d.ts
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5acd7ae98f..3a51bc2980 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,6 @@
         "**/platforms": true,
         "**/*.js": true,
         "**/*.js.map": true
-    }
+    },
+    "tslint.configFile": "./build/tslint.json"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5aaff8097f..931bc86f19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,140 @@
 Cross Platform Modules Changelog
 ==============================
+
+<a name="4.1.0"></a>
+# [4.1.0](https://github.com/NativeScript/NativeScript/compare/4.0.1...4.1.0) (2018-05-28)
+
+### Bug Fixes
+
+* **android:** fix sporadic issue with transition cleanup logic called twice ([#5805](https://github.com/NativeScript/NativeScript/issues/5805)) ([a86d41e](https://github.com/NativeScript/NativeScript/commit/a86d41e))
+* **android:** lollipop crash on changing activity context after navigation w/transition ([#5700](https://github.com/NativeScript/NativeScript/issues/5700)) ([4f5887b](https://github.com/NativeScript/NativeScript/commit/4f5887b))
+* **android-connectivity:** add ethernet connection type ([#5670](https://github.com/NativeScript/NativeScript/issues/5670)) ([1536d15](https://github.com/NativeScript/NativeScript/commit/1536d15))
+* **android-textfield:** returnPress fired twice for GO/SEARCH/SEND ([#5727](https://github.com/NativeScript/NativeScript/issues/5727)) ([ca444aa](https://github.com/NativeScript/NativeScript/commit/ca444aa))
+* **flexbox-ios:** resolve text size issue for ListView with flexbox layout template ([#5799](https://github.com/NativeScript/NativeScript/issues/5799)) ([a03065c](https://github.com/NativeScript/NativeScript/commit/a03065c))
+* **flexbox:** label text wrapping inside flexbox layout ([#5781](https://github.com/NativeScript/NativeScript/issues/5781)) ([481043f](https://github.com/NativeScript/NativeScript/commit/481043f))
+* **ios-image-asset:** getImageAsync() can retrieve assets stored remotely in iCloud ([#5705](https://github.com/NativeScript/NativeScript/issues/5705)) ([9e3da8e](https://github.com/NativeScript/NativeScript/commit/9e3da8e))
+* **ios-searchbar:** fix searchbar auto sizing in iOS11 ([#5658](https://github.com/NativeScript/NativeScript/issues/5658)) ([555e592](https://github.com/NativeScript/NativeScript/commit/555e592))
+* **list-view-ios:** fix rowHeight property to apply proper item size for iOS ([#5693](https://github.com/NativeScript/NativeScript/issues/5693)) ([b9806ba](https://github.com/NativeScript/NativeScript/commit/b9806ba))
+* **modal:** exception when calling ViewBase.showModal(...) ([#5737](https://github.com/NativeScript/NativeScript/issues/5737)) ([451589d](https://github.com/NativeScript/NativeScript/commit/451589d))
+* **modal:** innerView.closeModal(...) not passing back context ([#5833](https://github.com/NativeScript/NativeScript/issues/5833)) ([1365f13](https://github.com/NativeScript/NativeScript/commit/1365f13))
+* **navigation:** fix frame.navigate call inside page.navigatedTo handler ([#5649](https://github.com/NativeScript/NativeScript/issues/5649)) ([cf950e1](https://github.com/NativeScript/NativeScript/commit/cf950e1))
+* crash at application launch on Android P ([#5831](https://github.com/NativeScript/NativeScript/issues/5831)) ([7851629](https://github.com/NativeScript/NativeScript/commit/7851629))
+
+### Features
+
+* **file-system:** add ability to retrieve file size ([#5710](https://github.com/NativeScript/NativeScript/issues/5710)) ([6bdb5b5](https://github.com/NativeScript/NativeScript/commit/6bdb5b5))
+* **tabview:** add tab text font size property ([#5752](https://github.com/NativeScript/NativeScript/issues/5752)) ([11f0d6e](https://github.com/NativeScript/NativeScript/commit/11f0d6e))
+* **view:** introduce LayoutChanged event on every View component ([#5825](https://github.com/NativeScript/NativeScript/issues/5825)) ([0fc1547](https://github.com/NativeScript/NativeScript/commit/0fc1547))
+* **css:** linear-gradient support for background and backgroundImage ([#5534](https://github.com/NativeScript/NativeScript/issues/5534)) ([5a83a1c](https://github.com/NativeScript/NativeScript/commit/5a83a1c))
+
+
+# 4.0.1 (2018, May 18)
+
+### Bug Fixes
+
+* feat(builder): enable reading xml from bundle (#5668) ([1e682bf](https://github.com/NativeScript/NativeScript/commit/1e682bf)), closes [#5668](https://github.com/NativeScript/NativeScript/issues/5668)
+* fix(layout): IOS Layout not invalidated with custom root (#5724) ([f1c0b85](https://github.com/NativeScript/NativeScript/commit/f1c0b85)), closes [#5724](https://github.com/NativeScript/NativeScript/issues/5724)
+
+# 4.0.0 (2018, April 10)
+
+A detailed list of the new features and changes coming with NativeScript 4.0 ca be found [here](https://docs.google.com/document/d/1Iia0yEr5seq4H9qk4oMuJs4-M8dgmne98fymCO5IczA/edit?usp=sharing).
+
+You can also check the [NativeScript 4.0 is out blog post](https://www.nativescript.org/blog/nativescript-4.0-is-out) for highlights.
+
+### Bug Fixes
+
+* **android-images:** set decodeHeight/decodeWidth default values to dip ([#5490](https://github.com/NativeScript/NativeScript/issues/5490)) ([6509efa](https://github.com/NativeScript/NativeScript/commit/6509efa))
+* **animations:** change throw -> trace to avoid unnecessary app crash ([#5475](https://github.com/NativeScript/NativeScript/issues/5475)) ([fa80355](https://github.com/NativeScript/NativeScript/commit/fa80355))
+* **animations:** check if target is present before removing its animation ([#4586](https://github.com/NativeScript/NativeScript/issues/4586)) ([4bd3a94](https://github.com/NativeScript/NativeScript/commit/4bd3a94))
+* **animations:** register both style's "name" and "cssName" ([#3810](https://github.com/NativeScript/NativeScript/issues/3810)) ([3ea7365](https://github.com/NativeScript/NativeScript/commit/3ea7365))
+* **animations:** remove default getters for transform properties ([#4286](https://github.com/NativeScript/NativeScript/issues/4286)) ([26e2748](https://github.com/NativeScript/NativeScript/commit/26e2748))
+* **css-animations:** convert transform value properly ([#4352](https://github.com/NativeScript/NativeScript/issues/4352)) ([b7c61ca](https://github.com/NativeScript/NativeScript/commit/b7c61ca))
+* **date-picker:** Date picker changed check ([#4797](https://github.com/NativeScript/NativeScript/issues/4797)) ([d0b3e0c](https://github.com/NativeScript/NativeScript/commit/d0b3e0c))
+* **es6:** object constructor assign ([3ef45c1](https://github.com/NativeScript/NativeScript/commit/3ef45c1))
+* **file-system-access:** join paths without leading slash ([1a497b1](https://github.com/NativeScript/NativeScript/commit/1a497b1))
+* TextField not secure when keyboardType="number" ([#5012](https://github.com/NativeScript/NativeScript/issues/5012)) ([3e6f465](https://github.com/NativeScript/NativeScript/commit/3e6f465))
+* **frame:** add generic frame cleanup logic after modal dialog close ([#5479](https://github.com/NativeScript/NativeScript/issues/5479)) ([2704915](https://github.com/NativeScript/NativeScript/commit/2704915))
+* **frame:** recreate frame if no cached one found on app resume [#5318](https://github.com/NativeScript/NativeScript/issues/5318) ([#5330](https://github.com/NativeScript/NativeScript/issues/5330)) ([9d7f0e5](https://github.com/NativeScript/NativeScript/commit/9d7f0e5))
+* **frame:** root tabview with modal frame when suspend/resume app ([#5408](https://github.com/NativeScript/NativeScript/issues/5408)) ([2edef3d](https://github.com/NativeScript/NativeScript/commit/2edef3d))
+* **image:** image aspect dimensions for ImageSource.fromAsset(...) ([#5556](https://github.com/NativeScript/NativeScript/issues/5556)) ([7506905](https://github.com/NativeScript/NativeScript/commit/7506905))
+* **image-source:** Fix test for base64 image source for android API 26 ([#4741](https://github.com/NativeScript/NativeScript/issues/4741)) ([1171da2](https://github.com/NativeScript/NativeScript/commit/1171da2))
+* **image-source:** throw if source is not a correct native instance ([#5273](https://github.com/NativeScript/NativeScript/issues/5273)) ([58d61ca](https://github.com/NativeScript/NativeScript/commit/58d61ca))
+* **image:** apply tintColor correctly on iOS ([#5546](https://github.com/NativeScript/NativeScript/issues/5546)) ([75ee84c](https://github.com/NativeScript/NativeScript/commit/75ee84c))
+* **inspector:** Fix --debug-brk issue with Inspector ([#5460](https://github.com/NativeScript/NativeScript/issues/5460)) ([0b34e67](https://github.com/NativeScript/NativeScript/commit/0b34e67))
+* **iOS:** image._setColorTint is not a function fix ([465b5bf](https://github.com/NativeScript/NativeScript/commit/465b5bf))
+* **ios-action-bar:** enable NavigationButton text change on first navigation ([#5458](https://github.com/NativeScript/NativeScript/issues/5458)) ([b878143](https://github.com/NativeScript/NativeScript/commit/b878143))
+* **ios-action-bar:** NavigationButton cannot be hidden if navigating with transition ([#5451](https://github.com/NativeScript/NativeScript/issues/5451)) ([c54e069](https://github.com/NativeScript/NativeScript/commit/c54e069))
+* **ios-frame:** do not update backstack when navigating the same page ([#5426](https://github.com/NativeScript/NativeScript/issues/5426)) ([714af6b](https://github.com/NativeScript/NativeScript/commit/714af6b))
+* **layouts:** Set automaticallyAdjustsScrollViewInsets ([#5311](https://github.com/NativeScript/NativeScript/issues/5311)) ([b492996](https://github.com/NativeScript/NativeScript/commit/b492996))
+* **livesync:** attach __onLiveSyncCore to global object ([#4215](https://github.com/NativeScript/NativeScript/issues/4215)) ([90a0da2](https://github.com/NativeScript/NativeScript/commit/90a0da2))
+* **minor:** reword missing-xml-error to be clearer ([#4947](https://github.com/NativeScript/NativeScript/issues/4947)) ([374f31c](https://github.com/NativeScript/NativeScript/commit/374f31c))
+* **profiling:** resetProfiles doesn't reset all profiles ([#5425](https://github.com/NativeScript/NativeScript/issues/5425)) ([68d86fb](https://github.com/NativeScript/NativeScript/commit/68d86fb))
+* **slider:** correct maxValue setter for android  ([#4346](https://github.com/NativeScript/NativeScript/issues/4346)) ([6184338](https://github.com/NativeScript/NativeScript/commit/6184338)), closes [#4343](https://github.com/NativeScript/NativeScript/issues/4343)
+* **style:** Styles are not applied to dialogs ([#5612](https://github.com/NativeScript/NativeScript/issues/5612)) ([38e6f66](https://github.com/NativeScript/NativeScript/commit/38e6f66))
+* **style-scope:** remove isFileOrResourcePath check ([5746dc5](https://github.com/NativeScript/NativeScript/commit/5746dc5))
+* **text:** Allow -1 to be a valid binding value for text views ([#5563](https://github.com/NativeScript/NativeScript/issues/5563)) ([7cd8e7e](https://github.com/NativeScript/NativeScript/commit/7cd8e7e)), closes [#5559](https://github.com/NativeScript/NativeScript/issues/5559)
+* **uilabel:** line height setter should not break line break mode ([#5544](https://github.com/NativeScript/NativeScript/issues/5544)) ([75bd1d2](https://github.com/NativeScript/NativeScript/commit/75bd1d2))
+* **webpack:** fix fragment css not being applied with webpack ([#5172](https://github.com/NativeScript/NativeScript/issues/5172)) ([60773e7](https://github.com/NativeScript/NativeScript/commit/60773e7))
+* **webpack:** register wrap layout ([#5573](https://github.com/NativeScript/NativeScript/issues/5573)) ([0012bfd](https://github.com/NativeScript/NativeScript/commit/0012bfd))
+* **xml parser:** Fix text node data event. ([67cfab2](https://github.com/NativeScript/NativeScript/commit/67cfab2))
+* **xml parser:** Handle whitespace around attribute = ([2a2c0e5](https://github.com/NativeScript/NativeScript/commit/2a2c0e5))
+* ActionItems lacks proper support for VoiceOver on iOS ([#2796](https://github.com/NativeScript/NativeScript/issues/2796)) ([#2799](https://github.com/NativeScript/NativeScript/issues/2799)) ([37d927b](https://github.com/NativeScript/NativeScript/commit/37d927b))
+* ActionBar's title not updating in OnLoaded event ([1d63103](https://github.com/NativeScript/NativeScript/commit/1d63103))
+* add css-agent declarations ([#4361](https://github.com/NativeScript/NativeScript/issues/4361)) ([c62e79e](https://github.com/NativeScript/NativeScript/commit/c62e79e))
+* add dom-node declarations ([#4359](https://github.com/NativeScript/NativeScript/issues/4359)) ([08af2ef](https://github.com/NativeScript/NativeScript/commit/08af2ef))
+* cleanup modaltest paths ([#5300](https://github.com/NativeScript/NativeScript/issues/5300)) ([8d59cc4](https://github.com/NativeScript/NativeScript/commit/8d59cc4))
+* DatePicker month off by 1 in Android ([#4872](https://github.com/NativeScript/NativeScript/issues/4872)) ([1e47117](https://github.com/NativeScript/NativeScript/commit/1e47117))
+* Fix scroll-view tests for ios 9 and 10 ([#5358](https://github.com/NativeScript/NativeScript/issues/5358)) ([464cdd5](https://github.com/NativeScript/NativeScript/commit/464cdd5))
+* layoutParent crash with ProxyViewContainer ([#5315](https://github.com/NativeScript/NativeScript/issues/5315)) ([923d48b](https://github.com/NativeScript/NativeScript/commit/923d48b))
+* Navigation test app added ([4d23e37](https://github.com/NativeScript/NativeScript/commit/4d23e37))
+* Require core modules used for inspector lazily ([#4977](https://github.com/NativeScript/NativeScript/issues/4977)) ([0fe1806](https://github.com/NativeScript/NativeScript/commit/0fe1806))
+* set default values to time widgets ([#4383](https://github.com/NativeScript/NativeScript/issues/4383)) ([14098d4](https://github.com/NativeScript/NativeScript/commit/14098d4))
+* set tns-core-modules-widgets to 4.0.0 ([eff264e](https://github.com/NativeScript/NativeScript/commit/eff264e))
+* throw if global css file is not found in webpack context ([#5186](https://github.com/NativeScript/NativeScript/issues/5186)) ([9ce0819](https://github.com/NativeScript/NativeScript/commit/9ce0819))
+* typo on android utils, getPalleteColor to getPaletteColor ([#4687](https://github.com/NativeScript/NativeScript/issues/4687)) ([7b36461](https://github.com/NativeScript/NativeScript/commit/7b36461))
+* uuid for ios changed on IOS v7 ([#4681](https://github.com/NativeScript/NativeScript/issues/4681)) ([92471c6](https://github.com/NativeScript/NativeScript/commit/92471c6))
+
+
+
+### Features
+
+* **navigation:** Flexible Frame Composition ([#48](https://github.com/NativeScript/NativeScript/issues/48))
+* **angular xml:** Support [prop] and (tap) bindings ([fdd8c9b](https://github.com/NativeScript/NativeScript/commit/fdd8c9b))
+* **frame:** handle back navigation when common layout is used as a root element ([#5608](https://github.com/NativeScript/NativeScript/issues/5608)) ([70f0112](https://github.com/NativeScript/NativeScript/commit/70f0112))
+* **frame:** rework frame retrieval api ([#5527](https://github.com/NativeScript/NativeScript/issues/5527)) ([dfa70dd](https://github.com/NativeScript/NativeScript/commit/dfa70dd))
+* **ios:** fire onDisplayed event when first frame is ready to be displayed ([#5344](https://github.com/NativeScript/NativeScript/issues/5344)) ([1c78e47](https://github.com/NativeScript/NativeScript/commit/1c78e47))
+* **ios-image-source:** standardize quality scale in image-source  ([#5517](https://github.com/NativeScript/NativeScript/issues/5517)) ([319c153](https://github.com/NativeScript/NativeScript/commit/319c153)), closes [#5474](https://github.com/NativeScript/NativeScript/issues/5474)
+* **ios-list-view:** introduce iosEstimatedRowHeight property. ([#5568](https://github.com/NativeScript/NativeScript/issues/5568)) ([52c0448](https://github.com/NativeScript/NativeScript/commit/52c0448))
+* **listview:** add required interface for generalized list-view component ([#5524](https://github.com/NativeScript/NativeScript/issues/5524)) ([b29f04f](https://github.com/NativeScript/NativeScript/commit/b29f04f))
+* **modal:** introduce stretched param to showModal method ([#5496](https://github.com/NativeScript/NativeScript/issues/5496)) ([0138873](https://github.com/NativeScript/NativeScript/commit/0138873))
+* **observable:** Implement observable .once ([#5309](https://github.com/NativeScript/NativeScript/issues/5309)) ([2166d1e](https://github.com/NativeScript/NativeScript/commit/2166d1e))
+* **style-scope:** Resolve css sheets from tns_modules ([414ebc6](https://github.com/NativeScript/NativeScript/commit/414ebc6))
+* **tab-view-android:** enable tabs positioning at the bottom ([#5385](https://github.com/NativeScript/NativeScript/issues/5385)) ([f8dce08](https://github.com/NativeScript/NativeScript/commit/f8dce08))
+* **view:** expose method for android back override ([#5537](https://github.com/NativeScript/NativeScript/issues/5537)) ([cf8dcfa](https://github.com/NativeScript/NativeScript/commit/cf8dcfa))
+* **webpack:** mark the CSS type for stylable views explicitly ([#5257](https://github.com/NativeScript/NativeScript/issues/5257)) ([1cbb1e8](https://github.com/NativeScript/NativeScript/commit/1cbb1e8))
+* **xml parser:** Only allow angular syntax extensions if configured. ([748b4f1](https://github.com/NativeScript/NativeScript/commit/748b4f1))
+* Add methods to get the root view and set a different root view at run time ([#5386](https://github.com/NativeScript/NativeScript/issues/5386)) ([b113b00](https://github.com/NativeScript/NativeScript/commit/b113b00))
+* Add require.context typings ([#5156](https://github.com/NativeScript/NativeScript/issues/5156)) ([0986315](https://github.com/NativeScript/NativeScript/commit/0986315))
+* Register ./app.css instead of app.css so it can be provided by webpack context ([#5158](https://github.com/NativeScript/NativeScript/issues/5158)) ([d356339](https://github.com/NativeScript/NativeScript/commit/d356339))
+* support intent replacement in the android activity ([#5337](https://github.com/NativeScript/NativeScript/issues/5337)) ([01fab68](https://github.com/NativeScript/NativeScript/commit/01fab68))
+
+
+### BREAKING CHANGES
+
+* **ios-layout** Frame, Page and TabView measure/layout methods no longer used. We now rely on the iOS to position these controls. As a result width, height, minWidth, minHeight, margins won't be respected on these controls
+* **ios-layout** Layouts for ViewContollers now implemented with UILayoutGuide (requires iOS 9)
+* **tabview** TabViewItems are now loaded/unloaded on demand - when they will be displayed.
+* **webpack:** Extending classes requires marking the derived class with @CSSType
+The root classes are not marked with CSSType and classes derived from ViewBase and View
+will continue to work as expected. More concrete view classes (Button, Label, etc.) are
+marked with @CSSType now and store their cssType on the prototype suppressing the previous
+implementation that looked up the class function name. So clien classes that derive from one of
+our @CSSType decorated classes will now have to be marked with @CSSType.
+* **android-images:** change decodeHeight/decodeWidth properties to accept device independent pixels by default
+* **image-source:** Change the return type of `setNativeSource` method from `boolean` to `void`.
+
+
+
 ## 3.4.1 (2018, February 20)
 
 ### New
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index eb02a9a873..0eed34e467 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,6 +19,10 @@ Help us keep a healthy and open community. We expect all participants in this pr
 2. Search for similar issues in the issues list for this repo; it may already be an identified problem.
 3. If this is a bug or problem that is clear, simple, and is unlikely to require any discussion -- it is OK to open an issue on GitHub with a reproduction of the bug including workflows and screenshots. If possible, submit a Pull Request with a failing test, entire application or module. If you'd rather take matters into your own hands, fix the bug yourself (jump down to the [Submitting a PR](#pr) section).
 
+> While we are doing all we can to take care of every issue, sometimes we get overwhelmed. That's why
+> - issues that are not constructive or describe problems that cannot be reproduced will be closed
+> - feature requests or bug reports with unanswered questions regarding the behavior/reproduction for more than 20 days will be closed 
+
 ## <a name="features"></a> Requesting Features
 
 1. Use Github Issues to submit feature requests.
diff --git a/apps/app/css-perf-test/main-page.ts b/apps/app/css-perf-test/main-page.ts
index 3b97106491..c22a93868d 100644
--- a/apps/app/css-perf-test/main-page.ts
+++ b/apps/app/css-perf-test/main-page.ts
@@ -1,4 +1,4 @@
-import {EventData as ObservableEventData} from "tns-core-modules/data/observable";
+import {EventData as ObservableEventData } from "tns-core-modules/data/observable";
 
 export function navigatedTo(args: ObservableEventData) {
     setTimeout(() => {
diff --git a/apps/app/css-perf-test/root.ts b/apps/app/css-perf-test/root.ts
index 31b91d23ac..62f3976c0f 100644
--- a/apps/app/css-perf-test/root.ts
+++ b/apps/app/css-perf-test/root.ts
@@ -1,4 +1,4 @@
-import {Page} from "tns-core-modules/ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 export function onTap(args: any) {
     (<any>global).startTime = (<any>global).time();
diff --git a/apps/app/cuteness.io/main-page.ts b/apps/app/cuteness.io/main-page.ts
index 770a4c9609..6fc3b94291 100644
--- a/apps/app/cuteness.io/main-page.ts
+++ b/apps/app/cuteness.io/main-page.ts
@@ -1,8 +1,8 @@
-import {EventData as ObservableEventData} from "tns-core-modules/data/observable";
-import {Page} from "tns-core-modules/ui/page";
-import {ItemEventData as ListViewItemEventData} from "tns-core-modules/ui/list-view";
-import {topmost as topmostFrame} from "tns-core-modules/ui/frame";
-import {AppViewModel} from "./reddit-app-view-model";
+import {EventData as ObservableEventData } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import {ItemEventData as ListViewItemEventData } from "tns-core-modules/ui/list-view";
+import {topmost as topmostFrame } from "tns-core-modules/ui/frame";
+import { AppViewModel } from "./reddit-app-view-model";
 
 var appViewModel = new AppViewModel();
 
diff --git a/apps/app/devtools-app/main-page.ts b/apps/app/devtools-app/main-page.ts
index 451163c425..2a600ea21b 100644
--- a/apps/app/devtools-app/main-page.ts
+++ b/apps/app/devtools-app/main-page.ts
@@ -30,7 +30,7 @@ export function navigate() {
     frame.topmost().navigate("gallery-app/main-page");
 }
 
-export function change(args){
+export function change(args) {
     args.object.text = "hi " + Math.random();
 
 }
\ No newline at end of file
diff --git a/apps/app/modaltest/main-page.ts b/apps/app/modaltest/main-page.ts
index 3a153f0166..1ed90cb7f8 100644
--- a/apps/app/modaltest/main-page.ts
+++ b/apps/app/modaltest/main-page.ts
@@ -26,7 +26,7 @@ export function onTap3(args: EventData) {
 }
 
 function closeModal() {
-    console.log('closeModal Called');
+    console.log("closeModal Called");
 }
 
 export function sync(args: EventData) {
diff --git a/apps/app/modaltest/modal-tab.ts b/apps/app/modaltest/modal-tab.ts
index 1ebac4ff3b..224dcf81bd 100644
--- a/apps/app/modaltest/modal-tab.ts
+++ b/apps/app/modaltest/modal-tab.ts
@@ -1,6 +1,6 @@
 import { View, EventData } from "tns-core-modules/ui/core/view";
 
-const colors = ['red', 'orange', 'magenta'];
+const colors = ["red", "orange", "magenta"];
 let x = 0;
 
 export function onLoaded(args) {
diff --git a/apps/app/navigation-app/main-page.ts b/apps/app/navigation-app/main-page.ts
index 5b1af32d1e..32a4a7246b 100644
--- a/apps/app/navigation-app/main-page.ts
+++ b/apps/app/navigation-app/main-page.ts
@@ -1,6 +1,6 @@
-import { EventData } from 'tns-core-modules/data/observable';
-import { Page, NavigatedData } from 'tns-core-modules/ui/page';
-import { topmost, NavigationEntry } from 'tns-core-modules/ui/frame';
+import { EventData } from "tns-core-modules/data/observable";
+import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { topmost, NavigationEntry } from "tns-core-modules/ui/frame";
 
 export function nav() {
     const e: NavigationEntry = {
diff --git a/apps/app/perf-app/flexbox/main-page.ts b/apps/app/perf-app/flexbox/main-page.ts
index f8cdddd16f..dfca62340b 100644
--- a/apps/app/perf-app/flexbox/main-page.ts
+++ b/apps/app/perf-app/flexbox/main-page.ts
@@ -1,4 +1,4 @@
-import {TabView} from "tns-core-modules/ui/tab-view";
+import { TabView } from "tns-core-modules/ui/tab-view";
 import * as utils from "tns-core-modules/utils/utils";
 
 const titles = ["Etiam lacinia", "Imperdiet ante", "A interdum", "Quisque tempus", "Sodales viverra"];
diff --git a/apps/app/perf-app/properties/tests.ts b/apps/app/perf-app/properties/tests.ts
index 2e85994239..260fd7b3df 100644
--- a/apps/app/perf-app/properties/tests.ts
+++ b/apps/app/perf-app/properties/tests.ts
@@ -4,7 +4,7 @@ import { Label } from "tns-core-modules/ui/label";
 
 const average = 3;
 const noValue = "noValue";
-const colors = ['red', 'green'];
+const colors = ["red", "green"];
 
 export function addRemove(counts: Array<number>, parent: LayoutBase): string {
     let result = `addRemove`;
@@ -29,7 +29,7 @@ export function addRemove(counts: Array<number>, parent: LayoutBase): string {
 }
 
 export function setText(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setText ${parent ? 'with nativeView' : ''}`;
+    let result = `setText ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const time = executeTest(() => {
@@ -44,7 +44,7 @@ export function setText(counts: Array<number>, parent?: LayoutBase): string {
 }
 
 export function setBackgroundColor(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setBackgroundColor ${parent ? 'with nativeView' : ''}`;
+    let result = `setBackgroundColor ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         if (parent && count > 10000) {
             result += setResultTime(noValue);
@@ -66,7 +66,7 @@ export function setBackgroundColor(counts: Array<number>, parent?: LayoutBase):
 
 const borders = [1, 2, 3];
 export function setBorderWidths(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setBorderWidths ${parent ? 'with nativeView' : ''}`;
+    let result = `setBorderWidths ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         if (count > 10000 && parent) {
             result += setResultTime(noValue);
@@ -90,7 +90,7 @@ export function setBorderWidths(counts: Array<number>, parent?: LayoutBase): str
 }
 
 export function setColor(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setColor ${parent ? 'with nativeView' : ''}`;
+    let result = `setColor ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const style = lbl.style;
@@ -128,7 +128,7 @@ export function setColorWithParents(counts: Array<number>, parent: LayoutBase):
 
 const fontSizes = [10, 20];
 export function setFontSize(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setFontSize ${parent ? 'with nativeView' : ''}`;
+    let result = `setFontSize ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const style = lbl.style;
@@ -165,13 +165,13 @@ export function setFontSizeWithParents(counts: Array<number>, parent: LayoutBase
 }
 
 export function setFontWeight(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setFontWeight ${parent ? 'with nativeView' : ''}`;
+    let result = `setFontWeight ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const style = lbl.style;
         const time = executeTest(() => {
             for (let i = 0; i < count; i++) {
-                style.fontWeight = i % 2 === 0 ? 'bold' : 'normal';
+                style.fontWeight = i % 2 === 0 ? "bold" : "normal";
             }
         });
         result += setResultTime(time);
@@ -192,7 +192,7 @@ export function setFontWeightWithParents(counts: Array<number>, parent: LayoutBa
         setupParents(parent);
         const time = executeTest(() => {
             for (let i = 0; i < count; i++) {
-                style.fontWeight = i % 2 === 0 ? 'bold' : 'normal'
+                style.fontWeight = i % 2 === 0 ? "bold" : "normal"
             }
         });
         result += setResultTime(time);
@@ -202,7 +202,7 @@ export function setFontWeightWithParents(counts: Array<number>, parent: LayoutBa
 }
 
 export function setBindingContext(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setBindingContext ${parent ? 'with nativeView' : ''}`;
+    let result = `setBindingContext ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const time = executeTest(() => {
diff --git a/apps/app/perf-app/recycling/main-page.ts b/apps/app/perf-app/recycling/main-page.ts
index da0e75ffdc..3c715eede7 100644
--- a/apps/app/perf-app/recycling/main-page.ts
+++ b/apps/app/perf-app/recycling/main-page.ts
@@ -56,7 +56,7 @@ export function onTap(args) {
         result.text += line + "\n";
     }
 
-    let text = '';//"Count";
+    let text = ""; //"Count";
     // c.forEach(e => {
     //     text += `\t${e}`;
     // });
diff --git a/apps/app/perf-app/recycling/tests.ts b/apps/app/perf-app/recycling/tests.ts
index 9b2cb697cc..178859f66d 100644
--- a/apps/app/perf-app/recycling/tests.ts
+++ b/apps/app/perf-app/recycling/tests.ts
@@ -1,40 +1,40 @@
-import { time } from 'tns-core-modules/profiling';
-import { ActionBar } from 'tns-core-modules/ui/action-bar';
-import { ActivityIndicator } from 'tns-core-modules/ui/activity-indicator';
-import { Border } from 'tns-core-modules/ui/border';
-import { Button } from 'tns-core-modules/ui/button';
-import { ContentView } from 'tns-core-modules/ui/content-view';
-import { DatePicker } from 'tns-core-modules/ui/date-picker';
-import { HtmlView } from 'tns-core-modules/ui/html-view';
-import { Image } from 'tns-core-modules/ui/image';
-import { Label } from 'tns-core-modules/ui/label';
-import { AbsoluteLayout } from 'tns-core-modules/ui/layouts/absolute-layout';
-import { DockLayout } from 'tns-core-modules/ui/layouts/dock-layout';
-import { FlexboxLayout } from 'tns-core-modules/ui/layouts/flexbox-layout';
-import { GridLayout } from 'tns-core-modules/ui/layouts/grid-layout';
-import { StackLayout } from 'tns-core-modules/ui/layouts/stack-layout';
-import { WrapLayout } from 'tns-core-modules/ui/layouts/wrap-layout';
-import { ListPicker } from 'tns-core-modules/ui/list-picker';
-import { ListView } from 'tns-core-modules/ui/list-view';
-import { Page } from 'tns-core-modules/ui/page';
-import { Progress } from 'tns-core-modules/ui/progress';
-import { Repeater } from 'tns-core-modules/ui/repeater';
-import { SegmentedBar } from 'tns-core-modules/ui/segmented-bar';
-import { Switch } from 'tns-core-modules/ui/switch';
-import { TabView } from 'tns-core-modules/ui/tab-view';
-import { TextField } from 'tns-core-modules/ui/text-field';
-import { TextView } from 'tns-core-modules/ui/text-view';
-import { TimePicker } from 'tns-core-modules/ui/time-picker';
-import { View } from 'tns-core-modules/ui/core/view';
-import { FormattedString, Span } from 'tns-core-modules/text/formatted-string';
-import { _getProperties, _getStyleProperties } from 'tns-core-modules/ui/core/properties';
+import { time } from "tns-core-modules/profiling";
+import { ActionBar } from "tns-core-modules/ui/action-bar";
+import { ActivityIndicator } from "tns-core-modules/ui/activity-indicator";
+import { Border } from "tns-core-modules/ui/border";
+import { Button } from "tns-core-modules/ui/button";
+import { ContentView } from "tns-core-modules/ui/content-view";
+import { DatePicker } from "tns-core-modules/ui/date-picker";
+import { HtmlView } from "tns-core-modules/ui/html-view";
+import { Image } from "tns-core-modules/ui/image";
+import { Label } from "tns-core-modules/ui/label";
+import { AbsoluteLayout } from "tns-core-modules/ui/layouts/absolute-layout";
+import { DockLayout } from "tns-core-modules/ui/layouts/dock-layout";
+import { FlexboxLayout } from "tns-core-modules/ui/layouts/flexbox-layout";
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout";
+import { ListPicker } from "tns-core-modules/ui/list-picker";
+import { ListView } from "tns-core-modules/ui/list-view";
+import { Page } from "tns-core-modules/ui/page";
+import { Progress } from "tns-core-modules/ui/progress";
+import { Repeater } from "tns-core-modules/ui/repeater";
+import { SegmentedBar } from "tns-core-modules/ui/segmented-bar";
+import { Switch } from "tns-core-modules/ui/switch";
+import { TabView } from "tns-core-modules/ui/tab-view";
+import { TextField } from "tns-core-modules/ui/text-field";
+import { TextView } from "tns-core-modules/ui/text-view";
+import { TimePicker } from "tns-core-modules/ui/time-picker";
+import { View } from "tns-core-modules/ui/core/view";
+import { FormattedString, Span } from "tns-core-modules/text/formatted-string";
+import { _getProperties, _getStyleProperties } from "tns-core-modules/ui/core/properties";
 declare var __startCPUProfiler;
 declare var __stopCPUProfiler;
 
 const count = 200;
 export function testSetup(layout: StackLayout): string {
     setupSetters();
-    return '';
+    return "";
 }
 
 export function testFlexboxLayout(layout: StackLayout): string {
@@ -133,47 +133,47 @@ function test(layout: StackLayout, createView: () => View, count: number): strin
     const viewMap1 = new Map<string, any>();
     const cssMap1 = new Map<string, any>();
 
-    viewMap1.set('isEnabled', false);
+    viewMap1.set("isEnabled", false);
     let result = execute(layout, createView, count, viewMap1, cssMap1)
 
-    viewMap1.set('text', 'text');
-    viewMap1.set('automationText', "automationText");
-    cssMap1.set('width', 100);
-    cssMap1.set('height', 100);
-    cssMap1.set('rotate', '90');
+    viewMap1.set("text", "text");
+    viewMap1.set("automationText", "automationText");
+    cssMap1.set("width", 100);
+    cssMap1.set("height", 100);
+    cssMap1.set("rotate", "90");
     result += execute(layout, createView, count, viewMap1, cssMap1)
 
-    viewMap1.set('clipToBounds', false);
-    viewMap1.set('left', '20');
-    viewMap1.set('top', '20');
-    viewMap1.set('dock', 'top');
-    viewMap1.set('stretchLastChild', false);
+    viewMap1.set("clipToBounds", false);
+    viewMap1.set("left", "20");
+    viewMap1.set("top", "20");
+    viewMap1.set("dock", "top");
+    viewMap1.set("stretchLastChild", false);
 
-    cssMap1.set('paddingLeft', '30px');
-    cssMap1.set('paddingTop', '30px');
-    cssMap1.set('paddingRight', '30px');
-    cssMap1.set('paddingBottom', '30px');
-    cssMap1.set('horizontalAlignment', 'center');
-    cssMap1.set('verticalAlignment', 'center');
+    cssMap1.set("paddingLeft", "30px");
+    cssMap1.set("paddingTop", "30px");
+    cssMap1.set("paddingRight", "30px");
+    cssMap1.set("paddingBottom", "30px");
+    cssMap1.set("horizontalAlignment", "center");
+    cssMap1.set("verticalAlignment", "center");
 
     result += execute(layout, createView, count, viewMap1, cssMap1)
 
-    viewMap1.set('row', '1');
-    viewMap1.set('rowSpan', '2');
-    viewMap1.set('col', '1');
-    viewMap1.set('colSpan', '2');
-
-    cssMap1.set('rotate', '90');
-    cssMap1.set('scaleX', 2);
-    cssMap1.set('scaleY', 2);
-    cssMap1.set('translateX', 20);
-    cssMap1.set('translateY', 20);
-    cssMap1.set('clipPath', 'inset(100px 50px)');
-    cssMap1.set('color', 'red');
-    cssMap1.set('tintColor', 'green');
-    cssMap1.set('placeholderColor', 'green');
-    cssMap1.set('backgroundColor', 'red');
-    cssMap1.set('backgroundImage', '~/logo.png');
+    viewMap1.set("row", "1");
+    viewMap1.set("rowSpan", "2");
+    viewMap1.set("col", "1");
+    viewMap1.set("colSpan", "2");
+
+    cssMap1.set("rotate", "90");
+    cssMap1.set("scaleX", 2);
+    cssMap1.set("scaleY", 2);
+    cssMap1.set("translateX", 20);
+    cssMap1.set("translateY", 20);
+    cssMap1.set("clipPath", "inset(100px 50px)");
+    cssMap1.set("color", "red");
+    cssMap1.set("tintColor", "green");
+    cssMap1.set("placeholderColor", "green");
+    cssMap1.set("backgroundColor", "red");
+    cssMap1.set("backgroundImage", "~/logo.png");
 
     result += execute(layout, createView, count, viewMap1, cssMap1)
     result += execute(layout, createView, count, setters, cssSetters);
@@ -214,10 +214,10 @@ function profile(layout: StackLayout, createView: () => View, count: number, rec
     viewProps: Map<string, any>, cssProps: Map<string, any>): { time: number, count: number } {
 
     const view = createView();
-    view.recycleNativeView = recycle ? 'always' : 'never';
+    view.recycleNativeView = recycle ? "always" : "never";
     const style = view.style;
     // DatePicker throws OOM
-    const c = view.typeName === 'DatePicker' ? 1 : 5;
+    const c = view.typeName === "DatePicker" ? 1 : 5;
     let total = 0;
     let x = 0;
     for (let i = 0; i < c; i++) {
@@ -260,125 +260,125 @@ function setupSetters(): void {
 
     setters = new Map<string, any>();
     // view-base
-    setters.set('id', "someId");
-    setters.set('className', "someClassName");
-    setters.set('bindingContext', "someBindingContext");
+    setters.set("id", "someId");
+    setters.set("className", "someClassName");
+    setters.set("bindingContext", "someBindingContext");
 
     // view
-    setters.set('automationText', "automationText");
-    setters.set('originX', 0.2);
-    setters.set('originY', 0.2);
-    setters.set('isEnabled', false);
-    setters.set('isUserInteractionEnabled', false);
+    setters.set("automationText", "automationText");
+    setters.set("originX", 0.2);
+    setters.set("originY", 0.2);
+    setters.set("isEnabled", false);
+    setters.set("isUserInteractionEnabled", false);
 
     // action-bar
-    setters.set('title', 'title');
-    setters.set('text', 'text');
-    setters.set('icon', '~/logo.png');
-    setters.set('visibility', 'collapse');
+    setters.set("title", "title");
+    setters.set("text", "text");
+    setters.set("icon", "~/logo.png");
+    setters.set("visibility", "collapse");
 
     // activity-indicator
-    setters.set('busy', true);
+    setters.set("busy", true);
 
     // date-picker
-    setters.set('year', '2010');
-    setters.set('month', '2');
-    setters.set('day', '2');
-    setters.set('maxDate', '2100');
-    setters.set('minDate', '2000');
-    setters.set('date', new Date(2011, 3, 3));
+    setters.set("year", "2010");
+    setters.set("month", "2");
+    setters.set("day", "2");
+    setters.set("maxDate", "2100");
+    setters.set("minDate", "2000");
+    setters.set("date", new Date(2011, 3, 3));
 
     // editable-text
-    setters.set('keyboardType', 'datetime');
-    setters.set('returnKeyType', 'done');
-    setters.set('editable', false);
-    setters.set('updateTextTrigger', 'focusLost');
-    setters.set('autocapitalizationType', 'words');
-    setters.set('autocorrect', true);
-    setters.set('hint', 'hint');
-    setters.set('maxLength', '10');
+    setters.set("keyboardType", "datetime");
+    setters.set("returnKeyType", "done");
+    setters.set("editable", false);
+    setters.set("updateTextTrigger", "focusLost");
+    setters.set("autocapitalizationType", "words");
+    setters.set("autocorrect", true);
+    setters.set("hint", "hint");
+    setters.set("maxLength", "10");
 
     // html-view
-    setters.set('html', '<a></a>');
+    setters.set("html", "<a></a>");
 
     // image-view
-    setters.set('imageSource', '');
-    setters.set('src', '');
-    setters.set('loadMode', 'async');
-    setters.set('isLoading', true);
-    setters.set('stretch', 'none');
+    setters.set("imageSource", "");
+    setters.set("src", "");
+    setters.set("loadMode", "async");
+    setters.set("isLoading", true);
+    setters.set("stretch", "none");
 
     // layout-base
-    setters.set('clipToBounds', false);
+    setters.set("clipToBounds", false);
 
     // absolute-layout
-    setters.set('left', '20');
-    setters.set('top', '20');
+    setters.set("left", "20");
+    setters.set("top", "20");
 
     // dock-layout
-    setters.set('dock', 'top');
-    setters.set('stretchLastChild', false);
+    setters.set("dock", "top");
+    setters.set("stretchLastChild", false);
 
     // grid-layout props
-    setters.set('row', '1');
-    setters.set('rowSpan', '2');
-    setters.set('col', '1');
-    setters.set('colSpan', '2');
+    setters.set("row", "1");
+    setters.set("rowSpan", "2");
+    setters.set("col", "1");
+    setters.set("colSpan", "2");
 
     // stack-layout
-    setters.set('orientation', 'horizontal');
+    setters.set("orientation", "horizontal");
 
     // wrap-layout
     // custom orientation value
     // setters.set('orientation', 'vertical');
-    setters.set('itemWidth', '50');
-    setters.set('itemHeight', '50');
+    setters.set("itemWidth", "50");
+    setters.set("itemHeight", "50");
 
     // list-picker
-    setters.set('items', ['1', '2', '3']);
-    setters.set('selectedIndex', '1');
+    setters.set("items", ["1", "2", "3"]);
+    setters.set("selectedIndex", "1");
 
     // list-view
-    setters.set('items', ['1', '2', '3']);
-    setters.set('itemTemplate', '<Label text="{{ $value }}" />');
-    setters.set('itemTemplates', '<template key="green"><Label text="{{ $value }}" style.backgroundColor="green" /></template><template key="red"><Label text="{{ $value }}" style.backgroundColor="red" /></template>');
-    setters.set('rowHeight', '50');
+    setters.set("items", ["1", "2", "3"]);
+    setters.set("itemTemplate", "<Label text=\"{{ $value }}\" />");
+    setters.set("itemTemplates", "<template key=\"green\"><Label text=\"{{ $value }}\" style.backgroundColor=\"green\" /></template><template key=\"red\"><Label text=\"{{ $value }}\" style.backgroundColor=\"red\" /></template>");
+    setters.set("rowHeight", "50");
 
     // page
-    setters.set('actionBarHidden', 'true');
-    setters.set('backgroundSpanUnderStatusBar', 'true');
-    setters.set('enableSwipeBackNavigation', 'false');
+    setters.set("actionBarHidden", "true");
+    setters.set("backgroundSpanUnderStatusBar", "true");
+    setters.set("enableSwipeBackNavigation", "false");
 
     // progress
-    setters.set('value', '1');
-    setters.set('maxValue', '99');
+    setters.set("value", "1");
+    setters.set("maxValue", "99");
 
     // repeater
-    setters.set('items', ['1', '2', '3']);
-    setters.set('itemTemplate', '<Label text="{{ $value }}" />');
+    setters.set("items", ["1", "2", "3"]);
+    setters.set("itemTemplate", "<Label text=\"{{ $value }}\" />");
     // setters.set('itemsLayout', new StackLayout());
-    setters.set('rowHeight', '50');
+    setters.set("rowHeight", "50");
 
     // scroll-view
     // custom orientation value
     //setters.set('orientation', 'horizontal');
 
     // search-bar
-    setters.set('textFieldHintColor', 'red');
-    setters.set('textFieldBackgroundColor', 'red');
+    setters.set("textFieldHintColor", "red");
+    setters.set("textFieldBackgroundColor", "red");
 
     // segmented-bar
     // custom items property
 
     // slider
-    setters.set('minValue', '5');
+    setters.set("minValue", "5");
 
     // switch
-    setters.set('checked', 'true');
+    setters.set("checked", "true");
 
     // tab-view
     // custom items property
-    setters.set('androidOffscreenTabLimit', '2');
+    setters.set("androidOffscreenTabLimit", "2");
 
     // text-base
     // const formattedText = new FormattedString();
@@ -388,105 +388,105 @@ function setupSetters(): void {
     // setters.set('formattedText', formattedText);
 
     // text-base
-    setters.set('secure', 'true');
+    setters.set("secure", "true");
 
     // time-picker
-    setters.set('minHour', 1);
-    setters.set('hour', 2);
-    setters.set('maxHour', 11);
-    setters.set('minMinute', 1);
-    setters.set('minute', 2);
-    setters.set('maxMinute', 11);
-    setters.set('minuteInterval', 2);
-    setters.set('time', new Date(2011, 2, 2, 3, 3, 3));
+    setters.set("minHour", 1);
+    setters.set("hour", 2);
+    setters.set("maxHour", 11);
+    setters.set("minMinute", 1);
+    setters.set("minute", 2);
+    setters.set("maxMinute", 11);
+    setters.set("minuteInterval", 2);
+    setters.set("time", new Date(2011, 2, 2, 3, 3, 3));
 
     cssSetters = new Map<string, any>();
 
     // style
-    cssSetters.set('rotate', '90');
-    cssSetters.set('scaleX', 2);
-    cssSetters.set('scaleY', 2);
-    cssSetters.set('translateX', 20);
-    cssSetters.set('translateY', 20);
-
-    cssSetters.set('clipPath', 'inset(100px 50px)');
-    cssSetters.set('color', 'red');
-    cssSetters.set('tintColor', 'green');
-    cssSetters.set('placeholderColor', 'green');
-
-    cssSetters.set('backgroundColor', 'red');
-    cssSetters.set('backgroundImage', '~/logo.png');
-    cssSetters.set('backgroundRepeat', 'repeat');
-    cssSetters.set('backgroundSize', '60px 120px');
-    cssSetters.set('backgroundPosition', 'center');
-    cssSetters.set('borderColor', 'blue');
-    cssSetters.set('borderTopColor', 'green');
-    cssSetters.set('borderRightColor', 'green');
-    cssSetters.set('borderBottomColor', 'green');
-    cssSetters.set('borderLeftColor', 'green');
-    cssSetters.set('borderWidth', '10px');
-    cssSetters.set('borderTopWidth', '5px');
-    cssSetters.set('borderRightWidth', '5px');
-    cssSetters.set('borderBottomWidth', '5px');
-    cssSetters.set('borderLeftWidth', '5px');
-    cssSetters.set('borderRadius', '10px');
-    cssSetters.set('borderTopLeftRadius', '5px');
-    cssSetters.set('borderTopRightRadius', '5px');
-    cssSetters.set('borderBottomRightRadius', '5px');
-    cssSetters.set('borderBottomLeftRadius', '5px');
-
-    cssSetters.set('fontSize', '20');
-    cssSetters.set('fontFamily', 'monospace');
-    cssSetters.set('fontStyle', 'italic');
-    cssSetters.set('fontWeight', '100');
-    cssSetters.set('font', 'italic 2 "Open Sans", sans-serif');
+    cssSetters.set("rotate", "90");
+    cssSetters.set("scaleX", 2);
+    cssSetters.set("scaleY", 2);
+    cssSetters.set("translateX", 20);
+    cssSetters.set("translateY", 20);
+
+    cssSetters.set("clipPath", "inset(100px 50px)");
+    cssSetters.set("color", "red");
+    cssSetters.set("tintColor", "green");
+    cssSetters.set("placeholderColor", "green");
+
+    cssSetters.set("backgroundColor", "red");
+    cssSetters.set("backgroundImage", "~/logo.png");
+    cssSetters.set("backgroundRepeat", "repeat");
+    cssSetters.set("backgroundSize", "60px 120px");
+    cssSetters.set("backgroundPosition", "center");
+    cssSetters.set("borderColor", "blue");
+    cssSetters.set("borderTopColor", "green");
+    cssSetters.set("borderRightColor", "green");
+    cssSetters.set("borderBottomColor", "green");
+    cssSetters.set("borderLeftColor", "green");
+    cssSetters.set("borderWidth", "10px");
+    cssSetters.set("borderTopWidth", "5px");
+    cssSetters.set("borderRightWidth", "5px");
+    cssSetters.set("borderBottomWidth", "5px");
+    cssSetters.set("borderLeftWidth", "5px");
+    cssSetters.set("borderRadius", "10px");
+    cssSetters.set("borderTopLeftRadius", "5px");
+    cssSetters.set("borderTopRightRadius", "5px");
+    cssSetters.set("borderBottomRightRadius", "5px");
+    cssSetters.set("borderBottomLeftRadius", "5px");
+
+    cssSetters.set("fontSize", "20");
+    cssSetters.set("fontFamily", "monospace");
+    cssSetters.set("fontStyle", "italic");
+    cssSetters.set("fontWeight", "100");
+    cssSetters.set("font", "italic 2 \"Open Sans\", sans-serif");
 
     // zIndex on android is not what you think...
     // cssSetters.set('zIndex', '2');
-    cssSetters.set('opacity', '0.5');
+    cssSetters.set("opacity", "0.5");
     // already set through view properties.
     // cssSetters.set('visibility', 'collapse');
 
-    cssSetters.set('letterSpacing', '2');
-    cssSetters.set('textAlignment', 'center');
-    cssSetters.set('textDecoration', 'underline');
-    cssSetters.set('textTransform', 'capitalize');
-    cssSetters.set('whiteSpace', 'normal');
-
-    cssSetters.set('minWidth', 50);
-    cssSetters.set('minHeight', 50);
-    cssSetters.set('width', 100);
-    cssSetters.set('height', 100);
-    cssSetters.set('margin', '25');
-    cssSetters.set('marginLeft', '30px');
-    cssSetters.set('marginTop', '30px');
-    cssSetters.set('marginRight', '30px');
-    cssSetters.set('marginBottom', '30px');
-    cssSetters.set('padding', '25');
-    cssSetters.set('paddingLeft', '30px');
-    cssSetters.set('paddingTop', '30px');
-    cssSetters.set('paddingRight', '30px');
-    cssSetters.set('paddingBottom', '30px');
-    cssSetters.set('horizontalAlignment', 'center');
-    cssSetters.set('verticalAlignment', 'center');
-
-    cssSetters.set('transform', 'translate(5, 10), scale(1.2, 1.2), rotate(45)');
+    cssSetters.set("letterSpacing", "2");
+    cssSetters.set("textAlignment", "center");
+    cssSetters.set("textDecoration", "underline");
+    cssSetters.set("textTransform", "capitalize");
+    cssSetters.set("whiteSpace", "normal");
+
+    cssSetters.set("minWidth", 50);
+    cssSetters.set("minHeight", 50);
+    cssSetters.set("width", 100);
+    cssSetters.set("height", 100);
+    cssSetters.set("margin", "25");
+    cssSetters.set("marginLeft", "30px");
+    cssSetters.set("marginTop", "30px");
+    cssSetters.set("marginRight", "30px");
+    cssSetters.set("marginBottom", "30px");
+    cssSetters.set("padding", "25");
+    cssSetters.set("paddingLeft", "30px");
+    cssSetters.set("paddingTop", "30px");
+    cssSetters.set("paddingRight", "30px");
+    cssSetters.set("paddingBottom", "30px");
+    cssSetters.set("horizontalAlignment", "center");
+    cssSetters.set("verticalAlignment", "center");
+
+    cssSetters.set("transform", "translate(5, 10), scale(1.2, 1.2), rotate(45)");
 
     // TabView-specific props
-    cssSetters.set('tabTextColor', 'red');
-    cssSetters.set('tabBackgroundColor', 'red');
-    cssSetters.set('selectedTabTextColor', 'red');
-    cssSetters.set('androidSelectedTabHighlightColor', 'red');
+    cssSetters.set("tabTextColor", "red");
+    cssSetters.set("tabBackgroundColor", "red");
+    cssSetters.set("selectedTabTextColor", "red");
+    cssSetters.set("androidSelectedTabHighlightColor", "red");
 
     // ListView-specific props 
-    cssSetters.set('separatorColor', 'red');
+    cssSetters.set("separatorColor", "red");
 
     // SegmentedBar-specific props
-    cssSetters.set('selectedBackgroundColor', 'red');
+    cssSetters.set("selectedBackgroundColor", "red");
 
     // Page-specific props 
-    cssSetters.set('statusBarStyle', 'light');
-    cssSetters.set('androidStatusBarBackground', 'red');
+    cssSetters.set("statusBarStyle", "light");
+    cssSetters.set("androidStatusBarBackground", "red");
 
     // Flexbox-layout props
     // cssSetters.set('flexDirection', 'column');
diff --git a/apps/app/ui-tests-app/action-bar/modal-page.ts b/apps/app/ui-tests-app/action-bar/modal-page.ts
index 72163758d8..0a82f0cd6b 100644
--- a/apps/app/ui-tests-app/action-bar/modal-page.ts
+++ b/apps/app/ui-tests-app/action-bar/modal-page.ts
@@ -13,16 +13,16 @@ export function onTap() {
     closeCallback("sample text\n");
 }
 
-export function change(args){
-     var button:Button =<Button>args.object;
+export function change(args) {
+    var button: Button = <Button>args.object;
+
+    var page: Page = <Page>button.parent;
 
-    var page:Page =<Page> button.parent;
-    
     console.log("---------------------page-------------------------")
     console.log(page)
-     var label:Label = <Label> page.getViewById("label1");
-     label.text="fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo";
+    var label: Label = <Label>page.getViewById("label1");
+    label.text = "fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo";
 
-     var label2:Label = <Label> page.getViewById("label2");
-     label2.text="foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo";
+    var label2: Label = <Label>page.getViewById("label2");
+    label2.text = "foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo";
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/button/border-playground.ts b/apps/app/ui-tests-app/button/border-playground.ts
index 0b9272cd18..b8a313dade 100644
--- a/apps/app/ui-tests-app/button/border-playground.ts
+++ b/apps/app/ui-tests-app/button/border-playground.ts
@@ -8,32 +8,37 @@ import { ScrollView } from "tns-core-modules/ui/scroll-view";
 let red = new Color("red");
 let green = new Color("green");
 
-export function onToggle(args: EventData){
+export function onToggle(args: EventData) {
     let button = <Button>args.object;
     let target = button.page.getViewById<View>("target");
     let debugConsole = button.page.getViewById<TextView>("debugConsole");
     let scrollView = button.page.getViewById<ScrollView>("scrollView");
 
-    if (button.text === "Color"){
+    if (button.text === "Color") {
         target[button.id] = target[button.id] ? undefined : red;
         debugConsole.text += `> border-color: ${target.borderColor}\n`;
     }
-    else if (button.text === "Width"){
+    else if (button.text === "Width") {
         target[button.id] = target[button.id] ? 0 : 10; 
         debugConsole.text += `> border-width: ${target.borderWidth}\n`;
     }
-    else if (button.text === "Radius"){
+    else if (button.text === "Radius") {
         target[button.id] = target[button.id] ? 0 : 10; 
         debugConsole.text += `> border-radius: ${target.borderRadius}\n`;
     }
-    else if (button.text === "BGColor"){
+    else if (button.text === "BGColor") {
         target.backgroundColor = target.backgroundColor ? undefined : green; 
         debugConsole.text += `> background-color: ${target.backgroundColor}\n`;
     }
-    else if (button.text === "BGImage"){
+    else if (button.text === "BGImage") {
         target.backgroundImage = target.backgroundImage ? undefined : `~/ui-tests-app/resources/images/test2.png`; 
         debugConsole.text += `> background-image: ${target.backgroundImage}\n`;
     }
+    else if (button.text === "BGGradient") {
+        const gradient = "linear-gradient(to right, purple, red)";
+        target.backgroundImage = typeof target.backgroundImage === "object" ? undefined :  gradient;
+        debugConsole.text += `> background-image: ${gradient} \n`;
+    }
 
     scrollView.scrollToVerticalOffset(scrollView.scrollableHeight, true);
 }
diff --git a/apps/app/ui-tests-app/button/border-playground.xml b/apps/app/ui-tests-app/button/border-playground.xml
index 83d669808d..e3a0fb624d 100644
--- a/apps/app/ui-tests-app/button/border-playground.xml
+++ b/apps/app/ui-tests-app/button/border-playground.xml
@@ -17,6 +17,7 @@
         <StackLayout id="target" row="1" col="1">
             <Button text="BGColor" tap="onToggle"/>
             <Button text="BGImage" tap="onToggle"/>
+            <Button text="BGGradient" tap="onToggle"/>
         </StackLayout>
         <StackLayout id="right" class="button-container" row="1" col="2">
             <Button text="Color" id="borderRightColor" tap="onToggle"/>
diff --git a/apps/app/ui-tests-app/button/main-page.ts b/apps/app/ui-tests-app/button/main-page.ts
index ca3dcb4570..40f3efbdca 100644
--- a/apps/app/ui-tests-app/button/main-page.ts
+++ b/apps/app/ui-tests-app/button/main-page.ts
@@ -15,9 +15,9 @@ export function loadExamples() {
     examples.set("button-border", "button/button-border");
     examples.set("styles", "button/styles");
     examples.set("background", "button/background");
-    examples.set("border-playground","button/border-playground");
-    examples.set("issue-4287","button/issue-4287");
-    examples.set("issue-4385","button/issue-4385");
-    examples.set("highlight-4740","button/highlight-4740/highlight-4740");
+    examples.set("border-playground", "button/border-playground");
+    examples.set("issue-4287", "button/issue-4287");
+    examples.set("issue-4385", "button/issue-4385");
+    examples.set("highlight-4740", "button/highlight-4740/highlight-4740");
     return examples;
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-non-uniform-border.ts b/apps/app/ui-tests-app/css/all-non-uniform-border.ts
index 5ad802208b..50cb7aaed6 100644
--- a/apps/app/ui-tests-app/css/all-non-uniform-border.ts
+++ b/apps/app/ui-tests-app/css/all-non-uniform-border.ts
@@ -1,12 +1,12 @@
-import { EventData} from "tns-core-modules/data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { Page } from "tns-core-modules/ui/page";
 import { SearchBar } from "tns-core-modules/ui/search-bar";
 import { isAndroid } from "tns-core-modules/platform";
 
-export function onLoaded(args: EventData){
+export function onLoaded(args: EventData) {
     var page = <Page>args.object;
     var searchBar = <SearchBar>page.getViewById("sb");
-    if(isAndroid){
+    if (isAndroid) {
         searchBar.android.clearFocus();
     }
 }
diff --git a/apps/app/ui-tests-app/css/all-uniform-border.ts b/apps/app/ui-tests-app/css/all-uniform-border.ts
index 5ad802208b..50cb7aaed6 100644
--- a/apps/app/ui-tests-app/css/all-uniform-border.ts
+++ b/apps/app/ui-tests-app/css/all-uniform-border.ts
@@ -1,12 +1,12 @@
-import { EventData} from "tns-core-modules/data/observable";
+import { EventData } from "tns-core-modules/data/observable";
 import { Page } from "tns-core-modules/ui/page";
 import { SearchBar } from "tns-core-modules/ui/search-bar";
 import { isAndroid } from "tns-core-modules/platform";
 
-export function onLoaded(args: EventData){
+export function onLoaded(args: EventData) {
     var page = <Page>args.object;
     var searchBar = <SearchBar>page.getViewById("sb");
-    if(isAndroid){
+    if (isAndroid) {
         searchBar.android.clearFocus();
     }
 }
diff --git a/apps/app/ui-tests-app/css/background-image-linear-gradient.ts b/apps/app/ui-tests-app/css/background-image-linear-gradient.ts
new file mode 100644
index 0000000000..dce615cf26
--- /dev/null
+++ b/apps/app/ui-tests-app/css/background-image-linear-gradient.ts
@@ -0,0 +1,41 @@
+import * as pages from "tns-core-modules/ui/page";
+import { EventData } from "tns-core-modules/data/observable";
+import * as button from "tns-core-modules/ui/button";
+
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
+
+let testIndex = 0;
+const tests = [
+    { name: "black-blue only", backgroundImage: "linear-gradient(to bottom, black, blue)"},
+    { name: "to bottom green-blue", backgroundImage: "linear-gradient(to bottom, green, blue)"},
+    { name: "to left yellow-blue", backgroundImage: "linear-gradient(to left, yellow, green)"},
+    { name: "to right yellow-blue", backgroundImage: "linear-gradient(to right, yellow, green)"},
+    { name: "-45deg green-blue", backgroundImage: "linear-gradient(-45deg, green, blue)"},
+    { name: "45deg green-blue", backgroundImage: "linear-gradient(45deg, green, blue)"},
+
+    { name: "black-blue-pink only", backgroundImage: "linear-gradient(to bottom, black, blue, pink)"},
+    { name: "to bottom green-blue-pink", backgroundImage: "linear-gradient(to bottom, green, blue, pink)"},
+    { name: "to left yellow-blue-pink", backgroundImage: "linear-gradient(to left, yellow, green, pink)"},
+    { name: "to right yellow-blue-pink", backgroundImage: "linear-gradient(to right, yellow, green, pink)"},
+    { name: "-45deg green-blue-pink", backgroundImage: "linear-gradient(-45deg, green, blue, pink)"},
+    { name: "45deg green-blue-pink", backgroundImage: "linear-gradient(45deg, green, blue, pink)"},
+]
+
+export function onLoaded(args) {
+    applyNextStyle(args);
+}
+
+export function onButtonTap(args) {
+    applyNextStyle(args);
+}
+
+function applyNextStyle(args) {
+    let page = <pages.Page>args.object.page;
+    let btn = <button.Button>args.object;
+    let gridElement = <GridLayout>page.getViewById("Container");
+
+    btn.text = tests[testIndex].name;
+    gridElement.backgroundImage = tests[testIndex].backgroundImage;
+
+    testIndex = testIndex < tests.length - 1 ? ++testIndex : 0;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/background-image-linear-gradient.xml b/apps/app/ui-tests-app/css/background-image-linear-gradient.xml
new file mode 100644
index 0000000000..9349e820b2
--- /dev/null
+++ b/apps/app/ui-tests-app/css/background-image-linear-gradient.xml
@@ -0,0 +1,7 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="onLoaded">
+  <GridLayout rows="*, 7*">
+     <Button row="0" text="a1" tap="onButtonTap"/>
+
+    <GridLayout id="Container" fontSize="12" borderColor="black" margin="5" borderWidth="1" row="1"/>
+  </GridLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/background-shorthand.ts b/apps/app/ui-tests-app/css/background-shorthand.ts
index 2721d17c1e..805192ee0f 100644
--- a/apps/app/ui-tests-app/css/background-shorthand.ts
+++ b/apps/app/ui-tests-app/css/background-shorthand.ts
@@ -9,23 +9,25 @@ const tests = [
     { name: "black hex color only", background: "#000000" },
     { name: "yellow hex color only", background: "#ffff00" },
     { name: "blue color only", background: "blue" },
-    { name: "repeat image only", background: 'url("~/ui-tests-app/resources/images/icon.png")' },
-
-    { name: "[straight] image only, no-repeat ", background: 'url("~/ui-tests-app/resources/images/icon.png") no-repeat' },
-    { name: "[straight] green color, image, no-repeat", background: 'green url("~/ui-tests-app/resources/images/icon.png") no-repeat' },
-    { name: "[straight] yellow hex color, image, no-repeat, position pixels", background: '#ffff00 url("~/ui-tests-app/resources/images/icon.png") no-repeat 200px 200px' },
-    { name: "[straight] yellow hex color, image, repeat-y, position pixels", background: '#ffff00 url("~/ui-tests-app/resources/images/icon.png") repeat-y 100px 500px' },
-    { name: "[straight] orange hex color, image, no-repeat, position percents", background: '#F9791F url("~/ui-tests-app/resources/images/icon.png") no-repeat 100% 100%' },
-    { name: "[straight] green color, image, repeat-x, position percents", background: 'green url("~/ui-tests-app/resources/images/icon.png") repeat-x 100% 100%' },
-    { name: "[straight] blue color, image, repeat-x, position", background: 'blue url("~/ui-tests-app/resources/images/icon.png") repeat-x 150 150' },
-    
-    { name: "[shuffle] no-repeat, image only", background: 'no-repeat url("~/ui-tests-app/resources/images/icon.png")' },
-    { name: "[shuffle] no-repeat, green color, image, ", background: 'no-repeat green url("~/ui-tests-app/resources/images/icon.png")' },
-    { name: "[shuffle] yellow hex color, position pixels, image, no-repeat", background: '#ffff00 200px 200px url("~/ui-tests-app/resources/images/icon.png") no-repeat' },
-    { name: "[shuffle] image, repeat-y, yellow hex color, position pixels", background: 'url("~/ui-tests-app/resources/images/icon.png") repeat-y #ffff00 100px 500px' },
-    { name: "[shuffle] position percents, image, no-repeat, orange hex color", background: '100% 100% url("~/ui-tests-app/resources/images/icon.png") no-repeat #F9791F' },
-    { name: "[shuffle] position percents, image, repeat-x, green color", background: '100% 100% url("~/ui-tests-app/resources/images/icon.png") repeat-x green' },
-    { name: "[shuffle] image, repeat-x, position, blue color,", background: 'url("~/ui-tests-app/resources/images/icon.png") repeat-x 150 150 blue' },
+
+    { name: "repeat image only", background: "url(\"~/ui-tests-app/resources/images/icon.png\")" },
+    { name: "linear gradient red-blue only", background: "linear-gradient(to bottom, red, blue)"},
+
+    { name: "[straight] image only, no-repeat ", background: "url(\"~/ui-tests-app/resources/images/icon.png\") no-repeat" },
+    { name: "[straight] green color, image, no-repeat", background: "green url(\"~/ui-tests-app/resources/images/icon.png\") no-repeat" },
+    { name: "[straight] yellow hex color, image, no-repeat, position pixels", background: "#ffff00 url(\"~/ui-tests-app/resources/images/icon.png\") no-repeat 200px 200px" },
+    { name: "[straight] yellow hex color, image, repeat-y, position pixels", background: "#ffff00 url(\"~/ui-tests-app/resources/images/icon.png\") repeat-y 100px 500px" },
+    { name: "[straight] orange hex color, image, no-repeat, position percents", background: "#F9791F url(\"~/ui-tests-app/resources/images/icon.png\") no-repeat 100% 100%" },
+    { name: "[straight] green color, image, repeat-x, position percents", background: "green url(\"~/ui-tests-app/resources/images/icon.png\") repeat-x 100% 100%" },
+    { name: "[straight] blue color, image, repeat-x, position", background: "blue url(\"~/ui-tests-app/resources/images/icon.png\") repeat-x 150 150" },
+
+    { name: "[shuffle] no-repeat, image only", background: "no-repeat url(\"~/ui-tests-app/resources/images/icon.png\")" },
+    { name: "[shuffle] no-repeat, green color, image, ", background: "no-repeat green url(\"~/ui-tests-app/resources/images/icon.png\")" },
+    { name: "[shuffle] yellow hex color, position pixels, image, no-repeat", background: "#ffff00 200px 200px url(\"~/ui-tests-app/resources/images/icon.png\") no-repeat" },
+    { name: "[shuffle] image, repeat-y, yellow hex color, position pixels", background: "url(\"~/ui-tests-app/resources/images/icon.png\") repeat-y #ffff00 100px 500px" },
+    { name: "[shuffle] position percents, image, no-repeat, orange hex color", background: "100% 100% url(\"~/ui-tests-app/resources/images/icon.png\") no-repeat #F9791F" },
+    { name: "[shuffle] position percents, image, repeat-x, green color", background: "100% 100% url(\"~/ui-tests-app/resources/images/icon.png\") repeat-x green" },
+    { name: "[shuffle] image, repeat-x, position, blue color,", background: "url(\"~/ui-tests-app/resources/images/icon.png\") repeat-x 150 150 blue" },
 ]
 
 export function onLoaded(args) {
diff --git a/apps/app/ui-tests-app/css/gradient-border.css b/apps/app/ui-tests-app/css/gradient-border.css
new file mode 100644
index 0000000000..3f8c9ff150
--- /dev/null
+++ b/apps/app/ui-tests-app/css/gradient-border.css
@@ -0,0 +1,77 @@
+StackLayout {
+    width: 80;
+    height: 80;
+    background: linear-gradient(to top, green, blue);
+}
+
+#s0 {
+    border-width: 5;
+}
+
+#s1 {
+    border-width: 5; border-color: red;
+}
+
+#s2 {
+    border-width: 5; border-color: red red red green;
+}
+
+#s3 {
+    border-width: 5; border-color: red; border-radius: 5;
+}
+
+#s4 {
+    border-width: 5; border-color: red; border-radius: 50;
+}
+
+#s5 {
+    border-width: 5 10 15 20; border-color: red;
+}
+
+#s6 {
+    border-width: 5; border-color: red green blue yellow;
+}
+
+#s7 {
+    border-width: 5 10 15 20; border-color: red green blue yellow;
+}
+
+#s8 {
+    border-width: 5 10; border-color: red green;
+}
+
+#s9 {
+    border-width: 15 10 5; border-color: red green blue;
+}
+
+#s10 {
+    border-width: 5 0; border-color: black;
+}
+
+#s11 {
+    background-color: magenta;
+}
+
+#s12 {
+    border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5 10 15 20;
+}
+
+#s13 {
+    border-width: 5 10 15 20; border-color: red green blue yellow; border-radius: 5;
+}
+
+#s14 {
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-color: magenta;
+}
+
+#s15 {
+    border-width: 5 10 15 20; border-color: red green blue yellow; background-image: url('~/ui-tests-app/resources/images/test2.png');
+}
+
+#s16 {
+    border-width: 5; border-color: red; padding: 5;
+}
+
+#s17 {
+    border-width: 5 6 7 8; border-color: red green blue yellow; padding: 5 6 7 8;
+}
diff --git a/apps/app/ui-tests-app/css/gradient-border.xml b/apps/app/ui-tests-app/css/gradient-border.xml
new file mode 100644
index 0000000000..43c8adc28f
--- /dev/null
+++ b/apps/app/ui-tests-app/css/gradient-border.xml
@@ -0,0 +1,22 @@
+<Page>
+    <GridLayout rows="*,*,*,*,*,*" columns="*,*,*">
+        <StackLayout  id="s0" row="0" col="0"/>
+        <StackLayout  id="s1" row="0" col="1"/>
+        <StackLayout  id="s2" row="0" col="2"/>
+        <StackLayout  id="s3" row="1" col="0"/>
+        <StackLayout  id="s4" row="1" col="1"/>
+        <StackLayout  id="s5" row="1" col="2"/>
+        <StackLayout  id="s6" row="2" col="0"/>
+        <StackLayout  id="s7" row="2" col="1"/>
+        <StackLayout  id="s8" row="2" col="2"/>
+        <StackLayout  id="s9" row="3" col="0"/>
+        <StackLayout id="s10" row="3" col="1"/>
+        <StackLayout id="s11" row="3" col="2"/>
+        <StackLayout id="s12" row="4" col="0"/>
+        <StackLayout id="s13" row="4" col="1"/>
+        <StackLayout id="s14" row="4" col="2"/>
+        <StackLayout id="s15" row="5" col="0"/>
+        <StackLayout id="s16" row="5" col="1"/>
+        <StackLayout id="s17" row="5" col="2"/>
+    </GridLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
index 2e19539918..8e7083b4df 100644
--- a/apps/app/ui-tests-app/css/main-page.ts
+++ b/apps/app/ui-tests-app/css/main-page.ts
@@ -30,6 +30,7 @@ export function loadExamples() {
     examples.set("label-border", "css/label-border");
     examples.set("text-view-border", "css/text-view-border");
     examples.set("image-border", "css/image-border");
+    examples.set("gradient-border", "css/gradient-border");
     examples.set("layouts-border-overlap", "css/layouts-border-overlap");
     examples.set("measure-tests", "css/measure-tests");
     examples.set("all-uniform-border", "css/all-uniform-border");
@@ -41,5 +42,6 @@ export function loadExamples() {
     examples.set("non-uniform-radius", "css/non-uniform-radius");
     examples.set("missing-background-image", "css/missing-background-image");
     examples.set("background-shorthand", "css/background-shorthand");
+    examples.set("background-image-linear-gradient", "css/background-image-linear-gradient");
     return examples;
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/events/gestures.ts b/apps/app/ui-tests-app/events/gestures.ts
index d68503ebbc..264106db22 100644
--- a/apps/app/ui-tests-app/events/gestures.ts
+++ b/apps/app/ui-tests-app/events/gestures.ts
@@ -85,7 +85,7 @@ export function createPage() {
     var observer3 = longpressLabel.getGestureObservers(gestures.GestureTypes.longPress)[0];
 
     swipeLabel.on(gestures.GestureTypes.swipe, function (args: gestures.SwipeGestureEventData) {
-        swipeLabel.text = "Swipe Direction: " + args.direction + ", " + (args.object === swipeLabel);// + getStateAsString(args.state);
+        swipeLabel.text = "Swipe Direction: " + args.direction + ", " + (args.object === swipeLabel); // + getStateAsString(args.state);
     });
 
     var observer4 = swipeLabel.getGestureObservers(gestures.GestureTypes.swipe)[0];
diff --git a/apps/app/ui-tests-app/events/layout-changed-event.ts b/apps/app/ui-tests-app/events/layout-changed-event.ts
new file mode 100644
index 0000000000..9070896e8e
--- /dev/null
+++ b/apps/app/ui-tests-app/events/layout-changed-event.ts
@@ -0,0 +1,26 @@
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { Button } from "tns-core-modules/ui/button";
+import { TextView } from "tns-core-modules/ui/text-view";
+import { View } from "tns-core-modules/ui/core/view";
+import { EventData } from "tns-core-modules/data/observable";
+let buttonsCount = 1;
+
+export function onLayoutChanged(args) {
+    let msg = "StackLayout layout changed - width:" + args.object.getActualSize().width;
+    (<TextView>args.object.page.getViewById("output")).text += msg + "\n";
+}
+
+export function addChild(args) {
+    let button = new Button();
+    button.text = "Button" + buttonsCount;
+    button.margin = 10;
+    button.backgroundColor = "lightgreen";
+    
+    (<StackLayout>args.object.page.getViewById("target")).addChild(button);
+    buttonsCount++;
+}
+
+export function clear(args) {
+    (<StackLayout>args.object.page.getViewById("target")).removeChildren();
+    args.object.page.getViewById("output").text = "";
+}
diff --git a/apps/app/ui-tests-app/events/layout-changed-event.xml b/apps/app/ui-tests-app/events/layout-changed-event.xml
new file mode 100644
index 0000000000..d66a3a2892
--- /dev/null
+++ b/apps/app/ui-tests-app/events/layout-changed-event.xml
@@ -0,0 +1,11 @@
+<Page>
+  <GridLayout rows="*, *, *" >
+    <StackLayout horizontalAlignment="left" orientation="horizontal" backgroundColor="yellow" id="target" margin="20" layoutChanged="onLayoutChanged"/>
+    
+    <StackLayout row="1">
+        <Button text="clear" tap="clear"/>
+        <Button text="add child" tap="addChild"/>
+    </StackLayout>
+    <TextView row="2" id="output" automationText="output" style="font-size: 10, font-family: monospace;"/>
+  </GridLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/events/main-page.ts b/apps/app/ui-tests-app/events/main-page.ts
index 1f093b3e6e..2033fb6b5f 100644
--- a/apps/app/ui-tests-app/events/main-page.ts
+++ b/apps/app/ui-tests-app/events/main-page.ts
@@ -19,6 +19,7 @@ export function loadExamples() {
     examples.set("i61", "events/i61");
     examples.set("i73", "events/i73");
     examples.set("i86", "events/i86");
+    examples.set("layout changed", "events/layout-changed-event");
 
     return examples;
 }
diff --git a/apps/app/ui-tests-app/events/touch-event.ts b/apps/app/ui-tests-app/events/touch-event.ts
index c1179936a0..c7add61b76 100644
--- a/apps/app/ui-tests-app/events/touch-event.ts
+++ b/apps/app/ui-tests-app/events/touch-event.ts
@@ -1,4 +1,4 @@
-import {TextView} from "tns-core-modules/ui/text-view";
+import { TextView } from "tns-core-modules/ui/text-view";
 import * as gestures from "tns-core-modules/ui/gestures";
 
 export function onTouch(args: gestures.TouchGestureEventData) {
diff --git a/apps/app/ui-tests-app/flexbox/flexbox-4834.css b/apps/app/ui-tests-app/flexbox/flexbox-4834.css
new file mode 100644
index 0000000000..f2714f66bc
--- /dev/null
+++ b/apps/app/ui-tests-app/flexbox/flexbox-4834.css
@@ -0,0 +1,14 @@
+image {
+    width: 40;
+    height: 40;
+    flex-grow: 0;
+    flex-shrink: 0;
+}
+
+Label {
+    border-width: 1;
+    border-color: black;
+    padding: 0;
+    flex-grow: 1;
+    flex-shrink: 1;
+}
diff --git a/apps/app/ui-tests-app/flexbox/flexbox-4834.xml b/apps/app/ui-tests-app/flexbox/flexbox-4834.xml
new file mode 100644
index 0000000000..ac96bd2b84
--- /dev/null
+++ b/apps/app/ui-tests-app/flexbox/flexbox-4834.xml
@@ -0,0 +1,55 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+
+    <StackLayout width="200" class="p-20">
+
+        <!-- Android -->
+        <FlexboxLayout>
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p q r s t" />
+        </FlexboxLayout>
+
+        <FlexboxLayout>
+            <Image src="https://placehold.it/40x40" />
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p" />
+        </FlexboxLayout>
+
+        <FlexboxLayout flexWrap="wrap">
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p q r s t" />
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p q r s t" />
+        </FlexboxLayout>
+
+
+        <!-- iOS -->
+        <FlexboxLayout>
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p" />
+        </FlexboxLayout>
+
+        <FlexboxLayout>
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p q" />
+        </FlexboxLayout>
+
+        <FlexboxLayout>
+            <Image src="https://placehold.it/40x40" />
+            <Label textWrap="true" text="a b c d e f g h i j k l m" />
+        </FlexboxLayout>
+
+        <FlexboxLayout>
+            <Image src="https://placehold.it/40x40" />
+            <Label textWrap="true" text="a b c d e f g h i j k l m n" />
+        </FlexboxLayout>
+
+        <FlexboxLayout flexWrap="wrap">
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p" />
+            <Label textWrap="true" text="a b c d e f g h i j k l m n o p q" />
+        </FlexboxLayout>
+
+
+        <!-- Common -->
+        <FlexboxLayout alignItems="flex-start">
+            <Label textWrap="true" text="a b" style="flex-shrink:0;" />
+            <Label textWrap="true" text="a b c d e f g h i" />
+            <Label textWrap="true" text="a b c d e f g h i j" />
+            <Label textWrap="true" text="a b c d e f g h i j k" />
+        </FlexboxLayout>
+
+    </StackLayout>
+</Page>     
diff --git a/apps/app/ui-tests-app/flexbox/flexbox-main-page.ts b/apps/app/ui-tests-app/flexbox/flexbox-main-page.ts
index f1773098db..b7a8521537 100644
--- a/apps/app/ui-tests-app/flexbox/flexbox-main-page.ts
+++ b/apps/app/ui-tests-app/flexbox/flexbox-main-page.ts
@@ -17,6 +17,7 @@ export function loadExamples() {
     examples.set("flexrepeat", "flexbox/flexbox-repeater");
     examples.set("flex-perf", "flexbox/flexbox-perf-comparison");
     examples.set("flexbox-4143", "flexbox/flexbox-4143");
+    examples.set("flexbox-4834", "flexbox/flexbox-4834");
 
     return examples;
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/flexbox/flexbox-perf-comparison.ts b/apps/app/ui-tests-app/flexbox/flexbox-perf-comparison.ts
index e205b78c74..f50b2d8618 100644
--- a/apps/app/ui-tests-app/flexbox/flexbox-perf-comparison.ts
+++ b/apps/app/ui-tests-app/flexbox/flexbox-perf-comparison.ts
@@ -1,4 +1,4 @@
-import {TabView} from "tns-core-modules/ui/tab-view";
+import { TabView } from "tns-core-modules/ui/tab-view";
 import * as utils from "tns-core-modules/utils/utils";
 
 const titles = ["Etiam lacinia", "Imperdiet ante", "A interdum", "Quisque tempus", "Sodales viverra"];
diff --git a/apps/app/ui-tests-app/font/font-awesome/issue-3654-2.ts b/apps/app/ui-tests-app/font/font-awesome/issue-3654-2.ts
index 9a0e44edfb..9746dd1997 100644
--- a/apps/app/ui-tests-app/font/font-awesome/issue-3654-2.ts
+++ b/apps/app/ui-tests-app/font/font-awesome/issue-3654-2.ts
@@ -1,5 +1,5 @@
 import { topmost } from "tns-core-modules/ui/frame";
 
-export function onTap(args){
+export function onTap(args) {
     topmost().goBack();
 }
diff --git a/apps/app/ui-tests-app/font/font-awesome/issue-3654.ts b/apps/app/ui-tests-app/font/font-awesome/issue-3654.ts
index 2f46ce44a8..c1815ba42b 100644
--- a/apps/app/ui-tests-app/font/font-awesome/issue-3654.ts
+++ b/apps/app/ui-tests-app/font/font-awesome/issue-3654.ts
@@ -1,5 +1,5 @@
 import { topmost } from "tns-core-modules/ui/frame";
 
-export function onTap(){
+export function onTap() {
     topmost().navigate("ui-tests-app/font/font-awesome/issue-3654-2");
 }
diff --git a/apps/app/ui-tests-app/image-view/image-asset/view-model.ts b/apps/app/ui-tests-app/image-view/image-asset/view-model.ts
index 053c73d335..c66b23cce3 100644
--- a/apps/app/ui-tests-app/image-view/image-asset/view-model.ts
+++ b/apps/app/ui-tests-app/image-view/image-asset/view-model.ts
@@ -1,7 +1,7 @@
 import * as dialogs from "tns-core-modules/ui/dialogs";
 import * as observable from "tns-core-modules/data/observable";
 import * as imageAssetModule from "tns-core-modules/image-asset";
-import { ImageSource } from 'tns-core-modules/image-source';
+import { ImageSource } from "tns-core-modules/image-source";
 
 let _cameraImageAsset = null;
 let _cameraImageSrc = null;
@@ -10,7 +10,7 @@ export class ImageViewModel extends observable.Observable {
 
     constructor() {
         super();
-        let asset = new imageAssetModule.ImageAsset('~/splashscreen.png');
+        let asset = new imageAssetModule.ImageAsset("~/splashscreen.png");
         asset.options = {
             width: 300,
             height: 300,
diff --git a/apps/app/ui-tests-app/image-view/mode-matrix.ts b/apps/app/ui-tests-app/image-view/mode-matrix.ts
index 72c73029d7..92736156e6 100644
--- a/apps/app/ui-tests-app/image-view/mode-matrix.ts
+++ b/apps/app/ui-tests-app/image-view/mode-matrix.ts
@@ -28,7 +28,7 @@ export function navigatingTo(args) {
 
             grid.addChild(image);
 
-            switch(Math.floor(x / 4)) {
+            switch (Math.floor(x / 4)) {
                 case 1:
                     image.borderWidth = "3";
                     break;
@@ -38,7 +38,7 @@ export function navigatingTo(args) {
                     break;
             }
 
-            switch(Math.floor(y / 4)) {
+            switch (Math.floor(y / 4)) {
                 case 1:
                     image.borderRadius = "12";
                     break;
diff --git a/apps/app/ui-tests-app/issues/issue-3164.ts b/apps/app/ui-tests-app/issues/issue-3164.ts
index 0b190b2e65..1501b71612 100644
--- a/apps/app/ui-tests-app/issues/issue-3164.ts
+++ b/apps/app/ui-tests-app/issues/issue-3164.ts
@@ -4,7 +4,7 @@ import { Page } from "tns-core-modules/ui/page";
 import { View } from "tns-core-modules/ui/core/view";
 
 var page: Page;
-var borderColor : Color = new Color("#ff0000");
+var borderColor: Color = new Color("#ff0000");
 export function navigatingTo(args: EventData) {
     page = <Page>args.object;
 }
diff --git a/apps/app/ui-tests-app/issues/issue-3714.ts b/apps/app/ui-tests-app/issues/issue-3714.ts
new file mode 100644
index 0000000000..c7478a190e
--- /dev/null
+++ b/apps/app/ui-tests-app/issues/issue-3714.ts
@@ -0,0 +1,25 @@
+import { EventData } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+import { Label } from "tns-core-modules/ui/label";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
+
+export function toggle(args: EventData) {
+    const page = <Page>((<any>args.object).page);
+    
+    const getElementById = id => page.getViewById(id)
+    
+    const toggleBtn = <Button>getElementById("toggleUserInteraction");
+    const isEnabled = toggleBtn.text === "disable" ? true : false;
+    toggleBtn.text = !isEnabled ? "disable" : "enable";
+
+    (<Button>getElementById("testBtn")).isUserInteractionEnabled = !isEnabled;
+    (<Button>getElementById("testLabel")).isUserInteractionEnabled = !isEnabled;
+    (<StackLayout>getElementById("testStackLayout")).isUserInteractionEnabled = !isEnabled;
+}
+
+export function test() {
+    console.log("onTap");
+    alert("onTap");
+}
diff --git a/apps/app/ui-tests-app/issues/issue-3714.xml b/apps/app/ui-tests-app/issues/issue-3714.xml
new file mode 100644
index 0000000000..7f22827675
--- /dev/null
+++ b/apps/app/ui-tests-app/issues/issue-3714.xml
@@ -0,0 +1,11 @@
+<Page 
+    xmlns="http://schemas.nativescript.org/tns.xsd" class="page">
+    <StackLayout class="p-20">
+        <Button text="disable" tap="toggle" id="toggleUserInteraction" automationText="toggleUserInteraction"/>
+        <GridLayout rows="100 50 100" id="layoutid">
+            <Button id="testBtn" automationText="testBtn" row="0" isUserInteractionEnabled="{{userinteraction}}" text="test" tap="test" />
+            <Label id="testLabel" automationText="testLabel" row="1" text="test" isUserInteractionEnabled="{{userinteraction}}" tap="test"/>
+            <StackLayout id="testStackLayout" automationText="testStackLayout" row="2" isUserInteractionEnabled="{{userinteraction}}" backgroundColor="red" tap="test"></StackLayout>
+        </GridLayout>
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/issues/main-page.ts b/apps/app/ui-tests-app/issues/main-page.ts
index 04569c27f2..869b61d548 100644
--- a/apps/app/ui-tests-app/issues/main-page.ts
+++ b/apps/app/ui-tests-app/issues/main-page.ts
@@ -21,8 +21,9 @@ export function loadExamples() {
     examples.set("3175", "issues/issue-3175");
     examples.set("3211", "issues/issue-3211");
     examples.set("1639", "issues/issue-1639");
+    examples.set("3714", "issues/issue-3714");
     examples.set("1657-ios", "issues/issue-1657-ios");
-    examples.set("tabview-with-scrollview_4022","issues/tabview-with-scrollview_4022");
+    examples.set("tabview-with-scrollview_4022", "issues/tabview-with-scrollview_4022");
     examples.set("3354-ios", "issues/issue-3354");
     examples.set("4450", "issues/issue-4450");
 
diff --git a/apps/app/ui-tests-app/layouts-percent/dock.ts b/apps/app/ui-tests-app/layouts-percent/dock.ts
index b648c689da..1ac1b6c517 100644
--- a/apps/app/ui-tests-app/layouts-percent/dock.ts
+++ b/apps/app/ui-tests-app/layouts-percent/dock.ts
@@ -8,7 +8,7 @@ export function onLoaded(args: { eventName: string, object: any }) {
 
 export function onStretchLastChild(args: { eventName: string, object: any }) {
     var layout = args.object.parent;
-    if(layout.stretchLastChild === true) {
+    if (layout.stretchLastChild === true) {
         layout.stretchLastChild = false;
     } else {
         layout.stretchLastChild = true;
diff --git a/apps/app/ui-tests-app/layouts-percent/stack.ts b/apps/app/ui-tests-app/layouts-percent/stack.ts
index 92a714ba9f..98f82d74ee 100644
--- a/apps/app/ui-tests-app/layouts-percent/stack.ts
+++ b/apps/app/ui-tests-app/layouts-percent/stack.ts
@@ -9,7 +9,7 @@ export function onLoaded(args: { eventName: string, object: any }) {
 
 export function onOrientation(args: { eventName: string, object: any }) {
     var layout = args.object.parent;
-    if(layout.orientation === enums.Orientation.vertical) {
+    if (layout.orientation === enums.Orientation.vertical) {
         layout.orientation = enums.Orientation.horizontal;
     } else {
         layout.orientation = enums.Orientation.vertical;
diff --git a/apps/app/ui-tests-app/layouts/absolute.ts b/apps/app/ui-tests-app/layouts/absolute.ts
index cc4ce0db14..7d2418ed0f 100644
--- a/apps/app/ui-tests-app/layouts/absolute.ts
+++ b/apps/app/ui-tests-app/layouts/absolute.ts
@@ -12,7 +12,7 @@ export function onLoaded(args: { eventName: string, object: any }) {
 export function onSetLeftSetTop(args: { eventName: string, object: any }) {
     var layout = args.object.parent;
     var child = layout.getViewById("setLeftSetTop");
-    if(++count % 2 === 1) {
+    if (++count % 2 === 1) {
         absoluteLayout.AbsoluteLayout.setLeft(child, 175);
         absoluteLayout.AbsoluteLayout.setTop(child, 375);
     } else {
diff --git a/apps/app/ui-tests-app/layouts/dock.ts b/apps/app/ui-tests-app/layouts/dock.ts
index 6f5bf12512..ef16d47e97 100644
--- a/apps/app/ui-tests-app/layouts/dock.ts
+++ b/apps/app/ui-tests-app/layouts/dock.ts
@@ -8,7 +8,7 @@ export function onLoaded(args: { eventName: string, object: any }) {
 
 export function onStretchLastChild(args: { eventName: string, object: any }) {
     var layout = args.object.parent;
-    if(layout.stretchLastChild === true) {
+    if (layout.stretchLastChild === true) {
         layout.stretchLastChild = false;
     } else {
         layout.stretchLastChild = true;
diff --git a/apps/app/ui-tests-app/layouts/stack.ts b/apps/app/ui-tests-app/layouts/stack.ts
index e048fa9f19..f1e69e6e05 100644
--- a/apps/app/ui-tests-app/layouts/stack.ts
+++ b/apps/app/ui-tests-app/layouts/stack.ts
@@ -9,7 +9,7 @@ export function onLoaded(args: { eventName: string, object: any }) {
 
 export function onOrientation(args: { eventName: string, object: any }) {
     var layout = args.object.parent;
-    if(layout.orientation === enums.Orientation.vertical) {
+    if (layout.orientation === enums.Orientation.vertical) {
         layout.orientation = enums.Orientation.horizontal;
     } else {
         layout.orientation = enums.Orientation.vertical;
diff --git a/apps/app/ui-tests-app/list-picker/issue_2895.ts b/apps/app/ui-tests-app/list-picker/issue_2895.ts
index 154e3c31eb..1850e8e251 100644
--- a/apps/app/ui-tests-app/list-picker/issue_2895.ts
+++ b/apps/app/ui-tests-app/list-picker/issue_2895.ts
@@ -1,4 +1,4 @@
-import { Page } from 'tns-core-modules/ui/page';
+import { Page } from "tns-core-modules/ui/page";
 import { Observable } from "tns-core-modules/data/observable";
 import { EventData } from "tns-core-modules/ui/core/view";
 
diff --git a/apps/app/ui-tests-app/list-view/images-template.ts b/apps/app/ui-tests-app/list-view/images-template.ts
index e55748226b..0061993171 100644
--- a/apps/app/ui-tests-app/list-view/images-template.ts
+++ b/apps/app/ui-tests-app/list-view/images-template.ts
@@ -1,5 +1,5 @@
-import { EventData, Observable } from 'tns-core-modules/data/observable';
-import { Page } from 'tns-core-modules/ui/page';
+import { EventData, Observable } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
 
 export function navigatingTo(args: EventData) {
     let page = <Page>args.object;
diff --git a/apps/app/ui-tests-app/list-view/list-view.ts b/apps/app/ui-tests-app/list-view/list-view.ts
index 727c4e4cc0..7d23540a6b 100644
--- a/apps/app/ui-tests-app/list-view/list-view.ts
+++ b/apps/app/ui-tests-app/list-view/list-view.ts
@@ -2,7 +2,7 @@ import { EventData } from "tns-core-modules/data/observable";
 import { ObservableArray } from "tns-core-modules/data/observable-array";
 import { View, KeyedTemplate } from "tns-core-modules/ui/core/view";
 import { Page } from "tns-core-modules/ui/page";
-import { ViewModel, Item } from './main-view-model';
+import { ViewModel, Item } from "./main-view-model";
 import { ListView } from "tns-core-modules/ui/list-view";
 import { Label } from "tns-core-modules/ui/label";
 import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
@@ -35,24 +35,24 @@ export function pageLoaded(args: EventData) {
   lv4.itemTemplates = new Array<KeyedTemplate>(
       {
           key: "red",
-          createView: () => { return createLabel(new Color("red")); }
+          createView: () => createLabel(new Color("red"))
       },
       {
           key: "green",
-          createView: () => { return createLabel(new Color("green")); }
+          createView: () => createLabel(new Color("green"))
       },
       {
           key: "yellow",
-          createView: () => { return createLabel(new Color("yellow")); }
+          createView: () => createLabel(new Color("yellow"))
       }
   );
 }
 
 let scrollToBottom = true;
-export function onScroll(args: EventData){
+export function onScroll(args: EventData) {
   let page = (<View>args.object).page;
   let gridLayout = page.getViewById<GridLayout>("grid-layout");
-  for (let i = 0, length = gridLayout.getChildrenCount(); i < length; i++){
+  for (let i = 0, length = gridLayout.getChildrenCount(); i < length; i++) {
       let listView = <ListView>gridLayout.getChildAt(i);
       listView.scrollToIndex(scrollToBottom ? listView.items.length - 1 : 0);
   }
diff --git a/apps/app/ui-tests-app/list-view/main-page.ts b/apps/app/ui-tests-app/list-view/main-page.ts
index eaae1317f7..195ee96ed7 100644
--- a/apps/app/ui-tests-app/list-view/main-page.ts
+++ b/apps/app/ui-tests-app/list-view/main-page.ts
@@ -17,6 +17,7 @@ export function loadExamples() {
     examples.set("listview-bg-separator-color", "list-view/listview-bg-separator-color");
     examples.set("csslv", "list-view/csslv");
     examples.set("scrolling-and-sizing", "list-view/scrolling-and-sizing");
+    examples.set("row-height", "list-view/row-height");
 
     return examples;
 }
diff --git a/apps/app/ui-tests-app/list-view/main-view-model.ts b/apps/app/ui-tests-app/list-view/main-view-model.ts
index f6135dc617..18e6d68668 100644
--- a/apps/app/ui-tests-app/list-view/main-view-model.ts
+++ b/apps/app/ui-tests-app/list-view/main-view-model.ts
@@ -18,7 +18,7 @@ export class Item extends Observable {
   set name(value: string) {
     if (this._name !== value) {
       this._name = value;
-      this.notifyPropertyChange('name', value)
+      this.notifyPropertyChange("name", value)
     }
   }
 
@@ -29,7 +29,7 @@ export class Item extends Observable {
   set id(value: number) {
     if (this._id !== value) {
       this._id = value;
-      this.notifyPropertyChange('id', value)
+      this.notifyPropertyChange("id", value)
     }
   }
 
@@ -43,7 +43,7 @@ export class ViewModel extends Observable {
 
   get items(): ObservableArray<Item> {
     this._items = new ObservableArray<Item>();
-    for (let i = 0; i < 100; i++){
+    for (let i = 0; i < 100; i++) {
       this._items.push(new Item(`Item`, i));
     }
     return this._items;
diff --git a/apps/app/ui-tests-app/list-view/row-height.css b/apps/app/ui-tests-app/list-view/row-height.css
new file mode 100644
index 0000000000..1c81851e70
--- /dev/null
+++ b/apps/app/ui-tests-app/list-view/row-height.css
@@ -0,0 +1,51 @@
+.p-10 {
+    padding: 10 20 10 20;
+}
+
+.m-b-10 {
+    margin-bottom: 10;
+}
+
+.page {
+    background-color: #F2F2F2;
+}
+
+ListView {
+    background-color: yellow;
+}
+
+TextView {
+    background-color: #FFF;
+}
+
+.bordered {
+    border-width: 5;
+    border-color: green;
+}
+
+.fixed-height {
+    height: 55;
+}
+
+.border-radius {
+    border-radius: 15;
+}
+
+.border-radius-nonuniform {
+    border-radius: 10 20 30 40;
+}
+
+.bordered-nonuniform {
+    border-top-color: red;
+    border-right-color: green;
+    border-bottom-color: blue;
+    border-left-color: purple;
+    border-top-width: 5;
+    border-right-width: 10;
+    border-bottom-width: 15;
+    border-left-width: 20;
+}
+
+.body {
+    font-size: 11;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/list-view/row-height.ts b/apps/app/ui-tests-app/list-view/row-height.ts
new file mode 100644
index 0000000000..162ff30156
--- /dev/null
+++ b/apps/app/ui-tests-app/list-view/row-height.ts
@@ -0,0 +1,4 @@
+export function onNavigatingTo(args) {
+    const page = args.object;
+    page.bindingContext = ["Item 1", "Item 2", "Item 3"];
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/list-view/row-height.xml b/apps/app/ui-tests-app/list-view/row-height.xml
new file mode 100644
index 0000000000..fdf617605f
--- /dev/null
+++ b/apps/app/ui-tests-app/list-view/row-height.xml
@@ -0,0 +1,34 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="onNavigatingTo" class="page">
+
+    <Page.actionBar>
+        <ActionBar title="My App" icon="" class="action-bar">
+        </ActionBar>
+    </Page.actionBar>
+
+    <StackLayout>
+        <StackLayout class="p-10" row="0">
+            <Label text="Row height = 40" class="body m-b-10"/>
+            <ListView items="{{ $value }}" rowHeight="40">
+                <ListView.itemTemplate>
+                    <Label text="{{ $value }}" backgroundColor="green"/>
+                </ListView.itemTemplate>
+            </ListView>
+        </StackLayout>
+        <StackLayout class="p-10" row="0">
+            <Label text="Row height pixels = 40" class="body m-b-10"/>
+            <ListView items="{{ $value }}" rowHeight="40px">
+                <ListView.itemTemplate>
+                    <Label text="{{ $value }}" backgroundColor="green"/>
+                </ListView.itemTemplate>
+            </ListView>
+        </StackLayout>
+        <StackLayout class="p-10" row="0">
+            <Label text="Row height dips = 40" class="body m-b-10"/>
+            <ListView items="{{ $value }}" rowHeight="40dips">
+                <ListView.itemTemplate>
+                    <Label text="{{ $value }}" backgroundColor="green"/>
+                </ListView.itemTemplate>
+            </ListView>
+        </StackLayout>
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/main-page.ts b/apps/app/ui-tests-app/main-page.ts
index b030a14d36..027c174e38 100644
--- a/apps/app/ui-tests-app/main-page.ts
+++ b/apps/app/ui-tests-app/main-page.ts
@@ -37,13 +37,13 @@ export function pageLoaded(args: EventData) {
     examples.set("date-picker", "date-picker/date-picker");
     page.bindingContext = new MainPageViewModel(wrapLayout, examples);
 
-    const parent = page.getViewById('parentLayout');
-    const searchBar = page.getViewById('textView');
+    const parent = page.getViewById("parentLayout");
+    const searchBar = page.getViewById("textView");
     if (isAndroid) {
         parent.android.setFocusableInTouchMode(true);
         parent.android.setFocusable(true);
         searchBar.android.clearFocus();
-    }else{
-        parent.style.marginBottom=10;
+    } else {
+        parent.style.marginBottom = 10;
     }
 }
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts b/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts
index dde442dbcc..95256ac7ea 100644
--- a/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts
+++ b/apps/app/ui-tests-app/perf/memory-leaks/background-image.ts
@@ -11,7 +11,7 @@ var images = ["gravatar", "gravatar2", "red"];
 export function onLoad(args: EventData) {
     let index = indexCounter++ % 3;
     let page = <Page>args.object;
-    page.backgroundImage = '~/ui-tests-app/resources/images/' + images[index] + '.png';
+    page.backgroundImage = "~/ui-tests-app/resources/images/" + images[index] + ".png";
     setLabelText(page, navCounter, "countInfo");
     getMemoryUsage(args);
 }
@@ -28,7 +28,7 @@ export function navigateBack(args: EventData) {
 
 function setLabelText(page: Page, text: number, id: string) {
     let label = <Label>page.getViewById(id);
-    label.text = text + '';
+    label.text = text + "";
 }
 
 function getMemoryUsage(args: EventData) {
diff --git a/apps/app/ui-tests-app/perf/properties/tests.ts b/apps/app/ui-tests-app/perf/properties/tests.ts
index 2e85994239..260fd7b3df 100644
--- a/apps/app/ui-tests-app/perf/properties/tests.ts
+++ b/apps/app/ui-tests-app/perf/properties/tests.ts
@@ -4,7 +4,7 @@ import { Label } from "tns-core-modules/ui/label";
 
 const average = 3;
 const noValue = "noValue";
-const colors = ['red', 'green'];
+const colors = ["red", "green"];
 
 export function addRemove(counts: Array<number>, parent: LayoutBase): string {
     let result = `addRemove`;
@@ -29,7 +29,7 @@ export function addRemove(counts: Array<number>, parent: LayoutBase): string {
 }
 
 export function setText(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setText ${parent ? 'with nativeView' : ''}`;
+    let result = `setText ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const time = executeTest(() => {
@@ -44,7 +44,7 @@ export function setText(counts: Array<number>, parent?: LayoutBase): string {
 }
 
 export function setBackgroundColor(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setBackgroundColor ${parent ? 'with nativeView' : ''}`;
+    let result = `setBackgroundColor ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         if (parent && count > 10000) {
             result += setResultTime(noValue);
@@ -66,7 +66,7 @@ export function setBackgroundColor(counts: Array<number>, parent?: LayoutBase):
 
 const borders = [1, 2, 3];
 export function setBorderWidths(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setBorderWidths ${parent ? 'with nativeView' : ''}`;
+    let result = `setBorderWidths ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         if (count > 10000 && parent) {
             result += setResultTime(noValue);
@@ -90,7 +90,7 @@ export function setBorderWidths(counts: Array<number>, parent?: LayoutBase): str
 }
 
 export function setColor(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setColor ${parent ? 'with nativeView' : ''}`;
+    let result = `setColor ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const style = lbl.style;
@@ -128,7 +128,7 @@ export function setColorWithParents(counts: Array<number>, parent: LayoutBase):
 
 const fontSizes = [10, 20];
 export function setFontSize(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setFontSize ${parent ? 'with nativeView' : ''}`;
+    let result = `setFontSize ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const style = lbl.style;
@@ -165,13 +165,13 @@ export function setFontSizeWithParents(counts: Array<number>, parent: LayoutBase
 }
 
 export function setFontWeight(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setFontWeight ${parent ? 'with nativeView' : ''}`;
+    let result = `setFontWeight ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const style = lbl.style;
         const time = executeTest(() => {
             for (let i = 0; i < count; i++) {
-                style.fontWeight = i % 2 === 0 ? 'bold' : 'normal';
+                style.fontWeight = i % 2 === 0 ? "bold" : "normal";
             }
         });
         result += setResultTime(time);
@@ -192,7 +192,7 @@ export function setFontWeightWithParents(counts: Array<number>, parent: LayoutBa
         setupParents(parent);
         const time = executeTest(() => {
             for (let i = 0; i < count; i++) {
-                style.fontWeight = i % 2 === 0 ? 'bold' : 'normal'
+                style.fontWeight = i % 2 === 0 ? "bold" : "normal"
             }
         });
         result += setResultTime(time);
@@ -202,7 +202,7 @@ export function setFontWeightWithParents(counts: Array<number>, parent: LayoutBa
 }
 
 export function setBindingContext(counts: Array<number>, parent?: LayoutBase): string {
-    let result = `setBindingContext ${parent ? 'with nativeView' : ''}`;
+    let result = `setBindingContext ${parent ? "with nativeView" : ""}`;
     counts.forEach((count) => {
         const lbl = setup(parent);
         const time = executeTest(() => {
diff --git a/apps/app/ui-tests-app/search-bar/issue-5039-view-model.ts b/apps/app/ui-tests-app/search-bar/issue-5039-view-model.ts
index 4840439917..0fb8a68bf4 100644
--- a/apps/app/ui-tests-app/search-bar/issue-5039-view-model.ts
+++ b/apps/app/ui-tests-app/search-bar/issue-5039-view-model.ts
@@ -1,10 +1,10 @@
-import { Observable } from 'tns-core-modules/data/observable'
-import { ObservableArray } from 'tns-core-modules/data/observable-array'
-import { SearchBar } from 'tns-core-modules/ui/search-bar';
+import { Observable } from "tns-core-modules/data/observable"
+import { ObservableArray } from "tns-core-modules/data/observable-array"
+import { SearchBar } from "tns-core-modules/ui/search-bar";
 
 export class Issue5039ViewModel extends Observable {
 
-    private _items = ['apple', 'apple cider', 'apple pie', 'orange', 'orange juice', 'strawberry', 'blueberry']
+    private _items = ["apple", "apple cider", "apple pie", "orange", "orange juice", "strawberry", "blueberry"]
     public items = new ObservableArray()
 
     constructor(private _searchBar: SearchBar) {
@@ -20,7 +20,7 @@ export class Issue5039ViewModel extends Observable {
         this.filter();
     }
     
-    filter(value: string = '') {
+    filter(value: string = "") {
         this.items.splice(0, this.items.length) // remove all items
         this.items.push(this._items.filter(i => -1 !== i.indexOf(value)))
     }
diff --git a/apps/app/ui-tests-app/search-bar/issue-5039.ts b/apps/app/ui-tests-app/search-bar/issue-5039.ts
index d58406d974..10942d892e 100644
--- a/apps/app/ui-tests-app/search-bar/issue-5039.ts
+++ b/apps/app/ui-tests-app/search-bar/issue-5039.ts
@@ -1,4 +1,4 @@
-import { Issue5039ViewModel } from './issue-5039-view-model'
+import { Issue5039ViewModel } from "./issue-5039-view-model"
 import { SearchBar } from "tns-core-modules/ui/search-bar";
 import { Page } from "tns-core-modules/ui/page";
  
diff --git a/apps/app/ui-tests-app/search-bar/issue-5655.xml b/apps/app/ui-tests-app/search-bar/issue-5655.xml
new file mode 100644
index 0000000000..fab139506e
--- /dev/null
+++ b/apps/app/ui-tests-app/search-bar/issue-5655.xml
@@ -0,0 +1,28 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd">
+    <StackLayout>
+        <GridLayout height="60" rows="auto" columns="auto, *">
+            <SearchBar id="searchBar1" hint="Search" text="auto(sb), * col, no width" />   
+        </GridLayout>
+        <GridLayout height="60" rows="auto" columns="auto, *">
+            <SearchBar id="searchBar2" width="100%" hint="Search" text="auto(sb), * col, width 100%" />   
+        </GridLayout>
+        <GridLayout height="60" rows="auto" columns="auto, *">
+            <SearchBar id="searchBar3" width="300" hint="Search" text="auto(sb), * col, width 300dip" />   
+        </GridLayout>
+        <GridLayout height="60" rows="auto" columns="*, auto">
+            <SearchBar col="1" id="searchBar4" width="300" hint="Search" text="*, auto(sb) col, width 300dip" />   
+        </GridLayout>
+        <GridLayout height="60" rows="auto" columns="auto, 200">
+            <SearchBar id="searchBar5" hint="Search" text="auto(sb), 200 cols, no width" />   
+        </GridLayout>
+        <GridLayout height="60" rows="auto" columns="200, auto">
+            <SearchBar col="1" id="searchBar6" hint="Search" text="200, auto(sb) cols, no width" />   
+        </GridLayout>
+        <StackLayout height="60">
+            <SearchBar id="searchBar7" hint="Search" text="stack, no width" />
+        </StackLayout>
+        <StackLayout height="60">
+            <SearchBar id="searchBar8" width="300" hint="Search" text="stack, width 300dip" />
+        </StackLayout>
+    </StackLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/search-bar/main-page.ts b/apps/app/ui-tests-app/search-bar/main-page.ts
index cf77e4cf3d..63577e10dc 100644
--- a/apps/app/ui-tests-app/search-bar/main-page.ts
+++ b/apps/app/ui-tests-app/search-bar/main-page.ts
@@ -11,8 +11,10 @@ export function pageLoaded(args: EventData) {
 
 export function loadExamples() {
     const examples = new Map<string, string>();
-     examples.set("issue-4147", "search-bar/issue-4147");
-     examples.set("search-bar", "search-bar/search-bar");
-     examples.set("issue-5039","search-bar/issue-5039");
+    examples.set("issue-4147", "search-bar/issue-4147");
+    examples.set("search-bar", "search-bar/search-bar");
+    examples.set("issue-5039", "search-bar/issue-5039");
+    examples.set("issue-5655", "search-bar/issue-5655");
+    
     return examples;
 }
diff --git a/apps/app/ui-tests-app/tab-view/issue-5470.xml b/apps/app/ui-tests-app/tab-view/issue-5470.xml
new file mode 100644
index 0000000000..52abb39965
--- /dev/null
+++ b/apps/app/ui-tests-app/tab-view/issue-5470.xml
@@ -0,0 +1,29 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatingTo="navigatingTo" class="page">
+
+    <Page.actionBar>
+        <ActionBar title="TabView content sizing" icon="" class="action-bar">
+        </ActionBar>
+    </Page.actionBar>
+
+    <TabView id="tabViewContainer">
+        <TabView.items>
+            <TabViewItem title="Tab 1">
+                <TabViewItem.view>
+                    <GridLayout rows="*, auto" columns="*">
+                        <StackLayout row="0" backgroundColor="lightblue"></StackLayout>
+                        <StackLayout row="1" backgroundColor="green" height="50"></StackLayout>
+                    </GridLayout>
+                </TabViewItem.view>
+            </TabViewItem>
+            <TabViewItem title="Tab 2">
+                <TabViewItem.view>
+                    <GridLayout rows="*, auto" columns="*">
+                        <StackLayout row="0" backgroundColor="lightblue"></StackLayout>
+                        <StackLayout row="1" backgroundColor="red" height="50"></StackLayout>
+                    </GridLayout>
+                </TabViewItem.view>
+            </TabViewItem>
+        </TabView.items>
+    </TabView>
+    
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/tab-view/main-page.ts b/apps/app/ui-tests-app/tab-view/main-page.ts
index 9089815f74..70833eda45 100644
--- a/apps/app/ui-tests-app/tab-view/main-page.ts
+++ b/apps/app/ui-tests-app/tab-view/main-page.ts
@@ -21,6 +21,8 @@ export function loadExamples() {
     examples.set("tab-view-icons", "tab-view/tab-view-icon");
     examples.set("tab-view-icon-change", "tab-view/tab-view-icon-change");
     examples.set("text-transform", "tab-view/text-transform");
-    examples.set("tab-view-bottom-position","tab-view/tab-view-bottom-position");
+    examples.set("tab-view-bottom-position", "tab-view/tab-view-bottom-position");
+    examples.set("issue-5470", "tab-view/issue-5470");
+    examples.set("tab-view-tab-text-font-size", "tab-view/tab-view-tab-text-font-size");
     return examples;
 }
diff --git a/apps/app/ui-tests-app/tab-view/tab-view-tab-text-font-size.xml b/apps/app/ui-tests-app/tab-view/tab-view-tab-text-font-size.xml
new file mode 100644
index 0000000000..e1f7d39926
--- /dev/null
+++ b/apps/app/ui-tests-app/tab-view/tab-view-tab-text-font-size.xml
@@ -0,0 +1,20 @@
+<Page>
+  <TabView tabTextFontSize="8">
+    <TabView.items>
+      <TabViewItem title="First">
+        <TabViewItem.view>
+          <GridLayout>
+            <Label text="First View" verticalAlignment="center" horizontalAlignment="center"/>
+          </GridLayout>
+        </TabViewItem.view>
+      </TabViewItem>
+      <TabViewItem title="Second">
+        <TabViewItem.view>
+          <GridLayout>
+            <Label text="Second View" verticalAlignment="center" horizontalAlignment="center"/>
+          </GridLayout>
+        </TabViewItem.view>
+      </TabViewItem>
+    </TabView.items>
+  </TabView>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/text-field/focus-blur-events.ts b/apps/app/ui-tests-app/text-field/focus-blur-events.ts
index 82689f05a2..793727b459 100644
--- a/apps/app/ui-tests-app/text-field/focus-blur-events.ts
+++ b/apps/app/ui-tests-app/text-field/focus-blur-events.ts
@@ -6,10 +6,10 @@ export function onLoaded(args) {
     const textField = <TextField>page.getViewById("textField");
     const textView = <TextView>page.getViewById("textView");
 
-    attachToEvent(textField,"blur");
-    attachToEvent(textField,"focus");
-    attachToEvent(textView,"blur");
-    attachToEvent(textView,"focus");
+    attachToEvent(textField, "blur");
+    attachToEvent(textField, "focus");
+    attachToEvent(textView, "blur");
+    attachToEvent(textView, "focus");
 }
 
 function attachToEvent(control, event) {
diff --git a/apps/app/ui-tests-app/text-view/hint-text-color.ts b/apps/app/ui-tests-app/text-view/hint-text-color.ts
index a58c6c93e9..1c8d525ec9 100644
--- a/apps/app/ui-tests-app/text-view/hint-text-color.ts
+++ b/apps/app/ui-tests-app/text-view/hint-text-color.ts
@@ -5,7 +5,7 @@ import { TextField } from "tns-core-modules/ui/text-field";
 
 function exectuteOnAll(page: Page, callback: (txt: TextView | TextField) => void) { 
     page.getViewById("container").eachChild((child) => {
-        if(child instanceof TextView || child instanceof TextField) {
+        if (child instanceof TextView || child instanceof TextField) {
             callback(child);
         }
         return true;
diff --git a/build/tslint.json b/build/tslint.json
index b5318e628a..ba0dd01189 100644
--- a/build/tslint.json
+++ b/build/tslint.json
@@ -1,23 +1,20 @@
 {
     "rules": {
+        "arrow-return-shorthand": true,
         "class-name": true,
         "curly": true,
         "forin": false,
-        "indent": true,
+        "indent": [true, "spaces", 4],
         "jsdoc-format": false,
         "max-line-length": [false, 120],
         "no-arg": true,
+        "no-bitwise": false,
         "no-consecutive-blank-lines": true,
         "no-construct": true,
         "no-debugger": true,
-        "triple-equals": [true, "allow-null-check"],
-        "variable-name": [false, "allow-leading-underscore"],
+        "no-duplicate-variable": true,
         "no-empty": true,
         "no-eval": true,
-		"no-unused-variable": [true],
-		"no-duplicate-variable": true,
-
-        "no-bitwise": false,
         "no-string-literal": false,
         "no-trailing-whitespace": false,
         "no-unused-expression": true,
@@ -29,9 +26,10 @@
             "check-else",
             "check-whitespace"
         ],
-        "quotemark": [false, "double"],
+        "quotemark": [true, "double"],
         "radix": false,
         "semicolon": false,
+        "triple-equals": [true, "allow-null-check"],
         "typedef": [false,
             "callSignature",
             "indexSignature",
@@ -40,19 +38,33 @@
             "variableDeclarator",
             "memberVariableDeclarator"
         ],
-        "typedef-whitespace": [false,
-            "callSignature",
-            "catchClause",
-            "indexSignature"
+        "typedef-whitespace": [true,
+            {
+                "call-signature": "nospace",
+                "index-signature": "nospace",
+                "parameter": "nospace",
+                "property-declaration": "nospace",
+                "variable-declaration": "nospace"
+            },
+            {
+                "call-signature": "onespace",
+                "index-signature": "onespace",
+                "parameter": "onespace",
+                "property-declaration": "onespace",
+                "variable-declaration": "onespace"
+            }
         ],
-        "whitespace": [false,
+        "variable-name": [false, "allow-leading-underscore"],
+        "whitespace": [true,
             "check-branch",
             "check-decl",
             "check-operator",
+            "check-module",
             "check-separator",
-            "check-type"
-        ],
-        
-        "indent":4
+            "check-rest-spread",
+            "check-type",
+            "check-type-operator",
+            "check-preblock"
+        ]
     }
 }
diff --git a/e2e/modal-navigation/.gitignore b/e2e/modal-navigation/.gitignore
new file mode 100644
index 0000000000..c6f9a448eb
--- /dev/null
+++ b/e2e/modal-navigation/.gitignore
@@ -0,0 +1 @@
+.vscode/settings.json
diff --git a/e2e/modal-navigation/.vscode/launch.json b/e2e/modal-navigation/.vscode/launch.json
index 55dae90bf5..a017624a8e 100644
--- a/e2e/modal-navigation/.vscode/launch.json
+++ b/e2e/modal-navigation/.vscode/launch.json
@@ -53,7 +53,7 @@
             "platform": "ios",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "stopOnEntry": true,
+            "stopOnEntry": false,
             "tnsArgs": [
                 "--syncAllFiles"
             ],
@@ -78,7 +78,7 @@
             "platform": "android",
             "appRoot": "${workspaceRoot}",
             "sourceMaps": true,
-            "stopOnEntry": true,
+            "stopOnEntry": false,
             "tnsArgs": [
                 "--syncAllFiles"
             ],
diff --git a/e2e/modal-navigation/README.md b/e2e/modal-navigation/README.md
index b3371f3916..02de270d7a 100644
--- a/e2e/modal-navigation/README.md
+++ b/e2e/modal-navigation/README.md
@@ -4,13 +4,13 @@ Execute Tests
 Android:
 
 ```
-npm run e2e -- --runType android23 --reuseDevice
+npm run e2e -- --runType android23 # --devMode
 ```
 
 iOS:
 
 ```
-npm run  e2e -- --runType sim.iPhoneX.iOS112 --reuseDevice
+npm run e2e -- --runType sim.iPhoneX.iOS112 # --devMode
 ```
 
 Scenarios
@@ -32,7 +32,15 @@ ROOT FRAME:
 	2. Show nested modal dialog with frame
 		2. Close nested modal dialog
 	3. Close modal dialog
-3. [Done] Show modal tabview
+3. [Done] Show modal layout
+	1. Navigate to modal second page within modal dialog
+		1. Go back
+	2. Show nested modal dialog
+		2. Close nested modal dialog
+	3. Show nested modal dialog with frame
+		3. Close nested modal dialog
+	4. Close modal dialog
+4. [Done] Show modal tabview
 	1. Navigate to second page within tab item frame
 		1. Go back
 	2. Show nested modal dialog
@@ -40,7 +48,7 @@ ROOT FRAME:
 	3. Show nested modal dialog with frame
 		3. Close nested modal dialog
 	4. Close modal dialog
-4. Navigate to second page within root frame
+5. Navigate to second page within root frame
 	1. Show modal dialog with frame
 		1. Navigate to second page within modal dialog
 			1. Go back
@@ -57,6 +65,10 @@ ROOT FRAME:
 		3. Close modal dialog
 	3. Go back
 
+ROOT LAYOUT:
+
+[Same as above]
+
 ROOT TABVIEW:
 
 [Same as above]
diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts
index 3a0b9a9af4..f7871e8002 100644
--- a/e2e/modal-navigation/app/home/home-page.ts
+++ b/e2e/modal-navigation/app/home/home-page.ts
@@ -5,7 +5,6 @@ import { View, EventData } from "tns-core-modules/ui/core/view";
 import { Frame } from "tns-core-modules/ui/frame";
 
 export function onNavigatingTo(args: NavigatedData) {
-    const page = <StackLayout>args.object;
     console.log("home-page onNavigatingTo");
 }
 
@@ -66,7 +65,10 @@ export function onModalTabView(args: EventData) {
 export function onNavigate(args: EventData) {
     const view = args.object as View;
     const page = view.page as Page;
-    page.frame.navigate("second/second-page");
+    // In the layout root case for iOS, the page will be null
+    if (page) {
+        page.frame.navigate("second/second-page");
+    }
 }
 
 export function onFrameRootViewReset() {
diff --git a/e2e/modal-navigation/app/layout-root.xml b/e2e/modal-navigation/app/layout-root.android.xml
similarity index 80%
rename from e2e/modal-navigation/app/layout-root.xml
rename to e2e/modal-navigation/app/layout-root.android.xml
index ee0b598545..313834dc1a 100644
--- a/e2e/modal-navigation/app/layout-root.xml
+++ b/e2e/modal-navigation/app/layout-root.android.xml
@@ -1,3 +1,3 @@
 <GridLayout>
     <Frame defaultPage="home/home-page" />
-</GridLayout>
\ No newline at end of file
+</GridLayout>
diff --git a/e2e/modal-navigation/app/layout-root.ios.ts b/e2e/modal-navigation/app/layout-root.ios.ts
new file mode 100644
index 0000000000..403480d1ee
--- /dev/null
+++ b/e2e/modal-navigation/app/layout-root.ios.ts
@@ -0,0 +1,10 @@
+export {
+    onModalFrame,
+    onModalPage,
+    onModalLayout,
+    onModalTabView,
+    onNavigate,
+    onFrameRootViewReset,
+    onTabRootViewReset,
+    onLayoutRootViewReset
+} from "./home/home-page";
diff --git a/e2e/modal-navigation/app/layout-root.ios.xml b/e2e/modal-navigation/app/layout-root.ios.xml
new file mode 100644
index 0000000000..40d6d68bd3
--- /dev/null
+++ b/e2e/modal-navigation/app/layout-root.ios.xml
@@ -0,0 +1,11 @@
+<StackLayout>
+    <Label text="Home" horizontalAlignment="center" />
+    <Button text="Show Modal Page With Frame" tap="onModalFrame" />
+    <Button text="Show Modal Page" tap="onModalPage" />
+    <Button text="Show Modal Layout" tap="onModalLayout" />
+    <Button text="Show Modal TabView" tap="onModalTabView" />
+    <Button text="Navigate To Second Page" tap="onNavigate" />
+    <Button text="Reset Frame Root View" tap="onFrameRootViewReset" />
+    <Button text="Reset Tab Root View" tap="onTabRootViewReset" />
+    <Button text="Reset Layout Root View" tap="onLayoutRootViewReset" />
+</StackLayout>
diff --git a/e2e/modal-navigation/app/modal-layout/modal-layout.xml b/e2e/modal-navigation/app/modal-layout/modal-layout.xml
index b77cb41e30..33746e003e 100644
--- a/e2e/modal-navigation/app/modal-layout/modal-layout.xml
+++ b/e2e/modal-navigation/app/modal-layout/modal-layout.xml
@@ -1,4 +1,4 @@
-<GridLayout backgroundColor="green" showingModally="onShowingModally" loaded="onLoaded"
+<GridLayout showingModally="onShowingModally" loaded="onLoaded"
     navigatingTo="onNavigatingTo"
     navigatingFrom="onNavigatingFrom"
     navigatedTo="onNavigatedTo"
diff --git a/e2e/modal-navigation/app/modal-nested/modal-nested-page.xml b/e2e/modal-navigation/app/modal-nested/modal-nested-page.xml
index aaba10de7a..97f07d3b0a 100644
--- a/e2e/modal-navigation/app/modal-nested/modal-nested-page.xml
+++ b/e2e/modal-navigation/app/modal-nested/modal-nested-page.xml
@@ -1,4 +1,4 @@
-<Page backgroundColor="yellow" 
+<Page backgroundColor="blue"
     navigatingTo="onNavigatingTo" 
     navigatingFrom="onNavigatingFrom"
     navigatedTo="onNavigatedTo"
@@ -8,7 +8,7 @@
         <Label class="action-bar-title" text="Modal Nested"></Label>
     </ActionBar>
 
-    <StackLayout backgroundColor="darkBlue">
+    <StackLayout backgroundColor="lightBlue">
         <Button text="Close Modal Nested" tap="closeModal" />
     </StackLayout>
 </Page>
\ No newline at end of file
diff --git a/e2e/modal-navigation/app/modal-second/modal-second-page.ts b/e2e/modal-navigation/app/modal-second/modal-second-page.ts
index 9e941382d3..cc489fba87 100644
--- a/e2e/modal-navigation/app/modal-second/modal-second-page.ts
+++ b/e2e/modal-navigation/app/modal-second/modal-second-page.ts
@@ -24,3 +24,7 @@ export function onGoBack(args: EventData) {
     const page = view.page as Page;
     page.frame.goBack();
 }
+
+export function onCloseModal(args: EventData) {
+    (args.object as View).closeModal();
+}
diff --git a/e2e/modal-navigation/app/modal-second/modal-second-page.xml b/e2e/modal-navigation/app/modal-second/modal-second-page.xml
index a15af515d9..4463f05ef9 100644
--- a/e2e/modal-navigation/app/modal-second/modal-second-page.xml
+++ b/e2e/modal-navigation/app/modal-second/modal-second-page.xml
@@ -11,5 +11,6 @@
 
     <StackLayout>
         <Button text="Go Back" tap="onGoBack" />
+        <Button text="Close Modal" tap="onCloseModal" />
     </StackLayout>
 </Page>
diff --git a/e2e/modal-navigation/app/modal/modal-page.xml b/e2e/modal-navigation/app/modal/modal-page.xml
index 98e87feaf6..d5c4941ea5 100644
--- a/e2e/modal-navigation/app/modal/modal-page.xml
+++ b/e2e/modal-navigation/app/modal/modal-page.xml
@@ -8,7 +8,7 @@
         <Label class="action-bar-title" text="Modal"></Label>
     </ActionBar>
 
-    <StackLayout backgroundColor="maroon">
+    <StackLayout backgroundColor="lightGreen">
         <Button text="Navigate To Second Page" tap="onNavigate" visibility="{{ navigationVisibility }}" />
         <Button text="Show Nested Modal Page With Frame" tap="showNestedModalFrame" />
         <Button text="Show Nested Modal Page" tap="showNestedModalPage" />
diff --git a/e2e/modal-navigation/app/vendor-platform.android.ts b/e2e/modal-navigation/app/vendor-platform.android.ts
deleted file mode 100644
index 719f264983..0000000000
--- a/e2e/modal-navigation/app/vendor-platform.android.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-require("application");
-if (!global["__snapshot"]) {
-    // In case snapshot generation is enabled these modules will get into the bundle
-    // but will not be required/evaluated.
-    // The snapshot webpack plugin will add them to the tns-java-classes.js bundle file.
-    // This way, they will be evaluated on app start as early as possible.
-    require("ui/frame");
-    require("ui/frame/activity");
-}
diff --git a/e2e/modal-navigation/app/vendor-platform.ios.ts b/e2e/modal-navigation/app/vendor-platform.ios.ts
deleted file mode 100644
index 27c81aca4c..0000000000
--- a/e2e/modal-navigation/app/vendor-platform.ios.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// There is a bug in angular: https://github.com/angular/angular-cli/pull/8589/files
-// Legendary stuff, its webpack plugin pretty much doesn't work with empty TypeScript files in v1.8.3
-// tslint:disable-next-line:no-unused-expression
-void 0;
diff --git a/e2e/modal-navigation/app/vendor.ts b/e2e/modal-navigation/app/vendor.ts
deleted file mode 100644
index 8a38137468..0000000000
--- a/e2e/modal-navigation/app/vendor.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Snapshot the ~/app.css and the theme
-const application = require("application");
-require("ui/styling/style-scope");
-const appCssContext = require.context("~/", false, /^\.\/app\.(css|scss|less|sass)$/);
-global.registerWebpackModules(appCssContext);
-application.loadAppCss();
-
-require("./vendor-platform");
-
-require("bundle-entry-points");
diff --git a/e2e/modal-navigation/e2e/config/appium.capabilities.json b/e2e/modal-navigation/e2e/config/appium.capabilities.json
index ae1f0dea82..c13c15e75b 100644
--- a/e2e/modal-navigation/e2e/config/appium.capabilities.json
+++ b/e2e/modal-navigation/e2e/config/appium.capabilities.json
@@ -114,5 +114,13 @@
         "noReset": true,
         "fullReset": false,
         "app": ""
+    },
+    "sim.iPhoneX.iOS113": {
+        "platformName": "iOS",
+        "platformVersion": "11.3",
+        "deviceName": "iPhone X",
+        "noReset": true,
+        "fullReset": false,
+        "app": ""
     }
-}
+}
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-frame.e2e-spec.ts b/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-frame.e2e-spec.ts
deleted file mode 100644
index 3b312854cd..0000000000
--- a/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-frame.e2e-spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
-import { Screen } from "../screen"
-import { modalFrameBackground,
-    testSecondPageBackground,
-    testNestedModalFrameBackground,
-    testNestedModalPageBackground
-} from "../shared.e2e-spec"
-
-describe("app root modal frame background scenarios", () => {
-
-    let driver: AppiumDriver;
-    let screen: Screen;
-
-    before(async () => {
-        driver = await createDriver();
-        screen = new Screen(driver);
-        // should load app root
-        await screen.loadedHome();
-    });
-
-    beforeEach(async function () {
-        await screen.loadModalFrame();
-    });
-
-    afterEach(async function () {
-        if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
-            await driver.resetApp();
-        }
-    });
-
-    after(async () => {
-        // should close page with frame
-        await screen.closeModal();
-        await screen.loadedHome();
-    });
-
-    it("should run modal page with frame in background", async () => {
-        await modalFrameBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-
-    it("should show nested modal page with frame, run in background, close", async () => {
-        await testNestedModalFrameBackground(driver, screen);
-    });
-
-    it("should show nested modal page, run in background, close", async () => {
-        await testNestedModalPageBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-});
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-page.e2e-spec.ts b/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-page.e2e-spec.ts
deleted file mode 100644
index d7dc613a90..0000000000
--- a/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-page.e2e-spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
-import { Screen } from "../screen"
-import { modalPageBackground,
-    testSecondPageBackground,
-    testNestedModalFrameBackground,
-    testNestedModalPageBackground
-} from "../shared.e2e-spec"
-
-describe("app root modal page background scenarios", () => {
-
-    let driver: AppiumDriver;
-    let screen: Screen;
-
-    before(async () => {
-        driver = await createDriver();
-        screen = new Screen(driver);
-        // should load app root
-        await screen.loadedHome();
-    });
-
-    beforeEach(async function () {
-        await screen.loadModalPage();
-    });
-
-    afterEach(async function () {
-        if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
-            await driver.resetApp();
-        }
-    });
-
-    after(async () => {
-        // should close page with frame
-        await screen.closeModal();
-        await screen.loadedHome();
-    });
-
-    it("should run modal page in background", async () => {
-        await modalPageBackground(driver, screen, false);
-    });
-
-    it("should show nested modal page with frame, run in background, close", async () => {
-        await testNestedModalFrameBackground(driver, screen, false);
-    });
-
-    it("should show nested modal page, run in background, close", async () => {
-        await testNestedModalPageBackground(driver, screen, false);
-    });
-});
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-tab.e2e-spec.ts b/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-tab.e2e-spec.ts
deleted file mode 100644
index 75899e1637..0000000000
--- a/e2e/modal-navigation/e2e/e2e-spec-app-root/app-root-modal-tab.e2e-spec.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
-import { Screen } from "../screen"
-import { modalFrameBackground,
-    modalTabViewBackground,
-    testSecondPageBackground,
-    testNestedModalFrameBackground,
-    testNestedModalPageBackground,
-    testSecondItemBackground
-} from "../shared.e2e-spec"
-
-describe("app root modal tab view background scenarios", () => {
-
-    let driver: AppiumDriver;
-    let screen: Screen;
-
-    before(async () => {
-        driver = await createDriver();
-        screen = new Screen(driver);
-        // should load app root
-        await screen.loadedHome();
-    });
-
-    beforeEach(async function () {
-        await screen.loadModalTabView();
-    });
-
-    afterEach(async function () {
-        if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
-            await driver.resetApp();
-        }
-    });
-
-    after(async () => {
-        // should close page with frame
-        await screen.closeModal();
-        await screen.loadedHome();
-    });
-
-    it("should run modal tab view in background", async () => {
-        await modalTabViewBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-
-    it("should show nested modal page with frame, run in background, close", async () => {
-        await testNestedModalFrameBackground(driver, screen);
-    });
-
-    it("should show nested modal page, run in background, close", async () => {
-        await testNestedModalPageBackground(driver, screen);
-    });
-
-    it("should navigate to second item, run in background, navigate back to first item", async () => {
-        await testSecondItemBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-});
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-frame.e2e-spec.ts b/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-frame.e2e-spec.ts
deleted file mode 100644
index 8c226bf98e..0000000000
--- a/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-frame.e2e-spec.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
-import { Screen } from "../screen"
-import { modalFrameBackground,
-    testSecondPageBackground,
-    testNestedModalFrameBackground,
-    testNestedModalPageBackground
-} from "../shared.e2e-spec"
-
-describe("tab root modal frame background scenarios", () => {
-
-    let driver: AppiumDriver;
-    let screen: Screen;
-
-    before(async () => {
-        driver = await createDriver();
-        screen = new Screen(driver);
-        await screen.setTabRootView();
-    });
-
-    beforeEach(async function () {
-        await screen.loadModalFrame();
-    });
-
-    afterEach(async function () {
-        if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
-            await driver.resetApp();
-            await screen.setTabRootView();
-        }
-    });
-
-    after(async () => {
-        // should close page with frame
-        await screen.closeModal();
-        await screen.loadedHome();
-    });
-
-    it("should run modal page with frame in background", async () => {
-        await modalFrameBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-
-    it("should show nested modal page with frame, run in background, close", async () => {
-        await testNestedModalFrameBackground(driver, screen);
-    });
-
-    it("should show nested modal page, run in background, close", async () => {
-        await testNestedModalPageBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-});
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-page.e2e-spec.ts b/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-page.e2e-spec.ts
deleted file mode 100644
index 48343881bd..0000000000
--- a/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-page.e2e-spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
-import { Screen } from "../screen"
-import { modalPageBackground,
-    testSecondPageBackground,
-    testNestedModalFrameBackground,
-    testNestedModalPageBackground
-} from "../shared.e2e-spec"
-
-describe("tab root modal page background scenarios", () => {
-
-    let driver: AppiumDriver;
-    let screen: Screen;
-
-    before(async () => {
-        driver = await createDriver();
-        screen = new Screen(driver);
-        await screen.setTabRootView();
-    });
-
-    beforeEach(async function () {
-        await screen.loadModalPage();
-    });
-
-    afterEach(async function () {
-        if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
-            await driver.resetApp();
-            await screen.setTabRootView();
-        }
-    });
-
-    after(async () => {
-        // should close page with frame
-        await screen.closeModal();
-        await screen.loadedHome();
-    });
-
-    it("should run modal page in background", async () => {
-        await modalPageBackground(driver, screen, false);
-    });
-
-    it("should show nested modal page with frame, run in background, close", async () => {
-        await testNestedModalFrameBackground(driver, screen, false);
-    });
-
-    it("should show nested modal page, run in background, close", async () => {
-        await testNestedModalPageBackground(driver, screen, false);
-    });
-});
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-tab.e2e-spec.ts b/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-tab.e2e-spec.ts
deleted file mode 100644
index 7e92c5e13d..0000000000
--- a/e2e/modal-navigation/e2e/e2e-spec-tab-root/tab-root-modal-tab.e2e-spec.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { AppiumDriver, createDriver } from "nativescript-dev-appium";
-import { Screen } from "../screen"
-import { modalFrameBackground,
-    modalTabViewBackground,
-    testSecondPageBackground,
-    testNestedModalFrameBackground,
-    testNestedModalPageBackground,
-    testSecondItemBackground
-} from "../shared.e2e-spec"
-
-describe("tab root modal tab view background scenarios", () => {
-
-    let driver: AppiumDriver;
-    let screen: Screen;
-
-    before(async () => {
-        driver = await createDriver();
-        screen = new Screen(driver);
-        await screen.setTabRootView();
-    });
-
-    beforeEach(async function () {
-        await screen.loadModalTabView();
-    });
-
-    afterEach(async function () {
-        if (this.currentTest.state === "failed") {
-            await driver.logPageSource(this.currentTest.title);
-            await driver.logScreenshot(this.currentTest.title);
-            await driver.resetApp();
-            await screen.setTabRootView();
-        }
-    });
-
-    after(async () => {
-        // should close page with frame
-        await screen.closeModal();
-        await screen.loadedHome();
-    });
-
-    it("should run modal tab view in background", async () => {
-        await modalTabViewBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-
-    it("should show nested modal page with frame, run in background, close", async () => {
-        await testNestedModalFrameBackground(driver, screen);
-    });
-
-    it("should show nested modal page, run in background, close", async () => {
-        await testNestedModalPageBackground(driver, screen);
-    });
-
-    it("should navigate to second item, run in background, navigate back to first item", async () => {
-        await testSecondItemBackground(driver, screen);
-    });
-
-    it("should navigate to second page, run in background, go back", async () => {
-        await testSecondPageBackground(driver, screen);
-    });
-});
\ No newline at end of file
diff --git a/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts
new file mode 100644
index 0000000000..f4db7ac8a7
--- /dev/null
+++ b/e2e/modal-navigation/e2e/modal-frame.e2e-spec.ts
@@ -0,0 +1,72 @@
+import { AppiumDriver, createDriver } from "nativescript-dev-appium";
+import { Screen } from "./screen"
+import {
+    roots,
+    modalFrameBackground,
+    testSecondPageBackground,
+    testSecondPageClose,
+    testNestedModalFrameBackground,
+    testNestedModalPageBackground
+} from "./shared.e2e-spec"
+
+describe("modal frame:", () => {
+
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async () => {
+        driver = await createDriver();
+        screen = new Screen(driver);
+    });
+
+    roots.forEach(root => {
+        describe(`${root} modal frame background scenarios:`, () => {
+
+            before(async () => {
+                await screen[root]();
+            });
+
+            beforeEach(async function () {
+                await screen.loadModalFrame();
+            });
+
+            afterEach(async function () {
+                if (this.currentTest.state === "failed") {
+                    await driver.logPageSource(this.currentTest.title);
+                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.resetApp();
+                    await screen[root]();
+                }
+            });
+
+            after(async () => {
+                await screen.closeModal();
+                await screen.loadedHome();
+            });
+
+            it("should run modal page with frame in background", async () => {
+                await modalFrameBackground(driver, screen);
+            });
+
+            it("should navigate to second page, run in background, go back", async () => {
+                await testSecondPageBackground(driver, screen);
+            });
+
+            it("should show nested modal page with frame, run in background, close", async () => {
+                await testNestedModalFrameBackground(driver, screen);
+            });
+
+            it("should show nested modal page, run in background, close", async () => {
+                await testNestedModalPageBackground(driver, screen);
+            });
+
+            it("should navigate to second page, close", async () => {
+                await testSecondPageClose(driver, screen);
+            });
+
+            it("should navigate to second page, run in background, go back", async () => {
+                await testSecondPageBackground(driver, screen);
+            });
+        });
+    });
+});
diff --git a/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts
new file mode 100644
index 0000000000..7e8315a9fb
--- /dev/null
+++ b/e2e/modal-navigation/e2e/modal-layout.e2e-spec.ts
@@ -0,0 +1,75 @@
+import { AppiumDriver, createDriver } from "nativescript-dev-appium";
+import { Screen } from "./screen"
+import {
+    roots,
+    modalFrameBackground,
+    testSecondPageBackground,
+    testSecondPageClose,
+    testNestedModalFrameBackground,
+    testNestedModalPageBackground
+} from "./shared.e2e-spec"
+
+describe("modal layout:", () => {
+
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async () => {
+        driver = await createDriver();
+        screen = new Screen(driver);
+    });
+
+    roots.forEach(root => {
+        describe(`${root} modal layout background scenarios:`, () => {
+
+            before(async () => {
+                if (driver.isAndroid) {
+                    await driver.resetApp();
+                }
+                await screen[root]();
+            });
+
+            beforeEach(async function () {
+                await screen.loadModalLayout();
+            });
+
+            afterEach(async function () {
+                if (this.currentTest.state === "failed") {
+                    await driver.logPageSource(this.currentTest.title);
+                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.resetApp();
+                    await screen[root]();
+                }
+            });
+
+            after(async () => {
+                await screen.closeModal();
+                await screen.loadedHome();
+            });
+
+            it("should run modal layout in background", async () => {
+                await modalFrameBackground(driver, screen);
+            });
+
+            it("should navigate to second page, run in background, go back", async () => {
+                await testSecondPageBackground(driver, screen);
+            });
+
+            it("should show nested modal page with frame, run in background, close", async () => {
+                await testNestedModalFrameBackground(driver, screen);
+            });
+
+            it("should show nested modal page, run in background, close", async () => {
+                await testNestedModalPageBackground(driver, screen);
+            });
+
+            it("should navigate to second page, close", async () => {
+                await testSecondPageClose(driver, screen);
+            });
+
+            it("should navigate to second page, run in background, go back", async () => {
+                await testSecondPageBackground(driver, screen);
+            });
+        });
+    });
+});
diff --git a/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
new file mode 100644
index 0000000000..8b3cb19c47
--- /dev/null
+++ b/e2e/modal-navigation/e2e/modal-page.e2e-spec.ts
@@ -0,0 +1,62 @@
+import { AppiumDriver, createDriver } from "nativescript-dev-appium";
+import { Screen } from "./screen"
+import {
+    roots,
+    modalPageBackground,
+    testSecondPageBackground,
+    testNestedModalFrameBackground,
+    testNestedModalPageBackground
+} from "./shared.e2e-spec"
+
+describe("modal page:", () => {
+
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async () => {
+        driver = await createDriver();
+        screen = new Screen(driver);
+    });
+
+    roots.forEach(root => {
+        describe(`${root} modal page background scenarios:`, () => {
+
+            before(async () => {
+                if (driver.isAndroid) {
+                    await driver.resetApp();
+                }
+                await screen[root]();
+            });
+
+            beforeEach(async function () {
+                await screen.loadModalPage();
+            });
+
+            afterEach(async function () {
+                if (this.currentTest.state === "failed") {
+                    await driver.logPageSource(this.currentTest.title);
+                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.resetApp();
+                    await screen[root]();
+                }
+            });
+
+            after(async () => {
+                await screen.closeModal();
+                await screen.loadedHome();
+            });
+
+            it("should run modal page in background", async () => {
+                await modalPageBackground(driver, screen, false);
+            });
+
+            it("should show nested modal page with frame, run in background, close", async () => {
+                await testNestedModalFrameBackground(driver, screen, false);
+            });
+
+            it("should show nested modal page, run in background, close", async () => {
+                await testNestedModalPageBackground(driver, screen, false);
+            });
+        });
+    });
+});
diff --git a/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
new file mode 100644
index 0000000000..a3f5f6bf36
--- /dev/null
+++ b/e2e/modal-navigation/e2e/modal-tab.e2e-spec.ts
@@ -0,0 +1,81 @@
+import { AppiumDriver, createDriver } from "nativescript-dev-appium";
+import { Screen } from "./screen"
+import {
+    roots,
+    modalFrameBackground,
+    modalTabViewBackground,
+    testSecondPageBackground,
+    testSecondPageClose,
+    testNestedModalFrameBackground,
+    testNestedModalPageBackground,
+    testSecondItemBackground
+} from "./shared.e2e-spec"
+
+describe("modal tab:", () => {
+
+    let driver: AppiumDriver;
+    let screen: Screen;
+
+    before(async () => {
+        driver = await createDriver();
+        screen = new Screen(driver);
+    });
+
+    roots.forEach(root => {
+        describe(`${root} modal tab view background scenarios:`, () => {
+
+            before(async () => {
+                if (driver.isAndroid) {
+                    await driver.resetApp();
+                }
+                await screen[root]();
+            });
+
+            beforeEach(async function () {
+                await screen.loadModalTabView();
+            });
+
+            afterEach(async function () {
+                if (this.currentTest.state === "failed") {
+                    await driver.logPageSource(this.currentTest.title);
+                    await driver.logScreenshot(this.currentTest.title);
+                    await driver.resetApp();
+                    await screen[root]();
+                }
+            });
+
+            after(async () => {
+                await screen.closeModal();
+                await screen.loadedHome();
+            });
+
+            it("should run modal tab view in background", async () => {
+                await modalTabViewBackground(driver, screen);
+            });
+
+            it("should navigate to second page, run in background, go back", async () => {
+                await testSecondPageBackground(driver, screen);
+            });
+
+            it("should show nested modal page with frame, run in background, close", async () => {
+                await testNestedModalFrameBackground(driver, screen);
+            });
+
+            it("should show nested modal page, run in background, close", async () => {
+                await testNestedModalPageBackground(driver, screen);
+            });
+
+            it("should navigate to second item, run in background, navigate back to first item", async () => {
+                await testSecondItemBackground(driver, screen);
+            });
+
+            it("should navigate to second page, close", async () => {
+                await testSecondPageClose(driver, screen);
+            });
+
+            it("should navigate to second page, run in background, go back", async () => {
+                await testSecondPageBackground(driver, screen);
+            });
+        });
+    });
+});
diff --git a/e2e/modal-navigation/e2e/screen.ts b/e2e/modal-navigation/e2e/screen.ts
index bd9f36fe34..164c0a165b 100644
--- a/e2e/modal-navigation/e2e/screen.ts
+++ b/e2e/modal-navigation/e2e/screen.ts
@@ -10,6 +10,7 @@ const modalNested = "Modal Nested";
 
 const modalFrame = "Show Modal Page With Frame";
 const modalPage = "Show Modal Page";
+const modalLayout = "Show Modal Layout";
 const modalTabView = "Show Modal TabView";
 const navToSecondPage = "Navigate To Second Page";
 const resetFrameRootView = "Reset Frame Root View";
@@ -38,26 +39,34 @@ export class Screen {
     }
 
     resetFrameRootView = async () => {
+        console.log("Setting frame root ...");
         const btnResetFrameRootView = await this._driver.findElementByText(resetFrameRootView);
         await btnResetFrameRootView.tap();
     }
 
-    resetTabRootView = async () => {
-        const btnResetTabRootView = await this._driver.findElementByText(resetTabRootView);
-        await btnResetTabRootView.tap();
-    }
-
     resetLayoutRootView = async () => {
+        console.log("Setting layout root ...");
         const btnResetLayoutRootView = await this._driver.findElementByText(resetLayoutRootView);
         await btnResetLayoutRootView.tap();
     }
 
+    resetTabRootView = async () => {
+        const btnResetTabRootView = await this._driver.findElementByText(resetTabRootView);
+        await btnResetTabRootView.tap();
+    }
+
     loadedTabRootView = async () => {
         const tabFirst = await this._driver.findElementByText(first);
         assert.isTrue(await tabFirst.isDisplayed());
         console.log("Tab root view loaded!");
     }
 
+    setFrameRootView = async () => {
+        // should load frame root, no need to verify it is loaded
+        await this.loadedHome();
+        await this.resetFrameRootView();
+    }
+
     setTabRootView = async () => {
         // should load tab root
         await this.loadedHome();
@@ -69,6 +78,12 @@ export class Screen {
         }
     }
 
+    setLayoutRootView = async () => {
+        // should load layout root, no need to verify it is loaded
+        await this.loadedHome();
+        await this.resetLayoutRootView();
+    }
+
     showModalFrame = async () => {
         const btnModalFrame = await this._driver.findElementByText(modalFrame);
         await btnModalFrame.tap();
@@ -91,6 +106,15 @@ export class Screen {
         console.log("Modal Page loaded!");
     }
 
+    showModalLayout = async () => {
+        const btnModalLayout = await this._driver.findElementByText(modalLayout);
+        await btnModalLayout.tap();
+    }
+
+    loadedModalLayout = async () => {
+        await this.loadedModalFrame();
+    }
+
     showModalTabView = async () => {
         const btnModalTabView = await this._driver.findElementByText(modalTabView);
         await btnModalTabView.tap();
@@ -192,6 +216,16 @@ export class Screen {
         }
     }
 
+    loadModalLayout = async () => {
+        try {
+            await this.loadedModalLayout();
+        } catch (err) {
+            // should show modal layout
+            await this.showModalLayout();
+            await this.loadedModalLayout();
+        }
+    }
+
     loadModalTabView = async () => {
         try {
             await this.loadedModalTabView();
diff --git a/e2e/modal-navigation/e2e/shared.e2e-spec.ts b/e2e/modal-navigation/e2e/shared.e2e-spec.ts
index e039ce1c51..84f7d54568 100644
--- a/e2e/modal-navigation/e2e/shared.e2e-spec.ts
+++ b/e2e/modal-navigation/e2e/shared.e2e-spec.ts
@@ -3,6 +3,8 @@ import { Screen } from "./screen"
 
 const time = 1;
 
+export const roots = ["setFrameRootView", "setLayoutRootView", "setTabRootView"];
+
 export async function modalFrameBackground(driver: AppiumDriver, screen: Screen) {
     await driver.backgroundApp(time);
     await screen.loadedModalFrame();
@@ -19,6 +21,14 @@ export async function testSecondPageBackground(driver: AppiumDriver, screen: Scr
     await screen.loadedModalFrame();
 }
 
+export async function testSecondPageClose(driver: AppiumDriver, screen: Screen) {
+    await screen.navigateToSecondPage();
+    await screen.loadedSecondPage();
+
+    await screen.closeModal();
+    await screen.loadedHome();
+}
+
 export async function testNestedModalFrameBackground(driver: AppiumDriver, screen: Screen, isInFrame: boolean = true) {
     await screen.showNestedModalFrame();
     await screen.loadedNestedModalFrame();
diff --git a/e2e/modal-navigation/package.json b/e2e/modal-navigation/package.json
index b2eed4ed48..fbdf1585f2 100644
--- a/e2e/modal-navigation/package.json
+++ b/e2e/modal-navigation/package.json
@@ -17,28 +17,9 @@
     "tns-core-modules": "next"
   },
   "devDependencies": {
-    "awesome-typescript-loader": "~3.1.3",
-    "babel-traverse": "6.26.0",
-    "babel-types": "6.26.0",
-    "babylon": "6.18.0",
-    "copy-webpack-plugin": "~4.3.0",
-    "css-loader": "~0.28.7",
-    "extract-text-webpack-plugin": "~3.0.2",
-    "lazy": "1.0.11",
     "nativescript-dev-appium": "next",
     "nativescript-dev-typescript": "next",
-    "nativescript-dev-webpack": "next",
-    "nativescript-worker-loader": "~0.8.1",
-    "raw-loader": "~0.5.1",
-    "resolve-url-loader": "~2.2.1",
-    "typescript": "~2.4.2",
-    "uglifyjs-webpack-plugin": "~1.1.6",
-    "webpack": "~3.10.0",
-    "webpack-bundle-analyzer": "^2.9.1",
-    "webpack-sources": "~1.1.0",
-    "@types/chai": "^4.0.2",
-    "@types/mocha": "^2.2.41",
-    "@types/node": "^7.0.5"
+    "nativescript-dev-webpack": "next"
   },
   "scripts": {
     "e2e": "tsc -p e2e && mocha --opts ./e2e/config/mocha.opts",
diff --git a/e2e/modal-navigation/webpack.config.js b/e2e/modal-navigation/webpack.config.js
deleted file mode 100644
index c0129d7b95..0000000000
--- a/e2e/modal-navigation/webpack.config.js
+++ /dev/null
@@ -1,143 +0,0 @@
-const { resolve, join  } = require("path");
-
-const webpack = require("webpack");
-const nsWebpack = require("nativescript-dev-webpack");
-const nativescriptTarget = require("nativescript-dev-webpack/nativescript-target");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
-const { NativeScriptWorkerPlugin } = require("nativescript-worker-loader/NativeScriptWorkerPlugin");
-const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
-
-module.exports = env => {
-    const platform = env && (env.android && "android" || env.ios && "ios");
-    if (!platform) {
-        throw new Error("You need to provide a target platform!");
-    }
-    const platforms = ["ios", "android"];
-    const { snapshot, uglify, report } = env;
-
-    const config = {
-        context: resolve("./app"),
-        target: nativescriptTarget,
-        entry: {
-            bundle: `./${nsWebpack.getEntryModule()}`,
-            vendor: "./vendor"
-        },
-        output: {
-            pathinfo: true,
-            // Default destination inside platforms/<platform>/...
-            path: resolve(nsWebpack.getAppPath(platform)),
-            libraryTarget: "commonjs2",
-            filename: "[name].js",
-        },
-        resolve: {
-            extensions: [".ts", ".js", ".scss", ".css"],
-            // Resolve {N} system modules from tns-core-modules
-            modules: [
-                "node_modules/tns-core-modules",
-                "node_modules",
-            ],
-            alias: {
-                '~': resolve("./app")
-            },
-            // don't resolve symlinks to symlinked modules
-            symlinks: false
-        },
-        resolveLoader: {
-            // don't resolve symlinks to symlinked loaders
-            symlinks: false
-        },
-        node: {
-            // Disable node shims that conflict with NativeScript
-            "http": false,
-            "timers": false,
-            "setImmediate": false,
-            "fs": "empty",
-        },
-        module: {
-            rules: [
-                { test: /\.(html|xml)$/, use: "raw-loader" },
-
-                {
-                    test: /\.css$/,
-                    use: { loader: "css-loader", options: { minimize: false, url: false } }
-                },
-
-                {
-                    test: /\.scss$/,
-                    use: [
-                        { loader: "css-loader", options: { minimize: false, url: false } },
-                        "sass-loader"
-                    ]
-                },
-
-                { test: /\.ts$/, use: "awesome-typescript-loader" }
-            ]
-        },
-        plugins: [
-            // Vendor libs go to the vendor.js chunk
-            new webpack.optimize.CommonsChunkPlugin({
-                name: ["vendor"],
-            }),
-            // Define useful constants like TNS_WEBPACK
-            new webpack.DefinePlugin({
-                "global.TNS_WEBPACK": "true",
-            }),
-            // Copy assets to out dir. Add your own globs as needed.
-            new CopyWebpackPlugin([
-                { from: "App_Resources/**" },
-                { from: "fonts/**" },
-                { from: "**/*.jpg" },
-                { from: "**/*.png" },
-                { from: "**/*.xml" },
-            ]),
-            // Generate a bundle starter script and activate it in package.json
-            new nsWebpack.GenerateBundleStarterPlugin([
-                "./vendor",
-                "./bundle",
-            ]),
-            // Support for web workers since v3.2
-            new NativeScriptWorkerPlugin(),
-            new nsWebpack.PlatformFSPlugin({
-                platform,
-                platforms,
-                // ignore: ["App_Resources"]
-            }),
-            // Does IPC communication with the {N} CLI to notify events when running in watch mode.
-            new nsWebpack.WatchStateLoggerPlugin(),
-        ],
-    };
-    if (report) {
-        // Generate report files for bundles content
-        config.plugins.push(new BundleAnalyzerPlugin({
-            analyzerMode: "static",
-            openAnalyzer: false,
-            generateStatsFile: true,
-            reportFilename: join(__dirname, "report", `report.html`),
-            statsFilename: join(__dirname, "report", `stats.json`),
-        }));
-    }
-    if (snapshot) {
-        config.plugins.push(new nsWebpack.NativeScriptSnapshotPlugin({
-            chunk: "vendor",
-            projectRoot: __dirname,
-            webpackConfig: config,
-            targetArchs: ["arm", "arm64", "ia32"],
-            tnsJavaClassesOptions: { packages: ["tns-core-modules" ] },
-            useLibs: false
-        }));
-    }
-    if (uglify) {
-        config.plugins.push(new webpack.LoaderOptionsPlugin({ minimize: true }));
-
-        // Work around an Android issue by setting compress = false
-        const compress = platform !== "android";
-        config.plugins.push(new UglifyJsPlugin({
-            uglifyOptions: {
-                mangle: { reserved: nsWebpack.uglifyMangleExcludes },
-                compress,
-            }
-        }));
-    }
-    return config;
-};
diff --git a/package.json b/package.json
index b558146690..f67b7a8ac8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "unit-test": "tsc -p tsconfig.unit-tests.json && mocha --opts unit-tests/mocha.opts",
     "unit-test-watch": "mocha-typescript-watch -p tsconfig.unit-tests.json --opts unit-tests/mocha.opts",
     "compile-all": "npm run tsc -- -p tsconfig.json --outDir bin/dist",
-    "compile-modules": "npm run tsc -- -p tsconfig-modules.json --outDir bin/dist",
+    "compile-modules": "npm run tsc -- -p tsconfig.modules.json --outDir bin/dist",
     "compile-check-base-dts": "npm run tsc -- -p tsconfig.base-dts.json",
     "compile-unit-tests": "npm run tsc -- -p tsconfig.unit-tests.json --outDir bin/dist/unit-tests",
     "compile-check-combined-dts": "npm run tsc -- -p tsconfig.combined-dts.json",
diff --git a/tests/app/app/mainPage.ts b/tests/app/app/mainPage.ts
index 786b9320c2..70e2ce2e71 100644
--- a/tests/app/app/mainPage.ts
+++ b/tests/app/app/mainPage.ts
@@ -16,7 +16,7 @@ trace.addCategories(trace.categories.Test + "," + trace.categories.Error);
 // ));
 
 function runTests() {
-    setTimeout(() => tests.runAll(''), 10);
+    setTimeout(() => tests.runAll(""), 10);
 }
 
 export function onNavigatedTo(args) {
diff --git a/tests/app/application-settings/application-settings-tests.ts b/tests/app/application-settings/application-settings-tests.ts
index 0aac005625..1840b7d14b 100644
--- a/tests/app/application-settings/application-settings-tests.ts
+++ b/tests/app/application-settings/application-settings-tests.ts
@@ -4,7 +4,7 @@ var appSettings = require("application-settings");
 
 import * as TKUnit from "../TKUnit";
 
-var stringKey:string = "stringKey";
+var stringKey: string = "stringKey";
 var boolKey: string = "boolKey";
 var numberKey: string = "numberKey";
 var noStringKey: string = "noStringKey";
@@ -58,7 +58,7 @@ export var testDefaultsWithNoDefaultValueProvided = function () {
     // << application-settings-nodefault
     TKUnit.assertEqual(defaultValue, undefined, "Default string value is not undefined");
 
-    TKUnit.assertEqual(appSettings.getBoolean(noBoolKey) , undefined, "Default boolean value is not undefined");
+    TKUnit.assertEqual(appSettings.getBoolean(noBoolKey), undefined, "Default boolean value is not undefined");
     TKUnit.assertEqual(appSettings.getNumber(noNumberKey), undefined, "Default number value is not undefined");
 };
 
@@ -108,7 +108,7 @@ export var testFlush = function () {
     var flushed = appSettings.flush();
     // will return boolean indicating whether flush to disk was successful
     // << application-settings-flush
-    TKUnit.assert(flushed, "Flush failed: "+ flushed);
+    TKUnit.assert(flushed, "Flush failed: " + flushed);
     TKUnit.assert(appSettings.hasKey(stringKey), "There is no key: " + stringKey);
 };
 
diff --git a/tests/app/data/observable-array-tests.ts b/tests/app/data/observable-array-tests.ts
index 8d4cfb0be5..1b4cce9b16 100644
--- a/tests/app/data/observable-array-tests.ts
+++ b/tests/app/data/observable-array-tests.ts
@@ -344,7 +344,7 @@ export const test_ObservableArray_sortShouldReturnNewSortedArray = function () {
 export const test_ObservableArray_sortShouldReturnNewSortedArrayAccordingSpecifiedOrder = function () {
     // >> observable-array-sort-comparer
     const array = new ObservableArray([10, 100, 1]);
-    const result = array.sort((a: number, b: number) => { return a - b; });
+    const result = array.sort((a: number, b: number) => a - b);
     // << observable-array-sort-comparer
     TKUnit.assert(result[2] === 100 && result.length === 3, "ObservableArray sort() should return new sorted array according to specified order!");
 };
diff --git a/tests/app/fetch/fetch-tests.ts b/tests/app/fetch/fetch-tests.ts
index b6df4a99eb..835f405d98 100644
--- a/tests/app/fetch/fetch-tests.ts
+++ b/tests/app/fetch/fetch-tests.ts
@@ -20,7 +20,7 @@ export var test_fetch = function (done: (err: Error, res?: string) => void) {
 
 export var test_fetch_text = function (done: (err: Error, res?: string) => void) {
     // >> fetch-string
-    fetch("https://httpbin.org/get").then(response => { return response.text(); }).then(function (r) {
+    fetch("https://httpbin.org/get").then(response => response.text()).then(function (r) {
         // Argument (r) is string!
         // >> (hide)
         TKUnit.assert(types.isString(r), "Result from text() should be string! Actual result is: " + r);
@@ -32,7 +32,7 @@ export var test_fetch_text = function (done: (err: Error, res?: string) => void)
 
 export var test_fetch_json = function (done: (err: Error, res?: string) => void) {
     // >> fetch-json
-    fetch("https://httpbin.org/get").then(response => { return response.json(); }).then(function (r) {
+    fetch("https://httpbin.org/get").then(response => response.json()).then(function (r) {
         // Argument (r) is JSON object!
         // >> (hide)
         TKUnit.assertNotNull(r, "Result from json() should be JSON object!");
@@ -44,7 +44,7 @@ export var test_fetch_json = function (done: (err: Error, res?: string) => void)
 
 export var test_fetch_formData = function (done: (err: Error, res?: string) => void) {
     // >> fetch-formdata
-    fetch("https://httpbin.org/get").then(response => { return response.formData(); }).then(function (r) {
+    fetch("https://httpbin.org/get").then(response => response.formData()).then(function (r) {
         // Argument (r) is FormData object!
         // >> (hide)
         TKUnit.assert(r instanceof FormData, "Result from formData() should be FormData object! Actual result is: " + r);
@@ -133,7 +133,7 @@ export var test_fetch_post_json = function (done) {
         method: "POST",
         headers: new Headers({ "Content-Type": "application/json" }),
         body: JSON.stringify({ MyVariableOne: "ValueOne", MyVariableTwo: "ValueTwo" })
-    }).then(r => { return r.json(); }).then(function (r) {
+    }).then(r => r.json()).then(function (r) {
         // >> (hide)
         TKUnit.assert(r.json["MyVariableOne"] === "ValueOne" && r.json["MyVariableTwo"] === "ValueTwo", "Content not sent/received properly! Actual result is: " + r.json);
         done(null);
diff --git a/tests/app/file-system/file-system-tests.ts b/tests/app/file-system/file-system-tests.ts
index 9087a71510..60d2db33e2 100644
--- a/tests/app/file-system/file-system-tests.ts
+++ b/tests/app/file-system/file-system-tests.ts
@@ -183,12 +183,12 @@ export var testFileReadWriteBinary = function () {
     var sourceFile = fs.File.fromPath(__dirname + "/../" + fileName);
     var destinationFile = fs.knownFolders.documents().getFile(fileName);
 
-    var source = sourceFile.readSync(e=> { error = e; });
+    var source = sourceFile.readSync(e => { error = e; });
+
+    destinationFile.writeSync(source, e => { error = e; });
 
-    destinationFile.writeSync(source, e=> { error = e; });
-    
     // >> (hide)
-    var destination = destinationFile.readSync(e=> { error = e; });
+    var destination = destinationFile.readSync(e => { error = e; });
     TKUnit.assertNull(error);
     if (platform.device.os === platform.platformNames.ios) {
         TKUnit.assertTrue(source.isEqualToData(destination));
@@ -218,17 +218,17 @@ export var testGetKnownFolders = function () {
     // << file-system-known-folders
 };
 
-function _testIOSSpecificKnownFolder(knownFolderName: string){
+function _testIOSSpecificKnownFolder(knownFolderName: string) {
     let knownFolder: fs.Folder;
     let createdFile: fs.File;
-    let testFunc = function testFunc(){
+    let testFunc = function testFunc() {
         knownFolder = fs.knownFolders.ios[knownFolderName]();
         if (knownFolder) {
             createdFile = knownFolder.getFile("createdFile");
             createdFile.writeTextSync("some text");
         }
     };
-    if (platform.isIOS){
+    if (platform.isIOS) {
         testFunc();
         if (knownFolder) {
             TKUnit.assertTrue(knownFolder.isKnown, `The ${knownFolderName} folder should have its "isKnown" property set to true.`);
@@ -238,22 +238,22 @@ function _testIOSSpecificKnownFolder(knownFolderName: string){
         }
     }
     else {
-        TKUnit.assertThrows(testFunc, 
+        TKUnit.assertThrows(testFunc,
         `Trying to retrieve the ${knownFolderName} known folder on a platform different from iOS should throw!`,
         `The "${knownFolderName}" known folder is available on iOS only!`);
     }
 }
 
 export var testIOSSpecificKnownFolders = function () {
-    _testIOSSpecificKnownFolder("library");    
-    _testIOSSpecificKnownFolder("developer");    
-    _testIOSSpecificKnownFolder("desktop");    
-    _testIOSSpecificKnownFolder("downloads");    
-    _testIOSSpecificKnownFolder("movies");    
-    _testIOSSpecificKnownFolder("music");    
-    _testIOSSpecificKnownFolder("pictures");    
-    _testIOSSpecificKnownFolder("sharedPublic");    
-}
+    _testIOSSpecificKnownFolder("library");
+    _testIOSSpecificKnownFolder("developer");
+    _testIOSSpecificKnownFolder("desktop");
+    _testIOSSpecificKnownFolder("downloads");
+    _testIOSSpecificKnownFolder("movies");
+    _testIOSSpecificKnownFolder("music");
+    _testIOSSpecificKnownFolder("pictures");
+    _testIOSSpecificKnownFolder("sharedPublic");
+};
 
 export var testGetEntities = function () {
     // >> file-system-folders-content
@@ -559,12 +559,22 @@ export function test_FSEntity_Properties() {
     TKUnit.assert(file.extension === ".txt", "FileEntity.extension not working.");
     TKUnit.assert(file.isLocked === false, "FileEntity.isLocked not working.");
     TKUnit.assert(file.lastModified instanceof Date, "FileEntity.lastModified not working.");
+    TKUnit.assert(file.size === 0, "FileEntity.size not working.");
     TKUnit.assert(file.name === "Test_File.txt", "FileEntity.name not working.");
     TKUnit.assert(file.parent === documents, "FileEntity.parent not working.");
 
     file.remove();
 }
 
+export function test_FileSize(done) {
+    var file = fs.knownFolders.documents().getFile("Test_File_Size.txt");
+    file.writeText("Hello World!").then(() => {
+        TKUnit.assert(file.size === "Hello World!".length);
+        return file.remove();
+    }).then(() => done())
+    .catch(done);
+}
+
 export function test_UnlockAfterWrite(done) {
     var file = fs.knownFolders.documents().getFile("Test_File_Lock.txt");
     file.writeText("Hello World!").then(() => {
diff --git a/tests/app/http/http-string-worker.ts b/tests/app/http/http-string-worker.ts
index 90509e13cb..d20131ffb6 100644
--- a/tests/app/http/http-string-worker.ts
+++ b/tests/app/http/http-string-worker.ts
@@ -1,7 +1,7 @@
 require("globals");
 import * as http from "tns-core-modules/http";
 
-declare var postMessage : any;
+declare var postMessage: any;
 
 http.getString("https://httpbin.org/get").then(function (r) {
     postMessage(r);
diff --git a/tests/app/image-source/image-source-tests.ts b/tests/app/image-source/image-source-tests.ts
index 1209a33909..671ba77b2e 100644
--- a/tests/app/image-source/image-source-tests.ts
+++ b/tests/app/image-source/image-source-tests.ts
@@ -15,7 +15,7 @@ export function testFromResource() {
     // >> imagesource-resname
     const img = imageSource.fromResource("icon");
     // << imagesource-resname
-    
+
     TKUnit.assert(img.height > 0, "image.fromResource failed");
 }
 
@@ -79,7 +79,7 @@ export function testFromFile() {
 }
 
 export function testFromAssetFileNotFound(done) {
-    let asset = new imageAssetModule.ImageAsset('invalidFile.png');
+    let asset = new imageAssetModule.ImageAsset("invalidFile.png");
     asset.options = {
         width: 0,
         height: 0,
@@ -87,7 +87,7 @@ export function testFromAssetFileNotFound(done) {
     };
 
     let img = imageSource.fromAsset(asset).then((source) => {
-        done('Should not resolve with invalid file name.');
+        done("Should not resolve with invalid file name.");
     }, (error) => {
         TKUnit.assertNotNull(error);
         done();
@@ -149,6 +149,22 @@ export function testFromAssetWithScalingAndAspectRatio(done) {
     });
 }
 
+export function testFromAssetWithScalingAndDefaultAspectRatio(done) {
+    let asset = new imageAssetModule.ImageAsset(splashscreenPath);
+    let scaleWidth = 10;
+    let scaleHeight = 11;
+    asset.options.width = scaleWidth;
+    asset.options.height = scaleHeight;
+
+    let img = imageSource.fromAsset(asset).then((source) => {
+        TKUnit.assertEqual(source.width, 18);
+        TKUnit.assertEqual(source.height, scaleHeight);
+        done();
+    }, (error) => {
+        done(error);
+    });
+}
+
 export function testFromAssetWithBiggerScaling(done) {
     let asset = new imageAssetModule.ImageAsset(splashscreenPath);
     let scaleWidth = 600;
diff --git a/tests/app/navigation/navigation-tests.ts b/tests/app/navigation/navigation-tests.ts
index 98bb264a52..49339a7016 100644
--- a/tests/app/navigation/navigation-tests.ts
+++ b/tests/app/navigation/navigation-tests.ts
@@ -1,5 +1,5 @@
 import * as TKUnit from "../TKUnit";
-import { Page, NavigatedData } from "tns-core-modules/ui/page";
+import { EventData, Page, NavigatedData } from "tns-core-modules/ui/page";
 import { topmost as topmostFrame, NavigationTransition } from "tns-core-modules/ui/frame";
 import { Color } from "tns-core-modules/color";
 import * as helper from "../ui/helper";
@@ -377,4 +377,41 @@ export function test_NavigationEvents_WithClearHistory() {
 
 export function test_NavigationEvents_WithClearHistory_WithTransition() {
     _test_NavigationEvents_WithClearHistory({ name: "fade", duration: 10 });
+}
+
+export function test_Navigate_From_Page_Loaded_Handler() {
+    _test_Navigate_From_Page_Event_Handler(Page.loadedEvent);
+}
+
+export function test_Navigate_From_Page_NavigatedTo_Handler() {
+    _test_Navigate_From_Page_Event_Handler(Page.navigatedToEvent);
+}
+
+function _test_Navigate_From_Page_Event_Handler(eventName: string) {
+    let secondPageNavigatedTo = false;
+
+    const firstPageFactory = function (): Page {
+        const firstPage = new Page();
+        firstPage.id = "first-page";
+        firstPage.on(eventName, (args: EventData) => { 
+            const page = <Page>args.object;
+            const frame = page.frame;
+
+            const secondPageFactory = function (): Page {
+                const secondPage = new Page();
+                secondPage.id = "second-page";
+                secondPage.on(Page.navigatedToEvent, () => { secondPageNavigatedTo = true });
+
+                return secondPage;
+            };
+
+            frame.navigate(secondPageFactory);
+        });
+
+        return firstPage;
+    };
+
+    helper.navigateWithEntry({ create: firstPageFactory });
+
+    TKUnit.waitUntilReady(() => secondPageNavigatedTo);
 }
\ No newline at end of file
diff --git a/tests/app/pages/fonts-test.ts b/tests/app/pages/fonts-test.ts
index 9ab98001e1..bf86e134a8 100644
--- a/tests/app/pages/fonts-test.ts
+++ b/tests/app/pages/fonts-test.ts
@@ -1,10 +1,10 @@
 import * as stack from "tns-core-modules/ui/layouts/stack-layout";
-import {unsetValue} from "tns-core-modules/ui/core/view";
+import { unsetValue } from "tns-core-modules/ui/core/view";
 
 export function buttonTap(args) {
     var stackLayout = <stack.StackLayout>args.object.parent;
 
-    for (var i = 0; i < stackLayout.getChildrenCount(); i++){
+    for (var i = 0; i < stackLayout.getChildrenCount(); i++) {
         var v = stackLayout.getChildAt(i);
         v.style.fontFamily = unsetValue;
         v.style.fontSize = unsetValue;
diff --git a/tests/app/pages/page17.ts b/tests/app/pages/page17.ts
index 5983fba2fe..0f8847ae3f 100644
--- a/tests/app/pages/page17.ts
+++ b/tests/app/pages/page17.ts
@@ -3,7 +3,7 @@ import * as action from "tns-core-modules/ui/action-bar";
 
 import * as pages from "tns-core-modules/ui/page";
 
-var currentPage:pages.Page;
+var currentPage: pages.Page;
 // Event handler for Page "loaded" event attached in main-page.xml
 export function pageLoaded(args: observable.EventData) {
     // Get the event sender
diff --git a/tests/app/pages/page20.ts b/tests/app/pages/page20.ts
index a6e193f7ff..4181d1d8b4 100644
--- a/tests/app/pages/page20.ts
+++ b/tests/app/pages/page20.ts
@@ -1,7 +1,7 @@
 import * as observable from "tns-core-modules/data/observable";
 import * as trace from "tns-core-modules/trace";
-import {Button} from "tns-core-modules/ui/button";
-import {Page} from "tns-core-modules/ui/page";
+import { Button } from "tns-core-modules/ui/button";
+import { Page } from "tns-core-modules/ui/page";
 trace.addCategories(trace.categories.Layout);
 trace.enable();
 
diff --git a/tests/app/platform/platform-tests.ts b/tests/app/platform/platform-tests.ts
index 81de067d52..b94c177086 100644
--- a/tests/app/platform/platform-tests.ts
+++ b/tests/app/platform/platform-tests.ts
@@ -21,12 +21,18 @@ export function snippet_print_all() {
     // >> platform-current
     console.log("Device model: " + platformModule.device.model);
     console.log("Device type: " + platformModule.device.deviceType);
+    console.log("Device manufacturer: " + platformModule.device.manufacturer);
+    console.log("Preferred language: " + platformModule.device.language);
+    console.log("Preferred region: " + platformModule.device.region);
     console.log("OS: " + platformModule.device.os);
     console.log("OS version: " + platformModule.device.osVersion);
-    console.log("SDK Version: " + platformModule.device.sdkVersion);
+    console.log("SDK version: " + platformModule.device.sdkVersion);
+    console.log("Device UUID: " + platformModule.device.uuid);
 
-    console.log("Screen width: " + platformModule.screen.mainScreen.widthPixels);
-    console.log("Screen height: " + platformModule.screen.mainScreen.heightPixels);
+    console.log("Screen width (px): " + platformModule.screen.mainScreen.widthPixels);
+    console.log("Screen height (px): " + platformModule.screen.mainScreen.heightPixels);
+    console.log("Screen width (DIPs): " + platformModule.screen.mainScreen.widthDIPs);
+    console.log("Screen height (DIPs): " + platformModule.screen.mainScreen.heightDIPs);
     console.log("Screen scale: " + platformModule.screen.mainScreen.scale);
     // << platform-current
 };
diff --git a/tests/app/testRunner.ts b/tests/app/testRunner.ts
index 1e753fe44b..cd8b793958 100644
--- a/tests/app/testRunner.ts
+++ b/tests/app/testRunner.ts
@@ -45,14 +45,14 @@ allTests["PLATFORM"] = platformTests;
 import * as fsTests from "./file-system/file-system-tests";
 allTests["FILE-SYSTEM"] = fsTests;
 
-import * as httpTests from "./http/http-tests";
-allTests["HTTP"] = httpTests;
+// import * as httpTests from "./http/http-tests";
+// allTests["HTTP"] = httpTests;
 
-import * as xhrTests from "./xhr/xhr-tests";
-allTests["XHR"] = xhrTests;
+// import * as xhrTests from "./xhr/xhr-tests";
+// allTests["XHR"] = xhrTests;
 
-import * as fetchTests from "./fetch/fetch-tests";
-allTests["FETCH"] = fetchTests;
+// import * as fetchTests from "./fetch/fetch-tests";
+// allTests["FETCH"] = fetchTests;
 
 import * as appSettingsTests from "./application-settings/application-settings-tests";
 allTests["APPLICATION-SETTINGS"] = appSettingsTests;
@@ -141,6 +141,9 @@ allTests["FRAME"] = frameTests;
 import * as viewTests from "./ui/view/view-tests";
 allTests["VIEW"] = viewTests;
 
+import * as viewLayoutChangedEventTests from "./ui/view/view-tests-layout-event";
+allTests["VIEW-LAYOUT-EVENT"] = viewLayoutChangedEventTests;
+
 import * as styleTests from "./ui/styling/style-tests";
 allTests["STYLE"] = styleTests;
 
diff --git a/tests/app/timer/timer-tests.ts b/tests/app/timer/timer-tests.ts
index 5125f41b20..c6c13b1b36 100644
--- a/tests/app/timer/timer-tests.ts
+++ b/tests/app/timer/timer-tests.ts
@@ -142,7 +142,7 @@ export function test_setInterval_callbackCalledWithExtraArgs(done) {
         if (counter === 4) {
             const end = TKUnit.time();
             timer.clearInterval(id);
-            done(end - start > 250 ? new Error('setInterval too slow.') : null);
+            done(end - start > 250 ? new Error("setInterval too slow.") : null);
         }
     }, 50, rnd);
 };
@@ -156,7 +156,7 @@ export function test_setInterval_callbackShouldBeCleared(done) {
         // >> (hide)
         const end = TKUnit.time();
         timer.clearInterval(id);
-        done(end - start > 150 ? new Error('setInterval too slow.') : null);
+        done(end - start > 150 ? new Error("setInterval too slow.") : null);
         // << (hide)
         timer.clearInterval(id);
     }, 50);
diff --git a/tests/app/ui/action-bar/action-bar-tests-common.ts b/tests/app/ui/action-bar/action-bar-tests-common.ts
index 9925d256b7..c58b994947 100644
--- a/tests/app/ui/action-bar/action-bar-tests-common.ts
+++ b/tests/app/ui/action-bar/action-bar-tests-common.ts
@@ -154,7 +154,7 @@ export function test_ActionBar_is_not_empty_when_titleView_is_set() {
 };
 
 export function test_ActionBarItemBindingToEvent() {
-    const p = <Page>builder.parse('<Page><Page.actionBar><ActionBar><ActionBar.actionItems><ActionItem tap="{{ test }}"/></ActionBar.actionItems></ActionBar></Page.actionBar></Page>');
+    const p = <Page>builder.parse("<Page><Page.actionBar><ActionBar><ActionBar.actionItems><ActionItem tap=\"{{ test }}\"/></ActionBar.actionItems></ActionBar></Page.actionBar></Page>");
 
     const testAction = function (views: Array<View>) {
         const page = <Page>views[0];
diff --git a/tests/app/ui/animation/animation-tests.ts b/tests/app/ui/animation/animation-tests.ts
index 905ddad1e2..4274bdf690 100644
--- a/tests/app/ui/animation/animation-tests.ts
+++ b/tests/app/ui/animation/animation-tests.ts
@@ -1,8 +1,8 @@
 import * as TKUnit from "../../TKUnit";
 import * as helper from "../helper";
 import * as viewModule from "tns-core-modules/ui/core/view";
-import {Label} from "tns-core-modules/ui/label";
-import {StackLayout} from "tns-core-modules/ui/layouts/stack-layout";
+import { Label } from "tns-core-modules/ui/label";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
 import * as colorModule from "tns-core-modules/color";
 import * as enums from "tns-core-modules/ui/enums";
 import { AnimationPromise } from "tns-core-modules/ui/animation";
diff --git a/tests/app/ui/animation/css-animation-tests.ts b/tests/app/ui/animation/css-animation-tests.ts
index e78ec0db66..b9cd7d3be7 100644
--- a/tests/app/ui/animation/css-animation-tests.ts
+++ b/tests/app/ui/animation/css-animation-tests.ts
@@ -7,7 +7,7 @@ import * as stackModule from "tns-core-modules/ui/layouts/stack-layout";
 import * as labelModule from "tns-core-modules/ui/label";
 import * as color from "tns-core-modules/color";
 
-import {SelectorCore} from "tns-core-modules/ui/styling/css-selector";
+import { SelectorCore } from "tns-core-modules/ui/styling/css-selector";
 
 const DELTA = 1;
 const SCALE_DELTA = 0.001;
diff --git a/tests/app/ui/button/button-tests.ts b/tests/app/ui/button/button-tests.ts
index 7487bcedba..e9f4caeffc 100644
--- a/tests/app/ui/button/button-tests.ts
+++ b/tests/app/ui/button/button-tests.ts
@@ -277,7 +277,7 @@ export var test_StateHighlighted_also_fires_pressedState = function () {
 
         helper.waitUntilLayoutReady(view);
 
-        view._goToVisualState('highlighted');
+        view._goToVisualState("highlighted");
 
         var actualResult = buttonTestsNative.getNativeBackgroundColor(view);
         TKUnit.assert(actualResult.hex === expectedNormalizedColor, "Actual: " + actualResult.hex + "; Expected: " + expectedNormalizedColor);
@@ -294,7 +294,7 @@ export var test_StateHighlighted_also_fires_activeState = function () {
 
         helper.waitUntilLayoutReady(view);
 
-        view._goToVisualState('highlighted');
+        view._goToVisualState("highlighted");
 
         var actualResult = buttonTestsNative.getNativeBackgroundColor(view);
         TKUnit.assert(actualResult.hex === expectedNormalizedColor, "Actual: " + actualResult.hex + "; Expected: " + expectedNormalizedColor);
@@ -393,7 +393,7 @@ export function test_setting_formattedText_With_UnknownFont_DoesNotCrash() {
     btn.style.fontFamily = "_UnknownFont";
 
     helper.buildUIAndRunTest(btn, function (views) {
-        TKUnit.waitUntilReady(() => { return btn.isLayoutValid; });
+        TKUnit.waitUntilReady(() => btn.isLayoutValid);
 
         let span = new spanModule.Span();
         span.text = "Login";
@@ -401,6 +401,6 @@ export function test_setting_formattedText_With_UnknownFont_DoesNotCrash() {
         formattedString.spans.push(span);
         btn.formattedText = formattedString;
 
-        TKUnit.waitUntilReady(() => { return btn.isLayoutValid; });
+        TKUnit.waitUntilReady(() => btn.isLayoutValid);
     });
 }
diff --git a/tests/app/ui/core/bindable/bindable-tests.ts b/tests/app/ui/core/bindable/bindable-tests.ts
index 254ab1d584..aca39c5d54 100644
--- a/tests/app/ui/core/bindable/bindable-tests.ts
+++ b/tests/app/ui/core/bindable/bindable-tests.ts
@@ -34,8 +34,8 @@ export function test_Binding_to_bindingContext_of_View() {
     const source = new Button();
 
     target.bind({ targetProperty: "bindingContext", sourceProperty: "text" }, source);
-    source.text = 'a';
-    TKUnit.assertEqual(target.bindingContext, 'a');
+    source.text = "a";
+    TKUnit.assertEqual(target.bindingContext, "a");
 };
 
 export function test_Bindable_Bind_ToTarget_OneWay() {
@@ -220,7 +220,7 @@ export function test_WhenBindingIsSetToAnElement_AndElementIsRemoved_ShouldBeCol
             stack.addChild(weakRef.get());
             TKUnit.assertEqual(weakRef.get().text, expectedValue, "Binding is not working properly!");
             stack.removeChild(weakRef.get());
-            TKUnit.waitUntilReady(() => { return !weakRef.get().isLoaded; });
+            TKUnit.waitUntilReady(() => !weakRef.get().isLoaded);
             utils.GC();
             TKUnit.assert(!weakRef.get(), "UIElement is still alive!");
             testFinished = true;
@@ -232,7 +232,7 @@ export function test_WhenBindingIsSetToAnElement_AndElementIsRemoved_ShouldBeCol
 
     page.content = stack;
 
-    TKUnit.waitUntilReady(() => { return testFinished; });
+    TKUnit.waitUntilReady(() => testFinished);
     done(null);
 }
 
@@ -498,7 +498,7 @@ export function test_bindingToNestedPropertyWithValueSyntax() {
     }, bindingSource);
 
     TKUnit.assertEqual(testElement.get("targetPropertyName"), "testValue");
-    TKUnit.assertTrue(bindingSource['$value'] === undefined, "We should not add $value to bindingSource.");
+    TKUnit.assertTrue(bindingSource["$value"] === undefined, "We should not add $value to bindingSource.");
 };
 
 export function test_TwoElementsBindingToSameBindingContext() {
@@ -569,8 +569,8 @@ export function test_BindingToParentView_ShouldNotLeaveGarbageInViewModel() {
         testLabel.bind({ sourceProperty: "$parent.testProperty", targetProperty: "text", expression: "$parent.testProperty" });
 
         TKUnit.assertEqual(testLabel.text, expectedValue);
-        TKUnit.assertTrue(stackViewModel['$parent'] === undefined, "stackViewModel['$parent'] should be removed from parent binding context.");
-        TKUnit.assertTrue(testLabel.bindingContext['$parent'] === undefined, "testLabel.bindingContext['$parent'] should be removed from parent binding context.");
+        TKUnit.assertTrue(stackViewModel["$parent"] === undefined, "stackViewModel['$parent'] should be removed from parent binding context.");
+        TKUnit.assertTrue(testLabel.bindingContext["$parent"] === undefined, "testLabel.bindingContext['$parent'] should be removed from parent binding context.");
     };
 
     helper.buildUIAndRunTest(createStack(), testFunc);
@@ -595,8 +595,8 @@ export function test_BindingToParentsView_ShouldNotLeaveGarbageInViewModel() {
         testLabel.bind({ sourceProperty: "$parents['StackLayout'].testProperty", targetProperty: "text", expression: "$parents['StackLayout'].testProperty" });
 
         TKUnit.assertEqual(testLabel.text, expectedValue);
-        TKUnit.assertTrue(stackViewModel['$parent'] === undefined, "stackViewModel['$parent'] should be removed from parent binding context.");
-        TKUnit.assertTrue(testLabel.bindingContext['$parents'] === undefined, "testLabel.bindingContext['$parents'] should be removed from parent binding context.");
+        TKUnit.assertTrue(stackViewModel["$parent"] === undefined, "stackViewModel['$parent'] should be removed from parent binding context.");
+        TKUnit.assertTrue(testLabel.bindingContext["$parents"] === undefined, "testLabel.bindingContext['$parents'] should be removed from parent binding context.");
     };
 
     helper.buildUIAndRunTest(createStack(), testFunc);
@@ -1084,7 +1084,7 @@ export function test_$ValueSupportWithinExpression() {
     model.set("anyColor", "red");
 
     TKUnit.assertEqual(bindableObj.get("text"), "red", "When anyColor is red test property should be red too.");
-    TKUnit.assertTrue(model['$value'] === undefined, "We should not add $value to binding context.");
+    TKUnit.assertTrue(model["$value"] === undefined, "We should not add $value to binding context.");
 }
 
 class DummyNestedClass extends Observable {
@@ -1095,7 +1095,7 @@ class DummyNestedClass extends Observable {
     public set secondsobject(value: number) {
         if (this._secondsobject !== value) {
             this._secondsobject = value;
-            this.notifyPropertyChange('secondsobject', value);
+            this.notifyPropertyChange("secondsobject", value);
         }
     }
 }
@@ -1109,7 +1109,7 @@ class DummyClassWithSamePropertyNames extends Observable {
     public set seconds(value: number) {
         if (this._seconds !== value) {
             this._seconds = value;
-            this.notifyPropertyChange('seconds', value);
+            this.notifyPropertyChange("seconds", value);
         }
     }
 
@@ -1119,7 +1119,7 @@ class DummyClassWithSamePropertyNames extends Observable {
     public set secondsobject(value: DummyNestedClass) {
         if (this._secondsobject !== value) {
             this._secondsobject = value;
-            this.notifyPropertyChange('secondsobject', value);
+            this.notifyPropertyChange("secondsobject", value);
         }
     }
 }
@@ -1245,14 +1245,14 @@ export function test_BindingToRelatedProps() {
     model.prop2 = "Alabala";
 
     let target1 = new Label();
-    target1.bind({ sourceProperty: 'prop1', targetProperty: 'targetProp1' }, model);
+    target1.bind({ sourceProperty: "prop1", targetProperty: "targetProp1" }, model);
 
     let target2 = new Label();
-    target2.bind({ sourceProperty: 'prop2', targetProperty: 'targetProp2' }, model);
+    target2.bind({ sourceProperty: "prop2", targetProperty: "targetProp2" }, model);
 
     model.prop2 = "Tralala";
 
-    TKUnit.assertEqual(target2.get('targetProp2'), "Tralala");
+    TKUnit.assertEqual(target2.get("targetProp2"), "Tralala");
 }
 
 export function test_only_Bindable_BindingContext_Null_DoesNotThrow() {
@@ -1314,18 +1314,18 @@ export function test_BindingToBindingContextProperty_ShouldUseNewContext() {
     stackLayout.addChild(label);
 
     label.bind({
-        sourceProperty: 'context',
-        targetProperty: 'bindingContext'
+        sourceProperty: "context",
+        targetProperty: "bindingContext"
     });
 
     label.bind({
-        sourceProperty: 'text',
-        targetProperty: 'text'
+        sourceProperty: "text",
+        targetProperty: "text"
     });
 
     let testBindingContext = fromObjectRecursive({
         context: {
-            text: 'Alabala'
+            text: "Alabala"
         }
     });
 
diff --git a/tests/app/ui/core/weak-event-listener/weak-event-listener-tests.ts b/tests/app/ui/core/weak-event-listener/weak-event-listener-tests.ts
index 7e3adee922..f59f147dfc 100644
--- a/tests/app/ui/core/weak-event-listener/weak-event-listener-tests.ts
+++ b/tests/app/ui/core/weak-event-listener/weak-event-listener-tests.ts
@@ -101,9 +101,13 @@ export function test_listenerDoesNotRetainTarget(done) {
     const sourceRef = getSourceAsWeakRef();
     const targetRef = getTargetAsWeakRef();
 
-    addWeakEventListener(sourceRef.get(), Observable.propertyChangeEvent, emptyHandler, targetRef.get());
+    // with the v8 6.5 the GC does not release WeakRefs so fast if you pass them to a method
+    // that's why we are making the call to the addWeakEventListener in a closure so that the WeakRef will be easier released
+    (function() {
+        addWeakEventListener(sourceRef.get(), Observable.propertyChangeEvent, emptyHandler, targetRef.get());
+    })();
     forceGC();
-    
+
     try {
         TKUnit.assert(!targetRef.get(), "Target should be released after GC");
         done(null);
@@ -117,7 +121,11 @@ export function test_listenerDoesNotRetainSource(done) {
     const sourceRef = getSourceAsWeakRef();
     const targetRef = getTargetAsWeakRef();
 
-    addWeakEventListener(sourceRef.get(), Observable.propertyChangeEvent, targetRef.get().onEvent, targetRef.get());
+    // with the v8 6.5 the GC does not release WeakRefs so fast if you pass them to a method
+    // that's why we are making the call to the addWeakEventListener in a closure so that the WeakRef will be easier released
+    (function() {
+        addWeakEventListener(sourceRef.get(), Observable.propertyChangeEvent, targetRef.get().onEvent, targetRef.get());
+    })();
     forceGC();
 
     try {
diff --git a/tests/app/ui/date-picker/date-picker-tests-native.ios.ts b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts
index ead0fa337d..9361d62ef3 100644
--- a/tests/app/ui/date-picker/date-picker-tests-native.ios.ts
+++ b/tests/app/ui/date-picker/date-picker-tests-native.ios.ts
@@ -15,11 +15,11 @@ export function getNativeDay(datePicker: datePickerModule.DatePicker): number {
 }
 
 export function getNativeMaxDate(datePicker: datePickerModule.DatePicker): Date {
-    return new Date(1000* NSDate.dateWithTimeIntervalSinceDate(0, datePicker.ios.maximumDate).timeIntervalSince1970);
+    return new Date(1000 * NSDate.dateWithTimeIntervalSinceDate(0, datePicker.ios.maximumDate).timeIntervalSince1970);
 }
 
 export function getNativeMinDate(datePicker: datePickerModule.DatePicker): Date {
-    return new Date(1000* NSDate.dateWithTimeIntervalSinceDate(0, datePicker.ios.minimumDate).timeIntervalSince1970);
+    return new Date(1000 * NSDate.dateWithTimeIntervalSinceDate(0, datePicker.ios.minimumDate).timeIntervalSince1970);
 }
 
 export function setNativeYear(datePicker: datePickerModule.DatePicker, value: number): void {
diff --git a/tests/app/ui/date-picker/date-picker-tests.ts b/tests/app/ui/date-picker/date-picker-tests.ts
index 4f07d03c57..eaa9e40b7f 100644
--- a/tests/app/ui/date-picker/date-picker-tests.ts
+++ b/tests/app/ui/date-picker/date-picker-tests.ts
@@ -112,7 +112,7 @@ export class DatePickerTest extends testModule.UITest<datePickerModule.DatePicke
     }
 
     public test_WhenCreated_NativeDayIsCurrentDay() {
-        const actualValue = datePickerTestsNative.getNativeDay(this.testView);;
+        const actualValue = datePickerTestsNative.getNativeDay(this.testView);
         const expectedValue = currentDate.getDate();
         TKUnit.assertEqual(actualValue, expectedValue);
     }
diff --git a/tests/app/ui/frame/frame-tests-common.ts b/tests/app/ui/frame/frame-tests-common.ts
index 7ab48595fb..a6f275d913 100644
--- a/tests/app/ui/frame/frame-tests-common.ts
+++ b/tests/app/ui/frame/frame-tests-common.ts
@@ -71,63 +71,63 @@ export function test_can_go_back() {
     frame.navigate({ create: () => new Page(), backstackVisible: false });
     frame.navigate(() => new Page());
 
-    TKUnit.assertTrue(frame.canGoBack(), '1');
+    TKUnit.assertTrue(frame.canGoBack(), "1");
     frame.goBack();
 
-    TKUnit.assertTrue(frame.canGoBack(), '2');
+    TKUnit.assertTrue(frame.canGoBack(), "2");
     frame.goBack();
 
-    TKUnit.assertTrue(frame.canGoBack(), '3');
+    TKUnit.assertTrue(frame.canGoBack(), "3");
     frame.goBack();
 
-    TKUnit.assertFalse(frame.canGoBack(), '4');
+    TKUnit.assertFalse(frame.canGoBack(), "4");
     frame.goBack();
 
     frame.navigate({ create: () => new Page(), backstackVisible: false });
     frame.navigate(() => new Page());
 
-    TKUnit.assertTrue(frame.canGoBack(), '5');
+    TKUnit.assertTrue(frame.canGoBack(), "5");
     frame.goBack();
 
-    TKUnit.assertFalse(frame.canGoBack(), '6');
+    TKUnit.assertFalse(frame.canGoBack(), "6");
     frame.goBack();
 
     frame.navigate(() => new Page());
     frame.navigate({ create: () => new Page(), clearHistory: true });
 
-    TKUnit.assertFalse(frame.canGoBack(), '7');
+    TKUnit.assertFalse(frame.canGoBack(), "7");
     frame.goBack();
 
     frame.navigate(() => new Page());
     frame.navigate({ create: () => new Page(), backstackVisible: false });
 
-    TKUnit.assertTrue(frame.canGoBack(), '8');
+    TKUnit.assertTrue(frame.canGoBack(), "8");
     frame.goBack();
 
-    TKUnit.assertTrue(frame.canGoBack(), '9');
+    TKUnit.assertTrue(frame.canGoBack(), "9");
     frame.goBack();
 
-    TKUnit.assertFalse(frame.canGoBack(), '10');
+    TKUnit.assertFalse(frame.canGoBack(), "10");
     frame.goBack();
 
     frame.navigate(() => new Page());
     frame.navigate({ create: () => new Page(), clearHistory: true });
     frame.navigate({ create: () => new Page(), backstackVisible: false });
 
-    TKUnit.assertTrue(frame.canGoBack(), '11');
+    TKUnit.assertTrue(frame.canGoBack(), "11");
     frame.goBack();
 
-    TKUnit.assertFalse(frame.canGoBack(), '12');
+    TKUnit.assertFalse(frame.canGoBack(), "12");
     frame.goBack();
 
     frame.navigate({ create: () => new Page(), clearHistory: true });
     frame.navigate({ create: () => new Page(), backstackVisible: false });
     frame.navigate(() => new Page());
 
-    TKUnit.assertTrue(frame.canGoBack(), '13');
+    TKUnit.assertTrue(frame.canGoBack(), "13");
     frame.goBack();
 
-    TKUnit.assertFalse(frame.canGoBack(), '14');
+    TKUnit.assertFalse(frame.canGoBack(), "14");
     frame.goBack();
     TKUnit.waitUntilReady(() => frame.navigationQueueIsEmpty());
 }
@@ -142,10 +142,10 @@ export function test_go_back_to_backstack_entry() {
     frame.navigate({ create: () => new Page(), backstackVisible: false });
     frame.navigate(() => new Page());
 
-    TKUnit.assertTrue(frame.canGoBack(), '1');
+    TKUnit.assertTrue(frame.canGoBack(), "1");
     frame.goBack(frame.backStack[0]);
 
-    TKUnit.assertFalse(frame.canGoBack(), '2');
+    TKUnit.assertFalse(frame.canGoBack(), "2");
     frame.goBack();
     TKUnit.waitUntilReady(() => frame.navigationQueueIsEmpty());
 }
diff --git a/tests/app/ui/helper.ts b/tests/app/ui/helper.ts
index d96eebb958..7dd9851fca 100644
--- a/tests/app/ui/helper.ts
+++ b/tests/app/ui/helper.ts
@@ -37,7 +37,7 @@ export function getColor(uiColor: UIColor): Color {
     return new Color(alpha, red, green, blue);
 }
 
-function clearPage(): void {
+export function clearPage(): void {
     let newPage = getCurrentPage();
     if (!newPage) {
         throw new Error("NO CURRENT PAGE!!!!");
@@ -150,7 +150,7 @@ export function getClearCurrentPage(): Page {
     page.bindingContext = unsetValue;
     page.className = unsetValue;
     page.id = unsetValue;
-    page.css = '';
+    page.css = "";
     return page;
 }
 
@@ -163,7 +163,7 @@ export function waitUntilNavigatedTo(page: Page, action: Function) {
 
     page.on("navigatedTo", navigatedTo);
     action();
-    TKUnit.waitUntilReady(() => completed, 100);
+    TKUnit.waitUntilReady(() => completed, 5);
 }
 
 export function waitUntilNavigatedFrom(action: Function) {
@@ -335,22 +335,22 @@ function compareUsingReflection(recycledNativeView: View, newNativeView: View):
         const method = methods[i];
         const returnType = method.getReturnType();
         const name = method.getName();
-        const skip = name.includes('ViewId')
-            || name.includes('Accessibility')
-            || name.includes('hashCode')
-            || name === 'getId'
-            || name === 'hasFocus'
-            || name === 'isDirty'
-            || name === 'getLeft'
-            || name === 'getTop'
-            || name === 'getRight'
-            || name === 'getBottom'
-            || name === 'getWidth'
-            || name === 'getHeight'
-            || name === 'getX'
-            || name === 'getY'
-            || name.includes('getMeasured')
-            || name === 'toString';
+        const skip = name.includes("ViewId")
+            || name.includes("Accessibility")
+            || name.includes("hashCode")
+            || name === "getId"
+            || name === "hasFocus"
+            || name === "isDirty"
+            || name === "getLeft"
+            || name === "getTop"
+            || name === "getRight"
+            || name === "getBottom"
+            || name === "getWidth"
+            || name === "getHeight"
+            || name === "getX"
+            || name === "getY"
+            || name.includes("getMeasured")
+            || name === "toString";
 
         if (skip || method.getParameterTypes().length > 0) {
             continue;
@@ -375,7 +375,7 @@ function compareUsingReflection(recycledNativeView: View, newNativeView: View):
 
             const defValue = method.invoke(newer, null);
             const currValue = method.invoke(recycled, null);
-            if ((currValue + '') !== (defValue + '')) {
+            if ((currValue + "") !== (defValue + "")) {
                 throw new Error(`Actual: ${currValue}, Expected: ${defValue}, for method: ${method.getName()}`);
             }
         }
@@ -401,9 +401,9 @@ function setValue(object: Object, setters: Map<string, any>, customSetters?: Map
         let value = customSetters && customSetters.has(key) ? customSetters.get(key) : value1;
         const currentValue = object[key];
         if (currentValue === value) {
-            if (value === 'horizontal' && key === 'orientation') {
+            if (value === "horizontal" && key === "orientation") {
                 // wrap-layout.orientation default value is 'horizontal'
-                value = 'vertical';
+                value = "vertical";
             } else if (value === 2) {
                 value = 3;
             }
@@ -422,247 +422,247 @@ function setupSetters(): void {
 
     setters = new Map<string, any>();
     // view-base
-    setters.set('id', "someId");
-    setters.set('className', "someClassName");
-    setters.set('bindingContext', "someBindingContext");
+    setters.set("id", "someId");
+    setters.set("className", "someClassName");
+    setters.set("bindingContext", "someBindingContext");
 
     // view
-    setters.set('automationText', "automationText");
-    setters.set('originX', 0.2);
-    setters.set('originY', 0.2);
-    setters.set('isEnabled', false);
-    setters.set('isUserInteractionEnabled', false);
+    setters.set("automationText", "automationText");
+    setters.set("originX", 0.2);
+    setters.set("originY", 0.2);
+    setters.set("isEnabled", false);
+    setters.set("isUserInteractionEnabled", false);
 
     // action-bar
-    setters.set('title', 'title');
-    setters.set('text', 'text');
-    setters.set('icon', '~/logo.png');
-    setters.set('visibility', 'collapse');
+    setters.set("title", "title");
+    setters.set("text", "text");
+    setters.set("icon", "~/logo.png");
+    setters.set("visibility", "collapse");
 
     // activity-indicator
-    setters.set('busy', true);
+    setters.set("busy", true);
 
     // date-picker
-    setters.set('year', '2010');
-    setters.set('month', '2');
-    setters.set('day', '2');
-    setters.set('maxDate', '2100');
-    setters.set('minDate', '2000');
-    setters.set('date', new Date(2011, 3, 3));
+    setters.set("year", "2010");
+    setters.set("month", "2");
+    setters.set("day", "2");
+    setters.set("maxDate", "2100");
+    setters.set("minDate", "2000");
+    setters.set("date", new Date(2011, 3, 3));
 
     // editable-text
-    setters.set('keyboardType', 'datetime');
-    setters.set('returnKeyType', 'done');
-    setters.set('editable', false);
-    setters.set('updateTextTrigger', 'focusLost');
-    setters.set('autocapitalizationType', 'words');
-    setters.set('autocorrect', true);
-    setters.set('hint', 'hint');
-    setters.set('maxLength', '10');
+    setters.set("keyboardType", "datetime");
+    setters.set("returnKeyType", "done");
+    setters.set("editable", false);
+    setters.set("updateTextTrigger", "focusLost");
+    setters.set("autocapitalizationType", "words");
+    setters.set("autocorrect", true);
+    setters.set("hint", "hint");
+    setters.set("maxLength", "10");
 
     // html-view
-    setters.set('html', '<a></a>');
+    setters.set("html", "<a></a>");
 
     // image-view
-    setters.set('imageSource', '');
-    setters.set('src', '');
-    setters.set('loadMode', 'async');
-    setters.set('isLoading', true);
-    setters.set('stretch', 'none');
+    setters.set("imageSource", "");
+    setters.set("src", "");
+    setters.set("loadMode", "async");
+    setters.set("isLoading", true);
+    setters.set("stretch", "none");
 
     // layout-base
-    setters.set('clipToBounds', false);
+    setters.set("clipToBounds", false);
 
     // absolute-layout
-    setters.set('left', '20');
-    setters.set('top', '20');
+    setters.set("left", "20");
+    setters.set("top", "20");
 
     // dock-layout
-    setters.set('dock', 'top');
-    setters.set('stretchLastChild', false);
+    setters.set("dock", "top");
+    setters.set("stretchLastChild", false);
 
     // grid-layout props
-    setters.set('row', '1');
-    setters.set('rowSpan', '2');
-    setters.set('col', '1');
-    setters.set('colSpan', '2');
+    setters.set("row", "1");
+    setters.set("rowSpan", "2");
+    setters.set("col", "1");
+    setters.set("colSpan", "2");
 
     // stack-layout
-    setters.set('orientation', 'horizontal');
+    setters.set("orientation", "horizontal");
 
     // wrap-layout
     // custom orientation value
     // setters.set('orientation', 'vertical');
-    setters.set('itemWidth', '50');
-    setters.set('itemHeight', '50');
+    setters.set("itemWidth", "50");
+    setters.set("itemHeight", "50");
 
     // list-picker
-    setters.set('items', ['1', '2', '3']);
-    setters.set('selectedIndex', '1');
+    setters.set("items", ["1", "2", "3"]);
+    setters.set("selectedIndex", "1");
 
     // list-view
-    setters.set('items', ['1', '2', '3']);
-    setters.set('itemTemplate', '<Label text="{{ $value }}" />');
-    setters.set('itemTemplates', '<template key="green"><Label text="{{ $value }}" style.backgroundColor="green" /></template><template key="red"><Label text="{{ $value }}" style.backgroundColor="red" /></template>');
-    setters.set('rowHeight', '50');
+    setters.set("items", ["1", "2", "3"]);
+    setters.set("itemTemplate", "<Label text=\"{{ $value }}\" />");
+    setters.set("itemTemplates", "<template key=\"green\"><Label text=\"{{ $value }}\" style.backgroundColor=\"green\" /></template><template key=\"red\"><Label text=\"{{ $value }}\" style.backgroundColor=\"red\" /></template>");
+    setters.set("rowHeight", "50");
 
     // page
-    setters.set('actionBarHidden', 'true');
-    setters.set('backgroundSpanUnderStatusBar', 'true');
-    setters.set('enableSwipeBackNavigation', 'false');
+    setters.set("actionBarHidden", "true");
+    setters.set("backgroundSpanUnderStatusBar", "true");
+    setters.set("enableSwipeBackNavigation", "false");
 
     // progress
-    setters.set('value', '1');
-    setters.set('maxValue', '99');
+    setters.set("value", "1");
+    setters.set("maxValue", "99");
 
     // repeater
-    setters.set('items', ['1', '2', '3']);
-    setters.set('itemTemplate', '<Label text="{{ $value }}" />');
-    setters.set('itemsLayout', new StackLayout());
-    setters.set('rowHeight', '50');
+    setters.set("items", ["1", "2", "3"]);
+    setters.set("itemTemplate", "<Label text=\"{{ $value }}\" />");
+    setters.set("itemsLayout", new StackLayout());
+    setters.set("rowHeight", "50");
 
     // scroll-view
     // custom orientation value
     //setters.set('orientation', 'horizontal');
 
     // search-bar
-    setters.set('textFieldHintColor', 'red');
-    setters.set('textFieldBackgroundColor', 'red');
+    setters.set("textFieldHintColor", "red");
+    setters.set("textFieldBackgroundColor", "red");
 
     // segmented-bar
     // custom items property
 
     // slider
-    setters.set('minValue', '5');
+    setters.set("minValue", "5");
 
     // switch
-    setters.set('checked', 'true');
+    setters.set("checked", "true");
 
     // tab-view
     // custom items property
-    setters.set('androidOffscreenTabLimit', '2');
+    setters.set("androidOffscreenTabLimit", "2");
 
     // text-base
     const formattedText = new FormattedString();
     const span = new Span();
-    span.text = 'span';
+    span.text = "span";
     formattedText.spans.push(span);
-    setters.set('formattedText', formattedText);
+    setters.set("formattedText", formattedText);
 
     // text-base
-    setters.set('secure', 'true');
+    setters.set("secure", "true");
 
     // time-picker
-    setters.set('minHour', 1);
-    setters.set('hour', 2);
-    setters.set('maxHour', 11);
-    setters.set('minMinute', 1);
-    setters.set('minute', 2);
-    setters.set('maxMinute', 11);
-    setters.set('minuteInterval', 2);
-    setters.set('time', new Date(2011, 2, 2, 3, 3, 3));
+    setters.set("minHour", 1);
+    setters.set("hour", 2);
+    setters.set("maxHour", 11);
+    setters.set("minMinute", 1);
+    setters.set("minute", 2);
+    setters.set("maxMinute", 11);
+    setters.set("minuteInterval", 2);
+    setters.set("time", new Date(2011, 2, 2, 3, 3, 3));
 
     cssSetters = new Map<string, any>();
 
     // style
-    cssSetters.set('rotate', '90');
-    cssSetters.set('scaleX', 2);
-    cssSetters.set('scaleY', 2);
-    cssSetters.set('translateX', 20);
-    cssSetters.set('translateY', 20);
-
-    cssSetters.set('clipPath', 'inset(100px 50px)');
-    cssSetters.set('color', 'red');
-    cssSetters.set('tintColor', 'green');
-    cssSetters.set('placeholderColor', 'green');
-
-    cssSetters.set('backgroundColor', 'red');
-    cssSetters.set('backgroundImage', '~/logo.png');
-    cssSetters.set('backgroundRepeat', 'repeat');
-    cssSetters.set('backgroundSize', '60px 120px');
-    cssSetters.set('backgroundPosition', 'center');
-    cssSetters.set('borderColor', 'blue');
-    cssSetters.set('borderTopColor', 'green');
-    cssSetters.set('borderRightColor', 'green');
-    cssSetters.set('borderBottomColor', 'green');
-    cssSetters.set('borderLeftColor', 'green');
-    cssSetters.set('borderWidth', '10px');
-    cssSetters.set('borderTopWidth', '5px');
-    cssSetters.set('borderRightWidth', '5px');
-    cssSetters.set('borderBottomWidth', '5px');
-    cssSetters.set('borderLeftWidth', '5px');
-    cssSetters.set('borderRadius', '10px');
-    cssSetters.set('borderTopLeftRadius', '5px');
-    cssSetters.set('borderTopRightRadius', '5px');
-    cssSetters.set('borderBottomRightRadius', '5px');
-    cssSetters.set('borderBottomLeftRadius', '5px');
-
-    cssSetters.set('fontSize', '20');
-    cssSetters.set('fontFamily', 'monospace');
-    cssSetters.set('fontStyle', 'italic');
-    cssSetters.set('fontWeight', '100');
-    cssSetters.set('font', 'italic 2 "Open Sans", sans-serif');
+    cssSetters.set("rotate", "90");
+    cssSetters.set("scaleX", 2);
+    cssSetters.set("scaleY", 2);
+    cssSetters.set("translateX", 20);
+    cssSetters.set("translateY", 20);
+
+    cssSetters.set("clipPath", "inset(100px 50px)");
+    cssSetters.set("color", "red");
+    cssSetters.set("tintColor", "green");
+    cssSetters.set("placeholderColor", "green");
+
+    cssSetters.set("backgroundColor", "red");
+    cssSetters.set("backgroundImage", "~/logo.png");
+    cssSetters.set("backgroundRepeat", "repeat");
+    cssSetters.set("backgroundSize", "60px 120px");
+    cssSetters.set("backgroundPosition", "center");
+    cssSetters.set("borderColor", "blue");
+    cssSetters.set("borderTopColor", "green");
+    cssSetters.set("borderRightColor", "green");
+    cssSetters.set("borderBottomColor", "green");
+    cssSetters.set("borderLeftColor", "green");
+    cssSetters.set("borderWidth", "10px");
+    cssSetters.set("borderTopWidth", "5px");
+    cssSetters.set("borderRightWidth", "5px");
+    cssSetters.set("borderBottomWidth", "5px");
+    cssSetters.set("borderLeftWidth", "5px");
+    cssSetters.set("borderRadius", "10px");
+    cssSetters.set("borderTopLeftRadius", "5px");
+    cssSetters.set("borderTopRightRadius", "5px");
+    cssSetters.set("borderBottomRightRadius", "5px");
+    cssSetters.set("borderBottomLeftRadius", "5px");
+
+    cssSetters.set("fontSize", "20");
+    cssSetters.set("fontFamily", "monospace");
+    cssSetters.set("fontStyle", "italic");
+    cssSetters.set("fontWeight", "100");
+    cssSetters.set("font", "italic 2 \"Open Sans\", sans-serif");
 
     // zIndex on android is not what you think...
     // cssSetters.set('zIndex', '2');
-    cssSetters.set('opacity', '0.5');
+    cssSetters.set("opacity", "0.5");
     // already set through view properties.
     // cssSetters.set('visibility', 'collapse');
 
-    cssSetters.set('letterSpacing', '2');
-    cssSetters.set('textAlignment', 'center');
-    cssSetters.set('textDecoration', 'underline');
-    cssSetters.set('textTransform', 'capitalize');
-    cssSetters.set('whiteSpace', 'normal');
-
-    cssSetters.set('minWidth', 50);
-    cssSetters.set('minHeight', 50);
-    cssSetters.set('width', 100);
-    cssSetters.set('height', 100);
-    cssSetters.set('margin', '25');
-    cssSetters.set('marginLeft', '30px');
-    cssSetters.set('marginTop', '30px');
-    cssSetters.set('marginRight', '30px');
-    cssSetters.set('marginBottom', '30px');
-    cssSetters.set('padding', '25');
-    cssSetters.set('paddingLeft', '30px');
-    cssSetters.set('paddingTop', '30px');
-    cssSetters.set('paddingRight', '30px');
-    cssSetters.set('paddingBottom', '30px');
-    cssSetters.set('horizontalAlignment', 'center');
-    cssSetters.set('verticalAlignment', 'center');
-
-    cssSetters.set('transform', 'translate(5, 10), scale(1.2, 1.2), rotate(45)');
+    cssSetters.set("letterSpacing", "2");
+    cssSetters.set("textAlignment", "center");
+    cssSetters.set("textDecoration", "underline");
+    cssSetters.set("textTransform", "capitalize");
+    cssSetters.set("whiteSpace", "normal");
+
+    cssSetters.set("minWidth", 50);
+    cssSetters.set("minHeight", 50);
+    cssSetters.set("width", 100);
+    cssSetters.set("height", 100);
+    cssSetters.set("margin", "25");
+    cssSetters.set("marginLeft", "30px");
+    cssSetters.set("marginTop", "30px");
+    cssSetters.set("marginRight", "30px");
+    cssSetters.set("marginBottom", "30px");
+    cssSetters.set("padding", "25");
+    cssSetters.set("paddingLeft", "30px");
+    cssSetters.set("paddingTop", "30px");
+    cssSetters.set("paddingRight", "30px");
+    cssSetters.set("paddingBottom", "30px");
+    cssSetters.set("horizontalAlignment", "center");
+    cssSetters.set("verticalAlignment", "center");
+
+    cssSetters.set("transform", "translate(5, 10), scale(1.2, 1.2), rotate(45)");
 
     // TabView-specific props
-    cssSetters.set('tabTextColor', 'red');
-    cssSetters.set('tabBackgroundColor', 'red');
-    cssSetters.set('selectedTabTextColor', 'red');
-    cssSetters.set('androidSelectedTabHighlightColor', 'red');
+    cssSetters.set("tabTextColor", "red");
+    cssSetters.set("tabBackgroundColor", "red");
+    cssSetters.set("selectedTabTextColor", "red");
+    cssSetters.set("androidSelectedTabHighlightColor", "red");
 
     // ListView-specific props 
-    cssSetters.set('separatorColor', 'red');
+    cssSetters.set("separatorColor", "red");
 
     // SegmentedBar-specific props
-    cssSetters.set('selectedBackgroundColor', 'red');
+    cssSetters.set("selectedBackgroundColor", "red");
 
     // Page-specific props 
-    cssSetters.set('statusBarStyle', 'light');
-    cssSetters.set('androidStatusBarBackground', 'red');
+    cssSetters.set("statusBarStyle", "light");
+    cssSetters.set("androidStatusBarBackground", "red");
 
     // Flexbox-layout props
-    cssSetters.set('flexDirection', 'column');
-    cssSetters.set('flexWrap', 'wrap');
-    cssSetters.set('justifyContent', 'center');
-    cssSetters.set('alignItems', 'center');
-    cssSetters.set('alignContent', 'center');
-    cssSetters.set('order', '2');
-    cssSetters.set('flexGrow', '1');
-    cssSetters.set('flexShrink', '0');
-    cssSetters.set('flexWrapBefore', 'true');
-    cssSetters.set('alignSelf', 'center');
-    cssSetters.set('flexFlow', 'row-reverse wrap');
-    cssSetters.set('flex', '2 0.2');
+    cssSetters.set("flexDirection", "column");
+    cssSetters.set("flexWrap", "wrap");
+    cssSetters.set("justifyContent", "center");
+    cssSetters.set("alignItems", "center");
+    cssSetters.set("alignContent", "center");
+    cssSetters.set("order", "2");
+    cssSetters.set("flexGrow", "1");
+    cssSetters.set("flexShrink", "0");
+    cssSetters.set("flexWrapBefore", "true");
+    cssSetters.set("alignSelf", "center");
+    cssSetters.set("flexFlow", "row-reverse wrap");
+    cssSetters.set("flex", "2 0.2");
 
     const nativeGetters = defaultNativeGetters = new Map<string, (view) => any>();
 
diff --git a/tests/app/ui/html-view/html-view-tests.ts b/tests/app/ui/html-view/html-view-tests.ts
index 8d19ae4171..924df1a82d 100644
--- a/tests/app/ui/html-view/html-view-tests.ts
+++ b/tests/app/ui/html-view/html-view-tests.ts
@@ -23,7 +23,7 @@ export var testLoadHTMLString = function () {
     page.content = htmlView;
 
     // >> htmlview-using
-    htmlView.html = '<span><font color="#ff0000">Test</font></span>';
+    htmlView.html = "<span><font color=\"#ff0000\">Test</font></span>";
     // << htmlview-using
 
     if (htmlView.ios) {
diff --git a/tests/app/ui/layouts/common-layout-tests.ts b/tests/app/ui/layouts/common-layout-tests.ts
index 234a5d3458..91a94d0a49 100644
--- a/tests/app/ui/layouts/common-layout-tests.ts
+++ b/tests/app/ui/layouts/common-layout-tests.ts
@@ -1,7 +1,7 @@
 import * as TKUnit from "../../TKUnit";
 import * as layoutHelper from "./layout-helper";
 import * as testModule from "../../ui-test";
-import {LayoutBase, unsetValue, PercentLength} from "tns-core-modules/ui/layouts/layout-base";
+import { LayoutBase, unsetValue, PercentLength } from "tns-core-modules/ui/layouts/layout-base";
 import * as platform from "tns-core-modules/platform";
 
 function getNativeLayoutParams(nativeView: android.view.View): org.nativescript.widgets.CommonLayoutParams {
diff --git a/tests/app/ui/layouts/layout-helper.d.ts b/tests/app/ui/layouts/layout-helper.d.ts
index c93f7e5f4c..eacad856c1 100644
--- a/tests/app/ui/layouts/layout-helper.d.ts
+++ b/tests/app/ui/layouts/layout-helper.d.ts
@@ -1,6 +1,6 @@
-import {Button} from "tns-core-modules/ui/button";
-import {StackLayout} from "tns-core-modules/ui/layouts/stack-layout";
-import {GridLayout} from "tns-core-modules/ui/layouts/grid-layout";
+import { Button } from "tns-core-modules/ui/button";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
 
 export interface MeasuredView {
     measureCount: number;
diff --git a/tests/app/ui/layouts/layout-helper.ios.ts b/tests/app/ui/layouts/layout-helper.ios.ts
index c28986546a..fafa0a7bab 100644
--- a/tests/app/ui/layouts/layout-helper.ios.ts
+++ b/tests/app/ui/layouts/layout-helper.ios.ts
@@ -1,6 +1,6 @@
-import {Button} from "tns-core-modules/ui/button";
-import {StackLayout} from "tns-core-modules/ui/layouts/stack-layout";
-import {GridLayout} from "tns-core-modules/ui/layouts/grid-layout";
+import { Button } from "tns-core-modules/ui/button";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout";
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
 import * as utils from "tns-core-modules/utils/utils";
 import * as TKUnit from "../../TKUnit";
 import * as def from "./layout-helper";
diff --git a/tests/app/ui/layouts/stack-layout-tests.ts b/tests/app/ui/layouts/stack-layout-tests.ts
index 190d6f5484..75e06e63b3 100644
--- a/tests/app/ui/layouts/stack-layout-tests.ts
+++ b/tests/app/ui/layouts/stack-layout-tests.ts
@@ -141,14 +141,14 @@ export class StackLayoutTest extends testModule.UITest<StackLayout> {
     private assertChildTexts(expected, layout, message) {
         let texts: Array<string> = [];
         layout.eachChildView((child: { text: string }) => texts.push(child.text));
-        TKUnit.assertEqual(expected, texts.join('|'), message);
+        TKUnit.assertEqual(expected, texts.join("|"), message);
     }
 
     public test_insertChildAtPosition() {
         this.assertChildTexts("btn1|btn2", this.rootLayout, "initial 2 buttons");
 
         let newChild = new Button();
-        newChild.text = 'in-between';
+        newChild.text = "in-between";
         this.rootLayout.insertChild(newChild, 1);
 
         this.assertChildTexts("btn1|in-between|btn2", this.rootLayout, "button inserted at correct location");
diff --git a/tests/app/ui/list-view/list-view-tests.ts b/tests/app/ui/list-view/list-view-tests.ts
index 921fd323de..f33a18de34 100644
--- a/tests/app/ui/list-view/list-view-tests.ts
+++ b/tests/app/ui/list-view/list-view-tests.ts
@@ -899,13 +899,13 @@ export class ListViewTest extends testModule.UITest<listViewModule.ListView> {
         if (listView.android) {
             //(<any>listView)._dumpRealizedTemplates();
             let realizedItems = <Map<android.view.View, View>>(<any>listView)._realizedItems;
-            TKUnit.assertTrue(realizedItems.size <= 6, 'Realized items must be 6 or less');
+            TKUnit.assertTrue(realizedItems.size <= 6, "Realized items must be 6 or less");
 
             let realizedTemplates = <Map<string, Map<android.view.View, View>>>(<any>listView)._realizedTemplates;
-            TKUnit.assertEqual(realizedTemplates.size, 3, 'Realized templates');
-            TKUnit.assertTrue(realizedTemplates.get("red").size <= 2, 'Red realized items must be 2 or less');
-            TKUnit.assertTrue(realizedTemplates.get("green").size <= 2, 'Green realized items must be 2 or less');
-            TKUnit.assertTrue(realizedTemplates.get("blue").size <= 2, 'Blue realized items must be 2 or less');
+            TKUnit.assertEqual(realizedTemplates.size, 3, "Realized templates");
+            TKUnit.assertTrue(realizedTemplates.get("red").size <= 2, "Red realized items must be 2 or less");
+            TKUnit.assertTrue(realizedTemplates.get("green").size <= 2, "Green realized items must be 2 or less");
+            TKUnit.assertTrue(realizedTemplates.get("blue").size <= 2, "Blue realized items must be 2 or less");
         }
     }
 
diff --git a/tests/app/ui/page/modal-page.ts b/tests/app/ui/page/modal-page.ts
index dbf4588ede..b1c4ec9100 100644
--- a/tests/app/ui/page/modal-page.ts
+++ b/tests/app/ui/page/modal-page.ts
@@ -1,6 +1,6 @@
-import {topmost} from "tns-core-modules/ui/frame";
+import { topmost } from "tns-core-modules/ui/frame";
 import * as TKUnit from "../../TKUnit";
-import {Page, ShownModallyData} from "tns-core-modules/ui/page";
+import { Page, ShownModallyData } from "tns-core-modules/ui/page";
 
 export var modalPage: Page;
 export function onShowingModally(args) {
diff --git a/tests/app/ui/page/page-tests-common.ts b/tests/app/ui/page/page-tests-common.ts
index 6efd3e5f88..59aab24ce1 100644
--- a/tests/app/ui/page/page-tests-common.ts
+++ b/tests/app/ui/page/page-tests-common.ts
@@ -24,6 +24,7 @@ import { Label } from "tns-core-modules/ui/label";
 import { Color } from "tns-core-modules/color";
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view/tab-view";
 import { _resetRootView, getRootView } from "tns-core-modules/application";
+import { Button } from "tns-core-modules/ui/button/button";
 
 export function addLabelToPage(page: Page, text?: string) {
     const label = new Label();
@@ -421,6 +422,188 @@ export function test_WhenPageIsNavigatedToFrameCurrentPageIsNowTheSameAsThePage(
     page.off(Label.loadedEvent, navigatedEventHandler);
 }
 
+export function test_WhenInnerViewCallsCloseModal_WithArguments_ShouldPassResult() {
+    _test_WhenInnerViewCallsCloseModal((args: ShownModallyData) =>
+    {
+        const page = <Page>args.object;
+        const button = <Button>page.content;
+        return button.closeModal.bind(button);
+    }, "return value");
+}
+
+export function test_WhenInnerViewCallsCloseModal_WithoutArguments_ShouldWork() {
+    _test_WhenInnerViewCallsCloseModal((args: ShownModallyData) =>
+    {
+        const page = <Page>args.object;
+        const button = <Button>page.content;
+        return button.closeModal.bind(button);
+    });
+}
+
+export function test_WhenInnerViewCallsCloseCallback_WithArguments_ShouldPassResult() {
+    _test_WhenInnerViewCallsCloseModal((args: ShownModallyData) =>
+    {
+        return args.closeCallback;
+    }, "return value");
+}
+
+export function test_WhenInnerViewCallsCloseCallback_WithoutArguments_ShouldWork() {
+    _test_WhenInnerViewCallsCloseModal((args: ShownModallyData) =>
+    {
+        return args.closeCallback;
+    });
+}
+
+function _test_WhenInnerViewCallsCloseModal(closeModalGetter: (ShownModallyData) => Function, result?: any) {
+    let modalClosedWithResult = false;
+
+    const modalCloseCallback = function (returnValue: any) {
+        modalClosedWithResult = returnValue === result;
+    }
+
+    const modalPageShownModallyEventHandler = function(args: ShownModallyData) {
+        const page = <Page>args.object;
+        page.off(View.shownModallyEvent, modalPageShownModallyEventHandler);
+        
+        closeModalGetter(args)(result);
+    }
+
+    const hostNavigatedToEventHandler = function(args: NavigatedData) {
+        const page = <Page>args.object;
+        page.off(Page.navigatedToEvent, hostNavigatedToEventHandler);
+
+        const modalPage = new Page();
+        modalPage.id = "modalPage_test_WhenInnerViewCallsCloseModal_WithArguments_ShouldPassResult";
+        modalPage.on(View.shownModallyEvent, modalPageShownModallyEventHandler);
+
+        const button = new Button();
+        button.text = "CLOSE MODAL";
+        modalPage.content = button;
+
+        (<Button>page.content).showModal(modalPage, {}, modalCloseCallback);
+    }
+
+    const masterPageFactory = function(): Page {
+        const masterPage = new Page();
+        masterPage.id = "masterPage_test_WhenInnerViewCallsCloseModal_WithArguments_ShouldPassResult";
+        masterPage.on(Page.navigatedToEvent, hostNavigatedToEventHandler)
+        
+        const button = new Button();
+        button.text = "TAP";
+        masterPage.content = button;
+
+        return masterPage;
+    };
+
+    helper.navigate(masterPageFactory);
+
+    TKUnit.waitUntilReady(() => modalClosedWithResult);
+}
+
+export function test_WhenViewBaseCallsShowModal_WithArguments_ShouldOpenModal() {
+    let modalClosed = false;
+
+    const modalCloseCallback = function (returnValue: any) {
+        modalClosed = true;
+    }
+
+    const createTabItems = function(count: number) {
+        var items = new Array<TabViewItem>();
+
+        for (var i = 0; i < count; i++) {
+            var label = new Label();
+            label.text = "Tab " + i;
+            var tabEntry = new TabViewItem();
+            tabEntry.title = "Tab " + i;
+            tabEntry.view = label;
+
+            items.push(tabEntry);
+        }
+
+        return items;
+    }
+
+    const modalPageShownModallyEventHandler = function(args: ShownModallyData) {
+        const page = <Page>args.object;
+        page.off(View.shownModallyEvent, modalPageShownModallyEventHandler);
+        args.closeCallback();
+    }
+
+    const hostNavigatedToEventHandler = function(args) {
+        const page = <Page>args.object;
+        page.off(Page.navigatedToEvent, hostNavigatedToEventHandler);
+
+        const modalPage = new Page();
+        modalPage.id = "modalPage_test_WhenViewBaseCallsShowModal_WithArguments_ShouldOpenModal";
+        modalPage.on(View.shownModallyEvent, modalPageShownModallyEventHandler);
+        const tabViewItem = (<TabView>page.content).items[0];
+        tabViewItem.showModal(modalPage, {}, modalCloseCallback, false, false);
+    }
+
+    const masterPageFactory = function(): Page {
+        const masterPage = new Page();
+        masterPage.id = "masterPage_test_WhenViewBaseCallsShowModal_WithArguments_ShouldOpenModal";
+        masterPage.on(Page.navigatedToEvent, hostNavigatedToEventHandler)
+        
+        const tabView = new TabView();
+        tabView.items = createTabItems(2);
+        masterPage.content = tabView;
+
+        return masterPage;
+    };
+
+    helper.navigate(masterPageFactory);
+
+    TKUnit.waitUntilReady(() => modalClosed);
+}
+
+export function test_WhenViewBaseCallsShowModal_WithoutArguments_ShouldThrow() {
+    let navigatedTo = false;
+
+    const createTabItems = function(count: number) {
+        var items = new Array<TabViewItem>();
+
+        for (var i = 0; i < count; i++) {
+            var label = new Label();
+            label.text = "Tab " + i;
+            var tabEntry = new TabViewItem();
+            tabEntry.title = "Tab " + i;
+            tabEntry.view = label;
+
+            items.push(tabEntry);
+        }
+
+        return items;
+    }
+
+    const hostNavigatedToEventHandler = function(args) {
+        const page = <Page>args.object;
+        page.off(Page.navigatedToEvent, hostNavigatedToEventHandler);
+     
+        const hostPage = <Page>args.object;
+        const tabViewItem = (<TabView>page.content).items[0];
+        TKUnit.assertThrows(() => tabViewItem.showModal());
+
+        navigatedTo = true;
+    }
+
+    const masterPageFactory = function(): Page {
+        const masterPage = new Page();
+        masterPage.id = "masterPage_test_WhenViewBaseCallsShowModal_WithoutArguments_ShouldThrow";
+        masterPage.on(Page.navigatedToEvent, hostNavigatedToEventHandler)
+        
+        const tabView = new TabView();
+        tabView.items = createTabItems(2);
+        masterPage.content = tabView;
+
+        return masterPage;
+    };
+
+    helper.navigate(masterPageFactory);
+
+    TKUnit.waitUntilReady(() => navigatedTo);
+}
+
 export function test_WhenNavigatingForwardAndBack_IsBackNavigationIsCorrect() {
     let page1;
     let page2;
@@ -587,7 +770,7 @@ export function test_WhenPageIsNavigatedToItCanShowAnotherPageAsModal() {
 
     helper.navigate(masterPageFactory);
 
-    TKUnit.waitUntilReady(() => { return modalUnloaded > 0; });
+    TKUnit.waitUntilReady(() => modalUnloaded > 0);
     TKUnit.assertEqual(shownModally, 1, "shownModally");
     TKUnit.assertEqual(modalLoaded, 1, "modalLoaded");
     TKUnit.assertEqual(modalUnloaded, 1, "modalUnloaded");
diff --git a/tests/app/ui/page/page-tests.ios.ts b/tests/app/ui/page/page-tests.ios.ts
index 5227797f3d..f6987ca989 100644
--- a/tests/app/ui/page/page-tests.ios.ts
+++ b/tests/app/ui/page/page-tests.ios.ts
@@ -62,7 +62,7 @@ export function test_WhenShowingModalPageUnloadedIsNotFiredForTheMasterPage() {
     };
 
     helper.navigate(masterPageFactory);
-    TKUnit.waitUntilReady(() => { return modalUnloaded > 0; });
+    TKUnit.waitUntilReady(() => modalUnloaded > 0);
     TKUnit.assert(!masterPageUnloaded, "Master page should not raise 'unloaded' when showing modal!");
     masterPage.off(View.loadedEvent, navigatedToEventHandler);
     masterPage.off(View.unloadedEvent, unloadedEventHandler);
@@ -370,7 +370,7 @@ export function test_showing_native_viewcontroller_doesnt_throw_exception() {
     testPage.on(Page.navigatingFromEvent, () => navigatingFrom++);
     testPage.on(Page.navigatedFromEvent, () => navigatedFrom++);
 
-    helper.navigate(() => { return testPage; });
+    helper.navigate(() => testPage);
 
     TKUnit.assertEqual(1, navigatingTo, "navigatingTo");
     TKUnit.assertEqual(1, loaded, "navigatingTo");
diff --git a/tests/app/ui/page/page21.ts b/tests/app/ui/page/page21.ts
index 86c4021e0e..a003429575 100644
--- a/tests/app/ui/page/page21.ts
+++ b/tests/app/ui/page/page21.ts
@@ -1,4 +1,4 @@
-import {ShownModallyData} from "tns-core-modules/ui/page";
+import { ShownModallyData } from "tns-core-modules/ui/page";
 
 export function onShownModally(args: ShownModallyData) {
     args.context.childPage = args.object;
diff --git a/tests/app/ui/repeater/repeater-tests.ts b/tests/app/ui/repeater/repeater-tests.ts
index 9c3aad6401..113b15ad98 100644
--- a/tests/app/ui/repeater/repeater-tests.ts
+++ b/tests/app/ui/repeater/repeater-tests.ts
@@ -26,7 +26,7 @@ for (var i = 0; i < 100; i++) {
 
 export function test_recycling() {
     const setters = new Map<string, stackLayoutModule.StackLayout>();
-    setters.set('itemsLayout', new stackLayoutModule.StackLayout());
+    setters.set("itemsLayout", new stackLayoutModule.StackLayout());
     helper.nativeView_recycling_test(() => new repeaterModule.Repeater(), null, null, setters);
 }
 
diff --git a/tests/app/ui/root-view/mymodule/MyControl.ts b/tests/app/ui/root-view/mymodule/MyControl.ts
index d6455b3ab8..d882094e3b 100644
--- a/tests/app/ui/root-view/mymodule/MyControl.ts
+++ b/tests/app/ui/root-view/mymodule/MyControl.ts
@@ -10,6 +10,7 @@ export class MyControl extends stackLayoutModule.StackLayout {
         var counter: number = 0;
 
         var lbl = new label.Label();
+        lbl.id = "my-test-label";
         var btn = new button.Button();
         btn.text = "Tap me!";
         btn.on(button.Button.tapEvent, (args: observable.EventData) => {
diff --git a/tests/app/ui/root-view/root-modules/gridlayout-root.xml b/tests/app/ui/root-view/root-modules/gridlayout-root.xml
index 7f55539dc9..834d136023 100644
--- a/tests/app/ui/root-view/root-modules/gridlayout-root.xml
+++ b/tests/app/ui/root-view/root-modules/gridlayout-root.xml
@@ -1,2 +1,3 @@
 <GridLayout class="MyStackLayoutRoot">
+    <Label text="I'm here!!!" id="my-test-label"/>
 </GridLayout>
\ No newline at end of file
diff --git a/tests/app/ui/root-view/root-modules/tabview-root.xml b/tests/app/ui/root-view/root-modules/tabview-root.xml
index 588b8cea5d..89933d7786 100644
--- a/tests/app/ui/root-view/root-modules/tabview-root.xml
+++ b/tests/app/ui/root-view/root-modules/tabview-root.xml
@@ -3,7 +3,7 @@
 
     <TabViewItem title="Tab">
         <TabViewItem.view>
-            <Label text="Tab" />
+            <Label text="Tab" id="my-test-label"/>
         </TabViewItem.view>
     </TabViewItem>
 
diff --git a/tests/app/ui/root-view/root-view-tests.ts b/tests/app/ui/root-view/root-view-tests.ts
index d45c593c82..1f308446de 100644
--- a/tests/app/ui/root-view/root-view-tests.ts
+++ b/tests/app/ui/root-view/root-view-tests.ts
@@ -1,5 +1,5 @@
 import * as TKUnit from "../../TKUnit";
-import { Page } from "tns-core-modules/ui/page";
+import { Page, View } from "tns-core-modules/ui/page";
 import { Frame, NavigationEntry, stack } from "tns-core-modules/ui/frame";
 import { _resetRootView, getRootView } from "tns-core-modules/application";
 import { TabView, TabViewItem } from "tns-core-modules/ui/tab-view";
@@ -65,10 +65,42 @@ export function test_gridlayout_rootview_css_applied() {
     helper.assertViewBackgroundColor(rootView, "#0000FF");
 };
 
+export function test_gridlayout_rootview_layout_updates() {
+    layout_invalidate_test("ui/root-view/root-modules/gridlayout-root");
+}
+
+export function test_custom_component_rootview_layout_updates() {
+    layout_invalidate_test("ui/root-view/root-modules/custom-component-root");
+}
+
+export function test_tabview_rootview_layout_updates() {
+    layout_invalidate_test("ui/root-view/root-modules/gridlayout-root");
+}
+
+function layout_invalidate_test(moduleName: string) {
+    var entry = { moduleName };
+
+    _resetRootView(entry);
+
+    var rootView = getRootView();
+    TKUnit.waitUntilReady(() => rootView.isLayoutValid);
+
+    const lbl = <View>rootView.getViewById("my-test-label");
+
+    lbl.visibility = "collapse";
+    TKUnit.assertFalse(rootView.isLayoutValid);
+    TKUnit.waitUntilReady(() => rootView.isLayoutValid);
+
+    lbl.visibility = "visible";
+    TKUnit.assertFalse(rootView.isLayoutValid);
+    TKUnit.waitUntilReady(() => rootView.isLayoutValid);
+    TKUnit.waitUntilReady(() => lbl.isLayoutValid);
+}
+
 export function tearDownModule() {
     // reset the root to frame for other tests
     const resetFrameRoot = createTestFrameRootEntry();
 
     _resetRootView(resetFrameRoot.entry);
     TKUnit.waitUntilReady(() => resetFrameRoot.page.isLoaded);
-}
\ No newline at end of file
+}
diff --git a/tests/app/ui/scroll-view/scroll-view-tests.ts b/tests/app/ui/scroll-view/scroll-view-tests.ts
index ad2d921491..8c375305b9 100644
--- a/tests/app/ui/scroll-view/scroll-view-tests.ts
+++ b/tests/app/ui/scroll-view/scroll-view-tests.ts
@@ -113,7 +113,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
         this.waitUntilTestElementLayoutIsValid();
 
         this.testView.scrollToVerticalOffset(layoutHelper.dp(100), true);
-        TKUnit.waitUntilReady(() => { return TKUnit.areClose(layoutHelper.dip(this.testView.verticalOffset), 100, 0.9); });
+        TKUnit.waitUntilReady(() => TKUnit.areClose(layoutHelper.dip(this.testView.verticalOffset), 100, 0.9));
 
         // The scrolling animation should be finished by now
         TKUnit.assertAreClose(layoutHelper.dip(this.testView.verticalOffset), 100, 0.9, "this.testView.verticalOffset");
@@ -138,7 +138,7 @@ class ScrollLayoutTest extends UITest<ScrollView> {
         // No synchronous change. 
         TKUnit.assertEqual(this.testView.horizontalOffset, 0, "this.testView.horizontalOffset");
 
-        TKUnit.waitUntilReady(() => { return TKUnit.areClose(layoutHelper.dip(this.testView.horizontalOffset), 100, 0.9); });
+        TKUnit.waitUntilReady(() => TKUnit.areClose(layoutHelper.dip(this.testView.horizontalOffset), 100, 0.9));
 
         // The scrolling animation should be finished by now
         TKUnit.assertAreClose(layoutHelper.dip(this.testView.horizontalOffset), 100, 0.9, "this.testView.horizontalOffset");
diff --git a/tests/app/ui/search-bar/search-bar-code-snippet.ts b/tests/app/ui/search-bar/search-bar-code-snippet.ts
index 0f584a4b4e..c93d26d41a 100644
--- a/tests/app/ui/search-bar/search-bar-code-snippet.ts
+++ b/tests/app/ui/search-bar/search-bar-code-snippet.ts
@@ -1,17 +1,17 @@
-import { EventData } from 'tns-core-modules/data/observable';
+import { EventData } from "tns-core-modules/data/observable";
 import { SearchBar } from "tns-core-modules/ui/search-bar"
 
 export function navigatingTo(args: EventData) {
     console.log("page navigating to");
 }
 // >> searchbar-clear
-export function onClear(args){
+export function onClear(args) {
     console.log("clear search-bar text");
 }
 // << searchbar-clear
 // >> searchbar-submit
-export function onSubmit(args){
-    var searchbar:SearchBar = <SearchBar>args.object;
-    console.log("Search submit result: "+searchbar.text);
+export function onSubmit(args) {
+    var searchbar: SearchBar = <SearchBar>args.object;
+    console.log("Search submit result: " + searchbar.text);
 }
 // << searchbar-submit
\ No newline at end of file
diff --git a/tests/app/ui/segmented-bar/segmented-bar-tests.ts b/tests/app/ui/segmented-bar/segmented-bar-tests.ts
index 4396145d72..e6e4bd2a0c 100644
--- a/tests/app/ui/segmented-bar/segmented-bar-tests.ts
+++ b/tests/app/ui/segmented-bar/segmented-bar-tests.ts
@@ -21,7 +21,7 @@ function _createSegmentedBar(): segmentedBarModule.SegmentedBar {
 
 export function test_recycling() {
     const setters = new Map<string, Array<any>>();
-    setters.set('items', _createItems(3));
+    setters.set("items", _createItems(3));
     helper.nativeView_recycling_test(() => new segmentedBarModule.SegmentedBar(), null, null, setters);
 }
 
diff --git a/tests/app/ui/slider/slider-tests.ts b/tests/app/ui/slider/slider-tests.ts
index 79fabc54b7..81e8fc1bf6 100644
--- a/tests/app/ui/slider/slider-tests.ts
+++ b/tests/app/ui/slider/slider-tests.ts
@@ -165,7 +165,7 @@ export function test_values_change_native_values() {
         TKUnit.assertEqual(getNativeMaxValue(slider), isIOS ? 20 : 10, "4: Wrong native slider.maxValue");
 
         slider.value = 15;
-        TKUnit.assertEqual(getNativeValue(slider), isIOS ? 15: 5, "5: wrong native slider.value");
+        TKUnit.assertEqual(getNativeValue(slider), isIOS ? 15 : 5, "5: wrong native slider.value");
         TKUnit.assertEqual(getNativeMaxValue(slider), isIOS ? 20 : 10, "5: Wrong native slider.maxValue");
     };
 
diff --git a/tests/app/ui/styling/style-tests.ts b/tests/app/ui/styling/style-tests.ts
index 6652c8b475..a3519f220d 100644
--- a/tests/app/ui/styling/style-tests.ts
+++ b/tests/app/ui/styling/style-tests.ts
@@ -1367,7 +1367,7 @@ export function test_alone_attr_selector() {
 
 export function test_UsingSameSelectors_ShouldApplyLatest() {
     let testButton = new buttonModule.Button();
-    testButton.className = 'green';
+    testButton.className = "green";
 
     let testCss = ".green { background-color: #FF0000; } .green { background-color: #00FF00; }";
 
@@ -1380,7 +1380,7 @@ export function test_UsingSameSelectors_ShouldApplyLatest() {
 
 export function test_UsingSameSelectorsWithSpecific_ShouldApplyLatest() {
     let testButton = new buttonModule.Button();
-    testButton.className = 'red green';
+    testButton.className = "red green";
 
     let testCss = ".red { background-color: #FF0000; } Button.green { background-color: #00FF00; }";
 
@@ -1395,7 +1395,7 @@ export function test_CascadingClassNamesAppliesAfterPageLoad() {
     const stack = new stackModule.StackLayout();
     const label = new labelModule.Label();
     label.text = "Some text";
-    label.className = 'lab1';
+    label.className = "lab1";
     stack.addChild(label);
 
     application.addCss(".added { background-color: red; } .added .lab1 { background-color: blue; } .lab1 { color: red}");
diff --git a/tests/app/ui/tab-view/tab-view-navigation-tests.ts b/tests/app/ui/tab-view/tab-view-navigation-tests.ts
index 11a627648e..fb202a8a8d 100644
--- a/tests/app/ui/tab-view/tab-view-navigation-tests.ts
+++ b/tests/app/ui/tab-view/tab-view-navigation-tests.ts
@@ -117,7 +117,7 @@ export function testWhenNavigatingBackToANonCachedPageContainingATabViewWithALis
     _clickTheFirstButtonInTheListViewNatively(tabView);
 
     frameModule.goBack();
-    TKUnit.waitUntilReady(() => topFrame.navigationQueueIsEmpty());//() => topFrame.currentPage === tabViewPage);
+    TKUnit.waitUntilReady(() => topFrame.navigationQueueIsEmpty()); //() => topFrame.currentPage === tabViewPage);
 
     frameModule.goBack();
 
diff --git a/tests/app/ui/tab-view/tab-view-root-tests.ts b/tests/app/ui/tab-view/tab-view-root-tests.ts
index 399964256e..0e1376226f 100644
--- a/tests/app/ui/tab-view/tab-view-root-tests.ts
+++ b/tests/app/ui/tab-view/tab-view-root-tests.ts
@@ -15,7 +15,7 @@ function waitUntilNavigatedTo(pages: Page[], action: Function) {
 
     pages.forEach(page => page.on("navigatedTo", navigatedTo));
     action();
-    TKUnit.waitUntilReady(() => completed === pages.length, 100);
+    TKUnit.waitUntilReady(() => completed === pages.length, 5);
 }
 
 function createPage(i: number) {
diff --git a/tests/app/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts
index 2c2853d1b5..0bc2bab433 100644
--- a/tests/app/ui/tab-view/tab-view-tests.ts
+++ b/tests/app/ui/tab-view/tab-view-tests.ts
@@ -23,7 +23,7 @@ export class TabViewTest extends UITest<tabViewModule.TabView> {
 
     public test_recycling() {
         const setters = new Map<string, Array<any>>();
-        setters.set('items', this._createItems(3));
+        setters.set("items", this._createItems(3));
         helper.nativeView_recycling_test(() => new tabViewModule.TabView(), null, null, setters);
     }
 
diff --git a/tests/app/ui/tab-view/tab-view.md b/tests/app/ui/tab-view/tab-view.md
index e2e829955c..f21ab1292f 100644
--- a/tests/app/ui/tab-view/tab-view.md
+++ b/tests/app/ui/tab-view/tab-view.md
@@ -6,22 +6,27 @@ description: "Examples for using TabView"
 previous_url: /ApiReference/ui/tab-view/HOW-TO
 ---
 # TabView
+The TabView is a component, which allows to navigate between different views. The general behaviour of the TabView component is to load its items on demand. This means that every TabViewItem view will be loaded when it is shown and will be unloaded when it disappears. Respectively loaded and unloaded events will be fired while showing or hiding each view. However, there are some specifics for each platform(iOS and Android), which are described in the notes below.
+
+> Note (iOS specific): `UITabBarController` is used in the implementation, which means that only one `TabViewItem` can be shown at a given time and only one needs to be loaded. When the user selects a new `TabViewItem`, we load the new item and unload the previous one.
+
+> Note (Android specific): In the Android implementation is used `ViewPager` controller, which allows using the `swipe` gesture to navigate to the next or previous tab. This means that only one `TabViewItem` can be shown, but multiple `TabViewItems` need to be loaded. Otherwise, after left or right swipe, you will not see the `TabViewItem`'s contents, after the swiping. By default, the ViewPager controller will pre-load one `TabViewItem` on the left and on on the right. Regarding that, if one of the items is already pre-loaded, it will not be loaded again. In the Android, we have exposed a property called `androidOffscreenTabLimit`, which allow specifying, how many components should be pre-load on the left and right (if you are setting up `androidOffscreenTabLimit` to 0, the Android TabView will match to the iOS TabView). 
+ 
+The iOS and Android UX guidelines regarding the Tab controls differ greatly. The difference is described in the below points:
+
+* The iOS tabs have their tab bar, which will be displayed always on the bottom and does not allow swipe gesture for changing tabs.
+* The Android tabs are on top and will enable the swipe navigation between the tabs.
+* For Android we have `androidTabsPosition` property which has two options `top`(default value) and `bottom`. Setting up this property to `bottom` allows mimicking Bottom Tab Navigation control(provided by android support library v25 release). Setting the Tabs at the bottom will disable the swipe navigation and the items preloading functionality.
+
 ### Declaring the TabView in xml.
 ``` XML
-<Page>
  <TabView>
-   <TabView.items>
      <TabViewItem title="Tab 1">
-       <TabViewItem.view>
-          <Label text="Label in Tab1" />
-       </TabViewItem.view>
+            // ...
      </TabViewItem>
      <TabViewItem title="Tab 2">
-       <TabViewItem.view>
-          <Label text="Label in Tab2" />
-       </TabViewItem.view>
+            // ...
      </TabViewItem>
-   </TabView.items>
  </TabView>
 </Page>
 ```
@@ -37,11 +42,9 @@ Using a TabView requires the "ui/tab-view" module.
 {%snippet article-tabview-selectedIndexChanged%}
 ### Using selectedIndexChanged event from xml
 ```XML
-<Page>
- <TabView selectedIndexChanged="onSelectedIndexChanged">
-   ...
- </TabView>
-</Page>
+<TabView selectedIndexChanged="onSelectedIndexChanged">
+    ...
+</TabView>
 ```
 ```TypeScript
 export function onSelectedIndexChanged(args) {...}
@@ -57,37 +60,81 @@ For the TabView component could be set three different styling properties
 * `textTransform` (coresponding CSS property `text-transform`) - setting up textTransform individual for every `TabViewItem`. Value options: `capitalize`, `lowercase`, `none`, `uppercase`.
 
 ```XML
-<TabView selectedTabTextColor="#00FF00" tabBackgroundColor="#FF0000" >
-            <TabView.items>
-                <TabViewItem title="Tab 1" textTransform="lowercase">
-                <TabViewItem.view>
-                    <Label text="Label in Tab1" />
-                </TabViewItem.view>
-                </TabViewItem>
-                <TabViewItem title="Tab 2" textTransform="lowercase">
-                <TabViewItem.view>
-                    <Label text="Label in Tab2" />
-                </TabViewItem.view>
-                </TabViewItem>
-            </TabView.items>
+<TabView selectedTabTextColor="#00FF00" tabBackgroundColor="#FF0000">
+	<TabViewItem title="Tab 1" textTransform="lowercase">
+		<Label text="Label in Tab1" />
+	</TabViewItem>
+	<TabViewItem title="Tab 2" textTransform="lowercase">
+		<Label text="Label in Tab2" />
+	</TabViewItem>
 </TabView>
+
 ```
 
 * `androidSelectedTabHighlightColor`<sup>android specific property</sup> (coresponding CSS property `android-selected-tab-highlight-color`) - setup underline color of the `Tab`s in Android.
 
 ```XML
 <TabView androidSelectedTabHighlightColor="red">
-                <TabView.items>
-                    <TabViewItem title="Tab 1" >
-                    <TabViewItem.view>
-                        <Label text="Label in Tab1"/>
-                    </TabViewItem.view>
-                    </TabViewItem>
-                    <TabViewItem title="Tab 2">
-                    <TabViewItem.view>
-                        <Label text="Label in Tab2" />
-                    </TabViewItem.view>
-                    </TabViewItem>
-                </TabView.items>
-    </TabView>
-```
\ No newline at end of file
+	<TabViewItem title="Tab 1">
+		<Label text="Label in Tab1" />
+	</TabViewItem>
+	<TabViewItem title="Tab 2">
+		<Label text="Label in Tab2" />
+	</TabViewItem>
+</TabView>
+```
+
+## Tabs Limit <sup>Android Secific<sup>
+
+Setting up the limit of the tabs, which should be pre-loaded on the left and right sides in Android.
+```XML
+<TabView id="tabViewContainer" androidOffscreenTabLimit="0">
+	<TabViewItem title="NativeScript">
+		<StackLayout>
+			<Label text="NativeScript" class="m-15 h2 text-left" color="blue" />
+			<ScrollView>
+				<StackLayout height="100%">
+					{% raw %}
+					<Label text="{{content}}" textWrap="true" class="m-15" />
+					{% endraw %}
+				</StackLayout>
+			</ScrollView>
+		</StackLayout>
+	</TabViewItem>
+	<TabViewItem title="Icon">
+		<StackLayout>
+			<Image class="m-t-30 m-b-15" src="res://icon" width="80" height="80" />
+			<Label text="NativeScript" textWrap="true" class="h2 m-x-auto" color="blue" />
+		</StackLayout>
+	</TabViewItem>
+</TabView>
+```
+
+---
+
+## Tabs Position <sup>Android Secific<sup>
+
+Setting up the bottom Tabs position for Android.
+```XML
+<TabView id="tabViewContainer" androidTabsPosition="bottom">
+	<TabViewItem title="NativeScript">
+		<StackLayout>
+			<Label text="NativeScript" class="m-15 h2 text-left" color="blue" />
+			<ScrollView>
+				<StackLayout height="100%">
+					{% raw %}
+					<Label text="{{content}}" textWrap="true" class="m-15" />
+					{% endraw %}
+				</StackLayout>
+			</ScrollView>
+		</StackLayout>
+	</TabViewItem>
+	<TabViewItem title="Icon">
+		<StackLayout>
+			<Image class="m-t-30 m-b-15" src="res://icon" width="80" height="80" />
+			<Label text="NativeScript" textWrap="true" class="h2 m-x-auto" color="blue" />
+		</StackLayout>
+	</TabViewItem>
+</TabView>
+
+```
diff --git a/tests/app/ui/text-field/text-field-tests.ts b/tests/app/ui/text-field/text-field-tests.ts
index cb12372c83..1ecc4b92b0 100644
--- a/tests/app/ui/text-field/text-field-tests.ts
+++ b/tests/app/ui/text-field/text-field-tests.ts
@@ -638,7 +638,7 @@ export function test_android_ime_actions_move_focus() {
     const addTextField = () => {
         const tf = new TextField();
         (<any>tf).returnPress = 0
-        tf.on('returnPress', (args) => (<any>args.object).returnPress++);
+        tf.on("returnPress", (args) => (<any>args.object).returnPress++);
         stack.addChild(tf);
     }
 
diff --git a/tests/app/ui/view/view-tests-common.ts b/tests/app/ui/view/view-tests-common.ts
index fff0828041..e0e53ce800 100644
--- a/tests/app/ui/view/view-tests-common.ts
+++ b/tests/app/ui/view/view-tests-common.ts
@@ -605,7 +605,7 @@ export function test_NativeSetter_called_when_add_and_remove_and_recycled() {
         // TKUnit.assertEqual(secondView.viewPropCounter, isIOS ? 2 : 3, "8");
 
         TKUnit.assertEqual(secondView.cssPropCounter, 2, "7");
-        TKUnit.assertEqual(secondView.viewPropCounter,2, "8");
+        TKUnit.assertEqual(secondView.viewPropCounter, 2, "8");
     });
 };
 
@@ -1050,7 +1050,7 @@ export function test_background_image_doesnt_throw() {
     var btn = new Button();
     // There is no need to wait until image is downloaded.
     // It was throwing an exception when starting the download...
-    btn.style.backgroundImage = 'https://www.bodybuilding.com/images/2016/june/8-benefits-to-working-out-in-the-morning-header-v2-830x467.jpg';
+    btn.style.backgroundImage = "https://www.bodybuilding.com/images/2016/june/8-benefits-to-working-out-in-the-morning-header-v2-830x467.jpg";
     helper.buildUIAndRunTest(btn, function (views: Array<View>) {
         helper.waitUntilLayoutReady(btn);
     });
diff --git a/tests/app/ui/view/view-tests-layout-event.ts b/tests/app/ui/view/view-tests-layout-event.ts
new file mode 100644
index 0000000000..f250b13d48
--- /dev/null
+++ b/tests/app/ui/view/view-tests-layout-event.ts
@@ -0,0 +1,169 @@
+import * as commonTests from "./view-tests-common";
+
+import { View } from "tns-core-modules/ui/core/view";
+import { Button } from "tns-core-modules/ui/button";
+import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout/stack-layout";
+import * as helper from "../helper";
+import * as TKUnit from "../../TKUnit";
+import * as utils from "tns-core-modules/utils/utils";
+
+export function test_event_LayoutChanged_GetActualSize() {
+    const test = function (views: Array<View>) {
+        let buttonLayoutChanged = false;
+
+        views[1].on(View.layoutChangedEvent, (data) => {
+            buttonLayoutChanged = true;
+        });
+
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
+        TKUnit.assert(views[1].getActualSize().height > 0);
+        TKUnit.assert(views[1].getActualSize().width > 0);
+    };
+
+    helper.do_PageTest_WithStackLayout_AndButton(test);
+};
+
+export function test_event_LayoutChanged_Listeners() {
+    const test = function (views: Array<View>) {
+        let stackLayoutChanged = false;
+        let buttonLayoutChanged = false;
+
+        views[1].on(View.layoutChangedEvent, (data) => {
+            buttonLayoutChanged = true;
+        });
+
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
+        TKUnit.assertFalse(views[0].hasListeners(View.layoutChangedEvent));
+        TKUnit.assert(views[1].hasListeners(View.layoutChangedEvent));
+    };
+
+    helper.do_PageTest_WithStackLayout_AndButton(test);
+};
+
+export function test_event_LayoutChanged_IsRaised() {
+    helper.clearPage();
+    let newPage = helper.getCurrentPage();
+
+    let stackLayoutChanged = false;
+    let buttonLayoutChanged = false;
+
+    let stackLayout = new StackLayout();
+    let button = new Button();
+
+    stackLayout.on(View.layoutChangedEvent, (data) => {
+        stackLayoutChanged = true;
+    });
+
+    button.on(View.layoutChangedEvent, (data) => {
+        buttonLayoutChanged = true;
+    });
+
+    stackLayout.addChild(button);
+    newPage.content = stackLayout;
+
+    TKUnit.waitUntilReady(() => stackLayoutChanged && buttonLayoutChanged, 5);
+    TKUnit.assert(stackLayoutChanged);
+    TKUnit.assert(buttonLayoutChanged);
+
+    newPage.content = null;
+};
+
+export function test_event_LayoutChanged_IsRaised_ChildMarginChanged() {
+    const test = function (views: Array<View>) {
+        let stackLayoutChanged = false;
+        let buttonLayoutChanged = false;
+
+        views[1].on(View.layoutChangedEvent, (data) => {
+            stackLayoutChanged = true;
+        });
+
+        views[2].on(View.layoutChangedEvent, (data) => {
+            buttonLayoutChanged = true;
+        });
+
+        (<Button>views[2]).marginTop = 50;
+
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
+
+        TKUnit.assert(stackLayoutChanged);
+        TKUnit.assert(buttonLayoutChanged);
+    };
+
+    helper.do_PageTest_WithStackLayout_AndButton(test);
+};
+
+export function test_event_LayoutChanged_IsRaised_ParentMarginChanged() {
+    const test = function (views: Array<View>) {
+        let stackLayoutChanged = false;
+        let buttonLayoutChanged = false;
+
+        views[1].on(View.layoutChangedEvent, (data) => {
+            stackLayoutChanged = true;
+        });
+
+        views[2].on(View.layoutChangedEvent, (data) => {
+            buttonLayoutChanged = true;
+        });
+
+        (<Button>views[2]).marginTop = 50;
+
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
+
+        TKUnit.assert(stackLayoutChanged);
+        TKUnit.assert(buttonLayoutChanged);
+    };
+
+    helper.do_PageTest_WithStackLayout_AndButton(test);
+};
+
+export function test_event_LayoutChanged_IsNotRaised_TransformChanged() {
+    const test = function (views: Array<View>) {
+        let stackLayoutChangedCount = 0;
+        let buttonLayoutChangedCount = 0;
+        const button = <Button>views[2];
+
+        views[1].on(View.layoutChangedEvent, (data) => {
+            stackLayoutChangedCount++;
+        });
+
+        button.on(View.layoutChangedEvent, (data) => {
+            buttonLayoutChangedCount++;
+        });
+
+        button.translateX += 50;
+        button.translateY += 50;
+        button.rotate += 50;
+        button.height = 200;
+
+        TKUnit.waitUntilReady(() => button.height === 200, 5);
+
+        TKUnit.assertEqual(stackLayoutChangedCount, 1);
+        TKUnit.assertEqual(buttonLayoutChangedCount, 1);
+    };
+
+    helper.do_PageTest_WithStackLayout_AndButton(test);
+};
+
+export function test_event_LayoutChanged_IsRaised_StackLayout_SizeChanged() {
+    const test = function (views: Array<View>) {
+        let stackLayoutChanged = false;
+        let buttonLayoutChanged = false;
+
+        views[1].on(View.layoutChangedEvent, (data) => {
+            stackLayoutChanged = true;
+        });
+
+        views[2].on(View.layoutChangedEvent, (data) => {
+            buttonLayoutChanged = true;
+        });
+
+        (<StackLayout>views[1]).height = 100;
+
+        TKUnit.waitUntilReady(() => buttonLayoutChanged, 5);
+
+        TKUnit.assert(stackLayoutChanged);
+        TKUnit.assert(buttonLayoutChanged);
+    };
+
+    helper.do_PageTest_WithStackLayout_AndButton(test);
+};
diff --git a/tests/app/ui/view/view-tests.ios.ts b/tests/app/ui/view/view-tests.ios.ts
index d8c442cbf5..35f2463763 100644
--- a/tests/app/ui/view/view-tests.ios.ts
+++ b/tests/app/ui/view/view-tests.ios.ts
@@ -1,15 +1,16 @@
 import * as commonTests from "./view-tests-common";
-import * as view from "tns-core-modules/ui/core/view";
-import * as grid from "tns-core-modules/ui/layouts/grid-layout";
-import * as color from "tns-core-modules/color";
+
+import { View } from "tns-core-modules/ui/core/view";
+import { Button } from "tns-core-modules/ui/button";
+import { GridLayout } from "tns-core-modules/ui/layouts/grid-layout";
+import { Color } from "tns-core-modules/color";
 import * as helper from "../helper";
 import * as TKUnit from "../../TKUnit";
-import * as button from "tns-core-modules/ui/button";
 import * as utils from "tns-core-modules/utils/utils";
 
 global.moduleMerge(commonTests, exports);
 
-class MyGrid extends grid.GridLayout {
+class MyGrid extends GridLayout {
     public backgroundDrawCount: number = 0;
 
     _redrawNativeBackground(background: any) {
@@ -18,33 +19,33 @@ class MyGrid extends grid.GridLayout {
     }
 }
 
-export function getUniformNativeBorderWidth(v: view.View): number {
+export function getUniformNativeBorderWidth(v: View): number {
     return utils.layout.toDevicePixels((<UIView>v.ios).layer.borderWidth);
 }
 
-export function checkUniformNativeBorderColor(v: view.View): boolean {
-    if (v.borderColor instanceof color.Color) {
-        return (<UIView>v.ios).layer.borderColor === (<color.Color>v.borderColor).ios.CGColor;
+export function checkUniformNativeBorderColor(v: View): boolean {
+    if (v.borderColor instanceof Color) {
+        return (<UIView>v.ios).layer.borderColor === (<Color>v.borderColor).ios.CGColor;
     }
 
     return undefined;
 }
 
-export function getUniformNativeCornerRadius(v: view.View): number {
+export function getUniformNativeCornerRadius(v: View): number {
     return utils.layout.toDevicePixels((<UIView>v.ios).layer.cornerRadius);
 }
 
-export function checkNativeBackgroundColor(v: view.View): boolean {
+export function checkNativeBackgroundColor(v: View): boolean {
     if (v.ios instanceof UILabel) {
         var cgColor1 = (<UILabel>v.ios).layer.backgroundColor;
-        var cgColor2 = (<UIColor>(<color.Color>v.backgroundColor).ios).CGColor;
+        var cgColor2 = (<UIColor>(<Color>v.backgroundColor).ios).CGColor;
         return v.backgroundColor && !!CGColorEqualToColor(cgColor1, cgColor2);
     }
 
-    return v.backgroundColor && (<UIView>v.ios).backgroundColor.isEqual((<color.Color>v.backgroundColor).ios);
+    return v.backgroundColor && (<UIView>v.ios).backgroundColor.isEqual((<Color>v.backgroundColor).ios);
 }
 
-export function checkNativeBackgroundImage(v: view.View): boolean {
+export function checkNativeBackgroundImage(v: View): boolean {
     return (<UIView>v.ios).backgroundColor !== undefined;
 }
 
@@ -53,7 +54,7 @@ export function testBackgroundInternalChangedOnceOnResize() {
     let root = helper.getCurrentPage();
     let layout = new MyGrid();
     layout.className = "myClass";
-    layout.backgroundColor = new color.Color(255, 255, 0, 0);
+    layout.backgroundColor = new Color(255, 255, 0, 0);
 
     root.css = ".myClass { background-image: url('~/logo.png') }";
     root.content = layout;
@@ -82,7 +83,7 @@ export function testBackgroundInternalChangedOnceOnResize() {
 }
 
 export function test_automation_text_set_to_native() {
-    var newButton = new button.Button();
+    var newButton = new Button();
     newButton.automationText = "Button1";
     helper.getCurrentPage().content = newButton;
     TKUnit.assertEqual((<UIView>newButton.ios).accessibilityIdentifier, "Button1", "accessibilityIdentifier not set to native view.");
diff --git a/tests/app/ui/web-view/web-view-code-snippet.ts b/tests/app/ui/web-view/web-view-code-snippet.ts
index 61d4a4fa39..666478d97a 100644
--- a/tests/app/ui/web-view/web-view-code-snippet.ts
+++ b/tests/app/ui/web-view/web-view-code-snippet.ts
@@ -1,5 +1,5 @@
 // >> web-view-loaded
-import { EventData } from 'tns-core-modules/data/observable';
+import { EventData } from "tns-core-modules/data/observable";
 import { WebView } from "tns-core-modules/ui/web-view";
 import { isAndroid } from "tns-core-modules/platform"
 
@@ -7,17 +7,17 @@ export function navigatingTo(args: EventData) {
     console.log("page navigating to");
 }
 
-export function webViewTouch(args){
+export function webViewTouch(args) {
     console.log("touch event");
 }
 
-export function webViewPan(args){
+export function webViewPan(args) {
     console.log("pan gesture");
 }
 
-export function webViewLoaded(args){
-    var webview:WebView = <WebView>args.object;
-    if(isAndroid){
+export function webViewLoaded(args) {
+    var webview: WebView = <WebView>args.object;
+    if (isAndroid) {
         webview.android.getSettings().setDisplayZoomControls(false);
     }
 }
diff --git a/tests/app/ui/web-view/web-view-tests.ts b/tests/app/ui/web-view/web-view-tests.ts
index ef733509f9..db50cef17c 100644
--- a/tests/app/ui/web-view/web-view-tests.ts
+++ b/tests/app/ui/web-view/web-view-tests.ts
@@ -56,7 +56,7 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
         webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
             // >> (hide)
             let actual;
-            let expectedTitle = 'MyTitle';
+            let expectedTitle = "MyTitle";
 
             if (webView.ios) {
                 actual = webView.ios.title;
@@ -91,7 +91,7 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
 
         webView.on(webViewModule.WebView.loadFinishedEvent, function (args: webViewModule.LoadEventData) {
             let actual;
-            let expectedTitle = 'MyTitle';
+            let expectedTitle = "MyTitle";
 
             if (webView.ios) {
                 actual = webView.ios.title;
@@ -127,7 +127,7 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
             // >> (hide)
 
             let actual;
-            const expected = 'MyTitle';
+            const expected = "MyTitle";
 
             if (webView.ios) {
                 actual = webView.ios.title;
@@ -153,7 +153,7 @@ export class WebViewTest extends testModule.UITest<webViewModule.WebView> {
                 message = "Error loading " + args.url + ": " + args.error;
             }
         });
-        webView.src = '<!DOCTYPE html><html><head><title>MyTitle</title><meta charset="utf-8" /></head><body><span style="color:red">TestÖ</span></body></html>';
+        webView.src = "<!DOCTYPE html><html><head><title>MyTitle</title><meta charset=\"utf-8\" /></head><body><span style=\"color:red\">TestÖ</span></body></html>";
         // << webview-string
     }
 
diff --git a/tests/app/xhr/xhr-tests.ts b/tests/app/xhr/xhr-tests.ts
index 69af7ee518..27d9f42733 100644
--- a/tests/app/xhr/xhr-tests.ts
+++ b/tests/app/xhr/xhr-tests.ts
@@ -228,7 +228,7 @@ export function test_ignore_zero_length_request_body() {
     let xhr = new XMLHttpRequest();
     xhr.open("GET", "https://httpbin.org/get");
 
-    xhr.send('');
+    xhr.send("");
 }
 
 export function test_raises_onload_Event(done) {
@@ -246,9 +246,9 @@ export function test_xhr_events() {
     let loadCallbackFired = false, loadEventFired = false;
     xhr.onload = () => loadCallbackFired = true;
     let badEvent = () => { throw new Error("Shouldn't call me") }
-    xhr.addEventListener('load', () => loadEventFired = true);
-    xhr.addEventListener('load', badEvent);
-    xhr.removeEventListener('load', badEvent);
+    xhr.addEventListener("load", () => loadEventFired = true);
+    xhr.addEventListener("load", badEvent);
+    xhr.removeEventListener("load", badEvent);
 
     xhr._errorFlag = false;
     xhr._setReadyState(xhr.DONE);
@@ -257,23 +257,23 @@ export function test_xhr_events() {
 
     let errorCallbackData = null, errorEventData = null;
     xhr.onerror = (e) => errorCallbackData = e;
-    xhr.addEventListener('error', (e) => errorEventData = e);
-    xhr.addEventListener('error', badEvent);
-    xhr.removeEventListener('error', badEvent);
+    xhr.addEventListener("error", (e) => errorEventData = e);
+    xhr.addEventListener("error", badEvent);
+    xhr.removeEventListener("error", badEvent);
 
     xhr._errorFlag = true;
-    xhr._setReadyState(xhr.DONE, 'error data');
-    TKUnit.assertEqual(errorCallbackData, 'error data');
-    TKUnit.assertEqual(errorEventData, 'error data');
+    xhr._setReadyState(xhr.DONE, "error data");
+    TKUnit.assertEqual(errorCallbackData, "error data");
+    TKUnit.assertEqual(errorEventData, "error data");
 }
 
 export function test_xhr_responseType_rss() {
     const xhr = <any>new XMLHttpRequest();
-    const rawRssFeed = '<rss> <channel><item><title>Test</title></item></channel></rss>';
+    const rawRssFeed = "<rss> <channel><item><title>Test</title></item></channel></rss>";
     const response = {
         statusCode: 200,
         content: {
-            toString: function(){ return this.raw },
+            toString: function() { return this.raw },
             raw: rawRssFeed
         },
         headers: {
@@ -291,8 +291,8 @@ export function test_xhr_responseType_text() {
     const response = {
         statusCode: 200,
         content: {
-            toString: function(){ return this.raw },
-            raw: 'response body'
+            toString: function() { return this.raw },
+            raw: "response body"
         },
         headers: {
             "Content-Type": "text/plain"
@@ -302,7 +302,7 @@ export function test_xhr_responseType_text() {
     xhr._loadResponse(response);
 
     TKUnit.assertEqual(xhr.responseType, "text");
-    TKUnit.assertEqual(xhr.response, 'response body');
+    TKUnit.assertEqual(xhr.response, "response body");
 }
 
 export function test_xhr_responseType_switched_to_JSON_if_header_present() {
@@ -310,8 +310,8 @@ export function test_xhr_responseType_switched_to_JSON_if_header_present() {
     const response = {
         statusCode: 200,
         content: {
-            toString: function(){ return this.raw },
-            raw: '{"data": 42}'
+            toString: function() { return this.raw },
+            raw: "{\"data\": 42}"
         },
         headers: {
             "Content-Type": "application/json"
@@ -332,7 +332,7 @@ export function test_xhr_responseType_switched_to_JSON_if_headers_content_type_h
             toString: function () {
                 return this.raw
             },
-            raw: '{"data": 42}'
+            raw: "{\"data\": 42}"
         },
         headers: {
             "Content-Type": "type/media.type+json"
@@ -350,7 +350,7 @@ export function test_sets_status_and_statusText(done) {
         if (xhr.readyState > 3) {
             try {
                 TKUnit.assertEqual(xhr.status, 200);
-                TKUnit.assertEqual(xhr.statusText, 'OK');
+                TKUnit.assertEqual(xhr.statusText, "OK");
                 done(null);
             }
             catch (err) {
@@ -391,7 +391,7 @@ export function test_getResponseHeader() {
         statusCode: 200,
         content: {
             toString: function() { return this.raw },
-            raw: '{"data": 42}'
+            raw: "{\"data\": 42}"
         },
         headers: {
             "content-type": "application/json"
diff --git a/tests/app/xml-declaration/inherited-base-page.ts b/tests/app/xml-declaration/inherited-base-page.ts
index dfb6edef55..4b47045a8f 100644
--- a/tests/app/xml-declaration/inherited-base-page.ts
+++ b/tests/app/xml-declaration/inherited-base-page.ts
@@ -1,4 +1,4 @@
-import {Page} from "tns-core-modules/ui/page";
+import { Page } from "tns-core-modules/ui/page";
 
 export class InheritedPage extends Page {
 }
diff --git a/tests/app/xml-declaration/inherited-page.ts b/tests/app/xml-declaration/inherited-page.ts
index 19b459d74c..2d214f78ce 100644
--- a/tests/app/xml-declaration/inherited-page.ts
+++ b/tests/app/xml-declaration/inherited-page.ts
@@ -1,5 +1,5 @@
-import {Page} from "tns-core-modules/ui/page";
-import {Label} from "tns-core-modules/ui/label";
+import { Page } from "tns-core-modules/ui/page";
+import { Label } from "tns-core-modules/ui/label";
 
 export function pageLoaded(args) {
     var page = <Page>args.object;
diff --git a/tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts b/tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts
index 5c75e6fdd1..a63689580a 100644
--- a/tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts
+++ b/tests/app/xml-declaration/mymodulewithxml/TabViewParentChain.ts
@@ -1,6 +1,6 @@
-import {Label} from "tns-core-modules/ui/label";
-import {Observable} from "tns-core-modules/data/observable";
-import {Page} from "tns-core-modules/ui/page";
+import { Label } from "tns-core-modules/ui/label";
+import { Observable } from "tns-core-modules/data/observable";
+import { Page } from "tns-core-modules/ui/page";
 
 export function loaded(args) {
     (<Observable>(<Label>args.object).page.bindingContext).set("testPassed", true);
diff --git a/tests/app/xml-declaration/template-builder-tests/template-view.ts b/tests/app/xml-declaration/template-builder-tests/template-view.ts
index d304ff5b8a..6b860b9eb8 100644
--- a/tests/app/xml-declaration/template-builder-tests/template-view.ts
+++ b/tests/app/xml-declaration/template-builder-tests/template-view.ts
@@ -9,8 +9,8 @@ export module knownTemplates {
 export class TemplateView extends LayoutBase {
     public template: string;
 
-	public static testEvent: string = "test";
-	
+    public static testEvent: string = "test";
+    
     public parseTemplate() {
         this.addChild(parse(this.template));
     }
diff --git a/tests/app/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts
index f74daf591d..65ff4208f8 100644
--- a/tests/app/xml-declaration/xml-declaration-tests.ts
+++ b/tests/app/xml-declaration/xml-declaration-tests.ts
@@ -195,7 +195,7 @@ export function test_parse_ShouldThrowErrorWhenInvalidCodeFileIsSpecified() {
 };
 
 export function test_parse_ShouldResolveExportsFromCodeFileForTemplates() {
-    var p = <Page>builder.parse('<Page codeFile="~/xml-declaration/custom-code-file" xmlns:customControls="xml-declaration/mymodulewithxml"><ListView items="{{ items }}" itemLoading="{{ itemLoading }}"><ListView.itemTemplate><customControls:MyControl loaded="loaded" /></ListView.itemTemplate></ListView></Page>');
+    var p = <Page>builder.parse("<Page codeFile=\"~/xml-declaration/custom-code-file\" xmlns:customControls=\"xml-declaration/mymodulewithxml\"><ListView items=\"{{ items }}\" itemLoading=\"{{ itemLoading }}\"><ListView.itemTemplate><customControls:MyControl loaded=\"loaded\" /></ListView.itemTemplate></ListView></Page>");
 
     function testAction(views: Array<viewModule.View>) {
         var ctrl;
@@ -469,7 +469,7 @@ export function test_parse_ShouldParseBindingToSpecialProperty() {
 export function test_parse_ShouldParseBindingsWithCommaInsideSingleQuote() {
     var expected = "Hi,test"
     var bindingString = "{{ 'Hi,' + myProp }}";
-    var p = <Page>builder.parse('<Page><Label text="' + bindingString + '" /></Page>');
+    var p = <Page>builder.parse("<Page><Label text=\"" + bindingString + "\" /></Page>");
     var obj = new observable.Observable();
     obj.set("myProp", "test");
     p.bindingContext = obj;
@@ -480,7 +480,7 @@ export function test_parse_ShouldParseBindingsWithCommaInsideSingleQuote() {
 
 export function test_parse_ShouldParseBindingsWithCommaInsideDoubleQuote() {
     var expected = "Hi,test"
-    var bindingString = '{{ "Hi," + myProp }}';
+    var bindingString = "{{ \"Hi,\" + myProp }}";
     var p = <Page>builder.parse("<Page><Label text='" + bindingString + "' /></Page>");
     var obj = new observable.Observable();
     obj.set("myProp", "test");
@@ -502,7 +502,7 @@ export function test_parse_CanBindBackgroundImage() {
 };
 
 export function test_parse_ShouldParseLowerCaseDashedComponentDeclaration() {
-    var p = <Page>builder.parse('<page><stack-layout><label text="Label" /><segmented-bar><segmented-bar.items><segmented-bar-item title="test" /></segmented-bar.items></segmented-bar></stack-layout></page>');
+    var p = <Page>builder.parse("<page><stack-layout><label text=\"Label\" /><segmented-bar><segmented-bar.items><segmented-bar-item title=\"test\" /></segmented-bar.items></segmented-bar></stack-layout></page>");
     var ctrl = <stackLayoutModule.StackLayout>p.content;
 
     TKUnit.assert(ctrl instanceof stackLayoutModule.StackLayout, "Expected result: StackLayout!; Actual result: " + ctrl);
@@ -511,28 +511,28 @@ export function test_parse_ShouldParseLowerCaseDashedComponentDeclaration() {
 };
 
 export function test_parse_ShouldParseCustomComponentWithoutXml() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodule"><customControls:MyControl /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodule\"><customControls:MyControl /></Page>");
     var ctrl = p.content;
 
     TKUnit.assert(ctrl instanceof myCustomControlWithoutXml.MyControl, "Expected result: custom control is defined!; Actual result: " + ctrl);
 };
 
 export function test_parse_ShouldParseCustomComponentWithoutXmlFromTNSModules() {
-    var p = <Page>builder.parse('<Page xmlns' + ':customControls="ui/label"><customControls:Label /></Page>');
+    var p = <Page>builder.parse("<Page xmlns" + ":customControls=\"ui/label\"><customControls:Label /></Page>");
     var ctrl = p.content;
 
     TKUnit.assert(ctrl instanceof Label, "Expected result: custom control is defined!; Actual result: " + ctrl);
 };
 
 export function test_parse_ShouldParseCustomComponentWithoutXmlFromTNSModulesWhenNotSpecified() {
-    var p = <Page>builder.parse('<Page xmlns' + ':customControls="ui/label"><customControls:Label /></Page>');
+    var p = <Page>builder.parse("<Page xmlns" + ":customControls=\"ui/label\"><customControls:Label /></Page>");
     var ctrl = p.content;
 
     TKUnit.assert(ctrl instanceof Label, "Expected result: custom control is defined!; Actual result: " + ctrl);
 };
 
 export function test_parse_ShouldParseCustomComponentWithXml() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:MyControl /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodulewithxml\"><customControls:MyControl /></Page>");
     var panel = <stackLayoutModule.StackLayout>p.content;
     var lbl = <Label>panel.getChildAt(0);
 
@@ -540,21 +540,21 @@ export function test_parse_ShouldParseCustomComponentWithXml() {
 };
 
 export function test_parse_ShouldParseCustomComponentWithXml_WithAttributes() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:MyControl visibility="collapse" /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodulewithxml\"><customControls:MyControl visibility=\"collapse\" /></Page>");
     var panel = <stackLayoutModule.StackLayout>p.content;
 
     TKUnit.assertEqual(panel.visibility, "collapse", "panel.visibility");
 };
 
 export function test_parse_ShouldParseCustomComponentWithXml_WithCustomAttributes() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:MyControl myProperty="myValue" /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodulewithxml\"><customControls:MyControl myProperty=\"myValue\" /></Page>");
     var panel = <stackLayoutModule.StackLayout>p.content;
 
     TKUnit.assertEqual(panel["myProperty"], "myValue", "customControl.myProperty");
 };
 
 export function test_parse_ShouldParseCustomComponentWithXmlNoJS() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:my-control-no-js /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodulewithxml\"><customControls:my-control-no-js /></Page>");
     var panel = <stackLayoutModule.StackLayout>p.content;
     var lbl = <Label>panel.getChildAt(0);
 
@@ -562,21 +562,21 @@ export function test_parse_ShouldParseCustomComponentWithXmlNoJS() {
 };
 
 export function test_parse_ShouldParseCustomComponentWithXmlNoJS_WithAttributes() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:my-control-no-js visibility="collapse" /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodulewithxml\"><customControls:my-control-no-js visibility=\"collapse\" /></Page>");
     var panel = <stackLayoutModule.StackLayout>p.content;
 
     TKUnit.assertEqual(panel.visibility, "collapse", "panel.visibility");
 };
 
 export function test_parse_ShouldParseCustomComponentWithXmlNoJS_WithCustomAttributes() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodulewithxml"><customControls:my-control-no-js myProperty="myValue" /></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodulewithxml\"><customControls:my-control-no-js myProperty=\"myValue\" /></Page>");
     var panel = <stackLayoutModule.StackLayout>p.content;
 
     TKUnit.assertEqual(panel["myProperty"], "myValue", "customControl.myProperty");
 };
 
 export function test_parse_ShouldParseCustomComponentWithoutXmlInListViewTemplate() {
-    var p = <Page>builder.parse('<Page xmlns:customControls="xml-declaration/mymodule"><ListView items="{{ items }}" itemLoading="{{ itemLoading }}"><ListView.itemTemplate><customControls:MyControl /></ListView.itemTemplate></ListView></Page>');
+    var p = <Page>builder.parse("<Page xmlns:customControls=\"xml-declaration/mymodule\"><ListView items=\"{{ items }}\" itemLoading=\"{{ itemLoading }}\"><ListView.itemTemplate><customControls:MyControl /></ListView.itemTemplate></ListView></Page>");
 
     function testAction(views: Array<viewModule.View>) {
         let ctrl;
@@ -595,7 +595,7 @@ export function test_parse_ShouldParseCustomComponentWithoutXmlInListViewTemplat
 }
 
 export function test_parse_ShouldParseNestedListViewInListViewTemplate() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd"><ListView items="{{ items }}" itemLoading="{{ itemLoading }}"><ListView.itemTemplate><ListView items="{{ subItems }}" /></ListView.itemTemplate></ListView></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\"><ListView items=\"{{ items }}\" itemLoading=\"{{ itemLoading }}\"><ListView.itemTemplate><ListView items=\"{{ subItems }}\" /></ListView.itemTemplate></ListView></Page>");
 
     function testAction(views: Array<viewModule.View>) {
         let ctrl;
@@ -614,7 +614,7 @@ export function test_parse_ShouldParseNestedListViewInListViewTemplate() {
 }
 
 export function test_parse_ShouldEvaluateEventBindingExpressionInListViewTemplate() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd"><ListView items="{{ items }}" itemLoading="{{ itemLoading }}"><ListView.itemTemplate><SegmentedBar items="{{ $parents[\'ListView\'].segmentedBarItems }}" selectedIndexChanged="{{ $parents[\'ListView\'].changed }}" /></ListView.itemTemplate></ListView></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\"><ListView items=\"{{ items }}\" itemLoading=\"{{ itemLoading }}\"><ListView.itemTemplate><SegmentedBar items=\"{{ $parents['ListView'].segmentedBarItems }}\" selectedIndexChanged=\"{{ $parents['ListView'].changed }}\" /></ListView.itemTemplate></ListView></Page>");
 
     function testAction(views: Array<viewModule.View>) {
         let ctrl: segmentedBar.SegmentedBar = null;
@@ -696,7 +696,7 @@ export function test_parse_NestedRepeaters() {
 }
 
 export function test_parseSpansDirectlyOnLabel() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatedTo="pageNavigated"><StackLayout><Label id="testLabel"><Span text="We are" fontSize="10"/><Span text="Awesome" fontWeight="bold"/></Label></StackLayout></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\" navigatedTo=\"pageNavigated\"><StackLayout><Label id=\"testLabel\"><Span text=\"We are\" fontSize=\"10\"/><Span text=\"Awesome\" fontWeight=\"bold\"/></Label></StackLayout></Page>");
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testLabel = <Label>page.getViewById("testLabel");
@@ -709,7 +709,7 @@ export function test_parseSpansDirectlyOnLabel() {
 }
 
 export function test_parseSpansDirectlyOnButton() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatedTo="pageNavigated"><StackLayout><Button id="testButton"><Span text="We are" fontSize="10"/><Span text="Awesome" fontWeight="bold"/></Button></StackLayout></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\" navigatedTo=\"pageNavigated\"><StackLayout><Button id=\"testButton\"><Span text=\"We are\" fontSize=\"10\"/><Span text=\"Awesome\" fontWeight=\"bold\"/></Button></StackLayout></Page>");
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
@@ -722,7 +722,7 @@ export function test_parseSpansDirectlyOnButton() {
 }
 
 export function test_parseFormattedStringWithoutFormattedText() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatedTo="pageNavigated"><StackLayout><Button id="testButton"><FormattedString><FormattedString.spans><Span text="author"/><Span text=" num_comments"/></FormattedString.spans></FormattedString></Button></StackLayout></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\" navigatedTo=\"pageNavigated\"><StackLayout><Button id=\"testButton\"><FormattedString><FormattedString.spans><Span text=\"author\"/><Span text=\" num_comments\"/></FormattedString.spans></FormattedString></Button></StackLayout></Page>");
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
@@ -735,7 +735,7 @@ export function test_parseFormattedStringWithoutFormattedText() {
 }
 
 export function test_parseFormattedStringFullSyntax() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatedTo="pageNavigated"><StackLayout><Button id="testButton"><Button.formattedText><FormattedString><FormattedString.spans><Span text="author"/><Span text=" num_comments"/></FormattedString.spans></FormattedString></Button.formattedText></Button></StackLayout></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\" navigatedTo=\"pageNavigated\"><StackLayout><Button id=\"testButton\"><Button.formattedText><FormattedString><FormattedString.spans><Span text=\"author\"/><Span text=\" num_comments\"/></FormattedString.spans></FormattedString></Button.formattedText></Button></StackLayout></Page>");
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
@@ -748,7 +748,7 @@ export function test_parseFormattedStringFullSyntax() {
 }
 
 export function test_parseSpansDirectlyToFormattedString() {
-    var p = <Page>builder.parse('<Page xmlns="http://schemas.nativescript.org/tns.xsd" navigatedTo="pageNavigated"><StackLayout><Button id="testButton"><FormattedString><Span text="author"/><Span text=" num_comments"/></FormattedString></Button></StackLayout></Page>');
+    var p = <Page>builder.parse("<Page xmlns=\"http://schemas.nativescript.org/tns.xsd\" navigatedTo=\"pageNavigated\"><StackLayout><Button id=\"testButton\"><FormattedString><Span text=\"author\"/><Span text=\" num_comments\"/></FormattedString></Button></StackLayout></Page>");
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
@@ -761,14 +761,14 @@ export function test_parseSpansDirectlyToFormattedString() {
 }
 
 export function test_searchbar_donotcrash_whentext_isempty() {
-    var p = <Page>builder.parse('<Page><SearchBar text="" hint="Search" /></Page>');
+    var p = <Page>builder.parse("<Page><SearchBar text=\"\" hint=\"Search\" /></Page>");
     var sb = <searchBarModule.SearchBar>p.content;
 
     TKUnit.assertEqual(sb.text, "");
 };
 
 export function test_searchbar_donotcrash_whentext_isspace() {
-    var p = <Page>builder.parse('<Page><SearchBar text=" " hint="Search" /></Page>');
+    var p = <Page>builder.parse("<Page><SearchBar text=\" \" hint=\"Search\" /></Page>");
     var sb = <searchBarModule.SearchBar>p.content;
 
     TKUnit.assertEqual(sb.text, " ");
@@ -872,22 +872,22 @@ export function test_EventInCodelessFragment() {
 
 export function test_tabview_selectedindex_will_work_from_xml() {
     var p = <Page>builder.parse(
-        '<Page>' +
-        '<TabView selectedIndex= "1">' +
-        '<TabView.items>' +
-        '<TabViewItem title="First">' +
-        '<TabViewItem.view>' +
-        '<Label text="First View" />' +
-        '</TabViewItem.view>' +
-        '</TabViewItem>' +
-        '<TabViewItem title= "Second">' +
-        '<TabViewItem.view>' +
-        '<Label text="Second View" />' +
-        '</TabViewItem.view>' +
-        '</TabViewItem>' +
-        '</TabView.items>' +
-        '</TabView>' +
-        '</Page>');
+        "<Page>" +
+        "<TabView selectedIndex= \"1\">" +
+        "<TabView.items>" +
+        "<TabViewItem title=\"First\">" +
+        "<TabViewItem.view>" +
+        "<Label text=\"First View\" />" +
+        "</TabViewItem.view>" +
+        "</TabViewItem>" +
+        "<TabViewItem title= \"Second\">" +
+        "<TabViewItem.view>" +
+        "<Label text=\"Second View\" />" +
+        "</TabViewItem.view>" +
+        "</TabViewItem>" +
+        "</TabView.items>" +
+        "</TabView>" +
+        "</Page>");
 
     function testAction(views: Array<viewModule.View>) {
         let tab: TabView = <TabView>p.content;
@@ -920,13 +920,13 @@ export function test_hasSourceCodeLocations() {
 }
 
 export function test_Setting_digits_for_text_Label_is_not_converted_to_number() {
-    var p = <Page>builder.parse('<Page><Label id="testLabel" text="01234"/></Page>');
+    var p = <Page>builder.parse("<Page><Label id=\"testLabel\" text=\"01234\"/></Page>");
     var testLabel = <Label>p.getViewById("testLabel");
     TKUnit.assertEqual(testLabel.text, "01234");
 }
 
 export function test_Setting_digits_for_text_Button_is_not_converted_to_number() {
-    var p = <Page>builder.parse('<Page><Button id="testButton" text="01234"/></Page>');
+    var p = <Page>builder.parse("<Page><Button id=\"testButton\" text=\"01234\"/></Page>");
     var testButton = <Button>p.getViewById("testButton");
     TKUnit.assertEqual(testButton.text, "01234");
 }
diff --git a/tests/app/xml-parser-tests/xml-parser-tests.ts b/tests/app/xml-parser-tests/xml-parser-tests.ts
index 8c1e5050c8..39016a98e9 100644
--- a/tests/app/xml-parser-tests/xml-parser-tests.ts
+++ b/tests/app/xml-parser-tests/xml-parser-tests.ts
@@ -46,7 +46,7 @@ export var test_XmlParser_EntityReferencesInAttributeValuesAreDecoded = function
     var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
         switch (event.eventType) {
             case xmlModule.ParserEventType.StartElement:
-                data = event.attributes['text'];
+                data = event.attributes["text"];
                 break;
         }
     });
diff --git a/tns-core-modules/application-settings/application-settings-common.ts b/tns-core-modules/application-settings/application-settings-common.ts
index 471665349c..6a28f3ca37 100644
--- a/tns-core-modules/application-settings/application-settings-common.ts
+++ b/tns-core-modules/application-settings/application-settings-common.ts
@@ -1,7 +1,7 @@
-export var checkKey = function(key: string) : void {
+export var checkKey = function (key: string): void {
     if (typeof key !== "string") {
         throw new Error("key: '" + key + "' must be a string");
-    }    
+    }
 }
 
 export var ensureValidValue = function (value: any, valueType: string): void {
diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts
index 5416a18676..a3eae29cd3 100644
--- a/tns-core-modules/application/application.android.ts
+++ b/tns-core-modules/application/application.android.ts
@@ -45,6 +45,8 @@ export class AndroidApplication extends Observable implements AndroidApplication
     public foregroundActivity: android.app.Activity;
     public startActivity: android.app.Activity;
     public packageName: string;
+    // we are using these property to store the callbacks to avoid early GC collection which would trigger MarkReachableObjects
+    private callbacks: any = {};
 
     public get currentContext(): android.content.Context {
         return this.foregroundActivity;
@@ -63,10 +65,11 @@ export class AndroidApplication extends Observable implements AndroidApplication
         this.packageName = nativeApp.getPackageName();
         this.context = nativeApp.getApplicationContext();
 
-        let lifecycleCallbacks = initLifecycleCallbacks();
-        let componentCallbacks = initComponentCallbacks();
-        this.nativeApp.registerActivityLifecycleCallbacks(lifecycleCallbacks);
-        this.nativeApp.registerComponentCallbacks(componentCallbacks);
+        // we store those callbacks and add a function for clearing them later so that the objects will be eligable for GC
+        this.callbacks.lifecycleCallbacks = initLifecycleCallbacks();
+        this.callbacks.componentCallbacks = initComponentCallbacks();
+        this.nativeApp.registerActivityLifecycleCallbacks(this.callbacks.lifecycleCallbacks);
+        this.nativeApp.registerComponentCallbacks(this.callbacks.componentCallbacks);
 
         this._registerPendingReceivers();
     }
@@ -190,7 +193,7 @@ export function getNativeApplication(): android.app.Application {
 
         // the getInstance might return null if com.tns.NativeScriptApplication exists but is  not the starting app type
         if (!nativeApp) {
-            // TODO: Should we handle the case when a custom application type is provided and the user has not explicitly initialized the application module? 
+            // TODO: Should we handle the case when a custom application type is provided and the user has not explicitly initialized the application module?
             const clazz = java.lang.Class.forName("android.app.ActivityThread");
             if (clazz) {
                 const method = clazz.getMethod("currentApplication", null);
@@ -235,14 +238,15 @@ function initLifecycleCallbacks() {
 
     const subscribeForGlobalLayout = profile("subscribeForGlobalLayout", function (activity: android.app.Activity) {
         const rootView = activity.getWindow().getDecorView().getRootView();
-        let onGlobalLayoutListener = new android.view.ViewTreeObserver.OnGlobalLayoutListener({
+        // store the listener not to trigger GC collection before collecting the method
+        this.onGlobalLayoutListener = new android.view.ViewTreeObserver.OnGlobalLayoutListener({
             onGlobalLayout() {
                 notify({ eventName: displayedEvent, object: androidApp, activity });
                 let viewTreeObserver = rootView.getViewTreeObserver();
-                viewTreeObserver.removeOnGlobalLayoutListener(onGlobalLayoutListener);
+                viewTreeObserver.removeOnGlobalLayoutListener(this.onGlobalLayoutListener);
             }
         });
-        rootView.getViewTreeObserver().addOnGlobalLayoutListener(onGlobalLayoutListener);
+        rootView.getViewTreeObserver().addOnGlobalLayoutListener(this.onGlobalLayoutListener);
     });
 
     const lifecycleCallbacks = new android.app.Application.ActivityLifecycleCallbacks({
diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
index c28d76a4f5..a84397b4df 100644
--- a/tns-core-modules/application/application.ios.ts
+++ b/tns-core-modules/application/application.ios.ts
@@ -18,7 +18,6 @@ export * from "./application-common";
 import { createViewFromEntry } from "../ui/builder";
 import { ios as iosView, View } from "../ui/core/view";
 import { Frame, NavigationEntry } from "../ui/frame";
-import { ios } from "../ui/utils";
 import * as utils from "../utils/utils";
 import { profile, level as profilingLevel, Level } from "../profiling";
 
diff --git a/tns-core-modules/connectivity/connectivity.android.ts b/tns-core-modules/connectivity/connectivity.android.ts
index f2a9740e46..c7833224e8 100644
--- a/tns-core-modules/connectivity/connectivity.android.ts
+++ b/tns-core-modules/connectivity/connectivity.android.ts
@@ -1,13 +1,15 @@
-import { getNativeApplication, android as androidApp} from "../application";
+import { getNativeApplication, android as androidApp } from "../application";
 
 export enum connectionType {
     none = 0,
     wifi = 1,
     mobile = 2,
+    ethernet = 3
 }
 
 const wifi = "wifi";
 const mobile = "mobile";
+const ethernet = "ethernet";
 
 // Get Connection Type
 function getConnectivityManager(): android.net.ConnectivityManager {
@@ -30,13 +32,17 @@ export function getConnectionType(): number {
     }
 
     let type = activeNetworkInfo.getTypeName().toLowerCase();
-    if (type.indexOf(wifi) !== -1){
+    if (type.indexOf(wifi) !== -1) {
         return connectionType.wifi;
     }
     
-    if (type.indexOf(mobile) !== -1){
+    if (type.indexOf(mobile) !== -1) {
         return connectionType.mobile;
     }
+
+    if (type.indexOf(ethernet) !== -1) {
+        return connectionType.ethernet;
+    }
         
     return connectionType.none;
 }
diff --git a/tns-core-modules/connectivity/connectivity.d.ts b/tns-core-modules/connectivity/connectivity.d.ts
index d827286060..a4c09c0925 100644
--- a/tns-core-modules/connectivity/connectivity.d.ts
+++ b/tns-core-modules/connectivity/connectivity.d.ts
@@ -27,7 +27,12 @@ export enum connectionType {
     /**
      * Denotes a mobile connection, i.e. cellular network or WAN.
      */
-    mobile = 2
+    mobile = 2,
+
+    /**
+     * Denotes an ethernet connection
+     */
+    ethernet = 3
 }
 
 /**
diff --git a/tns-core-modules/css/parser.ts b/tns-core-modules/css/parser.ts
index c0988b8cc1..dda440c9eb 100644
--- a/tns-core-modules/css/parser.ts
+++ b/tns-core-modules/css/parser.ts
@@ -1,7 +1,5 @@
 export type Parsed<V> = { start: number, end: number, value: V };
 
-import * as reworkcss from "./reworkcss";
-
 // Values
 export type ARGB = number;
 export type URL = string;
@@ -342,7 +340,7 @@ export function parseAngle(value: string, start: number = 0): Parsed<Angle> {
     const angleResult = parseUnit(value, start);
     if (angleResult) {
         const { start, end, value } = angleResult;
-        return (angleUnitsToRadMap[value.unit] || ((_,__,___) => null))(start, end, value.value);
+        return (angleUnitsToRadMap[value.unit] || ((_, __, ___) => null))(start, end, value.value);
     }
     return null;
 }
@@ -461,27 +459,27 @@ export function parseBackgroundPosition(text: string, start: number = 0, keyword
 
 const directionRegEx = /\s*to\s*(left|right|top|bottom)\s*(left|right|top|bottom)?\s*/gy;
 const sideDirections = {
-    top: Math.PI * 0/2,
-    right: Math.PI * 1/2,
-    bottom: Math.PI * 2/2,
-    left: Math.PI * 3/2
+    top: Math.PI * 0 / 2,
+    right: Math.PI * 1 / 2,
+    bottom: Math.PI * 2 / 2,
+    left: Math.PI * 3 / 2
 }
 const cornerDirections = {
     top: {
-        right: Math.PI * 1/4,
-        left: Math.PI * 7/4
+        right: Math.PI * 1 / 4,
+        left: Math.PI * 7 / 4
     },
     right: {
-        top: Math.PI * 1/4,
-        bottom: Math.PI * 3/4
+        top: Math.PI * 1 / 4,
+        bottom: Math.PI * 3 / 4
     },
     bottom: {
-        right: Math.PI * 3/4,
-        left: Math.PI * 5/4
+        right: Math.PI * 3 / 4,
+        left: Math.PI * 5 / 4
     },
     left: {
-        top: Math.PI * 7/4,
-        bottom: Math.PI * 5/4
+        top: Math.PI * 7 / 4,
+        bottom: Math.PI * 5 / 4
     }
 }
 function parseDirection(text: string, start: number = 0): Parsed<Angle> {
@@ -519,7 +517,7 @@ function parseArgumentsList<T>(text: string, start: number, argument: (value: st
         return { start, end, value };
     }
 
-    for(var index = 0; true; index++) {
+    for (var index = 0; true; index++) {
         const arg = argument(text, end, index);
         if (!arg) {
             return null;
@@ -608,7 +606,7 @@ function parseSlash(text: string, start: number): Parsed<"/"> {
 export function parseBackground(text: string, start: number = 0): Parsed<Background> {
     const value: any = {};
     let end = start;
-    while(end < text.length) {
+    while (end < text.length) {
         const keyword = parseKeyword(text, end);
         const color = parseColor(text, end, keyword);
         if (color) {
@@ -751,7 +749,7 @@ export function parseSimpleSelectorSequence(text: string, start: number): Parsed
     }
     let end = simpleSelector.end;
     let value = <SimpleSelectorSequence>[];
-    while(simpleSelector) {
+    while (simpleSelector) {
         value.push(simpleSelector.value);
         end = simpleSelector.end;
         simpleSelector = parseSimpleSelector(text, end);
@@ -804,7 +802,7 @@ export function parseSelector(text: string, start: number = 0): Parsed<Selector>
             end = combinator.end;
         }
         expectSimpleSelector = combinator && combinator.value !== " "; // Simple selector must follow non trailing white space combinator
-    } while(combinator);
+    } while (combinator);
     return { start, end, value };
 }
 
@@ -833,7 +831,7 @@ const doubleQuoteStringRegEx = /"((?:[^\n\r\f\"]|\\(?:\$|\n|[0-9a-fA-F]{1,6}\s?)
 const commentRegEx = /(\/\*(?:[^\*]|\*[^\/])*\*\/)/gym;
 const numberRegEx = /[\+\-]?(?:\d+\.\d+|\d+|\.\d+)(?:[eE][\+\-]?\d+)?/gym;
 const nameRegEx = /-?(?:(?:[a-zA-Z_]|[^\x00-\x7F]|\\(?:\$|\n|[0-9a-fA-F]{1,6}\s?))(?:[a-zA-Z_0-9\-]*|\\(?:\$|\n|[0-9a-fA-F]{1,6}\s?))*)/gym;
-const nonQuoteURLRegEx = /(:?[^\)\s\t\n\r\f\'\"\(]|\\(?:\$|\n|[0-9a-fA-F]{1,6}\s?))*/gym; // TODO: non-printable code points omitted
+// const nonQuoteURLRegEx = /(:?[^\)\s\t\n\r\f\'\"\(]|\\(?:\$|\n|[0-9a-fA-F]{1,6}\s?))*/gym; // TODO: non-printable code points omitted
 
 type InputToken = "(" | ")" | "{" | "}" | "[" | "]" | ":" | ";" | "," | " " | "^=" | "|=" | "$=" | "*=" | "~=" | "<!--" | "-->" | undefined /* <EOF-token> */ | InputTokenObject | FunctionInputToken | FunctionToken | SimpleBlock | AtKeywordToken;
 
@@ -942,7 +940,7 @@ export class CSS3Parser {
         do {
             inputToken = this.consumeAToken();
             tokens.push(inputToken);
-        } while(inputToken);
+        } while (inputToken);
         return tokens;
     }
 
@@ -957,7 +955,7 @@ export class CSS3Parser {
             return result;
         }
         const char = this.text[this.nextInputCodePointIndex];
-        switch(char) {
+        switch (char) {
             case "\"": return this.consumeAStringToken();
             case "'": return this.consumeAStringToken();
             case "(":
@@ -996,7 +994,7 @@ export class CSS3Parser {
             case "U":
                 if (this.text[this.nextInputCodePointIndex + 1] === "+") {
                     const thirdChar = this.text[this.nextInputCodePointIndex + 2];
-                    if (thirdChar >= '0' && thirdChar <= '9' || thirdChar === "?") {
+                    if (thirdChar >= "0" && thirdChar <= "9" || thirdChar === "?") {
                         // TODO: Handle unicode stuff such as U+002B
                         throw new Error("Unicode tokens not supported!");
                     }
@@ -1025,7 +1023,7 @@ export class CSS3Parser {
 
     private consumeAWhitespace(): InputToken {
         whitespaceRegEx.lastIndex = this.nextInputCodePointIndex;
-        const result = whitespaceRegEx.exec(this.text);
+        whitespaceRegEx.exec(this.text);
         this.nextInputCodePointIndex = whitespaceRegEx.lastIndex;
         return " ";
     }
@@ -1164,9 +1162,9 @@ export class CSS3Parser {
             }
         }
 
-        while(this.nextInputCodePointIndex < this.text.length) {
+        while (this.nextInputCodePointIndex < this.text.length) {
             const char = this.text[this.nextInputCodePointIndex++];
-            switch(char) {
+            switch (char) {
                 case ")": return urlToken;
                 case " ":
                 case "\t":
@@ -1258,8 +1256,8 @@ export class CSS3Parser {
     public consumeAListOfRules(): Rule[] {
         const rules: Rule[] = [];
         let inputToken: InputToken;
-        while(inputToken = this.consumeAToken()) {
-            switch(inputToken) {
+        while (inputToken = this.consumeAToken()) {
+            switch (inputToken) {
                 case " ": continue;
                 case "<!--":
                 case "-->":
@@ -1302,7 +1300,7 @@ export class CSS3Parser {
             prelude: [],
             block: undefined
         }
-        while(inputToken = this.consumeAToken()) {
+        while (inputToken = this.consumeAToken()) {
             if (inputToken === ";") {
                 return atRule;
             } else if (inputToken === "{") {
@@ -1332,7 +1330,7 @@ export class CSS3Parser {
             block: undefined
         };
         let inputToken: InputToken;
-        while(inputToken = this.consumeAToken()) {
+        while (inputToken = this.consumeAToken()) {
             if (inputToken === "{") {
                 let block = this.consumeASimpleBlock(inputToken);
                 qualifiedRule.block = block;
@@ -1361,7 +1359,7 @@ export class CSS3Parser {
     private consumeAComponentValue(): InputToken {
         // const inputToken = this.consumeAToken();
         const inputToken = this.consumeAToken();
-        switch(inputToken) {
+        switch (inputToken) {
             case "{":
             case "[":
             case "(":
@@ -1392,7 +1390,7 @@ export class CSS3Parser {
             values: []
         };
         let nextInputToken;
-        while(nextInputToken = this.text[this.nextInputCodePointIndex]) {
+        while (nextInputToken = this.text[this.nextInputCodePointIndex]) {
             if (nextInputToken === endianToken) {
                 this.nextInputCodePointIndex++;
                 const end = this.nextInputCodePointIndex;
@@ -1421,7 +1419,7 @@ export class CSS3Parser {
                 return funcToken;
             }
             const nextInputToken = this.text[this.nextInputCodePointIndex];
-            switch(nextInputToken) {
+            switch (nextInputToken) {
                 case ")":
                     this.nextInputCodePointIndex++;
                     const end = this.nextInputCodePointIndex;
@@ -1434,7 +1432,7 @@ export class CSS3Parser {
                     }
                     // TODO: Else we won't advance
             }
-        } while(true);
+        } while (true);
     }
 }
 
diff --git a/tns-core-modules/data/observable/observable.ts b/tns-core-modules/data/observable/observable.ts
index 715b30f275..89b9340f81 100644
--- a/tns-core-modules/data/observable/observable.ts
+++ b/tns-core-modules/data/observable/observable.ts
@@ -229,7 +229,7 @@ function addPropertiesFromObject(observable: ObservableFromObject, source: any,
         if (recursive
             && !Array.isArray(value)
             && value
-            && typeof value === 'object'
+            && typeof value === "object"
             && !(value instanceof Observable)) {
             value = fromObjectRecursive(value);
         }
diff --git a/tns-core-modules/debugger/InspectorBackendCommands.ios.ts b/tns-core-modules/debugger/InspectorBackendCommands.ios.ts
index 65ca065124..13d6d881ab 100644
--- a/tns-core-modules/debugger/InspectorBackendCommands.ios.ts
+++ b/tns-core-modules/debugger/InspectorBackendCommands.ios.ts
@@ -10,53 +10,53 @@ export namespace HeapDomain {
 export type HeapSnapshotData = string
 
 export interface GarbageCollection {
-	// The type of garbage collection.
-	type: any /* full,partial */;
-	startTime: number;
-	endTime: number;
+    // The type of garbage collection.
+    type: any /* full,partial */;
+    startTime: number;
+    endTime: number;
 }
 
 export interface GetPreviewMethodArguments { 
-	// Identifier of the heap object within the snapshot. 
-	heapObjectId: number
+    // Identifier of the heap object within the snapshot. 
+    heapObjectId: number
 }
 export interface GetRemoteObjectMethodArguments { 
-	// Identifier of the heap object within the snapshot. 
-	heapObjectId: number,
-	// Symbolic group name that can be used to release multiple objects. 
-	objectGroup?: string
+    // Identifier of the heap object within the snapshot. 
+    heapObjectId: number,
+    // Symbolic group name that can be used to release multiple objects. 
+    objectGroup?: string
 }
 export interface HeapDomainDispatcher { 
-	// Enables Heap domain events.
-	enable(): void;
-	// Disables Heap domain events.
-	disable(): void;
-	// Trigger a full garbage collection.
-	gc(): void;
-	// Take a heap snapshot.
-	snapshot(): { timestamp: number, snapshotData: HeapSnapshotData };
-	// Start tracking heap changes. This will produce a `trackingStart` event.
-	startTracking(): void;
-	// Stop tracking heap changes. This will produce a `trackingComplete` event.
-	stopTracking(): void;
-	// Returns a preview (string, Debugger.FunctionDetails, or Runtime.ObjectPreview) for a Heap.HeapObjectId.
-	getPreview(params: GetPreviewMethodArguments): { string?: string, functionDetails?: DebuggerDomain.FunctionDetails, preview?: RuntimeDomain.ObjectPreview };
-	// Returns the strongly referenced Runtime.RemoteObject for a Heap.HeapObjectId.
-	getRemoteObject(params: GetRemoteObjectMethodArguments): { result: RuntimeDomain.RemoteObject };
+    // Enables Heap domain events.
+    enable(): void;
+    // Disables Heap domain events.
+    disable(): void;
+    // Trigger a full garbage collection.
+    gc(): void;
+    // Take a heap snapshot.
+    snapshot(): { timestamp: number, snapshotData: HeapSnapshotData };
+    // Start tracking heap changes. This will produce a `trackingStart` event.
+    startTracking(): void;
+    // Stop tracking heap changes. This will produce a `trackingComplete` event.
+    stopTracking(): void;
+    // Returns a preview (string, Debugger.FunctionDetails, or Runtime.ObjectPreview) for a Heap.HeapObjectId.
+    getPreview(params: GetPreviewMethodArguments): { string?: string, functionDetails?: DebuggerDomain.FunctionDetails, preview?: RuntimeDomain.ObjectPreview };
+    // Returns the strongly referenced Runtime.RemoteObject for a Heap.HeapObjectId.
+    getRemoteObject(params: GetRemoteObjectMethodArguments): { result: RuntimeDomain.RemoteObject };
 }
 export class HeapFrontend { 
-	// Information about the garbage collection.
-	garbageCollected(collection: GarbageCollection): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Heap.garbageCollected", "params": { "collection": collection } } )); 
-	}
-	// Tracking started.
-	trackingStart(timestamp: number, snapshotData: HeapSnapshotData): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Heap.trackingStart", "params": { "timestamp": timestamp, "snapshotData": snapshotData } } )); 
-	}
-	// Tracking stopped.
-	trackingComplete(timestamp: number, snapshotData: HeapSnapshotData): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Heap.trackingComplete", "params": { "timestamp": timestamp, "snapshotData": snapshotData } } )); 
-	}
+    // Information about the garbage collection.
+    garbageCollected(collection: GarbageCollection): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Heap.garbageCollected", "params": { "collection": collection } } )); 
+    }
+    // Tracking started.
+    trackingStart(timestamp: number, snapshotData: HeapSnapshotData): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Heap.trackingStart", "params": { "timestamp": timestamp, "snapshotData": snapshotData } } )); 
+    }
+    // Tracking stopped.
+    trackingComplete(timestamp: number, snapshotData: HeapSnapshotData): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Heap.trackingComplete", "params": { "timestamp": timestamp, "snapshotData": snapshotData } } )); 
+    }
 }
 }
 
@@ -73,258 +73,258 @@ export type ScriptId = string
 export type CallFrameId = string
 
 export interface Location {
-	// Script identifier as reported in the <code>Debugger.scriptParsed</code>.
-	scriptId: ScriptId;
-	// Line number in the script.
-	lineNumber: number;
-	// Column number in the script.
-	columnNumber?: number;
+    // Script identifier as reported in the <code>Debugger.scriptParsed</code>.
+    scriptId: ScriptId;
+    // Line number in the script.
+    lineNumber: number;
+    // Column number in the script.
+    columnNumber?: number;
 }
 
 export interface BreakpointAction {
-	// Different kinds of breakpoint actions.
-	type: any /* log,evaluate,sound,probe */;
-	// Data associated with this breakpoint type (e.g. for type "eval" this is the JavaScript string to evalulate).
-	data?: string;
-	// A frontend-assigned identifier for this breakpoint action.
-	id?: BreakpointActionIdentifier;
+    // Different kinds of breakpoint actions.
+    type: any /* log,evaluate,sound,probe */;
+    // Data associated with this breakpoint type (e.g. for type "eval" this is the JavaScript string to evalulate).
+    data?: string;
+    // A frontend-assigned identifier for this breakpoint action.
+    id?: BreakpointActionIdentifier;
 }
 
 export interface BreakpointOptions {
-	// Expression to use as a breakpoint condition. When specified, debugger will only stop on the breakpoint if this expression evaluates to true.
-	condition?: string;
-	// Actions to perform automatically when the breakpoint is triggered.
-	actions?: BreakpointAction[];
-	// Automatically continue after hitting this breakpoint and running actions.
-	autoContinue?: boolean;
-	// Number of times to ignore this breakpoint, before stopping on the breakpoint and running actions.
-	ignoreCount?: number;
+    // Expression to use as a breakpoint condition. When specified, debugger will only stop on the breakpoint if this expression evaluates to true.
+    condition?: string;
+    // Actions to perform automatically when the breakpoint is triggered.
+    actions?: BreakpointAction[];
+    // Automatically continue after hitting this breakpoint and running actions.
+    autoContinue?: boolean;
+    // Number of times to ignore this breakpoint, before stopping on the breakpoint and running actions.
+    ignoreCount?: number;
 }
 
 export interface FunctionDetails {
-	// Location of the function.
-	location: Location;
-	// Name of the function. Not present for anonymous functions.
-	name?: string;
-	// Display name of the function(specified in 'displayName' property on the function object).
-	displayName?: string;
-	// Scope chain for this closure.
-	scopeChain?: Scope[];
+    // Location of the function.
+    location: Location;
+    // Name of the function. Not present for anonymous functions.
+    name?: string;
+    // Display name of the function(specified in 'displayName' property on the function object).
+    displayName?: string;
+    // Scope chain for this closure.
+    scopeChain?: Scope[];
 }
 
 export interface CallFrame {
-	// Call frame identifier. This identifier is only valid while the virtual machine is paused.
-	callFrameId: CallFrameId;
-	// Name of the JavaScript function called on this call frame.
-	functionName: string;
-	// Location in the source code.
-	location: Location;
-	// Scope chain for this call frame.
-	scopeChain: Scope[];
-	// <code>this</code> object for this call frame.
-	this: RuntimeDomain.RemoteObject;
-	// Is the current frame tail deleted from a tail call.
-	isTailDeleted: boolean;
+    // Call frame identifier. This identifier is only valid while the virtual machine is paused.
+    callFrameId: CallFrameId;
+    // Name of the JavaScript function called on this call frame.
+    functionName: string;
+    // Location in the source code.
+    location: Location;
+    // Scope chain for this call frame.
+    scopeChain: Scope[];
+    // <code>this</code> object for this call frame.
+    this: RuntimeDomain.RemoteObject;
+    // Is the current frame tail deleted from a tail call.
+    isTailDeleted: boolean;
 }
 
 export interface Scope {
-	// Object representing the scope. For <code>global</code> and <code>with</code> scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties.
-	object: RuntimeDomain.RemoteObject;
-	// Scope type.
-	type: any /* global,with,closure,catch,functionName,globalLexicalEnvironment,nestedLexical */;
-	// Name associated with the scope.
-	name?: string;
-	// Location if available of the scope definition.
-	location?: Location;
-	// Whether the scope has any variables.
-	empty?: boolean;
+    // Object representing the scope. For <code>global</code> and <code>with</code> scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties.
+    object: RuntimeDomain.RemoteObject;
+    // Scope type.
+    type: any /* global,with,closure,catch,functionName,globalLexicalEnvironment,nestedLexical */;
+    // Name associated with the scope.
+    name?: string;
+    // Location if available of the scope definition.
+    location?: Location;
+    // Whether the scope has any variables.
+    empty?: boolean;
 }
 
 export interface ProbeSample {
-	// Identifier of the probe breakpoint action that created the sample.
-	probeId: BreakpointActionIdentifier;
-	// Unique identifier for this sample.
-	sampleId: number;
-	// A batch identifier which is the same for all samples taken at the same breakpoint hit.
-	batchId: number;
-	// Timestamp of when the sample was taken.
-	timestamp: number;
-	// Contents of the sample.
-	payload: RuntimeDomain.RemoteObject;
+    // Identifier of the probe breakpoint action that created the sample.
+    probeId: BreakpointActionIdentifier;
+    // Unique identifier for this sample.
+    sampleId: number;
+    // A batch identifier which is the same for all samples taken at the same breakpoint hit.
+    batchId: number;
+    // Timestamp of when the sample was taken.
+    timestamp: number;
+    // Contents of the sample.
+    payload: RuntimeDomain.RemoteObject;
 }
 
 export interface AssertPauseReason {
-	// The console.assert message string if provided.
-	message?: string;
+    // The console.assert message string if provided.
+    message?: string;
 }
 
 export interface BreakpointPauseReason {
-	// The identifier of the breakpoint causing the pause.
-	breakpointId: string;
+    // The identifier of the breakpoint causing the pause.
+    breakpointId: string;
 }
 
 export interface CSPViolationPauseReason {
-	// The CSP directive that blocked script execution.
-	directive: string;
+    // The CSP directive that blocked script execution.
+    directive: string;
 }
 
 export interface SetBreakpointsActiveMethodArguments { 
-	// New value for breakpoints active state. 
-	active: boolean
+    // New value for breakpoints active state. 
+    active: boolean
 }
 export interface SetBreakpointByUrlMethodArguments { 
-	// Line number to set breakpoint at. 
-	lineNumber: number,
-	// URL of the resources to set breakpoint on. 
-	url?: string,
-	// Regex pattern for the URLs of the resources to set breakpoints on. Either <code>url</code> or <code>urlRegex</code> must be specified. 
-	urlRegex?: string,
-	// Offset in the line to set breakpoint at. 
-	columnNumber?: number,
-	// Options to apply to this breakpoint to modify its behavior. 
-	options?: BreakpointOptions
+    // Line number to set breakpoint at. 
+    lineNumber: number,
+    // URL of the resources to set breakpoint on. 
+    url?: string,
+    // Regex pattern for the URLs of the resources to set breakpoints on. Either <code>url</code> or <code>urlRegex</code> must be specified. 
+    urlRegex?: string,
+    // Offset in the line to set breakpoint at. 
+    columnNumber?: number,
+    // Options to apply to this breakpoint to modify its behavior. 
+    options?: BreakpointOptions
 }
 export interface SetBreakpointMethodArguments { 
-	// Location to set breakpoint in. 
-	location: Location,
-	// Options to apply to this breakpoint to modify its behavior. 
-	options?: BreakpointOptions
+    // Location to set breakpoint in. 
+    location: Location,
+    // Options to apply to this breakpoint to modify its behavior. 
+    options?: BreakpointOptions
 }
 export interface RemoveBreakpointMethodArguments { 
-	breakpointId: BreakpointId
+    breakpointId: BreakpointId
 }
 export interface ContinueToLocationMethodArguments { 
-	// Location to continue to. 
-	location: Location
+    // Location to continue to. 
+    location: Location
 }
 export interface SearchInContentMethodArguments { 
-	// Id of the script to search in. 
-	scriptId: ScriptId,
-	// String to search for. 
-	query: string,
-	// If true, search is case sensitive. 
-	caseSensitive?: boolean,
-	// If true, treats string parameter as regex. 
-	isRegex?: boolean
+    // Id of the script to search in. 
+    scriptId: ScriptId,
+    // String to search for. 
+    query: string,
+    // If true, search is case sensitive. 
+    caseSensitive?: boolean,
+    // If true, treats string parameter as regex. 
+    isRegex?: boolean
 }
 export interface GetScriptSourceMethodArguments { 
-	// Id of the script to get source for. 
-	scriptId: ScriptId
+    // Id of the script to get source for. 
+    scriptId: ScriptId
 }
 export interface SetScriptSourceMethodArguments { 
-	// Absolute location of the script to set source for. 
-	scriptUrl: string,
-	// Script source. 
-	scriptSource: string
+    // Absolute location of the script to set source for. 
+    scriptUrl: string,
+    // Script source. 
+    scriptSource: string
 }
 export interface GetFunctionDetailsMethodArguments { 
-	// Id of the function to get location for. 
-	functionId: RuntimeDomain.RemoteObjectId
+    // Id of the function to get location for. 
+    functionId: RuntimeDomain.RemoteObjectId
 }
 export interface SetPauseOnExceptionsMethodArguments { 
-	// Pause on exceptions mode. 
-	state: any /* none,uncaught,all */
+    // Pause on exceptions mode. 
+    state: any /* none,uncaught,all */
 }
 export interface SetPauseOnAssertionsMethodArguments { 
-	enabled: boolean
+    enabled: boolean
 }
 export interface EvaluateOnCallFrameMethodArguments { 
-	// Call frame identifier to evaluate on. 
-	callFrameId: CallFrameId,
-	// Expression to evaluate. 
-	expression: string,
-	// String object group name to put result into (allows rapid releasing resulting object handles using <code>releaseObjectGroup</code>). 
-	objectGroup?: string,
-	// Specifies whether command line API should be available to the evaluated expression, defaults to false. 
-	includeCommandLineAPI?: boolean,
-	// Specifies whether evaluation should stop on exceptions and mute console. Overrides setPauseOnException state. 
-	doNotPauseOnExceptionsAndMuteConsole?: boolean,
-	// Whether the result is expected to be a JSON object that should be sent by value. 
-	returnByValue?: boolean,
-	// Whether preview should be generated for the result. 
-	generatePreview?: boolean,
-	// Whether the resulting value should be considered for saving in the $n history. 
-	saveResult?: boolean
+    // Call frame identifier to evaluate on. 
+    callFrameId: CallFrameId,
+    // Expression to evaluate. 
+    expression: string,
+    // String object group name to put result into (allows rapid releasing resulting object handles using <code>releaseObjectGroup</code>). 
+    objectGroup?: string,
+    // Specifies whether command line API should be available to the evaluated expression, defaults to false. 
+    includeCommandLineAPI?: boolean,
+    // Specifies whether evaluation should stop on exceptions and mute console. Overrides setPauseOnException state. 
+    doNotPauseOnExceptionsAndMuteConsole?: boolean,
+    // Whether the result is expected to be a JSON object that should be sent by value. 
+    returnByValue?: boolean,
+    // Whether preview should be generated for the result. 
+    generatePreview?: boolean,
+    // Whether the resulting value should be considered for saving in the $n history. 
+    saveResult?: boolean
 }
 export interface SetOverlayMessageMethodArguments { 
-	// Overlay message to display when paused in debugger. 
-	message?: string
+    // Overlay message to display when paused in debugger. 
+    message?: string
 }
 export interface DebuggerDomainDispatcher { 
-	// Enables debugger for the given page. Clients should not assume that the debugging has been enabled until the result for this command is received.
-	enable(): void;
-	// Disables debugger for given page.
-	disable(): void;
-	// Activates / deactivates all breakpoints on the page.
-	setBreakpointsActive(params: SetBreakpointsActiveMethodArguments): void;
-	// Sets JavaScript breakpoint at given location specified either by URL or URL regex. Once this command is issued, all existing parsed scripts will have breakpoints resolved and returned in <code>locations</code> property. Further matching script parsing will result in subsequent <code>breakpointResolved</code> events issued. This logical breakpoint will survive page reloads.
-	setBreakpointByUrl(params: SetBreakpointByUrlMethodArguments): { breakpointId: BreakpointId, locations: Location[] };
-	// Sets JavaScript breakpoint at a given location.
-	setBreakpoint(params: SetBreakpointMethodArguments): { breakpointId: BreakpointId, actualLocation: Location };
-	// Removes JavaScript breakpoint.
-	removeBreakpoint(params: RemoveBreakpointMethodArguments): void;
-	// Continues execution until specific location is reached.
-	continueToLocation(params: ContinueToLocationMethodArguments): void;
-	// Steps over the statement.
-	stepOver(): void;
-	// Steps into the function call.
-	stepInto(): void;
-	// Steps out of the function call.
-	stepOut(): void;
-	// Stops on the next JavaScript statement.
-	pause(): void;
-	// Resumes JavaScript execution.
-	resume(): void;
-	// Searches for given string in script content.
-	searchInContent(params: SearchInContentMethodArguments): { result: GenericTypesDomain.SearchMatch[] };
-	// Returns source for the script with given id.
-	getScriptSource(params: GetScriptSourceMethodArguments): { scriptSource: string };
-	// Set source for the script with given id.
-	setScriptSource(params: SetScriptSourceMethodArguments): void;
-	// Returns detailed information on given function.
-	getFunctionDetails(params: GetFunctionDetailsMethodArguments): { details: FunctionDetails };
-	// Defines pause on exceptions state. Can be set to stop on all exceptions, uncaught exceptions or no exceptions. Initial pause on exceptions state is <code>none</code>.
-	setPauseOnExceptions(params: SetPauseOnExceptionsMethodArguments): void;
-	// Set pause on assertions state. Assertions are console.assert assertions.
-	setPauseOnAssertions(params: SetPauseOnAssertionsMethodArguments): void;
-	// Evaluates expression on a given call frame.
-	evaluateOnCallFrame(params: EvaluateOnCallFrameMethodArguments): { result: RuntimeDomain.RemoteObject, wasThrown?: boolean, savedResultIndex?: number };
-	// Sets overlay message.
-	setOverlayMessage(params: SetOverlayMessageMethodArguments): void;
+    // Enables debugger for the given page. Clients should not assume that the debugging has been enabled until the result for this command is received.
+    enable(): void;
+    // Disables debugger for given page.
+    disable(): void;
+    // Activates / deactivates all breakpoints on the page.
+    setBreakpointsActive(params: SetBreakpointsActiveMethodArguments): void;
+    // Sets JavaScript breakpoint at given location specified either by URL or URL regex. Once this command is issued, all existing parsed scripts will have breakpoints resolved and returned in <code>locations</code> property. Further matching script parsing will result in subsequent <code>breakpointResolved</code> events issued. This logical breakpoint will survive page reloads.
+    setBreakpointByUrl(params: SetBreakpointByUrlMethodArguments): { breakpointId: BreakpointId, locations: Location[] };
+    // Sets JavaScript breakpoint at a given location.
+    setBreakpoint(params: SetBreakpointMethodArguments): { breakpointId: BreakpointId, actualLocation: Location };
+    // Removes JavaScript breakpoint.
+    removeBreakpoint(params: RemoveBreakpointMethodArguments): void;
+    // Continues execution until specific location is reached.
+    continueToLocation(params: ContinueToLocationMethodArguments): void;
+    // Steps over the statement.
+    stepOver(): void;
+    // Steps into the function call.
+    stepInto(): void;
+    // Steps out of the function call.
+    stepOut(): void;
+    // Stops on the next JavaScript statement.
+    pause(): void;
+    // Resumes JavaScript execution.
+    resume(): void;
+    // Searches for given string in script content.
+    searchInContent(params: SearchInContentMethodArguments): { result: GenericTypesDomain.SearchMatch[] };
+    // Returns source for the script with given id.
+    getScriptSource(params: GetScriptSourceMethodArguments): { scriptSource: string };
+    // Set source for the script with given id.
+    setScriptSource(params: SetScriptSourceMethodArguments): void;
+    // Returns detailed information on given function.
+    getFunctionDetails(params: GetFunctionDetailsMethodArguments): { details: FunctionDetails };
+    // Defines pause on exceptions state. Can be set to stop on all exceptions, uncaught exceptions or no exceptions. Initial pause on exceptions state is <code>none</code>.
+    setPauseOnExceptions(params: SetPauseOnExceptionsMethodArguments): void;
+    // Set pause on assertions state. Assertions are console.assert assertions.
+    setPauseOnAssertions(params: SetPauseOnAssertionsMethodArguments): void;
+    // Evaluates expression on a given call frame.
+    evaluateOnCallFrame(params: EvaluateOnCallFrameMethodArguments): { result: RuntimeDomain.RemoteObject, wasThrown?: boolean, savedResultIndex?: number };
+    // Sets overlay message.
+    setOverlayMessage(params: SetOverlayMessageMethodArguments): void;
 }
 export class DebuggerFrontend { 
-	// Called when global has been cleared and debugger client should reset its state. Happens upon navigation or reload.
-	globalObjectCleared(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.globalObjectCleared", "params": {  } } )); 
-	}
-	// Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
-	scriptParsed(scriptId: ScriptId, url: string, startLine: number, startColumn: number, endLine: number, endColumn: number, isContentScript?: boolean, sourceURL?: string, sourceMapURL?: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.scriptParsed", "params": { "scriptId": scriptId, "url": url, "startLine": startLine, "startColumn": startColumn, "endLine": endLine, "endColumn": endColumn, "isContentScript": isContentScript, "sourceURL": sourceURL, "sourceMapURL": sourceMapURL } } )); 
-	}
-	// Fired when virtual machine fails to parse the script.
-	scriptFailedToParse(url: string, scriptSource: string, startLine: number, errorLine: number, errorMessage: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.scriptFailedToParse", "params": { "url": url, "scriptSource": scriptSource, "startLine": startLine, "errorLine": errorLine, "errorMessage": errorMessage } } )); 
-	}
-	// Fired when breakpoint is resolved to an actual script and location.
-	breakpointResolved(breakpointId: BreakpointId, location: Location): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.breakpointResolved", "params": { "breakpointId": breakpointId, "location": location } } )); 
-	}
-	// Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
-	paused(callFrames: CallFrame[], reason: any /* XHR,DOM,EventListener,exception,assert,CSPViolation,DebuggerStatement,Breakpoint,PauseOnNextStatement,other */, data?: Object): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.paused", "params": { "callFrames": callFrames, "reason": reason, "data": data } } )); 
-	}
-	// Fired when the virtual machine resumed execution.
-	resumed(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.resumed", "params": {  } } )); 
-	}
-	// Fires when a new probe sample is collected.
-	didSampleProbe(sample: ProbeSample): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.didSampleProbe", "params": { "sample": sample } } )); 
-	}
-	// Fired when a "sound" breakpoint action is triggered on a breakpoint.
-	playBreakpointActionSound(breakpointActionId: BreakpointActionIdentifier): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Debugger.playBreakpointActionSound", "params": { "breakpointActionId": breakpointActionId } } )); 
-	}
+    // Called when global has been cleared and debugger client should reset its state. Happens upon navigation or reload.
+    globalObjectCleared(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.globalObjectCleared", "params": {  } } )); 
+    }
+    // Fired when virtual machine parses script. This event is also fired for all known and uncollected scripts upon enabling debugger.
+    scriptParsed(scriptId: ScriptId, url: string, startLine: number, startColumn: number, endLine: number, endColumn: number, isContentScript?: boolean, sourceURL?: string, sourceMapURL?: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.scriptParsed", "params": { "scriptId": scriptId, "url": url, "startLine": startLine, "startColumn": startColumn, "endLine": endLine, "endColumn": endColumn, "isContentScript": isContentScript, "sourceURL": sourceURL, "sourceMapURL": sourceMapURL } } )); 
+    }
+    // Fired when virtual machine fails to parse the script.
+    scriptFailedToParse(url: string, scriptSource: string, startLine: number, errorLine: number, errorMessage: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.scriptFailedToParse", "params": { "url": url, "scriptSource": scriptSource, "startLine": startLine, "errorLine": errorLine, "errorMessage": errorMessage } } )); 
+    }
+    // Fired when breakpoint is resolved to an actual script and location.
+    breakpointResolved(breakpointId: BreakpointId, location: Location): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.breakpointResolved", "params": { "breakpointId": breakpointId, "location": location } } )); 
+    }
+    // Fired when the virtual machine stopped on breakpoint or exception or any other stop criteria.
+    paused(callFrames: CallFrame[], reason: any /* XHR,DOM,EventListener,exception,assert,CSPViolation,DebuggerStatement,Breakpoint,PauseOnNextStatement,other */, data?: Object): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.paused", "params": { "callFrames": callFrames, "reason": reason, "data": data } } )); 
+    }
+    // Fired when the virtual machine resumed execution.
+    resumed(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.resumed", "params": {  } } )); 
+    }
+    // Fires when a new probe sample is collected.
+    didSampleProbe(sample: ProbeSample): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.didSampleProbe", "params": { "sample": sample } } )); 
+    }
+    // Fired when a "sound" breakpoint action is triggered on a breakpoint.
+    playBreakpointActionSound(breakpointActionId: BreakpointActionIdentifier): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Debugger.playBreakpointActionSound", "params": { "breakpointActionId": breakpointActionId } } )); 
+    }
 }
 }
 
@@ -337,323 +337,323 @@ export type RemoteObjectId = string
 export type ExecutionContextId = number
 
 export interface RemoteObject {
-	// Object type.
-	type: any /* object,function,undefined,string,number,boolean,symbol */;
-	// Object subtype hint. Specified for <code>object</code> <code>function</code> (for class) type values only.
-	subtype?: any /* array,null,node,regexp,date,error,map,set,weakmap,weakset,iterator,class,proxy */;
-	// Object class (constructor) name. Specified for <code>object</code> type values only.
-	className?: string;
-	// Remote object value (in case of primitive values or JSON values if it was requested).
-	value?: any;
-	// String representation of the object.
-	description?: string;
-	// Unique object identifier (for non-primitive values).
-	objectId?: RemoteObjectId;
-	// Size of the array/collection. Specified for array/map/set/weakmap/weakset object type values only.
-	size?: number;
-	// Remote object for the class prototype. Specified for class object type values only.
-	classPrototype?: RemoteObject;
-	// Preview containing abbreviated property values. Specified for <code>object</code> type values only.
-	preview?: ObjectPreview;
+    // Object type.
+    type: any /* object,function,undefined,string,number,boolean,symbol */;
+    // Object subtype hint. Specified for <code>object</code> <code>function</code> (for class) type values only.
+    subtype?: any /* array,null,node,regexp,date,error,map,set,weakmap,weakset,iterator,class,proxy */;
+    // Object class (constructor) name. Specified for <code>object</code> type values only.
+    className?: string;
+    // Remote object value (in case of primitive values or JSON values if it was requested).
+    value?: any;
+    // String representation of the object.
+    description?: string;
+    // Unique object identifier (for non-primitive values).
+    objectId?: RemoteObjectId;
+    // Size of the array/collection. Specified for array/map/set/weakmap/weakset object type values only.
+    size?: number;
+    // Remote object for the class prototype. Specified for class object type values only.
+    classPrototype?: RemoteObject;
+    // Preview containing abbreviated property values. Specified for <code>object</code> type values only.
+    preview?: ObjectPreview;
 }
 
 export interface ObjectPreview {
-	// Object type.
-	type: any /* object,function,undefined,string,number,boolean,symbol */;
-	// Object subtype hint. Specified for <code>object</code> type values only.
-	subtype?: any /* array,null,node,regexp,date,error,map,set,weakmap,weakset,iterator,class,proxy */;
-	// String representation of the object.
-	description?: string;
-	// Determines whether preview is lossless (contains all information of the original object).
-	lossless: boolean;
-	// True iff some of the properties of the original did not fit.
-	overflow?: boolean;
-	// List of the properties.
-	properties?: PropertyPreview[];
-	// List of the entries. Specified for <code>map</code> and <code>set</code> subtype values only.
-	entries?: EntryPreview[];
-	// Size of the array/collection. Specified for array/map/set/weakmap/weakset object type values only.
-	size?: number;
+    // Object type.
+    type: any /* object,function,undefined,string,number,boolean,symbol */;
+    // Object subtype hint. Specified for <code>object</code> type values only.
+    subtype?: any /* array,null,node,regexp,date,error,map,set,weakmap,weakset,iterator,class,proxy */;
+    // String representation of the object.
+    description?: string;
+    // Determines whether preview is lossless (contains all information of the original object).
+    lossless: boolean;
+    // True iff some of the properties of the original did not fit.
+    overflow?: boolean;
+    // List of the properties.
+    properties?: PropertyPreview[];
+    // List of the entries. Specified for <code>map</code> and <code>set</code> subtype values only.
+    entries?: EntryPreview[];
+    // Size of the array/collection. Specified for array/map/set/weakmap/weakset object type values only.
+    size?: number;
 }
 
 export interface PropertyPreview {
-	// Property name.
-	name: string;
-	// Object type.
-	type: any /* object,function,undefined,string,number,boolean,symbol,accessor */;
-	// Object subtype hint. Specified for <code>object</code> type values only.
-	subtype?: any /* array,null,node,regexp,date,error,map,set,weakmap,weakset,iterator,class,proxy */;
-	// User-friendly property value string.
-	value?: string;
-	// Nested value preview.
-	valuePreview?: ObjectPreview;
-	// True if this is an internal property.
-	internal?: boolean;
+    // Property name.
+    name: string;
+    // Object type.
+    type: any /* object,function,undefined,string,number,boolean,symbol,accessor */;
+    // Object subtype hint. Specified for <code>object</code> type values only.
+    subtype?: any /* array,null,node,regexp,date,error,map,set,weakmap,weakset,iterator,class,proxy */;
+    // User-friendly property value string.
+    value?: string;
+    // Nested value preview.
+    valuePreview?: ObjectPreview;
+    // True if this is an internal property.
+    internal?: boolean;
 }
 
 export interface EntryPreview {
-	// Entry key. Specified for map-like collection entries.
-	key?: ObjectPreview;
-	// Entry value.
-	value: ObjectPreview;
+    // Entry key. Specified for map-like collection entries.
+    key?: ObjectPreview;
+    // Entry value.
+    value: ObjectPreview;
 }
 
 export interface CollectionEntry {
-	// Entry key of a map-like collection, otherwise not provided.
-	key?: RemoteObject;
-	// Entry value.
-	value: RemoteObject;
+    // Entry key of a map-like collection, otherwise not provided.
+    key?: RemoteObject;
+    // Entry value.
+    value: RemoteObject;
 }
 
 export interface PropertyDescriptor {
-	// Property name or symbol description.
-	name: string;
-	// The value associated with the property.
-	value?: RemoteObject;
-	// True if the value associated with the property may be changed (data descriptors only).
-	writable?: boolean;
-	// A function which serves as a getter for the property, or <code>undefined</code> if there is no getter (accessor descriptors only).
-	get?: RemoteObject;
-	// A function which serves as a setter for the property, or <code>undefined</code> if there is no setter (accessor descriptors only).
-	set?: RemoteObject;
-	// True if the type of this property descriptor may be changed and if the property may be deleted from the corresponding object.
-	configurable: boolean;
-	// True if this property shows up during enumeration of the properties on the corresponding object.
-	enumerable: boolean;
-	// True if the result was thrown during the evaluation.
-	wasThrown?: boolean;
-	// True if the property is owned for the object.
-	isOwn?: boolean;
-	// Property symbol object, if the property is a symbol.
-	symbol?: RemoteObject;
-	// True if the property value came from a native getter.
-	nativeGetter?: boolean;
+    // Property name or symbol description.
+    name: string;
+    // The value associated with the property.
+    value?: RemoteObject;
+    // True if the value associated with the property may be changed (data descriptors only).
+    writable?: boolean;
+    // A function which serves as a getter for the property, or <code>undefined</code> if there is no getter (accessor descriptors only).
+    get?: RemoteObject;
+    // A function which serves as a setter for the property, or <code>undefined</code> if there is no setter (accessor descriptors only).
+    set?: RemoteObject;
+    // True if the type of this property descriptor may be changed and if the property may be deleted from the corresponding object.
+    configurable: boolean;
+    // True if this property shows up during enumeration of the properties on the corresponding object.
+    enumerable: boolean;
+    // True if the result was thrown during the evaluation.
+    wasThrown?: boolean;
+    // True if the property is owned for the object.
+    isOwn?: boolean;
+    // Property symbol object, if the property is a symbol.
+    symbol?: RemoteObject;
+    // True if the property value came from a native getter.
+    nativeGetter?: boolean;
 }
 
 export interface InternalPropertyDescriptor {
-	// Conventional property name.
-	name: string;
-	// The value associated with the property.
-	value?: RemoteObject;
+    // Conventional property name.
+    name: string;
+    // The value associated with the property.
+    value?: RemoteObject;
 }
 
 export interface CallArgument {
-	// Primitive value.
-	value?: any;
-	// Remote object handle.
-	objectId?: RemoteObjectId;
+    // Primitive value.
+    value?: any;
+    // Remote object handle.
+    objectId?: RemoteObjectId;
 }
 
 export interface ExecutionContextDescription {
-	// Unique id of the execution context. It can be used to specify in which execution context script evaluation should be performed.
-	id: ExecutionContextId;
-	// True if this is a context where inpspected web page scripts run. False if it is a content script isolated context.
-	isPageContext: boolean;
-	// Human readable name describing given context.
-	name: string;
-	// Id of the owning frame.
-	frameId: NetworkDomain.FrameId;
+    // Unique id of the execution context. It can be used to specify in which execution context script evaluation should be performed.
+    id: ExecutionContextId;
+    // True if this is a context where inpspected web page scripts run. False if it is a content script isolated context.
+    isPageContext: boolean;
+    // Human readable name describing given context.
+    name: string;
+    // Id of the owning frame.
+    frameId: NetworkDomain.FrameId;
 }
 
 export interface ErrorRange {
-	// Start offset of range (inclusive).
-	startOffset: number;
-	// End offset of range (exclusive).
-	endOffset: number;
+    // Start offset of range (inclusive).
+    startOffset: number;
+    // End offset of range (exclusive).
+    endOffset: number;
 }
 
 export interface StructureDescription {
-	// Array of strings, where the strings represent object properties.
-	fields?: string[];
-	// Array of strings, where the strings represent optional object properties.
-	optionalFields?: string[];
-	// Name of the constructor.
-	constructorName?: string;
-	// Pointer to the StructureRepresentation of the protoype if one exists.
-	prototypeStructure?: StructureDescription;
-	// If true, it indicates that the fields in this StructureDescription may be inaccurate. I.e, there might have been fields that have been deleted before it was profiled or it has fields we haven't profiled.
-	isImprecise?: boolean;
+    // Array of strings, where the strings represent object properties.
+    fields?: string[];
+    // Array of strings, where the strings represent optional object properties.
+    optionalFields?: string[];
+    // Name of the constructor.
+    constructorName?: string;
+    // Pointer to the StructureRepresentation of the protoype if one exists.
+    prototypeStructure?: StructureDescription;
+    // If true, it indicates that the fields in this StructureDescription may be inaccurate. I.e, there might have been fields that have been deleted before it was profiled or it has fields we haven't profiled.
+    isImprecise?: boolean;
 }
 
 export interface TypeSet {
-	// Indicates if this type description has been type Function.
-	isFunction: boolean;
-	// Indicates if this type description has been type Undefined.
-	isUndefined: boolean;
-	// Indicates if this type description has been type Null.
-	isNull: boolean;
-	// Indicates if this type description has been type Boolean.
-	isBoolean: boolean;
-	// Indicates if this type description has been type Integer.
-	isInteger: boolean;
-	// Indicates if this type description has been type Number.
-	isNumber: boolean;
-	// Indicates if this type description has been type String.
-	isString: boolean;
-	// Indicates if this type description has been type Object.
-	isObject: boolean;
-	// Indicates if this type description has been type Symbol.
-	isSymbol: boolean;
+    // Indicates if this type description has been type Function.
+    isFunction: boolean;
+    // Indicates if this type description has been type Undefined.
+    isUndefined: boolean;
+    // Indicates if this type description has been type Null.
+    isNull: boolean;
+    // Indicates if this type description has been type Boolean.
+    isBoolean: boolean;
+    // Indicates if this type description has been type Integer.
+    isInteger: boolean;
+    // Indicates if this type description has been type Number.
+    isNumber: boolean;
+    // Indicates if this type description has been type String.
+    isString: boolean;
+    // Indicates if this type description has been type Object.
+    isObject: boolean;
+    // Indicates if this type description has been type Symbol.
+    isSymbol: boolean;
 }
 
 export interface TypeDescription {
-	// If true, we were able to correlate the offset successfuly with a program location. If false, the offset may be bogus or the offset may be from a CodeBlock that hasn't executed.
-	isValid: boolean;
-	// Least common ancestor of all Constructors if the TypeDescription has seen any structures. This string is the display name of the shared constructor function.
-	leastCommonAncestor?: string;
-	// Set of booleans for determining the aggregate type of this type description.
-	typeSet?: TypeSet;
-	// Array of descriptions for all structures seen for this variable.
-	structures?: StructureDescription[];
-	// If true, this indicates that no more structures are being profiled because some maximum threshold has been reached and profiling has stopped because of memory pressure.
-	isTruncated?: boolean;
+    // If true, we were able to correlate the offset successfuly with a program location. If false, the offset may be bogus or the offset may be from a CodeBlock that hasn't executed.
+    isValid: boolean;
+    // Least common ancestor of all Constructors if the TypeDescription has seen any structures. This string is the display name of the shared constructor function.
+    leastCommonAncestor?: string;
+    // Set of booleans for determining the aggregate type of this type description.
+    typeSet?: TypeSet;
+    // Array of descriptions for all structures seen for this variable.
+    structures?: StructureDescription[];
+    // If true, this indicates that no more structures are being profiled because some maximum threshold has been reached and profiling has stopped because of memory pressure.
+    isTruncated?: boolean;
 }
 
 export interface TypeLocation {
-	// What kind of type information do we want (normal, function return values, 'this' statement).
-	typeInformationDescriptor: number;
-	// sourceID uniquely identifying a script
-	sourceID: string;
-	// character offset for assignment range
-	divot: number;
+    // What kind of type information do we want (normal, function return values, 'this' statement).
+    typeInformationDescriptor: number;
+    // sourceID uniquely identifying a script
+    sourceID: string;
+    // character offset for assignment range
+    divot: number;
 }
 
 export interface BasicBlock {
-	// Start offset of the basic block.
-	startOffset: number;
-	// End offset of the basic block.
-	endOffset: number;
-	// Indicates if the basic block has executed before.
-	hasExecuted: boolean;
-	// Indicates how many times the basic block has executed.
-	executionCount: number;
+    // Start offset of the basic block.
+    startOffset: number;
+    // End offset of the basic block.
+    endOffset: number;
+    // Indicates if the basic block has executed before.
+    hasExecuted: boolean;
+    // Indicates how many times the basic block has executed.
+    executionCount: number;
 }
 
 export const enum SyntaxErrorType { None, Irrecoverable, UnterminatedLiteral, Recoverable }; 
 
 export interface ParseMethodArguments { 
-	// Source code to parse. 
-	source: string
+    // Source code to parse. 
+    source: string
 }
 export interface EvaluateMethodArguments { 
-	// Expression to evaluate. 
-	expression: string,
-	// Symbolic group name that can be used to release multiple objects. 
-	objectGroup?: string,
-	// Determines whether Command Line API should be available during the evaluation. 
-	includeCommandLineAPI?: boolean,
-	// Specifies whether evaluation should stop on exceptions and mute console. Overrides setPauseOnException state. 
-	doNotPauseOnExceptionsAndMuteConsole?: boolean,
-	// Specifies in which isolated context to perform evaluation. Each content script lives in an isolated context and this parameter may be used to specify one of those contexts. If the parameter is omitted or 0 the evaluation will be performed in the context of the inspected page. 
-	contextId?: ExecutionContextId,
-	// Whether the result is expected to be a JSON object that should be sent by value. 
-	returnByValue?: boolean,
-	// Whether preview should be generated for the result. 
-	generatePreview?: boolean,
-	// Whether the resulting value should be considered for saving in the $n history. 
-	saveResult?: boolean
+    // Expression to evaluate. 
+    expression: string,
+    // Symbolic group name that can be used to release multiple objects. 
+    objectGroup?: string,
+    // Determines whether Command Line API should be available during the evaluation. 
+    includeCommandLineAPI?: boolean,
+    // Specifies whether evaluation should stop on exceptions and mute console. Overrides setPauseOnException state. 
+    doNotPauseOnExceptionsAndMuteConsole?: boolean,
+    // Specifies in which isolated context to perform evaluation. Each content script lives in an isolated context and this parameter may be used to specify one of those contexts. If the parameter is omitted or 0 the evaluation will be performed in the context of the inspected page. 
+    contextId?: ExecutionContextId,
+    // Whether the result is expected to be a JSON object that should be sent by value. 
+    returnByValue?: boolean,
+    // Whether preview should be generated for the result. 
+    generatePreview?: boolean,
+    // Whether the resulting value should be considered for saving in the $n history. 
+    saveResult?: boolean
 }
 export interface CallFunctionOnMethodArguments { 
-	// Identifier of the object to call function on. 
-	objectId: RemoteObjectId,
-	// Declaration of the function to call. 
-	functionDeclaration: string,
-	// Call arguments. All call arguments must belong to the same JavaScript world as the target object. 
-	arguments?: CallArgument[],
-	// Specifies whether function call should stop on exceptions and mute console. Overrides setPauseOnException state. 
-	doNotPauseOnExceptionsAndMuteConsole?: boolean,
-	// Whether the result is expected to be a JSON object which should be sent by value. 
-	returnByValue?: boolean,
-	// Whether preview should be generated for the result. 
-	generatePreview?: boolean
+    // Identifier of the object to call function on. 
+    objectId: RemoteObjectId,
+    // Declaration of the function to call. 
+    functionDeclaration: string,
+    // Call arguments. All call arguments must belong to the same JavaScript world as the target object. 
+    arguments?: CallArgument[],
+    // Specifies whether function call should stop on exceptions and mute console. Overrides setPauseOnException state. 
+    doNotPauseOnExceptionsAndMuteConsole?: boolean,
+    // Whether the result is expected to be a JSON object which should be sent by value. 
+    returnByValue?: boolean,
+    // Whether preview should be generated for the result. 
+    generatePreview?: boolean
 }
 export interface GetPropertiesMethodArguments { 
-	// Identifier of the object to return properties for. 
-	objectId: RemoteObjectId,
-	// If true, returns properties belonging only to the object itself, not to its prototype chain. 
-	ownProperties?: boolean,
-	// Whether preview should be generated for property values. 
-	generatePreview?: boolean
+    // Identifier of the object to return properties for. 
+    objectId: RemoteObjectId,
+    // If true, returns properties belonging only to the object itself, not to its prototype chain. 
+    ownProperties?: boolean,
+    // Whether preview should be generated for property values. 
+    generatePreview?: boolean
 }
 export interface GetDisplayablePropertiesMethodArguments { 
-	// Identifier of the object to return properties for. 
-	objectId: RemoteObjectId,
-	// Whether preview should be generated for property values. 
-	generatePreview?: boolean
+    // Identifier of the object to return properties for. 
+    objectId: RemoteObjectId,
+    // Whether preview should be generated for property values. 
+    generatePreview?: boolean
 }
 export interface GetCollectionEntriesMethodArguments { 
-	// Id of the collection to get entries for. 
-	objectId: RemoteObjectId,
-	// Symbolic group name that can be used to release multiple. If not provided, it will be the same objectGroup as the RemoteObject determined from <code>objectId</code>. This is useful for WeakMap to release the collection entries. 
-	objectGroup?: string,
-	// If provided skip to this index before collecting values. Otherwise, 0. 
-	startIndex?: number,
-	// If provided only return <code>numberToFetch</code> values. Otherwise, return values all the way to the end. 
-	numberToFetch?: number
+    // Id of the collection to get entries for. 
+    objectId: RemoteObjectId,
+    // Symbolic group name that can be used to release multiple. If not provided, it will be the same objectGroup as the RemoteObject determined from <code>objectId</code>. This is useful for WeakMap to release the collection entries. 
+    objectGroup?: string,
+    // If provided skip to this index before collecting values. Otherwise, 0. 
+    startIndex?: number,
+    // If provided only return <code>numberToFetch</code> values. Otherwise, return values all the way to the end. 
+    numberToFetch?: number
 }
 export interface SaveResultMethodArguments { 
-	// Id or value of the object to save. 
-	value: CallArgument,
-	// Unique id of the execution context. To specify in which execution context script evaluation should be performed. If not provided, determine from the CallArgument's objectId. 
-	contextId?: ExecutionContextId
+    // Id or value of the object to save. 
+    value: CallArgument,
+    // Unique id of the execution context. To specify in which execution context script evaluation should be performed. If not provided, determine from the CallArgument's objectId. 
+    contextId?: ExecutionContextId
 }
 export interface ReleaseObjectMethodArguments { 
-	// Identifier of the object to release. 
-	objectId: RemoteObjectId
+    // Identifier of the object to release. 
+    objectId: RemoteObjectId
 }
 export interface ReleaseObjectGroupMethodArguments { 
-	// Symbolic object group name. 
-	objectGroup: string
+    // Symbolic object group name. 
+    objectGroup: string
 }
 export interface GetRuntimeTypesForVariablesAtOffsetsMethodArguments { 
-	// An array of type locations we're requesting information for. Results are expected in the same order they're sent in. 
-	locations: TypeLocation[]
+    // An array of type locations we're requesting information for. Results are expected in the same order they're sent in. 
+    locations: TypeLocation[]
 }
 export interface GetBasicBlocksMethodArguments { 
-	// Indicates which sourceID information is requested for. 
-	sourceID: string
+    // Indicates which sourceID information is requested for. 
+    sourceID: string
 }
 export interface RuntimeDomainDispatcher { 
-	// Parses JavaScript source code for errors.
-	parse(params: ParseMethodArguments): { result: SyntaxErrorType, message?: string, range?: ErrorRange };
-	// Evaluates expression on global object.
-	evaluate(params: EvaluateMethodArguments): { result: RemoteObject, wasThrown?: boolean, savedResultIndex?: number };
-	// Calls function with given declaration on the given object. Object group of the result is inherited from the target object.
-	callFunctionOn(params: CallFunctionOnMethodArguments): { result: RemoteObject, wasThrown?: boolean };
-	// Returns properties of a given object. Object group of the result is inherited from the target object.
-	getProperties(params: GetPropertiesMethodArguments): { result: PropertyDescriptor[], internalProperties?: InternalPropertyDescriptor[] };
-	// Returns displayable properties of a given object. Object group of the result is inherited from the target object. Displayable properties are own properties, internal properties, and native getters in the prototype chain (assumed to be bindings and treated like own properties for the frontend).
-	getDisplayableProperties(params: GetDisplayablePropertiesMethodArguments): { properties: PropertyDescriptor[], internalProperties?: InternalPropertyDescriptor[] };
-	// Returns entries of given Map / Set collection.
-	getCollectionEntries(params: GetCollectionEntriesMethodArguments): { entries: CollectionEntry[] };
-	// Assign a saved result index to this value.
-	saveResult(params: SaveResultMethodArguments): { savedResultIndex?: number };
-	// Releases remote object with given id.
-	releaseObject(params: ReleaseObjectMethodArguments): void;
-	// Releases all remote objects that belong to a given group.
-	releaseObjectGroup(params: ReleaseObjectGroupMethodArguments): void;
-	// Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context.
-	enable(): void;
-	// Disables reporting of execution contexts creation.
-	disable(): void;
-	// Returns detailed informtation on given function.
-	getRuntimeTypesForVariablesAtOffsets(params: GetRuntimeTypesForVariablesAtOffsetsMethodArguments): { types: TypeDescription[] };
-	// Enables type profiling on the VM.
-	enableTypeProfiler(): void;
-	// Disables type profiling on the VM.
-	disableTypeProfiler(): void;
-	// Enables control flow profiling on the VM.
-	enableControlFlowProfiler(): void;
-	// Disables control flow profiling on the VM.
-	disableControlFlowProfiler(): void;
-	// Returns a list of basic blocks for the given sourceID with information about their text ranges and whether or not they have executed.
-	getBasicBlocks(params: GetBasicBlocksMethodArguments): { basicBlocks: BasicBlock[] };
+    // Parses JavaScript source code for errors.
+    parse(params: ParseMethodArguments): { result: SyntaxErrorType, message?: string, range?: ErrorRange };
+    // Evaluates expression on global object.
+    evaluate(params: EvaluateMethodArguments): { result: RemoteObject, wasThrown?: boolean, savedResultIndex?: number };
+    // Calls function with given declaration on the given object. Object group of the result is inherited from the target object.
+    callFunctionOn(params: CallFunctionOnMethodArguments): { result: RemoteObject, wasThrown?: boolean };
+    // Returns properties of a given object. Object group of the result is inherited from the target object.
+    getProperties(params: GetPropertiesMethodArguments): { result: PropertyDescriptor[], internalProperties?: InternalPropertyDescriptor[] };
+    // Returns displayable properties of a given object. Object group of the result is inherited from the target object. Displayable properties are own properties, internal properties, and native getters in the prototype chain (assumed to be bindings and treated like own properties for the frontend).
+    getDisplayableProperties(params: GetDisplayablePropertiesMethodArguments): { properties: PropertyDescriptor[], internalProperties?: InternalPropertyDescriptor[] };
+    // Returns entries of given Map / Set collection.
+    getCollectionEntries(params: GetCollectionEntriesMethodArguments): { entries: CollectionEntry[] };
+    // Assign a saved result index to this value.
+    saveResult(params: SaveResultMethodArguments): { savedResultIndex?: number };
+    // Releases remote object with given id.
+    releaseObject(params: ReleaseObjectMethodArguments): void;
+    // Releases all remote objects that belong to a given group.
+    releaseObjectGroup(params: ReleaseObjectGroupMethodArguments): void;
+    // Enables reporting of execution contexts creation by means of <code>executionContextCreated</code> event. When the reporting gets enabled the event will be sent immediately for each existing execution context.
+    enable(): void;
+    // Disables reporting of execution contexts creation.
+    disable(): void;
+    // Returns detailed informtation on given function.
+    getRuntimeTypesForVariablesAtOffsets(params: GetRuntimeTypesForVariablesAtOffsetsMethodArguments): { types: TypeDescription[] };
+    // Enables type profiling on the VM.
+    enableTypeProfiler(): void;
+    // Disables type profiling on the VM.
+    disableTypeProfiler(): void;
+    // Enables control flow profiling on the VM.
+    enableControlFlowProfiler(): void;
+    // Disables control flow profiling on the VM.
+    disableControlFlowProfiler(): void;
+    // Returns a list of basic blocks for the given sourceID with information about their text ranges and whether or not they have executed.
+    getBasicBlocks(params: GetBasicBlocksMethodArguments): { basicBlocks: BasicBlock[] };
 }
 export class RuntimeFrontend { 
-	// Issued when new execution context is created.
-	executionContextCreated(context: ExecutionContextDescription): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Runtime.executionContextCreated", "params": { "context": context } } )); 
-	}
+    // Issued when new execution context is created.
+    executionContextCreated(context: ExecutionContextDescription): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Runtime.executionContextCreated", "params": { "context": context } } )); 
+    }
 }
 }
 
@@ -662,80 +662,80 @@ export class RuntimeFrontend {
 export namespace ConsoleDomain {
 
 export interface ConsoleMessage {
-	// Message source.
-	source: any /* xml,javascript,network,console-api,storage,appcache,rendering,css,security,content-blocker,other */;
-	// Message severity.
-	level: any /* log,info,warning,error,debug */;
-	// Message text.
-	text: string;
-	// Console message type.
-	type?: any /* log,dir,dirxml,table,trace,clear,startGroup,startGroupCollapsed,endGroup,assert,timing,profile,profileEnd */;
-	// URL of the message origin.
-	url?: string;
-	// Line number in the resource that generated this message.
-	line?: number;
-	// Column number on the line in the resource that generated this message.
-	column?: number;
-	// Repeat count for repeated messages.
-	repeatCount?: number;
-	// Message parameters in case of the formatted message.
-	parameters?: RuntimeDomain.RemoteObject[];
-	// JavaScript stack trace for assertions and error messages.
-	stackTrace?: CallFrame[];
-	// Identifier of the network request associated with this message.
-	networkRequestId?: NetworkDomain.RequestId;
+    // Message source.
+    source: any /* xml,javascript,network,console-api,storage,appcache,rendering,css,security,content-blocker,other */;
+    // Message severity.
+    level: any /* log,info,warning,error,debug */;
+    // Message text.
+    text: string;
+    // Console message type.
+    type?: any /* log,dir,dirxml,table,trace,clear,startGroup,startGroupCollapsed,endGroup,assert,timing,profile,profileEnd */;
+    // URL of the message origin.
+    url?: string;
+    // Line number in the resource that generated this message.
+    line?: number;
+    // Column number on the line in the resource that generated this message.
+    column?: number;
+    // Repeat count for repeated messages.
+    repeatCount?: number;
+    // Message parameters in case of the formatted message.
+    parameters?: RuntimeDomain.RemoteObject[];
+    // JavaScript stack trace for assertions and error messages.
+    stackTrace?: CallFrame[];
+    // Identifier of the network request associated with this message.
+    networkRequestId?: NetworkDomain.RequestId;
 }
 
 export interface CallFrame {
-	// JavaScript function name.
-	functionName: string;
-	// JavaScript script name or url.
-	url: string;
-	// Script identifier.
-	scriptId: DebuggerDomain.ScriptId;
-	// JavaScript script line number.
-	lineNumber: number;
-	// JavaScript script column number.
-	columnNumber: number;
+    // JavaScript function name.
+    functionName: string;
+    // JavaScript script name or url.
+    url: string;
+    // Script identifier.
+    scriptId: DebuggerDomain.ScriptId;
+    // JavaScript script line number.
+    lineNumber: number;
+    // JavaScript script column number.
+    columnNumber: number;
 }
 
 export interface SetMonitoringXHREnabledMethodArguments { 
-	// Monitoring enabled state. 
-	enabled: boolean
+    // Monitoring enabled state. 
+    enabled: boolean
 }
 export interface AddInspectedNodeMethodArguments { 
-	// DOM node id to be accessible by means of $0 command line API. 
-	nodeId: DOMDomain.NodeId
+    // DOM node id to be accessible by means of $0 command line API. 
+    nodeId: DOMDomain.NodeId
 }
 export interface ConsoleDomainDispatcher { 
-	// Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification.
-	enable(): void;
-	// Disables console domain, prevents further console messages from being reported to the client.
-	disable(): void;
-	// Clears console messages collected in the browser.
-	clearMessages(): void;
-	// Toggles monitoring of XMLHttpRequest. If <code>true</code>, console will receive messages upon each XHR issued.
-	setMonitoringXHREnabled(params: SetMonitoringXHREnabledMethodArguments): void;
-	// Enables console to refer to the node with given id via $0 (see Command Line API for more details).
-	addInspectedNode(params: AddInspectedNodeMethodArguments): void;
+    // Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification.
+    enable(): void;
+    // Disables console domain, prevents further console messages from being reported to the client.
+    disable(): void;
+    // Clears console messages collected in the browser.
+    clearMessages(): void;
+    // Toggles monitoring of XMLHttpRequest. If <code>true</code>, console will receive messages upon each XHR issued.
+    setMonitoringXHREnabled(params: SetMonitoringXHREnabledMethodArguments): void;
+    // Enables console to refer to the node with given id via $0 (see Command Line API for more details).
+    addInspectedNode(params: AddInspectedNodeMethodArguments): void;
 }
 export class ConsoleFrontend { 
-	// Issued when new console message is added.
-	messageAdded(message: ConsoleMessage): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Console.messageAdded", "params": { "message": message } } )); 
-	}
-	// Issued when subsequent message(s) are equal to the previous one(s).
-	messageRepeatCountUpdated(count: number): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Console.messageRepeatCountUpdated", "params": { "count": count } } )); 
-	}
-	// Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation.
-	messagesCleared(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Console.messagesCleared", "params": {  } } )); 
-	}
-	// Issued from console.takeHeapSnapshot.
-	heapSnapshot(timestamp: number, snapshotData: HeapDomain.HeapSnapshotData, title?: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Console.heapSnapshot", "params": { "timestamp": timestamp, "snapshotData": snapshotData, "title": title } } )); 
-	}
+    // Issued when new console message is added.
+    messageAdded(message: ConsoleMessage): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Console.messageAdded", "params": { "message": message } } )); 
+    }
+    // Issued when subsequent message(s) are equal to the previous one(s).
+    messageRepeatCountUpdated(count: number): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Console.messageRepeatCountUpdated", "params": { "count": count } } )); 
+    }
+    // Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation.
+    messagesCleared(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Console.messagesCleared", "params": {  } } )); 
+    }
+    // Issued from console.takeHeapSnapshot.
+    heapSnapshot(timestamp: number, snapshotData: HeapDomain.HeapSnapshotData, title?: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Console.heapSnapshot", "params": { "timestamp": timestamp, "snapshotData": snapshotData, "title": title } } )); 
+    }
 }
 }
 
@@ -744,10 +744,10 @@ export class ConsoleFrontend {
 export namespace GenericTypesDomain {
 
 export interface SearchMatch {
-	// Line number in resource content.
-	lineNumber: number;
-	// Line with match content.
-	lineContent: string;
+    // Line number in resource content.
+    lineNumber: number;
+    // Line with match content.
+    lineContent: string;
 }
 
 }
@@ -759,76 +759,76 @@ export namespace PageDomain {
 export type ScriptIdentifier = string
 
 export interface Frame {
-	// Frame unique identifier.
-	id: string;
-	// Parent frame identifier.
-	parentId?: string;
-	// Identifier of the loader associated with this frame.
-	loaderId: NetworkDomain.LoaderId;
-	// Frame's name as specified in the tag.
-	name?: string;
-	// Frame document's URL.
-	url: string;
-	// Frame document's security origin.
-	securityOrigin: string;
-	// Frame document's mimeType as determined by the browser.
-	mimeType: string;
+    // Frame unique identifier.
+    id: string;
+    // Parent frame identifier.
+    parentId?: string;
+    // Identifier of the loader associated with this frame.
+    loaderId: NetworkDomain.LoaderId;
+    // Frame's name as specified in the tag.
+    name?: string;
+    // Frame document's URL.
+    url: string;
+    // Frame document's security origin.
+    securityOrigin: string;
+    // Frame document's mimeType as determined by the browser.
+    mimeType: string;
 }
 
 export interface FrameResource {
-	// Resource URL.
-	url: string;
-	// Type of this resource.
-	type: ResourceType;
-	// Resource mimeType as determined by the browser.
-	mimeType: string;
-	// True if the resource failed to load.
-	failed?: boolean;
-	// True if the resource was canceled during loading.
-	canceled?: boolean;
-	// URL of source map associated with this resource (if any).
-	sourceMapURL?: string;
+    // Resource URL.
+    url: string;
+    // Type of this resource.
+    type: ResourceType;
+    // Resource mimeType as determined by the browser.
+    mimeType: string;
+    // True if the resource failed to load.
+    failed?: boolean;
+    // True if the resource was canceled during loading.
+    canceled?: boolean;
+    // URL of source map associated with this resource (if any).
+    sourceMapURL?: string;
 }
 
 export interface FrameResourceTree {
-	// Frame information for this tree item.
-	frame: Frame;
-	// Child frames.
-	childFrames?: FrameResourceTree[];
-	// Information about frame resources.
-	resources: FrameResource[];
+    // Frame information for this tree item.
+    frame: Frame;
+    // Child frames.
+    childFrames?: FrameResourceTree[];
+    // Information about frame resources.
+    resources: FrameResource[];
 }
 
 export interface SearchResult {
-	// Resource URL.
-	url: string;
-	// Resource frame id.
-	frameId: NetworkDomain.FrameId;
-	// Number of matches in the resource content.
-	matchesCount: number;
-	// Network request id.
-	requestId?: NetworkDomain.RequestId;
+    // Resource URL.
+    url: string;
+    // Resource frame id.
+    frameId: NetworkDomain.FrameId;
+    // Number of matches in the resource content.
+    matchesCount: number;
+    // Network request id.
+    requestId?: NetworkDomain.RequestId;
 }
 
 export interface Cookie {
-	// Cookie name.
-	name: string;
-	// Cookie value.
-	value: string;
-	// Cookie domain.
-	domain: string;
-	// Cookie path.
-	path: string;
-	// Cookie expires.
-	expires: number;
-	// Cookie size.
-	size: number;
-	// True if cookie is http-only.
-	httpOnly: boolean;
-	// True if cookie is secure.
-	secure: boolean;
-	// True in case of session cookie.
-	session: boolean;
+    // Cookie name.
+    name: string;
+    // Cookie value.
+    value: string;
+    // Cookie domain.
+    domain: string;
+    // Cookie path.
+    path: string;
+    // Cookie expires.
+    expires: number;
+    // Cookie size.
+    size: number;
+    // True if cookie is http-only.
+    httpOnly: boolean;
+    // True if cookie is secure.
+    secure: boolean;
+    // True in case of session cookie.
+    session: boolean;
 }
 
 export const enum ResourceType { Document, Stylesheet, Image, Font, Script, XHR, WebSocket, Other }; 
@@ -836,194 +836,194 @@ export const enum ResourceType { Document, Stylesheet, Image, Font, Script, XHR,
 export const enum CoordinateSystem { Viewport, Page }; 
 
 export interface AddScriptToEvaluateOnLoadMethodArguments { 
-	scriptSource: string
+    scriptSource: string
 }
 export interface RemoveScriptToEvaluateOnLoadMethodArguments { 
-	identifier: ScriptIdentifier
+    identifier: ScriptIdentifier
 }
 export interface ReloadMethodArguments { 
-	// If true, browser cache is ignored (as if the user pressed Shift+refresh). 
-	ignoreCache?: boolean,
-	// If set, the script will be injected into all frames of the inspected page after reload. 
-	scriptToEvaluateOnLoad?: string
+    // If true, browser cache is ignored (as if the user pressed Shift+refresh). 
+    ignoreCache?: boolean,
+    // If set, the script will be injected into all frames of the inspected page after reload. 
+    scriptToEvaluateOnLoad?: string
 }
 export interface NavigateMethodArguments { 
-	// URL to navigate the page to. 
-	url: string
+    // URL to navigate the page to. 
+    url: string
 }
 export interface DeleteCookieMethodArguments { 
-	// Name of the cookie to remove. 
-	cookieName: string,
-	// URL to match cooke domain and path. 
-	url: string
+    // Name of the cookie to remove. 
+    cookieName: string,
+    // URL to match cooke domain and path. 
+    url: string
 }
 export interface GetResourceContentMethodArguments { 
-	// Frame id to get resource for. 
-	frameId: NetworkDomain.FrameId,
-	// URL of the resource to get content for. 
-	url: string
+    // Frame id to get resource for. 
+    frameId: NetworkDomain.FrameId,
+    // URL of the resource to get content for. 
+    url: string
 }
 export interface SearchInResourceMethodArguments { 
-	// Frame id for resource to search in. 
-	frameId: NetworkDomain.FrameId,
-	// URL of the resource to search in. 
-	url: string,
-	// String to search for. 
-	query: string,
-	// If true, search is case sensitive. 
-	caseSensitive?: boolean,
-	// If true, treats string parameter as regex. 
-	isRegex?: boolean,
-	// Request id for resource to search in. 
-	requestId?: NetworkDomain.RequestId
+    // Frame id for resource to search in. 
+    frameId: NetworkDomain.FrameId,
+    // URL of the resource to search in. 
+    url: string,
+    // String to search for. 
+    query: string,
+    // If true, search is case sensitive. 
+    caseSensitive?: boolean,
+    // If true, treats string parameter as regex. 
+    isRegex?: boolean,
+    // Request id for resource to search in. 
+    requestId?: NetworkDomain.RequestId
 }
 export interface SearchInResourcesMethodArguments { 
-	// String to search for. 
-	text: string,
-	// If true, search is case sensitive. 
-	caseSensitive?: boolean,
-	// If true, treats string parameter as regex. 
-	isRegex?: boolean
+    // String to search for. 
+    text: string,
+    // If true, search is case sensitive. 
+    caseSensitive?: boolean,
+    // If true, treats string parameter as regex. 
+    isRegex?: boolean
 }
 export interface SetDocumentContentMethodArguments { 
-	// Frame id to set HTML for. 
-	frameId: NetworkDomain.FrameId,
-	// HTML content to set. 
-	html: string
+    // Frame id to set HTML for. 
+    frameId: NetworkDomain.FrameId,
+    // HTML content to set. 
+    html: string
 }
 export interface SetShowPaintRectsMethodArguments { 
-	// True for showing paint rectangles 
-	result: boolean
+    // True for showing paint rectangles 
+    result: boolean
 }
 export interface SetScriptExecutionDisabledMethodArguments { 
-	// Whether script execution should be disabled in the page. 
-	value: boolean
+    // Whether script execution should be disabled in the page. 
+    value: boolean
 }
 export interface SetTouchEmulationEnabledMethodArguments { 
-	// Whether the touch event emulation should be enabled. 
-	enabled: boolean
+    // Whether the touch event emulation should be enabled. 
+    enabled: boolean
 }
 export interface SetEmulatedMediaMethodArguments { 
-	// Media type to emulate. Empty string disables the override. 
-	media: string
+    // Media type to emulate. Empty string disables the override. 
+    media: string
 }
 export interface SetCompositingBordersVisibleMethodArguments { 
-	// True for showing compositing borders. 
-	visible: boolean
+    // True for showing compositing borders. 
+    visible: boolean
 }
 export interface SnapshotNodeMethodArguments { 
-	// Id of the node to snapshot. 
-	nodeId: DOMDomain.NodeId
+    // Id of the node to snapshot. 
+    nodeId: DOMDomain.NodeId
 }
 export interface SnapshotRectMethodArguments { 
-	// X coordinate 
-	x: number,
-	// Y coordinate 
-	y: number,
-	// Rectangle width 
-	width: number,
-	// Rectangle height 
-	height: number,
-	// Indicates the coordinate system of the supplied rectangle. 
-	coordinateSystem: CoordinateSystem
+    // X coordinate 
+    x: number,
+    // Y coordinate 
+    y: number,
+    // Rectangle width 
+    width: number,
+    // Rectangle height 
+    height: number,
+    // Indicates the coordinate system of the supplied rectangle. 
+    coordinateSystem: CoordinateSystem
 }
 export interface HandleJavaScriptDialogMethodArguments { 
-	// Whether to accept or dismiss the dialog. 
-	accept: boolean,
-	// The text to enter into the dialog prompt before accepting. Used only if this is a prompt dialog. 
-	promptText?: string
+    // Whether to accept or dismiss the dialog. 
+    accept: boolean,
+    // The text to enter into the dialog prompt before accepting. Used only if this is a prompt dialog. 
+    promptText?: string
 }
 export interface PageDomainDispatcher { 
-	// Enables page domain notifications.
-	enable(): void;
-	// Disables page domain notifications.
-	disable(): void;
-	addScriptToEvaluateOnLoad(params: AddScriptToEvaluateOnLoadMethodArguments): { identifier: ScriptIdentifier };
-	removeScriptToEvaluateOnLoad(params: RemoveScriptToEvaluateOnLoadMethodArguments): void;
-	// Reloads given page optionally ignoring the cache.
-	reload(params: ReloadMethodArguments): void;
-	// Navigates current page to the given URL.
-	navigate(params: NavigateMethodArguments): void;
-	// Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field.
-	getCookies(): { cookies: Cookie[] };
-	// Deletes browser cookie with given name, domain and path.
-	deleteCookie(params: DeleteCookieMethodArguments): void;
-	// Returns present frame / resource tree structure.
-	getResourceTree(): { frameTree: FrameResourceTree };
-	// Returns content of the given resource.
-	getResourceContent(params: GetResourceContentMethodArguments): { content: string, base64Encoded: boolean };
-	// Searches for given string in resource content.
-	searchInResource(params: SearchInResourceMethodArguments): { result: GenericTypesDomain.SearchMatch[] };
-	// Searches for given string in frame / resource tree structure.
-	searchInResources(params: SearchInResourcesMethodArguments): { result: SearchResult[] };
-	// Sets given markup as the document's HTML.
-	setDocumentContent(params: SetDocumentContentMethodArguments): void;
-	// Requests that backend shows paint rectangles
-	setShowPaintRects(params: SetShowPaintRectsMethodArguments): void;
-	// Determines if scripts can be executed in the page.
-	getScriptExecutionStatus(): { result: any /* allowed,disabled,forbidden */ };
-	// Switches script execution in the page.
-	setScriptExecutionDisabled(params: SetScriptExecutionDisabledMethodArguments): void;
-	// Toggles mouse event-based touch event emulation.
-	setTouchEmulationEnabled(params: SetTouchEmulationEnabledMethodArguments): void;
-	// Emulates the given media for CSS media queries.
-	setEmulatedMedia(params: SetEmulatedMediaMethodArguments): void;
-	// Indicates the visibility of compositing borders.
-	getCompositingBordersVisible(): { result: boolean };
-	// Controls the visibility of compositing borders.
-	setCompositingBordersVisible(params: SetCompositingBordersVisibleMethodArguments): void;
-	// Capture a snapshot of the specified node that does not include unrelated layers.
-	snapshotNode(params: SnapshotNodeMethodArguments): { dataURL: string };
-	// Capture a snapshot of the page within the specified rectangle and coordinate system.
-	snapshotRect(params: SnapshotRectMethodArguments): { dataURL: string };
-	// Accepts or dismisses a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload).
-	handleJavaScriptDialog(params: HandleJavaScriptDialogMethodArguments): void;
-	// Grab an archive of the page.
-	archive(): { data: string };
+    // Enables page domain notifications.
+    enable(): void;
+    // Disables page domain notifications.
+    disable(): void;
+    addScriptToEvaluateOnLoad(params: AddScriptToEvaluateOnLoadMethodArguments): { identifier: ScriptIdentifier };
+    removeScriptToEvaluateOnLoad(params: RemoveScriptToEvaluateOnLoadMethodArguments): void;
+    // Reloads given page optionally ignoring the cache.
+    reload(params: ReloadMethodArguments): void;
+    // Navigates current page to the given URL.
+    navigate(params: NavigateMethodArguments): void;
+    // Returns all browser cookies. Depending on the backend support, will return detailed cookie information in the <code>cookies</code> field.
+    getCookies(): { cookies: Cookie[] };
+    // Deletes browser cookie with given name, domain and path.
+    deleteCookie(params: DeleteCookieMethodArguments): void;
+    // Returns present frame / resource tree structure.
+    getResourceTree(): { frameTree: FrameResourceTree };
+    // Returns content of the given resource.
+    getResourceContent(params: GetResourceContentMethodArguments): { content: string, base64Encoded: boolean };
+    // Searches for given string in resource content.
+    searchInResource(params: SearchInResourceMethodArguments): { result: GenericTypesDomain.SearchMatch[] };
+    // Searches for given string in frame / resource tree structure.
+    searchInResources(params: SearchInResourcesMethodArguments): { result: SearchResult[] };
+    // Sets given markup as the document's HTML.
+    setDocumentContent(params: SetDocumentContentMethodArguments): void;
+    // Requests that backend shows paint rectangles
+    setShowPaintRects(params: SetShowPaintRectsMethodArguments): void;
+    // Determines if scripts can be executed in the page.
+    getScriptExecutionStatus(): { result: any /* allowed,disabled,forbidden */ };
+    // Switches script execution in the page.
+    setScriptExecutionDisabled(params: SetScriptExecutionDisabledMethodArguments): void;
+    // Toggles mouse event-based touch event emulation.
+    setTouchEmulationEnabled(params: SetTouchEmulationEnabledMethodArguments): void;
+    // Emulates the given media for CSS media queries.
+    setEmulatedMedia(params: SetEmulatedMediaMethodArguments): void;
+    // Indicates the visibility of compositing borders.
+    getCompositingBordersVisible(): { result: boolean };
+    // Controls the visibility of compositing borders.
+    setCompositingBordersVisible(params: SetCompositingBordersVisibleMethodArguments): void;
+    // Capture a snapshot of the specified node that does not include unrelated layers.
+    snapshotNode(params: SnapshotNodeMethodArguments): { dataURL: string };
+    // Capture a snapshot of the page within the specified rectangle and coordinate system.
+    snapshotRect(params: SnapshotRectMethodArguments): { dataURL: string };
+    // Accepts or dismisses a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload).
+    handleJavaScriptDialog(params: HandleJavaScriptDialogMethodArguments): void;
+    // Grab an archive of the page.
+    archive(): { data: string };
 }
 export class PageFrontend { 
-	domContentEventFired(timestamp: number): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.domContentEventFired", "params": { "timestamp": timestamp } } )); 
-	}
-	loadEventFired(timestamp: number): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.loadEventFired", "params": { "timestamp": timestamp } } )); 
-	}
-	// Fired once navigation of the frame has completed. Frame is now associated with the new loader.
-	frameNavigated(frame: Frame): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.frameNavigated", "params": { "frame": frame } } )); 
-	}
-	// Fired when frame has been detached from its parent.
-	frameDetached(frameId: NetworkDomain.FrameId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.frameDetached", "params": { "frameId": frameId } } )); 
-	}
-	// Fired when frame has started loading.
-	frameStartedLoading(frameId: NetworkDomain.FrameId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.frameStartedLoading", "params": { "frameId": frameId } } )); 
-	}
-	// Fired when frame has stopped loading.
-	frameStoppedLoading(frameId: NetworkDomain.FrameId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.frameStoppedLoading", "params": { "frameId": frameId } } )); 
-	}
-	// Fired when frame schedules a potential navigation.
-	frameScheduledNavigation(frameId: NetworkDomain.FrameId, delay: number): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.frameScheduledNavigation", "params": { "frameId": frameId, "delay": delay } } )); 
-	}
-	// Fired when frame no longer has a scheduled navigation.
-	frameClearedScheduledNavigation(frameId: NetworkDomain.FrameId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.frameClearedScheduledNavigation", "params": { "frameId": frameId } } )); 
-	}
-	// Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) is about to open.
-	javascriptDialogOpening(message: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.javascriptDialogOpening", "params": { "message": message } } )); 
-	}
-	// Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) has been closed.
-	javascriptDialogClosed(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.javascriptDialogClosed", "params": {  } } )); 
-	}
-	// Fired when the JavaScript is enabled/disabled on the page
-	scriptsEnabled(isEnabled: boolean): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Page.scriptsEnabled", "params": { "isEnabled": isEnabled } } )); 
-	}
+    domContentEventFired(timestamp: number): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.domContentEventFired", "params": { "timestamp": timestamp } } )); 
+    }
+    loadEventFired(timestamp: number): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.loadEventFired", "params": { "timestamp": timestamp } } )); 
+    }
+    // Fired once navigation of the frame has completed. Frame is now associated with the new loader.
+    frameNavigated(frame: Frame): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.frameNavigated", "params": { "frame": frame } } )); 
+    }
+    // Fired when frame has been detached from its parent.
+    frameDetached(frameId: NetworkDomain.FrameId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.frameDetached", "params": { "frameId": frameId } } )); 
+    }
+    // Fired when frame has started loading.
+    frameStartedLoading(frameId: NetworkDomain.FrameId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.frameStartedLoading", "params": { "frameId": frameId } } )); 
+    }
+    // Fired when frame has stopped loading.
+    frameStoppedLoading(frameId: NetworkDomain.FrameId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.frameStoppedLoading", "params": { "frameId": frameId } } )); 
+    }
+    // Fired when frame schedules a potential navigation.
+    frameScheduledNavigation(frameId: NetworkDomain.FrameId, delay: number): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.frameScheduledNavigation", "params": { "frameId": frameId, "delay": delay } } )); 
+    }
+    // Fired when frame no longer has a scheduled navigation.
+    frameClearedScheduledNavigation(frameId: NetworkDomain.FrameId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.frameClearedScheduledNavigation", "params": { "frameId": frameId } } )); 
+    }
+    // Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) is about to open.
+    javascriptDialogOpening(message: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.javascriptDialogOpening", "params": { "message": message } } )); 
+    }
+    // Fired when a JavaScript initiated dialog (alert, confirm, prompt, or onbeforeunload) has been closed.
+    javascriptDialogClosed(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.javascriptDialogClosed", "params": {  } } )); 
+    }
+    // Fired when the JavaScript is enabled/disabled on the page
+    scriptsEnabled(isEnabled: boolean): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Page.scriptsEnabled", "params": { "isEnabled": isEnabled } } )); 
+    }
 }
 }
 
@@ -1043,194 +1043,194 @@ export interface Headers {
 }
 
 export interface ResourceTiming {
-	// Timing's startTime is a baseline in seconds, while the other numbers are ticks in milliseconds relatively to this.
-	startTime: number;
-	// Started DNS address resolve.
-	domainLookupStart: number;
-	// Finished DNS address resolve.
-	domainLookupEnd: number;
-	// Started connecting to the remote host.
-	connectStart: number;
-	// Connected to the remote host.
-	connectEnd: number;
-	// Started SSL handshake.
-	secureConnectionStart: number;
-	// Started sending request.
-	requestStart: number;
-	// Started receiving response headers.
-	responseStart: number;
+    // Timing's startTime is a baseline in seconds, while the other numbers are ticks in milliseconds relatively to this.
+    startTime: number;
+    // Started DNS address resolve.
+    domainLookupStart: number;
+    // Finished DNS address resolve.
+    domainLookupEnd: number;
+    // Started connecting to the remote host.
+    connectStart: number;
+    // Connected to the remote host.
+    connectEnd: number;
+    // Started SSL handshake.
+    secureConnectionStart: number;
+    // Started sending request.
+    requestStart: number;
+    // Started receiving response headers.
+    responseStart: number;
 }
 
 export interface Request {
-	// Request URL.
-	url: string;
-	// HTTP request method.
-	method: string;
-	// HTTP request headers.
-	headers: Headers;
-	// HTTP POST request data.
-	postData?: string;
+    // Request URL.
+    url: string;
+    // HTTP request method.
+    method: string;
+    // HTTP request headers.
+    headers: Headers;
+    // HTTP POST request data.
+    postData?: string;
 }
 
 export interface Response {
-	// Response URL. This URL can be different from CachedResource.url in case of redirect.
-	url: string;
-	// HTTP response status code.
-	status: number;
-	// HTTP response status text.
-	statusText: string;
-	// HTTP response headers.
-	headers: Headers;
-	// HTTP response headers text.
-	headersText?: string;
-	// Resource mimeType as determined by the browser.
-	mimeType: string;
-	// Refined HTTP request headers that were actually transmitted over the network.
-	requestHeaders?: Headers;
-	// HTTP request headers text.
-	requestHeadersText?: string;
-	// Specifies that the request was served from the disk cache.
-	fromDiskCache?: boolean;
-	// Timing information for the given request.
-	timing?: ResourceTiming;
+    // Response URL. This URL can be different from CachedResource.url in case of redirect.
+    url: string;
+    // HTTP response status code.
+    status: number;
+    // HTTP response status text.
+    statusText: string;
+    // HTTP response headers.
+    headers: Headers;
+    // HTTP response headers text.
+    headersText?: string;
+    // Resource mimeType as determined by the browser.
+    mimeType: string;
+    // Refined HTTP request headers that were actually transmitted over the network.
+    requestHeaders?: Headers;
+    // HTTP request headers text.
+    requestHeadersText?: string;
+    // Specifies that the request was served from the disk cache.
+    fromDiskCache?: boolean;
+    // Timing information for the given request.
+    timing?: ResourceTiming;
 }
 
 export interface WebSocketRequest {
-	// HTTP response headers.
-	headers: Headers;
+    // HTTP response headers.
+    headers: Headers;
 }
 
 export interface WebSocketResponse {
-	// HTTP response status code.
-	status: number;
-	// HTTP response status text.
-	statusText: string;
-	// HTTP response headers.
-	headers: Headers;
+    // HTTP response status code.
+    status: number;
+    // HTTP response status text.
+    statusText: string;
+    // HTTP response headers.
+    headers: Headers;
 }
 
 export interface WebSocketFrame {
-	// WebSocket frame opcode.
-	opcode: number;
-	// WebSocket frame mask.
-	mask: boolean;
-	// WebSocket frame payload data.
-	payloadData: string;
+    // WebSocket frame opcode.
+    opcode: number;
+    // WebSocket frame mask.
+    mask: boolean;
+    // WebSocket frame payload data.
+    payloadData: string;
 }
 
 export interface CachedResource {
-	// Resource URL. This is the url of the original network request.
-	url: string;
-	// Type of this resource.
-	type: PageDomain.ResourceType;
-	// Cached response data.
-	response?: Response;
-	// Cached response body size.
-	bodySize: number;
-	// URL of source map associated with this resource (if any).
-	sourceMapURL?: string;
+    // Resource URL. This is the url of the original network request.
+    url: string;
+    // Type of this resource.
+    type: PageDomain.ResourceType;
+    // Cached response data.
+    response?: Response;
+    // Cached response body size.
+    bodySize: number;
+    // URL of source map associated with this resource (if any).
+    sourceMapURL?: string;
 }
 
 export interface Initiator {
-	// Type of this initiator.
-	type: any /* parser,script,other */;
-	// Initiator JavaScript stack trace, set for Script only.
-	stackTrace?: ConsoleDomain.CallFrame[];
-	// Initiator URL, set for Parser type only.
-	url?: string;
-	// Initiator line number, set for Parser type only.
-	lineNumber?: number;
+    // Type of this initiator.
+    type: any /* parser,script,other */;
+    // Initiator JavaScript stack trace, set for Script only.
+    stackTrace?: ConsoleDomain.CallFrame[];
+    // Initiator URL, set for Parser type only.
+    url?: string;
+    // Initiator line number, set for Parser type only.
+    lineNumber?: number;
 }
 
 export interface SetExtraHTTPHeadersMethodArguments { 
-	// Map with extra HTTP headers. 
-	headers: Headers
+    // Map with extra HTTP headers. 
+    headers: Headers
 }
 export interface GetResponseBodyMethodArguments { 
-	// Identifier of the network request to get content for. 
-	requestId: RequestId
+    // Identifier of the network request to get content for. 
+    requestId: RequestId
 }
 export interface SetCacheDisabledMethodArguments { 
-	// Cache disabled state. 
-	cacheDisabled: boolean
+    // Cache disabled state. 
+    cacheDisabled: boolean
 }
 export interface LoadResourceMethodArguments { 
-	// Frame to load the resource from. 
-	frameId: FrameId,
-	// URL of the resource to load. 
-	url: string
+    // Frame to load the resource from. 
+    frameId: FrameId,
+    // URL of the resource to load. 
+    url: string
 }
 export interface NetworkDomainDispatcher { 
-	// Enables network tracking, network events will now be delivered to the client.
-	enable(): void;
-	// Disables network tracking, prevents network events from being sent to the client.
-	disable(): void;
-	// Specifies whether to always send extra HTTP headers with the requests from this page.
-	setExtraHTTPHeaders(params: SetExtraHTTPHeadersMethodArguments): void;
-	// Returns content served for the given request.
-	getResponseBody(params: GetResponseBodyMethodArguments): { body: string, base64Encoded: boolean };
-	// Toggles ignoring cache for each request. If <code>true</code>, cache will not be used.
-	setCacheDisabled(params: SetCacheDisabledMethodArguments): void;
-	// Loads a resource in the context of a frame on the inspected page without cross origin checks.
-	loadResource(params: LoadResourceMethodArguments): { content: string, mimeType: string, status: number };
+    // Enables network tracking, network events will now be delivered to the client.
+    enable(): void;
+    // Disables network tracking, prevents network events from being sent to the client.
+    disable(): void;
+    // Specifies whether to always send extra HTTP headers with the requests from this page.
+    setExtraHTTPHeaders(params: SetExtraHTTPHeadersMethodArguments): void;
+    // Returns content served for the given request.
+    getResponseBody(params: GetResponseBodyMethodArguments): { body: string, base64Encoded: boolean };
+    // Toggles ignoring cache for each request. If <code>true</code>, cache will not be used.
+    setCacheDisabled(params: SetCacheDisabledMethodArguments): void;
+    // Loads a resource in the context of a frame on the inspected page without cross origin checks.
+    loadResource(params: LoadResourceMethodArguments): { content: string, mimeType: string, status: number };
 }
 export class NetworkFrontend { 
-	// Fired when page is about to send HTTP request.
-	requestWillBeSent(requestId: RequestId, frameId: FrameId, loaderId: LoaderId, documentURL: string, request: Request, timestamp: Timestamp, initiator: Initiator, redirectResponse?: Response, type?: PageDomain.ResourceType): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.requestWillBeSent", "params": { "requestId": requestId, "frameId": frameId, "loaderId": loaderId, "documentURL": documentURL, "request": request, "timestamp": timestamp, "initiator": initiator, "redirectResponse": redirectResponse, "type": type } } )); 
-	}
-	// Fired if request ended up loading from cache.
-	requestServedFromCache(requestId: RequestId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.requestServedFromCache", "params": { "requestId": requestId } } )); 
-	}
-	// Fired when HTTP response is available.
-	responseReceived(requestId: RequestId, frameId: FrameId, loaderId: LoaderId, timestamp: Timestamp, type: PageDomain.ResourceType, response: Response): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.responseReceived", "params": { "requestId": requestId, "frameId": frameId, "loaderId": loaderId, "timestamp": timestamp, "type": type, "response": response } } )); 
-	}
-	// Fired when data chunk was received over the network.
-	dataReceived(requestId: RequestId, timestamp: Timestamp, dataLength: number, encodedDataLength: number): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.dataReceived", "params": { "requestId": requestId, "timestamp": timestamp, "dataLength": dataLength, "encodedDataLength": encodedDataLength } } )); 
-	}
-	// Fired when HTTP request has finished loading.
-	loadingFinished(requestId: RequestId, timestamp: Timestamp, sourceMapURL?: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.loadingFinished", "params": { "requestId": requestId, "timestamp": timestamp, "sourceMapURL": sourceMapURL } } )); 
-	}
-	// Fired when HTTP request has failed to load.
-	loadingFailed(requestId: RequestId, timestamp: Timestamp, errorText: string, canceled?: boolean): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.loadingFailed", "params": { "requestId": requestId, "timestamp": timestamp, "errorText": errorText, "canceled": canceled } } )); 
-	}
-	// Fired when HTTP request has been served from memory cache.
-	requestServedFromMemoryCache(requestId: RequestId, frameId: FrameId, loaderId: LoaderId, documentURL: string, timestamp: Timestamp, initiator: Initiator, resource: CachedResource): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.requestServedFromMemoryCache", "params": { "requestId": requestId, "frameId": frameId, "loaderId": loaderId, "documentURL": documentURL, "timestamp": timestamp, "initiator": initiator, "resource": resource } } )); 
-	}
-	// Fired when WebSocket is about to initiate handshake.
-	webSocketWillSendHandshakeRequest(requestId: RequestId, timestamp: Timestamp, request: WebSocketRequest): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketWillSendHandshakeRequest", "params": { "requestId": requestId, "timestamp": timestamp, "request": request } } )); 
-	}
-	// Fired when WebSocket handshake response becomes available.
-	webSocketHandshakeResponseReceived(requestId: RequestId, timestamp: Timestamp, response: WebSocketResponse): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketHandshakeResponseReceived", "params": { "requestId": requestId, "timestamp": timestamp, "response": response } } )); 
-	}
-	// Fired upon WebSocket creation.
-	webSocketCreated(requestId: RequestId, url: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketCreated", "params": { "requestId": requestId, "url": url } } )); 
-	}
-	// Fired when WebSocket is closed.
-	webSocketClosed(requestId: RequestId, timestamp: Timestamp): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketClosed", "params": { "requestId": requestId, "timestamp": timestamp } } )); 
-	}
-	// Fired when WebSocket frame is received.
-	webSocketFrameReceived(requestId: RequestId, timestamp: Timestamp, response: WebSocketFrame): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketFrameReceived", "params": { "requestId": requestId, "timestamp": timestamp, "response": response } } )); 
-	}
-	// Fired when WebSocket frame error occurs.
-	webSocketFrameError(requestId: RequestId, timestamp: Timestamp, errorMessage: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketFrameError", "params": { "requestId": requestId, "timestamp": timestamp, "errorMessage": errorMessage } } )); 
-	}
-	// Fired when WebSocket frame is sent.
-	webSocketFrameSent(requestId: RequestId, timestamp: Timestamp, response: WebSocketFrame): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketFrameSent", "params": { "requestId": requestId, "timestamp": timestamp, "response": response } } )); 
-	}
+    // Fired when page is about to send HTTP request.
+    requestWillBeSent(requestId: RequestId, frameId: FrameId, loaderId: LoaderId, documentURL: string, request: Request, timestamp: Timestamp, initiator: Initiator, redirectResponse?: Response, type?: PageDomain.ResourceType): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.requestWillBeSent", "params": { "requestId": requestId, "frameId": frameId, "loaderId": loaderId, "documentURL": documentURL, "request": request, "timestamp": timestamp, "initiator": initiator, "redirectResponse": redirectResponse, "type": type } } )); 
+    }
+    // Fired if request ended up loading from cache.
+    requestServedFromCache(requestId: RequestId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.requestServedFromCache", "params": { "requestId": requestId } } )); 
+    }
+    // Fired when HTTP response is available.
+    responseReceived(requestId: RequestId, frameId: FrameId, loaderId: LoaderId, timestamp: Timestamp, type: PageDomain.ResourceType, response: Response): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.responseReceived", "params": { "requestId": requestId, "frameId": frameId, "loaderId": loaderId, "timestamp": timestamp, "type": type, "response": response } } )); 
+    }
+    // Fired when data chunk was received over the network.
+    dataReceived(requestId: RequestId, timestamp: Timestamp, dataLength: number, encodedDataLength: number): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.dataReceived", "params": { "requestId": requestId, "timestamp": timestamp, "dataLength": dataLength, "encodedDataLength": encodedDataLength } } )); 
+    }
+    // Fired when HTTP request has finished loading.
+    loadingFinished(requestId: RequestId, timestamp: Timestamp, sourceMapURL?: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.loadingFinished", "params": { "requestId": requestId, "timestamp": timestamp, "sourceMapURL": sourceMapURL } } )); 
+    }
+    // Fired when HTTP request has failed to load.
+    loadingFailed(requestId: RequestId, timestamp: Timestamp, errorText: string, canceled?: boolean): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.loadingFailed", "params": { "requestId": requestId, "timestamp": timestamp, "errorText": errorText, "canceled": canceled } } )); 
+    }
+    // Fired when HTTP request has been served from memory cache.
+    requestServedFromMemoryCache(requestId: RequestId, frameId: FrameId, loaderId: LoaderId, documentURL: string, timestamp: Timestamp, initiator: Initiator, resource: CachedResource): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.requestServedFromMemoryCache", "params": { "requestId": requestId, "frameId": frameId, "loaderId": loaderId, "documentURL": documentURL, "timestamp": timestamp, "initiator": initiator, "resource": resource } } )); 
+    }
+    // Fired when WebSocket is about to initiate handshake.
+    webSocketWillSendHandshakeRequest(requestId: RequestId, timestamp: Timestamp, request: WebSocketRequest): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketWillSendHandshakeRequest", "params": { "requestId": requestId, "timestamp": timestamp, "request": request } } )); 
+    }
+    // Fired when WebSocket handshake response becomes available.
+    webSocketHandshakeResponseReceived(requestId: RequestId, timestamp: Timestamp, response: WebSocketResponse): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketHandshakeResponseReceived", "params": { "requestId": requestId, "timestamp": timestamp, "response": response } } )); 
+    }
+    // Fired upon WebSocket creation.
+    webSocketCreated(requestId: RequestId, url: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketCreated", "params": { "requestId": requestId, "url": url } } )); 
+    }
+    // Fired when WebSocket is closed.
+    webSocketClosed(requestId: RequestId, timestamp: Timestamp): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketClosed", "params": { "requestId": requestId, "timestamp": timestamp } } )); 
+    }
+    // Fired when WebSocket frame is received.
+    webSocketFrameReceived(requestId: RequestId, timestamp: Timestamp, response: WebSocketFrame): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketFrameReceived", "params": { "requestId": requestId, "timestamp": timestamp, "response": response } } )); 
+    }
+    // Fired when WebSocket frame error occurs.
+    webSocketFrameError(requestId: RequestId, timestamp: Timestamp, errorMessage: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketFrameError", "params": { "requestId": requestId, "timestamp": timestamp, "errorMessage": errorMessage } } )); 
+    }
+    // Fired when WebSocket frame is sent.
+    webSocketFrameSent(requestId: RequestId, timestamp: Timestamp, response: WebSocketFrame): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "Network.webSocketFrameSent", "params": { "requestId": requestId, "timestamp": timestamp, "response": response } } )); 
+    }
 }
 }
 
@@ -1243,78 +1243,78 @@ export type NodeId = number
 export type BackendNodeId = number
 
 export interface Node {
-	// Node identifier that is passed into the rest of the DOM messages as the <code>nodeId</code>. Backend will only push node with given <code>id</code> once. It is aware of all requested nodes and will only fire DOM events for nodes known to the client.
-	nodeId: NodeId;
-	// <code>Node</code>'s nodeType.
-	nodeType: number;
-	// <code>Node</code>'s nodeName.
-	nodeName: string;
-	// <code>Node</code>'s localName.
-	localName: string;
-	// <code>Node</code>'s nodeValue.
-	nodeValue: string;
-	// Child count for <code>Container</code> nodes.
-	childNodeCount?: number;
-	// Child nodes of this node when requested with children.
-	children?: Node[];
-	// Attributes of the <code>Element</code> node in the form of flat array <code>[name1, value1, name2, value2]</code>.
-	attributes?: string[];
-	// Document URL that <code>Document</code> or <code>FrameOwner</code> node points to.
-	documentURL?: string;
-	// Base URL that <code>Document</code> or <code>FrameOwner</code> node uses for URL completion.
-	baseURL?: string;
-	// <code>DocumentType</code>'s publicId.
-	publicId?: string;
-	// <code>DocumentType</code>'s systemId.
-	systemId?: string;
-	// <code>Document</code>'s XML version in case of XML documents.
-	xmlVersion?: string;
-	// <code>Attr</code>'s name.
-	name?: string;
-	// <code>Attr</code>'s value.
-	value?: string;
-	// Pseudo element type for this node.
-	pseudoType?: PseudoType;
-	// Shadow root type.
-	shadowRootType?: ShadowRootType;
-	// Frame ID for frame owner elements.
-	frameId?: NetworkDomain.FrameId;
-	// Content document for frame owner elements.
-	contentDocument?: Node;
-	// Shadow root list for given element host.
-	shadowRoots?: Node[];
-	// Content document fragment for template elements
-	templateContent?: Node;
-	// Pseudo elements associated with this node.
-	pseudoElements?: Node[];
-	// Computed value for first recognized role token, default role per element, or overridden role.
-	role?: string;
-	// Computed SHA-256 Content Security Policy hash source for given element.
-	contentSecurityPolicyHash?: string;
+    // Node identifier that is passed into the rest of the DOM messages as the <code>nodeId</code>. Backend will only push node with given <code>id</code> once. It is aware of all requested nodes and will only fire DOM events for nodes known to the client.
+    nodeId: NodeId;
+    // <code>Node</code>'s nodeType.
+    nodeType: number;
+    // <code>Node</code>'s nodeName.
+    nodeName: string;
+    // <code>Node</code>'s localName.
+    localName: string;
+    // <code>Node</code>'s nodeValue.
+    nodeValue: string;
+    // Child count for <code>Container</code> nodes.
+    childNodeCount?: number;
+    // Child nodes of this node when requested with children.
+    children?: Node[];
+    // Attributes of the <code>Element</code> node in the form of flat array <code>[name1, value1, name2, value2]</code>.
+    attributes?: string[];
+    // Document URL that <code>Document</code> or <code>FrameOwner</code> node points to.
+    documentURL?: string;
+    // Base URL that <code>Document</code> or <code>FrameOwner</code> node uses for URL completion.
+    baseURL?: string;
+    // <code>DocumentType</code>'s publicId.
+    publicId?: string;
+    // <code>DocumentType</code>'s systemId.
+    systemId?: string;
+    // <code>Document</code>'s XML version in case of XML documents.
+    xmlVersion?: string;
+    // <code>Attr</code>'s name.
+    name?: string;
+    // <code>Attr</code>'s value.
+    value?: string;
+    // Pseudo element type for this node.
+    pseudoType?: PseudoType;
+    // Shadow root type.
+    shadowRootType?: ShadowRootType;
+    // Frame ID for frame owner elements.
+    frameId?: NetworkDomain.FrameId;
+    // Content document for frame owner elements.
+    contentDocument?: Node;
+    // Shadow root list for given element host.
+    shadowRoots?: Node[];
+    // Content document fragment for template elements
+    templateContent?: Node;
+    // Pseudo elements associated with this node.
+    pseudoElements?: Node[];
+    // Computed value for first recognized role token, default role per element, or overridden role.
+    role?: string;
+    // Computed SHA-256 Content Security Policy hash source for given element.
+    contentSecurityPolicyHash?: string;
 }
 
 export interface RGBAColor {
-	// The red component, in the [0-255] range.
-	r: number;
-	// The green component, in the [0-255] range.
-	g: number;
-	// The blue component, in the [0-255] range.
-	b: number;
-	// The alpha component, in the [0-1] range (default: 1).
-	a?: number;
+    // The red component, in the [0-255] range.
+    r: number;
+    // The green component, in the [0-255] range.
+    g: number;
+    // The blue component, in the [0-255] range.
+    b: number;
+    // The alpha component, in the [0-1] range (default: 1).
+    a?: number;
 }
 
 export interface HighlightConfig {
-	// Whether the node info tooltip should be shown (default: false).
-	showInfo?: boolean;
-	// The content box highlight fill color (default: transparent).
-	contentColor?: RGBAColor;
-	// The padding highlight fill color (default: transparent).
-	paddingColor?: RGBAColor;
-	// The border highlight fill color (default: transparent).
-	borderColor?: RGBAColor;
-	// The margin highlight fill color (default: transparent).
-	marginColor?: RGBAColor;
+    // Whether the node info tooltip should be shown (default: false).
+    showInfo?: boolean;
+    // The content box highlight fill color (default: transparent).
+    contentColor?: RGBAColor;
+    // The padding highlight fill color (default: transparent).
+    paddingColor?: RGBAColor;
+    // The border highlight fill color (default: transparent).
+    borderColor?: RGBAColor;
+    // The margin highlight fill color (default: transparent).
+    marginColor?: RGBAColor;
 }
 
 export const enum PseudoType { Before, After }; 
@@ -1324,142 +1324,142 @@ export const enum ShadowRootType { UserAgent, Open, Closed };
 export const enum LiveRegionRelevant { Additions, Removals, Text }; 
 
 export interface RemoveNodeMethodArguments { 
-	// Id of the node to remove. 
-	nodeId: NodeId
+    // Id of the node to remove. 
+    nodeId: NodeId
 }
 export interface SetAttributeValueMethodArguments { 
-	// Id of the element to set attribute for. 
-	nodeId: NodeId,
-	// Attribute name. 
-	name: string,
-	// Attribute value. 
-	value: string
+    // Id of the element to set attribute for. 
+    nodeId: NodeId,
+    // Attribute name. 
+    name: string,
+    // Attribute value. 
+    value: string
 }
 export interface SetAttributesAsTextMethodArguments { 
-	// Id of the element to set attributes for. 
-	nodeId: NodeId,
-	// Text with a number of attributes. Will parse this text using HTML parser. 
-	text: string,
-	// Attribute name to replace with new attributes derived from text in case text parsed successfully. 
-	name?: string
+    // Id of the element to set attributes for. 
+    nodeId: NodeId,
+    // Text with a number of attributes. Will parse this text using HTML parser. 
+    text: string,
+    // Attribute name to replace with new attributes derived from text in case text parsed successfully. 
+    name?: string
 }
 export interface RemoveAttributeMethodArguments { 
-	// Id of the element to remove attribute from. 
-	nodeId: NodeId,
-	// Name of the attribute to remove. 
-	name: string
+    // Id of the element to remove attribute from. 
+    nodeId: NodeId,
+    // Name of the attribute to remove. 
+    name: string
 }
 export interface PerformSearchMethodArguments { 
-	// Plain text or query selector or XPath search query. 
-	query: string,
-	// Ids of nodes to use as starting points for the search. 
-	nodeIds?: NodeId[]
+    // Plain text or query selector or XPath search query. 
+    query: string,
+    // Ids of nodes to use as starting points for the search. 
+    nodeIds?: NodeId[]
 }
 export interface GetSearchResultsMethodArguments { 
-	// Unique search session identifier. 
-	searchId: string,
-	// Start index of the search result to be returned. 
-	fromIndex: number,
-	// End index of the search result to be returned. 
-	toIndex: number
+    // Unique search session identifier. 
+    searchId: string,
+    // Start index of the search result to be returned. 
+    fromIndex: number,
+    // End index of the search result to be returned. 
+    toIndex: number
 }
 export interface DiscardSearchResultsMethodArguments { 
-	// Unique search session identifier. 
-	searchId: string
+    // Unique search session identifier. 
+    searchId: string
 }
 export interface HighlightNodeMethodArguments { 
-	// A descriptor for the highlight appearance. 
-	highlightConfig: HighlightConfig,
-	// Identifier of the node to highlight. 
-	nodeId?: NodeId,
-	// JavaScript object id of the node to be highlighted. 
-	objectId?: RuntimeDomain.RemoteObjectId
+    // A descriptor for the highlight appearance. 
+    highlightConfig: HighlightConfig,
+    // Identifier of the node to highlight. 
+    nodeId?: NodeId,
+    // JavaScript object id of the node to be highlighted. 
+    objectId?: RuntimeDomain.RemoteObjectId
 }
 export interface ResolveNodeMethodArguments { 
-	// Id of the node to resolve. 
-	nodeId: NodeId,
-	// Symbolic group name that can be used to release multiple objects. 
-	objectGroup?: string
+    // Id of the node to resolve. 
+    nodeId: NodeId,
+    // Symbolic group name that can be used to release multiple objects. 
+    objectGroup?: string
 }
 export interface DOMDomainDispatcher { 
-	enable(): void;
-	disable(): void;
-	// Returns the root DOM node to the caller.
-	getDocument(): { root: Node };
-	// Removes node with given id.
-	removeNode(params: RemoveNodeMethodArguments): void;
-	// Sets attribute for an element with given id.
-	setAttributeValue(params: SetAttributeValueMethodArguments): void;
-	// Sets attributes on element with given id. This method is useful when user edits some existing attribute value and types in several attribute name/value pairs.
-	setAttributesAsText(params: SetAttributesAsTextMethodArguments): void;
-	// Removes attribute with given name from an element with given id.
-	removeAttribute(params: RemoveAttributeMethodArguments): void;
-	// Searches for a given string in the DOM tree. Use <code>getSearchResults</code> to access search results or <code>cancelSearch</code> to end this search session.
-	performSearch(params: PerformSearchMethodArguments): { searchId: string, resultCount: number };
-	// Returns search results from given <code>fromIndex</code> to given <code>toIndex</code> from the sarch with the given identifier.
-	getSearchResults(params: GetSearchResultsMethodArguments): { nodeIds: NodeId[] };
-	// Discards search results from the session with the given id. <code>getSearchResults</code> should no longer be called for that search.
-	discardSearchResults(params: DiscardSearchResultsMethodArguments): void;
-	// Highlights DOM node with given id or with the given JavaScript object wrapper. Either nodeId or objectId must be specified.
-	highlightNode(params: HighlightNodeMethodArguments): void;
-	// Hides DOM node highlight.
-	hideHighlight(): void;
-	// Resolves JavaScript node object for given node id.
-	resolveNode(params: ResolveNodeMethodArguments): { object: RuntimeDomain.RemoteObject };
+    enable(): void;
+    disable(): void;
+    // Returns the root DOM node to the caller.
+    getDocument(): { root: Node };
+    // Removes node with given id.
+    removeNode(params: RemoveNodeMethodArguments): void;
+    // Sets attribute for an element with given id.
+    setAttributeValue(params: SetAttributeValueMethodArguments): void;
+    // Sets attributes on element with given id. This method is useful when user edits some existing attribute value and types in several attribute name/value pairs.
+    setAttributesAsText(params: SetAttributesAsTextMethodArguments): void;
+    // Removes attribute with given name from an element with given id.
+    removeAttribute(params: RemoveAttributeMethodArguments): void;
+    // Searches for a given string in the DOM tree. Use <code>getSearchResults</code> to access search results or <code>cancelSearch</code> to end this search session.
+    performSearch(params: PerformSearchMethodArguments): { searchId: string, resultCount: number };
+    // Returns search results from given <code>fromIndex</code> to given <code>toIndex</code> from the sarch with the given identifier.
+    getSearchResults(params: GetSearchResultsMethodArguments): { nodeIds: NodeId[] };
+    // Discards search results from the session with the given id. <code>getSearchResults</code> should no longer be called for that search.
+    discardSearchResults(params: DiscardSearchResultsMethodArguments): void;
+    // Highlights DOM node with given id or with the given JavaScript object wrapper. Either nodeId or objectId must be specified.
+    highlightNode(params: HighlightNodeMethodArguments): void;
+    // Hides DOM node highlight.
+    hideHighlight(): void;
+    // Resolves JavaScript node object for given node id.
+    resolveNode(params: ResolveNodeMethodArguments): { object: RuntimeDomain.RemoteObject };
 }
 export class DOMFrontend { 
-	// Fired when <code>Document</code> has been totally updated. Node ids are no longer valid.
-	documentUpdated(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.documentUpdated", "params": {  } } )); 
-	}
-	// Fired when backend wants to provide client with the missing DOM structure. This happens upon most of the calls requesting node ids.
-	setChildNodes(parentId: NodeId, nodes: Node[]): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.setChildNodes", "params": { "parentId": parentId, "nodes": nodes } } )); 
-	}
-	// Fired when <code>Element</code>'s attribute is modified.
-	attributeModified(nodeId: NodeId, name: string, value: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.attributeModified", "params": { "nodeId": nodeId, "name": name, "value": value } } )); 
-	}
-	// Fired when <code>Element</code>'s attribute is removed.
-	attributeRemoved(nodeId: NodeId, name: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.attributeRemoved", "params": { "nodeId": nodeId, "name": name } } )); 
-	}
-	// Fired when <code>Element</code>'s inline style is modified via a CSS property modification.
-	inlineStyleInvalidated(nodeIds: NodeId[]): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.inlineStyleInvalidated", "params": { "nodeIds": nodeIds } } )); 
-	}
-	// Mirrors <code>DOMCharacterDataModified</code> event.
-	characterDataModified(nodeId: NodeId, characterData: string): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.characterDataModified", "params": { "nodeId": nodeId, "characterData": characterData } } )); 
-	}
-	// Fired when <code>Container</code>'s child node count has changed.
-	childNodeCountUpdated(nodeId: NodeId, childNodeCount: number): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.childNodeCountUpdated", "params": { "nodeId": nodeId, "childNodeCount": childNodeCount } } )); 
-	}
-	// Mirrors <code>DOMNodeInserted</code> event.
-	childNodeInserted(parentNodeId: NodeId, previousNodeId: NodeId, node: Node): void {
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.childNodeInserted", "params": { "parentNodeId": parentNodeId, "previousNodeId": previousNodeId, "node": node } } )); 
-	}
-	// Mirrors <code>DOMNodeRemoved</code> event.
-	childNodeRemoved(parentNodeId: NodeId, nodeId: NodeId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.childNodeRemoved", "params": { "parentNodeId": parentNodeId, "nodeId": nodeId } } )); 
-	}
-	// Called when shadow root is pushed into the element.
-	shadowRootPushed(hostId: NodeId, root: Node): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.shadowRootPushed", "params": { "hostId": hostId, "root": root } } )); 
-	}
-	// Called when shadow root is popped from the element.
-	shadowRootPopped(hostId: NodeId, rootId: NodeId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.shadowRootPopped", "params": { "hostId": hostId, "rootId": rootId } } )); 
-	}
-	// Called when a pseudo element is added to an element.
-	pseudoElementAdded(parentId: NodeId, pseudoElement: Node): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.pseudoElementAdded", "params": { "parentId": parentId, "pseudoElement": pseudoElement } } )); 
-	}
-	// Called when a pseudo element is removed from an element.
-	pseudoElementRemoved(parentId: NodeId, pseudoElementId: NodeId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "DOM.pseudoElementRemoved", "params": { "parentId": parentId, "pseudoElementId": pseudoElementId } } )); 
-	}
+    // Fired when <code>Document</code> has been totally updated. Node ids are no longer valid.
+    documentUpdated(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.documentUpdated", "params": {  } } )); 
+    }
+    // Fired when backend wants to provide client with the missing DOM structure. This happens upon most of the calls requesting node ids.
+    setChildNodes(parentId: NodeId, nodes: Node[]): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.setChildNodes", "params": { "parentId": parentId, "nodes": nodes } } )); 
+    }
+    // Fired when <code>Element</code>'s attribute is modified.
+    attributeModified(nodeId: NodeId, name: string, value: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.attributeModified", "params": { "nodeId": nodeId, "name": name, "value": value } } )); 
+    }
+    // Fired when <code>Element</code>'s attribute is removed.
+    attributeRemoved(nodeId: NodeId, name: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.attributeRemoved", "params": { "nodeId": nodeId, "name": name } } )); 
+    }
+    // Fired when <code>Element</code>'s inline style is modified via a CSS property modification.
+    inlineStyleInvalidated(nodeIds: NodeId[]): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.inlineStyleInvalidated", "params": { "nodeIds": nodeIds } } )); 
+    }
+    // Mirrors <code>DOMCharacterDataModified</code> event.
+    characterDataModified(nodeId: NodeId, characterData: string): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.characterDataModified", "params": { "nodeId": nodeId, "characterData": characterData } } )); 
+    }
+    // Fired when <code>Container</code>'s child node count has changed.
+    childNodeCountUpdated(nodeId: NodeId, childNodeCount: number): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.childNodeCountUpdated", "params": { "nodeId": nodeId, "childNodeCount": childNodeCount } } )); 
+    }
+    // Mirrors <code>DOMNodeInserted</code> event.
+    childNodeInserted(parentNodeId: NodeId, previousNodeId: NodeId, node: Node): void {
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.childNodeInserted", "params": { "parentNodeId": parentNodeId, "previousNodeId": previousNodeId, "node": node } } )); 
+    }
+    // Mirrors <code>DOMNodeRemoved</code> event.
+    childNodeRemoved(parentNodeId: NodeId, nodeId: NodeId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.childNodeRemoved", "params": { "parentNodeId": parentNodeId, "nodeId": nodeId } } )); 
+    }
+    // Called when shadow root is pushed into the element.
+    shadowRootPushed(hostId: NodeId, root: Node): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.shadowRootPushed", "params": { "hostId": hostId, "root": root } } )); 
+    }
+    // Called when shadow root is popped from the element.
+    shadowRootPopped(hostId: NodeId, rootId: NodeId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.shadowRootPopped", "params": { "hostId": hostId, "rootId": rootId } } )); 
+    }
+    // Called when a pseudo element is added to an element.
+    pseudoElementAdded(parentId: NodeId, pseudoElement: Node): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.pseudoElementAdded", "params": { "parentId": parentId, "pseudoElement": pseudoElement } } )); 
+    }
+    // Called when a pseudo element is removed from an element.
+    pseudoElementRemoved(parentId: NodeId, pseudoElementId: NodeId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "DOM.pseudoElementRemoved", "params": { "parentId": parentId, "pseudoElementId": pseudoElementId } } )); 
+    }
 }
 }
 
@@ -1469,266 +1469,266 @@ export namespace CSSDomain {
 export type StyleSheetId = string
 
 export interface PseudoElementMatches {
-	// Pseudo element type.
-	pseudoType: DOMDomain.PseudoType;
-	// Matches of CSS rules applicable to the pseudo style.
-	matches: RuleMatch[];
+    // Pseudo element type.
+    pseudoType: DOMDomain.PseudoType;
+    // Matches of CSS rules applicable to the pseudo style.
+    matches: RuleMatch[];
 }
 
 export interface InheritedStyleEntry {
-	// The ancestor node's inline style, if any, in the style inheritance chain.
-	inlineStyle?: CSSStyle;
-	// Matches of CSS rules matching the ancestor node in the style inheritance chain.
-	matchedCSSRules: RuleMatch[];
+    // The ancestor node's inline style, if any, in the style inheritance chain.
+    inlineStyle?: CSSStyle;
+    // Matches of CSS rules matching the ancestor node in the style inheritance chain.
+    matchedCSSRules: RuleMatch[];
 }
 
 export interface RuleMatch {
-	// CSS rule in the match.
-	rule: CSSRule;
-	// Matching selector indices in the rule's selectorList selectors (0-based).
-	matchingSelectors: number[];
+    // CSS rule in the match.
+    rule: CSSRule;
+    // Matching selector indices in the rule's selectorList selectors (0-based).
+    matchingSelectors: number[];
 }
 
 export interface Value {
-	// Value text.
-	text: string;
-	// Value range in the underlying resource (if available).
-	range?: SourceRange;
+    // Value text.
+    text: string;
+    // Value range in the underlying resource (if available).
+    range?: SourceRange;
 }
 
 export interface SelectorList {
-	// Selectors in the list.
-	selectors: Value[];
-	// Rule selector text.
-	text: string;
+    // Selectors in the list.
+    selectors: Value[];
+    // Rule selector text.
+    text: string;
 }
 
 export interface CSSStyleSheetHeader {
-	// The stylesheet identifier.
-	styleSheetId: StyleSheetId;
-	// Owner frame identifier.
-	frameId: string;
-	// Stylesheet resource URL.
-	sourceURL: string;
-	// URL of source map associated with the stylesheet (if any).
-	sourceMapURL?: string;
-	// Stylesheet origin.
-	origin: StyleSheetOrigin;
-	// Stylesheet title.
-	title: string;
-	// The backend id for the owner node of the stylesheet.
-	ownerNode?: DOMDomain.BackendNodeId;
-	// Denotes whether the stylesheet is disabled.
-	disabled: boolean;
-	// Whether the sourceURL field value comes from the sourceURL comment.
-	hasSourceURL?: boolean;
-	// Whether this stylesheet is created for STYLE tag by parser. This flag is not set for document.written STYLE tags.
-	isInline: boolean;
-	// Line offset of the stylesheet within the resource (zero based).
-	startLine: number;
-	// Column offset of the stylesheet within the resource (zero based).
-	startColumn: number;
+    // The stylesheet identifier.
+    styleSheetId: StyleSheetId;
+    // Owner frame identifier.
+    frameId: string;
+    // Stylesheet resource URL.
+    sourceURL: string;
+    // URL of source map associated with the stylesheet (if any).
+    sourceMapURL?: string;
+    // Stylesheet origin.
+    origin: StyleSheetOrigin;
+    // Stylesheet title.
+    title: string;
+    // The backend id for the owner node of the stylesheet.
+    ownerNode?: DOMDomain.BackendNodeId;
+    // Denotes whether the stylesheet is disabled.
+    disabled: boolean;
+    // Whether the sourceURL field value comes from the sourceURL comment.
+    hasSourceURL?: boolean;
+    // Whether this stylesheet is created for STYLE tag by parser. This flag is not set for document.written STYLE tags.
+    isInline: boolean;
+    // Line offset of the stylesheet within the resource (zero based).
+    startLine: number;
+    // Column offset of the stylesheet within the resource (zero based).
+    startColumn: number;
 }
 
 export interface CSSRule {
-	// The css style sheet identifier (absent for user agent stylesheet and user-specified stylesheet rules) this rule came from.
-	styleSheetId?: StyleSheetId;
-	// Rule selector data.
-	selectorList: SelectorList;
-	// Parent stylesheet's origin.
-	origin: StyleSheetOrigin;
-	// Associated style declaration.
-	style: CSSStyle;
-	// Media list array (for rules involving media queries). The array enumerates media queries starting with the innermost one, going outwards.
-	media?: CSSMedia[];
+    // The css style sheet identifier (absent for user agent stylesheet and user-specified stylesheet rules) this rule came from.
+    styleSheetId?: StyleSheetId;
+    // Rule selector data.
+    selectorList: SelectorList;
+    // Parent stylesheet's origin.
+    origin: StyleSheetOrigin;
+    // Associated style declaration.
+    style: CSSStyle;
+    // Media list array (for rules involving media queries). The array enumerates media queries starting with the innermost one, going outwards.
+    media?: CSSMedia[];
 }
 
 export interface SourceRange {
-	// Start line of range.
-	startLine: number;
-	// Start column of range (inclusive).
-	startColumn: number;
-	// End line of range
-	endLine: number;
-	// End column of range (exclusive).
-	endColumn: number;
+    // Start line of range.
+    startLine: number;
+    // Start column of range (inclusive).
+    startColumn: number;
+    // End line of range
+    endLine: number;
+    // End column of range (exclusive).
+    endColumn: number;
 }
 
 export interface ShorthandEntry {
-	// Shorthand name.
-	name: string;
-	// Shorthand value.
-	value: string;
-	// Whether the property has "!important" annotation (implies <code>false</code> if absent).
-	important?: boolean;
+    // Shorthand name.
+    name: string;
+    // Shorthand value.
+    value: string;
+    // Whether the property has "!important" annotation (implies <code>false</code> if absent).
+    important?: boolean;
 }
 
 export interface CSSComputedStyleProperty {
-	// Computed style property name.
-	name: string;
-	// Computed style property value.
-	value: string;
+    // Computed style property name.
+    name: string;
+    // Computed style property value.
+    value: string;
 }
 
 export interface CSSStyle {
-	// The css style sheet identifier (absent for user agent stylesheet and user-specified stylesheet rules) this rule came from.
-	styleSheetId?: StyleSheetId;
-	// CSS properties in the style.
-	cssProperties: CSSProperty[];
-	// Computed values for all shorthands found in the style.
-	shorthandEntries: ShorthandEntry[];
-	// Style declaration text (if available).
-	cssText?: string;
-	// Style declaration range in the enclosing stylesheet (if available).
-	range?: SourceRange;
+    // The css style sheet identifier (absent for user agent stylesheet and user-specified stylesheet rules) this rule came from.
+    styleSheetId?: StyleSheetId;
+    // CSS properties in the style.
+    cssProperties: CSSProperty[];
+    // Computed values for all shorthands found in the style.
+    shorthandEntries: ShorthandEntry[];
+    // Style declaration text (if available).
+    cssText?: string;
+    // Style declaration range in the enclosing stylesheet (if available).
+    range?: SourceRange;
 }
 
 export interface CSSProperty {
-	// The property name.
-	name: string;
-	// The property value.
-	value: string;
-	// Whether the property has "!important" annotation (implies <code>false</code> if absent).
-	important?: boolean;
-	// Whether the property is implicit (implies <code>false</code> if absent).
-	implicit?: boolean;
-	// The full property text as specified in the style.
-	text?: string;
-	// Whether the property is understood by the browser (implies <code>true</code> if absent).
-	parsedOk?: boolean;
-	// Whether the property is disabled by the user (present for source-based properties only).
-	disabled?: boolean;
-	// The entire property range in the enclosing style declaration (if available).
-	range?: SourceRange;
+    // The property name.
+    name: string;
+    // The property value.
+    value: string;
+    // Whether the property has "!important" annotation (implies <code>false</code> if absent).
+    important?: boolean;
+    // Whether the property is implicit (implies <code>false</code> if absent).
+    implicit?: boolean;
+    // The full property text as specified in the style.
+    text?: string;
+    // Whether the property is understood by the browser (implies <code>true</code> if absent).
+    parsedOk?: boolean;
+    // Whether the property is disabled by the user (present for source-based properties only).
+    disabled?: boolean;
+    // The entire property range in the enclosing style declaration (if available).
+    range?: SourceRange;
 }
 
 export interface CSSMedia {
-	// Media query text.
-	text: string;
-	// Source of the media query: "mediaRule" if specified by a @media rule, "importRule" if specified by an @import rule, "linkedSheet" if specified by a "media" attribute in a linked stylesheet's LINK tag, "inlineSheet" if specified by a "media" attribute in an inline stylesheet's STYLE tag.
-	source: any /* mediaRule,importRule,linkedSheet,inlineSheet */;
-	// URL of the document containing the media query description.
-	sourceURL?: string;
-	// The associated rule (@media or @import) header range in the enclosing stylesheet (if available).
-	range?: SourceRange;
-	// Identifier of the stylesheet containing this object (if exists).
-	styleSheetId?: StyleSheetId;
-	// Array of media queries.
-	mediaList?: MediaQuery[];
+    // Media query text.
+    text: string;
+    // Source of the media query: "mediaRule" if specified by a @media rule, "importRule" if specified by an @import rule, "linkedSheet" if specified by a "media" attribute in a linked stylesheet's LINK tag, "inlineSheet" if specified by a "media" attribute in an inline stylesheet's STYLE tag.
+    source: any /* mediaRule,importRule,linkedSheet,inlineSheet */;
+    // URL of the document containing the media query description.
+    sourceURL?: string;
+    // The associated rule (@media or @import) header range in the enclosing stylesheet (if available).
+    range?: SourceRange;
+    // Identifier of the stylesheet containing this object (if exists).
+    styleSheetId?: StyleSheetId;
+    // Array of media queries.
+    mediaList?: MediaQuery[];
 }
 
 export interface MediaQuery {
-	// Array of media query expressions.
-	expressions: MediaQueryExpression[];
-	// Whether the media query condition is satisfied.
-	active: boolean;
+    // Array of media query expressions.
+    expressions: MediaQueryExpression[];
+    // Whether the media query condition is satisfied.
+    active: boolean;
 }
 
 export interface MediaQueryExpression {
-	// Media query expression value.
-	value: number;
-	// Media query expression units.
-	unit: string;
-	// Media query expression feature.
-	feature: string;
-	// The associated range of the value text in the enclosing stylesheet (if available).
-	valueRange?: SourceRange;
-	// Computed length of media query expression (if applicable).
-	computedLength?: number;
+    // Media query expression value.
+    value: number;
+    // Media query expression units.
+    unit: string;
+    // Media query expression feature.
+    feature: string;
+    // The associated range of the value text in the enclosing stylesheet (if available).
+    valueRange?: SourceRange;
+    // Computed length of media query expression (if applicable).
+    computedLength?: number;
 }
 
 export interface PlatformFontUsage {
-	// Font's family name reported by platform.
-	familyName: string;
-	// Indicates if the font was downloaded or resolved locally.
-	isCustomFont: boolean;
-	// Amount of glyphs that were rendered with this font.
-	glyphCount: number;
+    // Font's family name reported by platform.
+    familyName: string;
+    // Indicates if the font was downloaded or resolved locally.
+    isCustomFont: boolean;
+    // Amount of glyphs that were rendered with this font.
+    glyphCount: number;
 }
 
 export interface CSSKeyframesRule {
-	// Animation name.
-	animationName: Value;
-	// List of keyframes.
-	keyframes: CSSKeyframeRule[];
+    // Animation name.
+    animationName: Value;
+    // List of keyframes.
+    keyframes: CSSKeyframeRule[];
 }
 
 export interface CSSKeyframeRule {
-	// The css style sheet identifier (absent for user agent stylesheet and user-specified stylesheet rules) this rule came from.
-	styleSheetId?: StyleSheetId;
-	// Parent stylesheet's origin.
-	origin: StyleSheetOrigin;
-	// Associated key text.
-	keyText: Value;
-	// Associated style declaration.
-	style: CSSStyle;
+    // The css style sheet identifier (absent for user agent stylesheet and user-specified stylesheet rules) this rule came from.
+    styleSheetId?: StyleSheetId;
+    // Parent stylesheet's origin.
+    origin: StyleSheetOrigin;
+    // Associated key text.
+    keyText: Value;
+    // Associated style declaration.
+    style: CSSStyle;
 }
 
 export interface StyleDeclarationEdit {
-	// The css style sheet identifier.
-	styleSheetId: StyleSheetId;
-	// The range of the style text in the enclosing stylesheet.
-	range: SourceRange;
-	// New style text.
-	text: string;
+    // The css style sheet identifier.
+    styleSheetId: StyleSheetId;
+    // The range of the style text in the enclosing stylesheet.
+    range: SourceRange;
+    // New style text.
+    text: string;
 }
 
 export const enum StyleSheetOrigin { Injected, UserAgent, Inspector, Regular }; 
 
 export interface GetMatchedStylesForNodeMethodArguments { 
-	nodeId: DOMDomain.NodeId
+    nodeId: DOMDomain.NodeId
 }
 export interface GetInlineStylesForNodeMethodArguments { 
-	nodeId: DOMDomain.NodeId
+    nodeId: DOMDomain.NodeId
 }
 export interface GetComputedStyleForNodeMethodArguments { 
-	nodeId: DOMDomain.NodeId
+    nodeId: DOMDomain.NodeId
 }
 export interface GetPlatformFontsForNodeMethodArguments { 
-	nodeId: DOMDomain.NodeId
+    nodeId: DOMDomain.NodeId
 }
 export interface GetStyleSheetTextMethodArguments { 
-	styleSheetId: StyleSheetId
+    styleSheetId: StyleSheetId
 }
 export interface CSSDomainDispatcher { 
-	// Enables the CSS agent for the given page. Clients should not assume that the CSS agent has been enabled until the result of this command is received.
-	enable(): void;
-	// Disables the CSS agent for the given page.
-	disable(): void;
-	// Returns requested styles for a DOM node identified by <code>nodeId</code>.
-	getMatchedStylesForNode(params: GetMatchedStylesForNodeMethodArguments): { inlineStyle?: CSSStyle, attributesStyle?: CSSStyle, matchedCSSRules?: RuleMatch[], pseudoElements?: PseudoElementMatches[], inherited?: InheritedStyleEntry[], cssKeyframesRules?: CSSKeyframesRule[] };
-	// Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM attributes) for a DOM node identified by <code>nodeId</code>.
-	getInlineStylesForNode(params: GetInlineStylesForNodeMethodArguments): { inlineStyle?: CSSStyle, attributesStyle?: CSSStyle };
-	// Returns the computed style for a DOM node identified by <code>nodeId</code>.
-	getComputedStyleForNode(params: GetComputedStyleForNodeMethodArguments): { computedStyle: CSSComputedStyleProperty[] };
-	// Requests information about platform fonts which we used to render child TextNodes in the given node.
-	getPlatformFontsForNode(params: GetPlatformFontsForNodeMethodArguments): { fonts: PlatformFontUsage[] };
-	// Returns the current textual content and the URL for a stylesheet.
-	getStyleSheetText(params: GetStyleSheetTextMethodArguments): { text: string };
+    // Enables the CSS agent for the given page. Clients should not assume that the CSS agent has been enabled until the result of this command is received.
+    enable(): void;
+    // Disables the CSS agent for the given page.
+    disable(): void;
+    // Returns requested styles for a DOM node identified by <code>nodeId</code>.
+    getMatchedStylesForNode(params: GetMatchedStylesForNodeMethodArguments): { inlineStyle?: CSSStyle, attributesStyle?: CSSStyle, matchedCSSRules?: RuleMatch[], pseudoElements?: PseudoElementMatches[], inherited?: InheritedStyleEntry[], cssKeyframesRules?: CSSKeyframesRule[] };
+    // Returns the styles defined inline (explicitly in the "style" attribute and implicitly, using DOM attributes) for a DOM node identified by <code>nodeId</code>.
+    getInlineStylesForNode(params: GetInlineStylesForNodeMethodArguments): { inlineStyle?: CSSStyle, attributesStyle?: CSSStyle };
+    // Returns the computed style for a DOM node identified by <code>nodeId</code>.
+    getComputedStyleForNode(params: GetComputedStyleForNodeMethodArguments): { computedStyle: CSSComputedStyleProperty[] };
+    // Requests information about platform fonts which we used to render child TextNodes in the given node.
+    getPlatformFontsForNode(params: GetPlatformFontsForNodeMethodArguments): { fonts: PlatformFontUsage[] };
+    // Returns the current textual content and the URL for a stylesheet.
+    getStyleSheetText(params: GetStyleSheetTextMethodArguments): { text: string };
 }
 export class CSSFrontend { 
-	// Fires whenever a MediaQuery result changes (for example, after a browser window has been resized.) The current implementation considers only viewport-dependent media features.
-	mediaQueryResultChanged(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "CSS.mediaQueryResultChanged", "params": {  } } )); 
-	}
-	// Fires whenever a web font gets loaded.
-	fontsUpdated(): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "CSS.fontsUpdated", "params": {  } } )); 
-	}
-	// Fired whenever a stylesheet is changed as a result of the client operation.
-	styleSheetChanged(styleSheetId: StyleSheetId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "CSS.styleSheetChanged", "params": { "styleSheetId": styleSheetId } } )); 
-	}
-	// Fired whenever an active document stylesheet is added.
-	styleSheetAdded(header: CSSStyleSheetHeader): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "CSS.styleSheetAdded", "params": { "header": header } } )); 
-	}
-	// Fired whenever an active document stylesheet is removed.
-	styleSheetRemoved(styleSheetId: StyleSheetId): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "CSS.styleSheetRemoved", "params": { "styleSheetId": styleSheetId } } )); 
-	}
-	layoutEditorChange(styleSheetId: StyleSheetId, changeRange: SourceRange): void { 
-		 __inspectorSendEvent(JSON.stringify( { "method": "CSS.layoutEditorChange", "params": { "styleSheetId": styleSheetId, "changeRange": changeRange } } )); 
-	}
+    // Fires whenever a MediaQuery result changes (for example, after a browser window has been resized.) The current implementation considers only viewport-dependent media features.
+    mediaQueryResultChanged(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "CSS.mediaQueryResultChanged", "params": {  } } )); 
+    }
+    // Fires whenever a web font gets loaded.
+    fontsUpdated(): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "CSS.fontsUpdated", "params": {  } } )); 
+    }
+    // Fired whenever a stylesheet is changed as a result of the client operation.
+    styleSheetChanged(styleSheetId: StyleSheetId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "CSS.styleSheetChanged", "params": { "styleSheetId": styleSheetId } } )); 
+    }
+    // Fired whenever an active document stylesheet is added.
+    styleSheetAdded(header: CSSStyleSheetHeader): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "CSS.styleSheetAdded", "params": { "header": header } } )); 
+    }
+    // Fired whenever an active document stylesheet is removed.
+    styleSheetRemoved(styleSheetId: StyleSheetId): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "CSS.styleSheetRemoved", "params": { "styleSheetId": styleSheetId } } )); 
+    }
+    layoutEditorChange(styleSheetId: StyleSheetId, changeRange: SourceRange): void { 
+         __inspectorSendEvent(JSON.stringify( { "method": "CSS.layoutEditorChange", "params": { "styleSheetId": styleSheetId, "changeRange": changeRange } } )); 
+    }
 }
 }
\ No newline at end of file
diff --git a/tns-core-modules/debugger/debugger.ts b/tns-core-modules/debugger/debugger.ts
index b5e1c04751..ae219b2f1d 100644
--- a/tns-core-modules/debugger/debugger.ts
+++ b/tns-core-modules/debugger/debugger.ts
@@ -47,7 +47,7 @@ export function setNetwork(newNetwork: domains.network.NetworkDomainDebugger) {
 
 var dom;
 
-export function getDOM():any {
+export function getDOM(): any {
     return dom;
 }
 
@@ -70,6 +70,8 @@ export namespace NetworkAgent {
         url: string;
         method: string;
         headers: any;
+        initialPriority: string;
+        referrerPolicy: string;
         postData?: string;
     }
 
@@ -79,6 +81,7 @@ export namespace NetworkAgent {
         request: Request;
         timestamp: number;
         type: string;
+        wallTime: number;
     }
 
     export interface Response {
@@ -88,6 +91,10 @@ export namespace NetworkAgent {
         headers: any;
         headersText?: string;
         mimeType: string;
+        connectionReused: boolean;
+        connectionId: number;
+        encodedDataLength: number;
+        securityState: string;
         fromDiskCache?: boolean;
     }
 
@@ -113,13 +120,23 @@ export namespace NetworkAgent {
         const requestIdStr = requestId.toString();
         // Content-Type and content-type are both common in headers spelling
         const mimeType: string = <string>headers["Content-Type"] || <string>headers["content-type"] || "application/octet-stream";
+        const contentLengthHeader: string = <string>headers["Content-Length"] || <string>headers["content-length"];
+        var contentLength = parseInt(contentLengthHeader, 10);
+        if (isNaN(contentLength)) {
+            contentLength = 0;
+        }
+
         const response: NetworkAgent.Response = {
             url: result.url || "",
             status: result.statusCode,
             statusText: result.statusText || "",
             headers: headers,
             mimeType: mimeType,
-            fromDiskCache: false
+            fromDiskCache: false,
+            connectionReused: true,
+            connectionId: 0,
+            encodedDataLength: contentLength,
+            securityState: "info"
         }
 
         const responseData: NetworkAgent.ResponseData = {
@@ -130,7 +147,11 @@ export namespace NetworkAgent {
         }
 
         global.__inspector.responseReceived(responseData);
-        global.__inspector.loadingFinished({ requestId: requestIdStr, timestamp: getTimeStamp() });
+        global.__inspector.loadingFinished({
+            requestId: requestIdStr,
+            timestamp: getTimeStamp(),
+            encodedDataLength: contentLength
+        });
 
         const hasTextContent = responseData.type === "Document" || responseData.type === "Script";
         let data;
@@ -164,7 +185,9 @@ export namespace NetworkAgent {
             url: options.url,
             method: options.method,
             headers: options.headers || {},
-            postData: options.content ? options.content.toString() : ""
+            postData: options.content ? options.content.toString() : "",
+            initialPriority: "Medium",
+            referrerPolicy: "no-referrer-when-downgrade"
         }
 
         const requestData: NetworkAgent.RequestData = {
@@ -172,7 +195,8 @@ export namespace NetworkAgent {
             url: request.url,
             request: request,
             timestamp: getTimeStamp(),
-            type: "Document"
+            type: "Document",
+            wallTime: 0
         }
 
         global.__inspector.requestWillBeSent(requestData);
diff --git a/tns-core-modules/debugger/devtools-elements.common.ts b/tns-core-modules/debugger/devtools-elements.common.ts
index fc35c6f093..186cfe3202 100644
--- a/tns-core-modules/debugger/devtools-elements.common.ts
+++ b/tns-core-modules/debugger/devtools-elements.common.ts
@@ -4,7 +4,7 @@ import { getNodeById } from "./dom-node";
 import { ViewBase } from "../ui/core/view-base";
 
 // Use lazy requires for core modules
-const frameTopmost = () => { return require("../ui/frame").topmost(); };
+const frameTopmost = () => require("../ui/frame").topmost();
 
 let unsetValue;
 function unsetViewValue(view, name) {
@@ -76,7 +76,7 @@ export function setAttributeAsText(nodeId, text, name) {
 
             if (textParts.length === 2) {
                 let attrName = textParts[0];
-                let attrValue = textParts[1].replace(/['"]+/g, '');
+                let attrValue = textParts[1].replace(/['"]+/g, "");
 
                 // if attr name is being replaced with another
                 if (name !== attrName && hasOriginalAttribute) {
diff --git a/tns-core-modules/debugger/dom-node.ts b/tns-core-modules/debugger/dom-node.ts
index f592b8b296..f4f3ba069b 100644
--- a/tns-core-modules/debugger/dom-node.ts
+++ b/tns-core-modules/debugger/dom-node.ts
@@ -210,7 +210,8 @@ export class DOMNode {
             localName: this.localName,
             nodeValue: this.nodeValue,
             children: this.children.map(c => c.toObject()),
-            attributes: this.attributes
+            attributes: this.attributes,
+            backendNodeId: 0
         };
     }
 }
diff --git a/tns-core-modules/debugger/webinspector-css.ios.ts b/tns-core-modules/debugger/webinspector-css.ios.ts
index 855b03002c..e248a6d041 100644
--- a/tns-core-modules/debugger/webinspector-css.ios.ts
+++ b/tns-core-modules/debugger/webinspector-css.ios.ts
@@ -2,9 +2,6 @@ import * as inspectorCommandTypes from "./InspectorBackendCommands.ios";
 var inspectorCommands: typeof inspectorCommandTypes = require("./InspectorBackendCommands");
 
 import * as debuggerDomains from "./debugger";
-import * as devToolsElements from "./devtools-elements";
-
-declare var __inspectorSendEvent;
 
 import { attachCSSInspectorCommandCallbacks } from "./devtools-elements";
 
diff --git a/tns-core-modules/debugger/webinspector-dom.ios.ts b/tns-core-modules/debugger/webinspector-dom.ios.ts
index c558acb8d3..038147be44 100644
--- a/tns-core-modules/debugger/webinspector-dom.ios.ts
+++ b/tns-core-modules/debugger/webinspector-dom.ios.ts
@@ -3,9 +3,6 @@ var inspectorCommands: typeof inspectorCommandTypes = require("./InspectorBacken
 // var inspectorCommandTypes: any = inspectorCommands;
 
 import * as debuggerDomains from "./debugger";
-import * as devToolsElements from "./devtools-elements";
-
-declare var __inspectorSendEvent;
 
 import { attachDOMInspectorEventCallbacks, attachDOMInspectorCommandCallbacks } from "./devtools-elements";
 
diff --git a/tns-core-modules/debugger/webinspector-network.ios.ts b/tns-core-modules/debugger/webinspector-network.ios.ts
index 258c5b84e5..769dbf402e 100644
--- a/tns-core-modules/debugger/webinspector-network.ios.ts
+++ b/tns-core-modules/debugger/webinspector-network.ios.ts
@@ -73,7 +73,7 @@ export class Request {
                 resourceType = documentTypeByMimeType[this._mimeType];
             }
 
-            if(this._mimeType.indexOf("image/") !== -1) {
+            if (this._mimeType.indexOf("image/") !== -1) {
                 resourceType = "Image";
             }
 
@@ -127,7 +127,7 @@ export class Request {
     
     public requestWillBeSent(request: inspectorCommandTypes.NetworkDomain.Request): void {
         if (this._networkDomainDebugger.enabled) {
-            this._networkDomainDebugger.events.requestWillBeSent(this.requestID, frameId, loaderId, request.url, request, __inspectorTimestamp(), { type: 'Script' });
+            this._networkDomainDebugger.events.requestWillBeSent(this.requestID, frameId, loaderId, request.url, request, __inspectorTimestamp(), { type: "Script" });
         }
     }
 }
@@ -182,7 +182,7 @@ export class NetworkDomainDebugger implements inspectorCommandTypes.NetworkDomai
         var body = resource_data.hasTextContent ? NSString.alloc().initWithDataEncoding(resource_data.data, 4).toString() :
                     resource_data.data.base64EncodedStringWithOptions(0);
 
-        if(resource_data) {
+        if (resource_data) {
              return {
                  body: body,
                  base64Encoded: !resource_data.hasTextContent
diff --git a/tns-core-modules/file-system/file-system-access.android.ts b/tns-core-modules/file-system/file-system-access.android.ts
index 4778367142..13da55dd6e 100644
--- a/tns-core-modules/file-system/file-system-access.android.ts
+++ b/tns-core-modules/file-system/file-system-access.android.ts
@@ -18,6 +18,11 @@ export class FileSystemAccess {
         return new Date(javaFile.lastModified());
     }
 
+    public getFileSize(path: string): number {
+        const javaFile = new java.io.File(path);
+        return javaFile.length();
+    }
+
     public getParent(path: string, onError?: (error: any) => any): { path: string; name: string } {
         try {
             var javaFile = new java.io.File(path);
@@ -311,7 +316,7 @@ export class FileSystemAccess {
     private deleteFolderContent(file: java.io.File): boolean {
         var filesList = file.listFiles();
         if (filesList.length === 0) {
-            return true;// Nothing to delete, so success!
+            return true; // Nothing to delete, so success!
         }
 
         var i,
diff --git a/tns-core-modules/file-system/file-system-access.d.ts b/tns-core-modules/file-system/file-system-access.d.ts
index c9048d50ae..e89e3dca81 100644
--- a/tns-core-modules/file-system/file-system-access.d.ts
+++ b/tns-core-modules/file-system/file-system-access.d.ts
@@ -12,6 +12,12 @@ export class FileSystemAccess {
      */
     getLastModified(path: string): Date;
 
+    /**
+     * Gets the size in bytes of a file with a given path.
+     * @param path Path to the file.
+     */
+    getFileSize(path: string): number;
+
     /**
      * Gets the parent folder of a file with a given path.
      * @param path Path to the file.
diff --git a/tns-core-modules/file-system/file-system-access.ios.ts b/tns-core-modules/file-system/file-system-access.ios.ts
index fbac869538..23c7faf1f8 100644
--- a/tns-core-modules/file-system/file-system-access.ios.ts
+++ b/tns-core-modules/file-system/file-system-access.ios.ts
@@ -16,6 +16,16 @@ export class FileSystemAccess {
         }
     }
 
+    public getFileSize(path: string): number {
+        const fileManager = ios.getter(NSFileManager, NSFileManager.defaultManager);
+        const attributes = fileManager.attributesOfItemAtPathError(path);
+        if (attributes) {
+            return attributes.objectForKey("NSFileSize");
+        } else {
+            return 0;
+        }
+    }
+
     public getParent(path: string, onError?: (error: any) => any): { path: string; name: string } {
         try {
             const fileManager = ios.getter(NSFileManager, NSFileManager.defaultManager);
@@ -347,7 +357,7 @@ export class FileSystemAccess {
                 const info = {
                     path: this.concatPath(path, file),
                     name: file,
-                    extension: ''
+                    extension: ""
                 };
 
                 if (!this.folderExists(this.joinPath(path, file))) {
@@ -386,4 +396,4 @@ export class FileSystemAccess {
     public joinPaths(paths: string[]): string {
        return ios.joinPaths(...paths);
     }
-}
\ No newline at end of file
+}
diff --git a/tns-core-modules/file-system/file-system.d.ts b/tns-core-modules/file-system/file-system.d.ts
index b3b4f06765..30268aad46 100644
--- a/tns-core-modules/file-system/file-system.d.ts
+++ b/tns-core-modules/file-system/file-system.d.ts
@@ -23,7 +23,7 @@ export class FileSystemEntity {
     path: string;
 
     /**
-     * Gets the Folder object representing the parent of this entity. 
+     * Gets the Folder object representing the parent of this entity.
      * Will be null for a root folder like Documents or Temporary.
      * This property is readonly.
      */
@@ -67,6 +67,11 @@ export class File extends FileSystemEntity {
      */
     extension: string;
 
+    /**
+     * Gets the size in bytes of the file.
+     */
+    size: number;
+
     /**
      * Gets a value indicating whether the file is currently locked, meaning a background operation associated with this file is running.
      */
@@ -208,7 +213,7 @@ export module knownFolders {
      * iOS - this folder is read-only and contains the app and all its resources.
      */
     export function currentApp(): Folder;
-    
+
     /**
      * Contains iOS-specific known folders.
      */
@@ -217,42 +222,42 @@ export module knownFolders {
          * Gets the NSLibraryDirectory.
          */
         export function library(): Folder;
-        
+
         /**
          * Gets the NSDeveloperDirectory.
          */
         export function developer(): Folder;
-        
+
         /**
          * Gets the NSDesktopDirectory.
          */
         export function desktop(): Folder;
-        
+
         /**
          * Gets the NSDownloadsDirectory.
          */
         export function downloads(): Folder;
-        
+
         /**
          * Gets the NSMoviesDirectory.
          */
         export function movies(): Folder;
-        
+
         /**
          * Gets the NSMusicDirectory.
          */
         export function music(): Folder;
-        
+
         /**
          * Gets the NSPicturesDirectory.
          */
         export function pictures(): Folder;
-        
+
         /**
          * Gets the NSSharedPublicDirectory.
          */
         export function sharedPublic(): Folder;
-    } 
+    }
 }
 
 /**
diff --git a/tns-core-modules/file-system/file-system.ts b/tns-core-modules/file-system/file-system.ts
index 830d51817f..14fab41186 100644
--- a/tns-core-modules/file-system/file-system.ts
+++ b/tns-core-modules/file-system/file-system.ts
@@ -137,9 +137,7 @@ export class FileSystemEntity {
         var path = parentFolder.path;
         var newPath = fileAccess.joinPath(path, newName);
 
-        var hasError = false;
         var localError = function (error) {
-            hasError = true;
             if (onError) {
                 onError(error);
             }
@@ -200,6 +198,10 @@ export class File extends FileSystemEntity {
         return !!this._locked;
     }
 
+    get size(): number {
+        return getFileAccess().getFileSize(this.path);
+    }
+
     public readSync(onError?: (error: any) => any): any {
         this.checkAccess();
 
@@ -304,7 +306,7 @@ export class File extends FileSystemEntity {
                     onError(error);
                 }
             };
-    
+
             // TODO: Asyncronous
             getFileAccess().writeText(this.path, content, localError, encoding);
         } finally {
@@ -499,15 +501,15 @@ export module knownFolders {
 
         return _app;
     };
-    
+
     export module ios {
-        function _checkPlatform(knownFolderName: string){
+        function _checkPlatform(knownFolderName: string) {
             ensurePlatform();
-            if (!platform.isIOS){
+            if (!platform.isIOS) {
                 throw new Error(`The "${knownFolderName}" known folder is available on iOS only!`);
-            }            
+            }
         }
-        
+
         let _library: Folder;
         export var library = function(): Folder {
             _checkPlatform("library");
@@ -523,7 +525,7 @@ export module knownFolders {
 
             return _library;
         };
-        
+
         let _developer: Folder;
         export var developer = function(): Folder {
             _checkPlatform("developer");
@@ -539,7 +541,7 @@ export module knownFolders {
 
             return _developer;
         };
-        
+
         let _desktop: Folder;
         export var desktop = function(): Folder {
             _checkPlatform("desktop");
@@ -555,7 +557,7 @@ export module knownFolders {
 
             return _desktop;
         };
-        
+
         let _downloads: Folder;
         export var downloads = function(): Folder {
             _checkPlatform("downloads");
@@ -571,7 +573,7 @@ export module knownFolders {
 
             return _downloads;
         };
-        
+
         let _movies: Folder;
         export var movies = function(): Folder {
             _checkPlatform("movies");
@@ -587,7 +589,7 @@ export module knownFolders {
 
             return _movies;
         };
-        
+
         let _music: Folder;
         export var music = function(): Folder {
             _checkPlatform("music");
diff --git a/tns-core-modules/globals/globals.ts b/tns-core-modules/globals/globals.ts
index 181882f8e2..5b3162d632 100644
--- a/tns-core-modules/globals/globals.ts
+++ b/tns-core-modules/globals/globals.ts
@@ -126,8 +126,6 @@ global.registerModule("fetch", () => require("fetch"));
     }
 }
 
-const __tnsGlobalMergedModules = new Map<string, boolean>();
-
 function registerOnGlobalContext(name: string, module: string): void {
 
     Object.defineProperty(global, name, {
diff --git a/tns-core-modules/http/http-request/http-request-common.ts b/tns-core-modules/http/http-request/http-request-common.ts
index 63c9e73b04..bf3f2b0eb0 100644
--- a/tns-core-modules/http/http-request/http-request-common.ts
+++ b/tns-core-modules/http/http-request/http-request-common.ts
@@ -2,8 +2,8 @@ import * as fsModule from "../../file-system";
 
 export function getFilenameFromUrl(url: string) {
     const fs: typeof fsModule = require("file-system");
-    const slashPos = url.lastIndexOf('/') + 1;
-    const questionMarkPos = url.lastIndexOf('?');
+    const slashPos = url.lastIndexOf("/") + 1;
+    const questionMarkPos = url.lastIndexOf("?");
 
     let actualFileName: string;
     if (questionMarkPos !== -1) {
diff --git a/tns-core-modules/http/http-request/http-request.android.ts b/tns-core-modules/http/http-request/http-request.android.ts
index 8c43b9fbba..0877e6d0dc 100644
--- a/tns-core-modules/http/http-request/http-request.android.ts
+++ b/tns-core-modules/http/http-request/http-request.android.ts
@@ -230,7 +230,7 @@ export function request(options: http.HttpRequestOptions): Promise<http.HttpResp
 function decodeResponse(raw: any, encoding?: HttpResponseEncoding) {
     let charsetName = "UTF-8";
     if (encoding === HttpResponseEncoding.GBK) {
-        charsetName = 'GBK';
+        charsetName = "GBK";
     }
     return raw.toString(charsetName)
 }
diff --git a/tns-core-modules/http/http-request/http-request.ios.ts b/tns-core-modules/http/http-request/http-request.ios.ts
index 59d1b6eb58..2055b09ebf 100644
--- a/tns-core-modules/http/http-request/http-request.ios.ts
+++ b/tns-core-modules/http/http-request/http-request.ios.ts
@@ -24,7 +24,7 @@ var osVersion = currentDevice.systemVersion;
 
 var GET = "GET";
 var USER_AGENT_HEADER = "User-Agent";
-var USER_AGENT = `Mozilla/5.0 (i${device}; CPU OS ${osVersion.replace('.', '_')} like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/${osVersion} Mobile/10A5355d Safari/8536.25`;
+var USER_AGENT = `Mozilla/5.0 (i${device}; CPU OS ${osVersion.replace(".", "_")} like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/${osVersion} Mobile/10A5355d Safari/8536.25`;
 var sessionConfig = getter(NSURLSessionConfiguration, NSURLSessionConfiguration.defaultSessionConfiguration);
 var queue = getter(NSOperationQueue, NSOperationQueue.mainQueue);
 
diff --git a/tns-core-modules/image-asset/image-asset-common.ts b/tns-core-modules/image-asset/image-asset-common.ts
index 56dac68500..52cbb5a424 100644
--- a/tns-core-modules/image-asset/image-asset-common.ts
+++ b/tns-core-modules/image-asset/image-asset-common.ts
@@ -9,6 +9,11 @@ export class ImageAsset  extends observable.Observable implements definition.Ima
     ios: PHAsset;
     android: string;
 
+    constructor () {
+        super();
+        this._options = { keepAspectRatio: true };
+    }
+
     get options(): definition.ImageAssetOptions {
         return this._options;
     }
diff --git a/tns-core-modules/image-asset/image-asset.android.ts b/tns-core-modules/image-asset/image-asset.android.ts
index eaba56d88b..411b772a4a 100644
--- a/tns-core-modules/image-asset/image-asset.android.ts
+++ b/tns-core-modules/image-asset/image-asset.android.ts
@@ -1,4 +1,3 @@
-import * as platform from "../platform";
 import * as common from "./image-asset-common";
 import { path as fsPath, knownFolders } from "../file-system";
 
@@ -89,30 +88,3 @@ var calculateAngleFromFile = function (filename: string) {
 
     return rotationAngle;
 }
-
-var calculateInSampleSize = function (imageWidth, imageHeight, reqWidth, reqHeight) {
-    let sampleSize = 1;
-    let displayWidth = platform.screen.mainScreen.widthDIPs;
-    let displayHeigth = platform.screen.mainScreen.heightDIPs;
-    reqWidth = (reqWidth > 0 && reqWidth < displayWidth) ? reqWidth : displayWidth;
-    reqHeight = (reqHeight > 0 && reqHeight < displayHeigth) ? reqHeight : displayHeigth;
-    if (imageWidth > reqWidth && imageHeight > reqHeight) {
-        let halfWidth = imageWidth / 2;
-        let halfHeight = imageHeight / 2;
-        while ((halfWidth / sampleSize) > reqWidth && (halfHeight / sampleSize) > reqHeight) {
-            sampleSize *= 2;
-        }
-    }
-
-    var totalPixels = (imageWidth / sampleSize) * (imageHeight / sampleSize);
-
-    // Anything more than 2x the requested pixels we'll sample down further
-    var totalReqPixelsCap = reqWidth * reqHeight * 2;
-
-    while (totalPixels > totalReqPixelsCap) {
-        sampleSize *= 2;
-        totalPixels = (imageWidth / sampleSize) * (imageHeight / sampleSize);
-    }
-
-    return sampleSize;
-}
diff --git a/tns-core-modules/image-asset/image-asset.ios.ts b/tns-core-modules/image-asset/image-asset.ios.ts
index b0f3380141..d80750183e 100644
--- a/tns-core-modules/image-asset/image-asset.ios.ts
+++ b/tns-core-modules/image-asset/image-asset.ios.ts
@@ -49,6 +49,7 @@ export class ImageAsset extends common.ImageAsset {
 
         let imageRequestOptions = PHImageRequestOptions.alloc().init();
         imageRequestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.HighQualityFormat;
+        imageRequestOptions.networkAccessAllowed = true;
         
         PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(this.ios, requestedSize, PHImageContentMode.AspectFit, imageRequestOptions,
             (image, imageResultInfo) => {
@@ -70,4 +71,4 @@ export class ImageAsset extends common.ImageAsset {
         UIGraphicsEndImageContext();
         return resultImage;
     }
-}
\ No newline at end of file
+}
diff --git a/tns-core-modules/image-source/image-source.android.ts b/tns-core-modules/image-source/image-source.android.ts
index 0f14b2e4d0..1754953213 100644
--- a/tns-core-modules/image-source/image-source.android.ts
+++ b/tns-core-modules/image-source/image-source.android.ts
@@ -58,7 +58,7 @@ export class ImageSource implements ImageSourceDefinition {
         this.android = null;
         const res = getResources();
         if (res) {
-            const identifier: number = res.getIdentifier(name, 'drawable', getApplication().getPackageName());
+            const identifier: number = res.getIdentifier(name, "drawable", getApplication().getPackageName());
             if (0 < identifier) {
                 // Load BitmapDrawable with getDrawable to make use of Android internal caching
                 const bitmapDrawable = <android.graphics.drawable.BitmapDrawable>res.getDrawable(identifier);
diff --git a/tns-core-modules/matrix/matrix.ts b/tns-core-modules/matrix/matrix.ts
index 29f580dfc9..383d78b8c0 100644
--- a/tns-core-modules/matrix/matrix.ts
+++ b/tns-core-modules/matrix/matrix.ts
@@ -56,11 +56,11 @@ export function decompose2DTransformMatrix(matrix: number[])
     let rotate = 0;
     let scale = { x: 1, y: 1 };
     if (A || B) {
-        const R = Math.sqrt(A*A + B*B);
+        const R = Math.sqrt(A * A + B * B);
         rotate = B > 0 ? Math.acos(A / R) : -Math.acos(A / R);
         scale = { x: R, y: determinant / R };
     } else if (C || D) {
-        const R = Math.sqrt(C*C + D*D);
+        const R = Math.sqrt(C * C + D * D);
         rotate = Math.PI / 2 - (D > 0 ? Math.acos(-C / R) : -Math.acos(C / R));
         scale = { x: determinant / R, y: R  };
     }
diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json
index 1aa48fdae2..c2376241a8 100644
--- a/tns-core-modules/package.json
+++ b/tns-core-modules/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tns-core-modules",
   "description": "Telerik NativeScript Core Modules",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "homepage": "https://www.nativescript.org",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
   "license": "Apache-2.0",
   "typings": "tns-core-modules.d.ts",
   "dependencies": {
-    "tns-core-modules-widgets": "next"
+    "tns-core-modules-widgets": "4.1.0"
   },
   "devDependencies": {
     "@types/node": "~7.0.5",
@@ -33,8 +33,8 @@
   },
   "nativescript": {
     "platforms": {
-      "ios": "3.0.0",
-      "android": "3.0.0"
+      "ios": "4.0.0",
+      "android": "4.0.0"
     }
   },
   "snapshot": {
diff --git a/tns-core-modules/platform/platform.ios.ts b/tns-core-modules/platform/platform.ios.ts
index 4bbdded974..58a0b17cae 100644
--- a/tns-core-modules/platform/platform.ios.ts
+++ b/tns-core-modules/platform/platform.ios.ts
@@ -85,7 +85,7 @@ class Device implements DeviceDefinition {
     }
 
     get region(): string {
-        if(!this._region) {
+        if (!this._region) {
             this._region = utils.ios.getter(NSLocale, NSLocale.currentLocale).objectForKey(NSLocaleCountryCode);
         }
 
diff --git a/tns-core-modules/text/formatted-string.ts b/tns-core-modules/text/formatted-string.ts
index d76e223f5b..2d4d62b00d 100644
--- a/tns-core-modules/text/formatted-string.ts
+++ b/tns-core-modules/text/formatted-string.ts
@@ -127,7 +127,7 @@ export class FormattedString extends ViewBase implements FormattedStringDefiniti
             }
         }
 
-        this.notifyPropertyChange('.', this);
+        this.notifyPropertyChange(".", this);
     }
 
     private addPropertyChangeHandler(span: Span) {
diff --git a/tns-core-modules/tns-core-modules.d.ts b/tns-core-modules/tns-core-modules.d.ts
index a381bb9b04..3e5b0b7ef7 100644
--- a/tns-core-modules/tns-core-modules.d.ts
+++ b/tns-core-modules/tns-core-modules.d.ts
@@ -11,10 +11,10 @@ declare enum RequestContext {
 
 // Extend the lib.dom.d.ts Body interface with `formData`
 interface Body {
-    formData() : Promise<FormData>;
+    formData(): Promise<FormData>;
 }
 
-declare type HeaderInit = Headers|Array<string>;
+declare type HeaderInit = Headers | Array<string>;
 
 declare function fetch(url: string, init?: RequestInit): Promise<Response>;
 
@@ -57,14 +57,14 @@ declare function JavaProxy(nativeClassName: string): ClassDecorator;
  * Important: Not applicable to Objective-C classes (iOS platform)
  * Decorates class that extends native Java class
  * @param interfaces An array of fully-classified Java interface names that the class must implement.
- */ 
+ */
 declare function Interfaces(interfaces: any[]): ClassDecorator;
 
 /**
  * Important: Not applicable to Java classes (Android platform)
  * Decorates a class that implements native Objective-C protocols.
  * @param protocols An array of fully-classified Objective-C protocol names that the class must implement.
- */ 
+ */
 declare function ObjCClass(...protocols: any[]): ClassDecorator;
 
 /**
@@ -72,7 +72,7 @@ declare function ObjCClass(...protocols: any[]): ClassDecorator;
  * Decorates method that it is exposed in Objective-C.
  * The JS name of the method will be used as the name of the native method
  * and the return type will be set to `interop.types.void`
- */ 
+ */
 declare function ObjCMethod(): MethodDecorator;
 
 /**
@@ -80,7 +80,7 @@ declare function ObjCMethod(): MethodDecorator;
  * Decorates method that it is exposed in Objective-C.
  * @param name The name of the method to be exposed.
  * The native return type will be set to `interop.types.void`.
- */ 
+ */
 declare function ObjCMethod(name: string): MethodDecorator;
 
 /**
@@ -88,7 +88,7 @@ declare function ObjCMethod(name: string): MethodDecorator;
  * Decorates a method to be exposed in Objective-C.
  * The JS name of the method will be used for the name of the native method.
  * @param returnType The native type of the result.
- */ 
+ */
 declare function ObjCMethod(returnType: any): MethodDecorator;
 
 /**
@@ -97,7 +97,7 @@ declare function ObjCMethod(returnType: any): MethodDecorator;
  * @param name The name of the method to be exposed. Can be different than the JS function name
  * and can follow Objective-C colon syntax (for example `tableView:cellForRowAtIndexPath:`).
  * @param returnType The native type of the result.
- */ 
+ */
 declare function ObjCMethod(name: string, returnType: any): MethodDecorator;
 
 /**
@@ -105,14 +105,14 @@ declare function ObjCMethod(name: string, returnType: any): MethodDecorator;
  * This is a shorthand decorator that can be used to decorate either a method or a class
  * to be exposed to Objective-C.
  * @param params Parameters to send to the ObjCClass or ObjCMethod decorators.
- */ 
+ */
 declare function ObjC(...params: any[]): ClassDecorator & MethodDecorator;
 
 /**
  * Important: Not applicable to Java method parameters (Android platform)
  * Decorates a parameter in an Objective-C exposed method with its native type.
  * @param type The native type for the parameter.
- */ 
+ */
 declare function ObjCParam(type: any): ParameterDecorator;
 
 declare function Log(data: any): void;
diff --git a/tns-core-modules/ui/action-bar/action-bar.android.ts b/tns-core-modules/ui/action-bar/action-bar.android.ts
index 1063fc6738..7b7ef0818a 100644
--- a/tns-core-modules/ui/action-bar/action-bar.android.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.android.ts
@@ -421,7 +421,7 @@ function getDrawableOrResourceId(icon: string, resources: android.content.res.Re
     }
 
     if (icon.indexOf(RESOURCE_PREFIX) === 0) {
-        let resourceId: number = resources.getIdentifier(icon.substr(RESOURCE_PREFIX.length), 'drawable', application.android.packageName);
+        let resourceId: number = resources.getIdentifier(icon.substr(RESOURCE_PREFIX.length), "drawable", application.android.packageName);
         if (resourceId > 0) {
             return resourceId;
         }
diff --git a/tns-core-modules/ui/action-bar/action-bar.ios.ts b/tns-core-modules/ui/action-bar/action-bar.ios.ts
index 449f6f98f7..d614545680 100644
--- a/tns-core-modules/ui/action-bar/action-bar.ios.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.ios.ts
@@ -282,9 +282,7 @@ export class ActionBar extends ActionBarBase {
 
     public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number) {
         const width = layout.getMeasureSpecSize(widthMeasureSpec);
-        const widthMode = layout.getMeasureSpecMode(widthMeasureSpec);
         const height = layout.getMeasureSpecSize(heightMeasureSpec);
-        const heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
 
         if (this.titleView) {
             View.measureChild(this, this.titleView, UNSPECIFIED, UNSPECIFIED);
diff --git a/tns-core-modules/ui/animation/animation-common.ts b/tns-core-modules/ui/animation/animation-common.ts
index 0b86cbd452..20d29c4fba 100644
--- a/tns-core-modules/ui/animation/animation-common.ts
+++ b/tns-core-modules/ui/animation/animation-common.ts
@@ -66,7 +66,7 @@ export abstract class AnimationBase implements AnimationBaseDefinition {
 
         this._propertyAnimations = new Array<PropertyAnimation>();
         for (let i = 0, length = animationDefinitions.length; i < length; i++) {
-            if (animationDefinitions[i].curve){
+            if (animationDefinitions[i].curve) {
                 animationDefinitions[i].curve = this._resolveAnimationCurve(animationDefinitions[i].curve);
             }
             this._propertyAnimations = this._propertyAnimations.concat(AnimationBase._createPropertyAnimations(animationDefinitions[i]));
@@ -84,7 +84,7 @@ export abstract class AnimationBase implements AnimationBaseDefinition {
 
     abstract _resolveAnimationCurve(curve: any): any;
 
-    protected _rejectAlreadyPlaying(): AnimationPromiseDefinition{
+    protected _rejectAlreadyPlaying(): AnimationPromiseDefinition {
         const reason = "Animation is already playing.";
         traceWrite(reason, traceCategories.Animation, traceType.warn);
         
diff --git a/tns-core-modules/ui/animation/animation.ios.ts b/tns-core-modules/ui/animation/animation.ios.ts
index ce7ac6eef5..29a1228653 100644
--- a/tns-core-modules/ui/animation/animation.ios.ts
+++ b/tns-core-modules/ui/animation/animation.ios.ts
@@ -18,8 +18,6 @@ let _skip = "_skip";
 
 let FLT_MAX = 340282346638528859811704183484516925440.000000;
 
-declare var CASpringAnimation: any;
-
 class AnimationInfo {
     public propertyNameToAnimate: string;
     public fromValue: any;
diff --git a/tns-core-modules/ui/animation/keyframe-animation.ts b/tns-core-modules/ui/animation/keyframe-animation.ts
index a35b21dbb8..6bf493f9ed 100644
--- a/tns-core-modules/ui/animation/keyframe-animation.ts
+++ b/tns-core-modules/ui/animation/keyframe-animation.ts
@@ -12,7 +12,7 @@ import { View, Color } from "../core/view";
 
 import { AnimationCurve } from "../enums";
 
-import { isEnabled as traceEnabled, write as traceWrite, categories as traceCategories, messageType as traceType } from "../../trace";
+import { write as traceWrite, categories as traceCategories, messageType as traceType } from "../../trace";
 
 // Types.
 import { unsetValue } from "../core/properties";
diff --git a/tns-core-modules/ui/builder/binding-builder.ts b/tns-core-modules/ui/builder/binding-builder.ts
index dfbf13dd41..899b8b5fac 100644
--- a/tns-core-modules/ui/builder/binding-builder.ts
+++ b/tns-core-modules/ui/builder/binding-builder.ts
@@ -92,7 +92,7 @@ function getParamsArray(value: string) {
     var singleQuoteBlock, doubleQuoteBlock = false;
 
     for (i = 0; i < value.length; i++) {
-        if (value[i] === '"') {
+        if (value[i] === "\"") {
             doubleQuoteBlock = !doubleQuoteBlock;
         }
 
@@ -100,15 +100,15 @@ function getParamsArray(value: string) {
             singleQuoteBlock = !singleQuoteBlock;
         }
 
-        if (value[i] === '(' || value[i] === '[') {
+        if (value[i] === "(" || value[i] === "[") {
             skipComma++;
         }
 
-        if (value[i] === ')' || value[i] === ']') {
+        if (value[i] === ")" || value[i] === "]") {
             skipComma--;
         }
 
-        if (value[i] === ',' && skipComma === 0 && !(singleQuoteBlock || doubleQuoteBlock)) {
+        if (value[i] === "," && skipComma === 0 && !(singleQuoteBlock || doubleQuoteBlock)) {
             result.push(value.substr(indexReached, i - indexReached));
             indexReached = i + 1;
         }
diff --git a/tns-core-modules/ui/builder/builder.ts b/tns-core-modules/ui/builder/builder.ts
index 79ba2b2597..86efcb94a7 100644
--- a/tns-core-modules/ui/builder/builder.ts
+++ b/tns-core-modules/ui/builder/builder.ts
@@ -81,17 +81,13 @@ const loadModule = profile("loadModule", (moduleNamePath: string, entry: ViewEnt
 const viewFromBuilder = profile("viewFromBuilder", (moduleNamePath: string, moduleExports: any): View => {
     // Possible XML file path.
     const fileName = resolveFileName(moduleNamePath, "xml");
-    if (fileName) {
-        // Or check if the file exists in the app modules and load the page from XML.
-        return loadPage(moduleNamePath, fileName, moduleExports);
-    }
 
     // Attempts to implement https://github.com/NativeScript/NativeScript/issues/1311
     // if (page && fileName === `${moduleNamePath}.port.xml` || fileName === `${moduleNamePath}.land.xml`){
     //     page["isBiOrientational"] = true;
-    // }
+    // };
 
-    return null;
+    return loadPage(moduleNamePath, fileName, moduleExports);
 })
 
 export const createViewFromEntry = profile("createViewFromEntry", (entry: ViewEntry): View => {
@@ -143,8 +139,13 @@ const moduleCreateView = profile("module.createView", (moduleNamePath: string, m
 function loadInternal(fileName: string, context?: any, moduleNamePath?: string): ComponentModule {
     let componentModule: ComponentModule;
 
-    // Check if the XML file exists.
-    if (File.exists(fileName)) {
+    const appPath = knownFolders.currentApp().path;
+    const filePathRelativeToApp = (moduleNamePath && moduleNamePath.startsWith(appPath) ? "./" + moduleNamePath.substr(appPath.length + 1) : moduleNamePath) + ".xml";
+
+    if (global.moduleExists(filePathRelativeToApp)) {
+        var text = global.loadModule(filePathRelativeToApp);
+        componentModule = parseInternal(text, context, fileName, moduleNamePath);
+    } else if (fileName && File.exists(fileName)) {
         const file = File.fromPath(fileName);
         const text = file.readTextSync((error) => { throw new Error("Error loading file " + fileName + " :" + error.message) });
         componentModule = parseInternal(text, context, fileName, moduleNamePath);
@@ -168,7 +169,8 @@ function loadCustomComponent(componentPath: string, componentName?: string, attr
 
     let result: ComponentModule;
     componentPath = componentPath.replace("~/", "");
-    const moduleName = componentPath + "/" + componentName;
+    const moduleName = `${componentPath}/${componentName}`;
+    const xmlModuleName = `${moduleName}.xml`;
 
     let fullComponentPathFilePathWithoutExt = componentPath;
 
@@ -177,8 +179,7 @@ function loadCustomComponent(componentPath: string, componentName?: string, attr
     }
 
     const xmlFilePath = resolveFileName(fullComponentPathFilePathWithoutExt, "xml");
-
-    if (xmlFilePath) {
+    if (xmlFilePath || global.moduleExists(xmlModuleName)) {
         // Custom components with XML
 
         let subExports = context;
@@ -201,7 +202,9 @@ function loadCustomComponent(componentPath: string, componentName?: string, attr
 
         subExports["_parentPage"] = parentPage;
 
-        result = loadInternal(xmlFilePath, subExports);
+        result = xmlFilePath ?
+            loadInternal(xmlFilePath, subExports) :
+            loadInternal(xmlFilePath, subExports, moduleName);
 
         // Attributes will be transfered to the custom component
         if (isDefined(result) && isDefined(result.component) && isDefined(attributes)) {
@@ -611,7 +614,7 @@ namespace xml2ui {
             } else {
                 // Default components
                 let namespace = args.namespace;
-                if (defaultNameSpaceMatcher.test(namespace || '')) {
+                if (defaultNameSpaceMatcher.test(namespace || "")) {
                     //Ignore the default ...tns.xsd namespace URL
                     namespace = undefined;
                 }
diff --git a/tns-core-modules/ui/builder/component-builder/component-builder.ts b/tns-core-modules/ui/builder/component-builder/component-builder.ts
index 2ece5eb8e5..fe20bfa186 100644
--- a/tns-core-modules/ui/builder/component-builder/component-builder.ts
+++ b/tns-core-modules/ui/builder/component-builder/component-builder.ts
@@ -176,7 +176,7 @@ const applyComponentAttributes = profile("applyComponentAttributes", (instance:
 
 export function getComponentModule(elementName: string, namespace: string, attributes: Object, moduleExports: Object, moduleNamePath?: string, isRootComponent?: boolean): ComponentModule {
     // Support lower-case-dashed component declaration in the XML (https://github.com/NativeScript/NativeScript/issues/309).
-    elementName = elementName.split("-").map(s => { return s[0].toUpperCase() + s.substring(1) }).join("");
+    elementName = elementName.split("-").map(s => s[0].toUpperCase() + s.substring(1)).join("");
 
     const { instance, instanceModule } = createComponentInstance(elementName, namespace);
     moduleExports = getComponentModuleExports(instance, moduleExports, attributes);
diff --git a/tns-core-modules/ui/core/bindable/bindable.ts b/tns-core-modules/ui/core/bindable/bindable.ts
index df8800a034..636e3d2ed3 100644
--- a/tns-core-modules/ui/core/bindable/bindable.ts
+++ b/tns-core-modules/ui/core/bindable/bindable.ts
@@ -91,8 +91,6 @@ export class Binding {
     private sourceOptions: { instance: WeakRef<any>; property: string };
     private targetOptions: { instance: WeakRef<Object>; property: string };
 
-    private sourcesAndProperties: Array<{ instance: Object; property: string }>;
-
     private sourceProperties: Array<string>;
     private propertyChangeListeners: Map<string, Observable> = new Map<string, Observable>();
 
@@ -140,7 +138,6 @@ export class Binding {
         });
 
         this.propertyChangeListeners.clear();
-        this.sourcesAndProperties = null;
 
         if (this.source) {
             this.source.clear();
@@ -309,7 +306,7 @@ export class Binding {
         // update expression will be '$newPropertyValue + 2'
         // then on expression execution the new value will be taken and target property will be updated with the value of the expression.
         let escapedSourceProperty = escapeRegexSymbols(this.options.sourceProperty);
-        let expRegex = new RegExp(escapedSourceProperty, 'g');
+        let expRegex = new RegExp(escapedSourceProperty, "g");
         let resultExp = this.options.expression.replace(expRegex, bc.newPropertyValueKey);
         return resultExp;
     }
@@ -444,7 +441,7 @@ export class Binding {
                 const newProps = sourceProps.slice(changedPropertyIndex + 1);
                 // add new weak event listeners
                 const newObject = data.object[sourceProps[changedPropertyIndex]]
-                if (!types.isNullOrUndefined(newObject) && typeof newObject === 'object') {
+                if (!types.isNullOrUndefined(newObject) && typeof newObject === "object") {
                     this.addPropertyChangeListeners(new WeakRef(newObject), newProps, parentProps);
                 }
             }
diff --git a/tns-core-modules/ui/core/control-state-change/control-state-change.ios.ts b/tns-core-modules/ui/core/control-state-change/control-state-change.ios.ts
index b8de979552..87546d6169 100644
--- a/tns-core-modules/ui/core/control-state-change/control-state-change.ios.ts
+++ b/tns-core-modules/ui/core/control-state-change/control-state-change.ios.ts
@@ -3,7 +3,7 @@ import { ControlStateChangeListener as ControlStateChangeListenerDefinition } fr
 
 class ObserverClass extends NSObject {
     // NOTE: Refactor this - use Typescript property instead of strings....
-    observeValueForKeyPathOfObjectChangeContext(path: string, obj: Object, change: NSDictionary<any, any>, context: any) {
+    observeValueForKeyPathOfObjectChangeContext(path: string) {
         if (path === "selected") {
             this["_owner"]._onSelectedChanged();
         } else if (path === "enabled") {
@@ -16,7 +16,6 @@ class ObserverClass extends NSObject {
 
 export class ControlStateChangeListener implements ControlStateChangeListenerDefinition {
     private _observer: NSObject;
-    private _states: string[];
     private _control: UIControl;
     private _observing: boolean = false;
 
@@ -44,14 +43,17 @@ export class ControlStateChangeListener implements ControlStateChangeListenerDef
         }
     }
 
+    //@ts-ignore
     private _onEnabledChanged() {
         this._updateState();
     }
 
+    //@ts-ignore
     private _onSelectedChanged() {
         this._updateState();
     }
 
+    //@ts-ignore
     private _onHighlightedChanged() {
         this._updateState();
     }
diff --git a/tns-core-modules/ui/core/properties/properties.ts b/tns-core-modules/ui/core/properties/properties.ts
index 9ef013cc33..5f54f7b979 100644
--- a/tns-core-modules/ui/core/properties/properties.ts
+++ b/tns-core-modules/ui/core/properties/properties.ts
@@ -670,7 +670,7 @@ export class CssAnimationProperty<T extends Style, U> implements definitions.Css
 
     public _valueConverter?: (value: string) => any;
 
-    constructor(private options: definitions.CssAnimationPropertyOptions<T, U>) {
+    constructor(options: definitions.CssAnimationPropertyOptions<T, U>) {
         const { valueConverter, equalityComparer, valueChanged, defaultValue } = options;
         const propertyName = options.name;
         this.name = propertyName;
@@ -1087,7 +1087,7 @@ function inheritableCssPropertyValuesOn(style: Style): Array<{ property: Inherit
 
 type PropertyInterface = Property<ViewBase, any> | CssProperty<Style, any> | CssAnimationProperty<Style, any>;
 
-export const initNativeView = profile('"properties".initNativeView', function initNativeView(view: ViewBase): void {
+export const initNativeView = profile("\"properties\".initNativeView", function initNativeView(view: ViewBase): void {
     if (view._suspendedUpdates) {
         applyPendingNativeSetters(view);
     } else {
diff --git a/tns-core-modules/ui/core/view-base/view-base.d.ts b/tns-core-modules/ui/core/view-base/view-base.d.ts
index 13b6507260..e780386dcb 100644
--- a/tns-core-modules/ui/core/view-base/view-base.d.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.d.ts
@@ -116,9 +116,11 @@ export abstract class ViewBase extends Observable {
      * This same context will be available in the arguments of the shownModally event handler.
      * @param closeCallback - A function that will be called when the view is closed.
      * Any arguments provided when calling ShownModallyData.closeCallback will be available here.
-     * @param fullscreen - An optional parameter specifying whether to show the modal page in full-screen mode.
+     * @param fullscreen - An optional parameter specifying whether to show the modal view in full-screen mode.
+     * @param animated - An optional parameter specifying whether to show the modal view with animation.
+     * @param stretched - An optional parameter specifying whether to stretch the modal view when not in full-screen mode.
      */
-    showModal(moduleName: string, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean): ViewBase;
+    showModal(moduleName: string, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean): ViewBase;
 
     /**
      * Shows the view passed as parameter as a modal view.
@@ -126,8 +128,10 @@ export abstract class ViewBase extends Observable {
      * @param context - Any context you want to pass to the modally shown view. This same context will be available in the arguments of the shownModally event handler.
      * @param closeCallback - A function that will be called when the view is closed. Any arguments provided when calling ShownModallyData.closeCallback will be available here.
      * @param fullscreen - An optional parameter specifying whether to show the modal view in full-screen mode.
+     * @param animated - An optional parameter specifying whether to show the modal view with animation.
+     * @param stretched - An optional parameter specifying whether to stretch the modal view when not in full-screen mode.
      */
-    showModal(view: ViewBase, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean): ViewBase;
+    showModal(view: ViewBase, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean): ViewBase;
 
     /**
      * Deprecated. Showing view as modal is deprecated.
@@ -137,8 +141,9 @@ export abstract class ViewBase extends Observable {
 
     /**
      * Closes the current modal view that this page is showing.
+     * @param context - Any context you want to pass back to the host when closing the modal view.
      */
-    closeModal(): void;
+    closeModal(context?: any): void;
 
     public effectiveMinWidth: number;
     public effectiveMinHeight: number;
diff --git a/tns-core-modules/ui/core/view-base/view-base.ts b/tns-core-modules/ui/core/view-base/view-base.ts
index 75233bcfaf..e1196636fd 100644
--- a/tns-core-modules/ui/core/view-base/view-base.ts
+++ b/tns-core-modules/ui/core/view-base/view-base.ts
@@ -1,14 +1,12 @@
 // Definitions.
 import { ViewBase as ViewBaseDefinition } from ".";
 import { Page } from "../../page";
-import { SelectorCore } from "../../styling/css-selector";
 import { Order, FlexGrow, FlexShrink, FlexWrapBefore, AlignSelf } from "../../layouts/flexbox-layout";
-import { KeyframeAnimation } from "../../animation/keyframe-animation";
 
 // Types.
-import { Property, CssProperty, CssAnimationProperty, InheritedProperty, Style, clearInheritedProperties, propagateInheritableProperties, propagateInheritableCssProperties, resetCSSProperties, initNativeView, resetNativeView } from "../properties";
+import { Property, CssProperty, CssAnimationProperty, InheritedProperty, Style, clearInheritedProperties, propagateInheritableProperties, propagateInheritableCssProperties, initNativeView } from "../properties";
 import { Source } from "../../../utils/debug";
-import { Binding, BindingOptions, Observable, WrappedValue, PropertyChangeData, traceEnabled, traceWrite, traceCategories, traceNotifyEvent } from "../bindable";
+import { Binding, BindingOptions, Observable, WrappedValue, PropertyChangeData, traceEnabled, traceWrite, traceCategories } from "../bindable";
 import { isIOS, isAndroid } from "../../../platform";
 import { layout } from "../../../utils/utils";
 import { Length, paddingTopProperty, paddingRightProperty, paddingBottomProperty, paddingLeftProperty } from "../../styling/style-properties";
@@ -141,8 +139,8 @@ let viewIdCounter = 1;
 // }
 
 enum Flags {
-    superOnLoadedCalled = 'Loaded',
-    superOnUnloadedCalled = 'Unloaded',
+    superOnLoadedCalled = "Loaded",
+    superOnUnloadedCalled = "Unloaded",
 }
 
 enum SuspendType {
@@ -442,9 +440,9 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
     }
 
     private pseudoClassAliases = {
-        'highlighted': [
-            'active',
-            'pressed'
+        "highlighted": [
+            "active",
+            "pressed"
         ]
     };
 
@@ -946,15 +944,15 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition
         }
     }
 
-    public showModal(): ViewBase {
+    public showModal(...args): ViewBase {
         const parent = this.parent;
-        return parent && parent.showModal();
+        return parent && parent.showModal(...args);
     }
 
-    public closeModal(): void {
+    public closeModal(...args): void {
         const parent = this.parent;
         if (parent) {
-            parent.closeModal();
+            parent.closeModal(...args);
         }
     }
 
@@ -1028,7 +1026,7 @@ export const idProperty = new Property<ViewBase, string>({ name: "id", valueChan
 idProperty.register(ViewBase);
 
 export function booleanConverter(v: string): boolean {
-    const lowercase = (v + '').toLowerCase();
+    const lowercase = (v + "").toLowerCase();
     if (lowercase === "true") {
         return true;
     } else if (lowercase === "false") {
diff --git a/tns-core-modules/ui/core/view/view-common.ts b/tns-core-modules/ui/core/view/view-common.ts
index 36d5317141..0f9cb7c426 100644
--- a/tns-core-modules/ui/core/view/view-common.ts
+++ b/tns-core-modules/ui/core/view/view-common.ts
@@ -21,9 +21,11 @@ import {
 
 import { createViewFromEntry } from "../../builder";
 import { StyleScope } from "../../styling/style-scope";
+import { LinearGradient } from "../../styling/linear-gradient";
 
 export * from "../../styling/style-properties";
 export * from "../view-base";
+export { LinearGradient };
 
 import * as am from "../../animation";
 let animationModule: typeof am;
@@ -59,6 +61,7 @@ export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator
 export const _rootModalViews = new Array<ViewBase>();
 
 export abstract class ViewCommon extends ViewBase implements ViewDefinition {
+    public static layoutChangedEvent = "layoutChanged";
     public static shownModallyEvent = "shownModally";
     public static showingModallyEvent = "showingModally";
 
@@ -213,7 +216,7 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 
     public showModal(): ViewDefinition {
         if (arguments.length === 0) {
-            throw new Error('showModal without parameters is deprecated. Please call showModal on a view instance instead.');
+            throw new Error("showModal without parameters is deprecated. Please call showModal on a view instance instead.");
         } else {
             const firstAgrument = arguments[0];
             const context: any = arguments[1];
@@ -230,14 +233,14 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
         }
     }
 
-    public closeModal() {
+    public closeModal(...args) {
         let closeCallback = this._closeModalCallback;
         if (closeCallback) {
             closeCallback.apply(undefined, arguments);
         } else {
             let parent = this.parent;
             if (parent) {
-                parent.closeModal();
+                parent.closeModal(...args);
             }
         }
     }
@@ -275,6 +278,14 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
         //
     }
 
+    protected _raiseLayoutChangedEvent() {
+        const args: EventData = {
+            eventName: ViewCommon.layoutChangedEvent,
+            object: this
+        };
+        this.notify(args);
+    }
+
     protected _raiseShownModallyEvent() {
         const args: ShownModallyData = {
             eventName: ViewCommon.shownModallyEvent,
@@ -435,10 +446,10 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
         this.style.backgroundColor = value;
     }
 
-    get backgroundImage(): string {
+    get backgroundImage(): string | LinearGradient {
         return this.style.backgroundImage;
     }
-    set backgroundImage(value: string) {
+    set backgroundImage(value: string | LinearGradient) {
         this.style.backgroundImage = value;
     }
 
diff --git a/tns-core-modules/ui/core/view/view.android.ts b/tns-core-modules/ui/core/view/view.android.ts
index b73bf63172..e4fb6ae4ba 100644
--- a/tns-core-modules/ui/core/view/view.android.ts
+++ b/tns-core-modules/ui/core/view/view.android.ts
@@ -1,5 +1,4 @@
 // Definitions.
-import { ViewBase } from "../view-base";
 import { Point, CustomLayoutView as CustomLayoutViewDefinition, dip } from ".";
 import { GestureTypes, GestureEventData } from "../../gestures";
 import { AndroidActivityBackPressedEventData } from "../../../application";
@@ -8,7 +7,7 @@ import {
     ViewCommon, layout, isEnabledProperty, originXProperty, originYProperty, automationTextProperty, isUserInteractionEnabledProperty,
     traceEnabled, traceWrite, traceCategories, traceNotifyEvent,
     paddingLeftProperty, paddingTopProperty, paddingRightProperty, paddingBottomProperty,
-    Color
+    Color, EventData
 } from "./view-common";
 
 import {
@@ -34,7 +33,6 @@ const modalMap = new Map<number, DialogOptions>();
 let TouchListener: TouchListener;
 let disableUserInteractionListener: org.nativescript.widgets.DisableUserInteractionListener;
 let DialogFragment: DialogFragment;
-let Dialog: android.app.Dialog;
 
 interface DialogOptions {
     owner: View;
@@ -231,6 +229,8 @@ export class View extends ViewCommon {
     private _isClickable: boolean;
     private touchListenerIsSet: boolean;
     private touchListener: android.view.View.OnTouchListener;
+    private layoutChangeListenerIsSet: boolean;
+    private layoutChangeListener: android.view.View.OnLayoutChangeListener;
     private _manager: android.app.FragmentManager;
 
     nativeViewProtected: android.view.View;
@@ -243,6 +243,26 @@ export class View extends ViewCommon {
         }
     }
 
+    on(eventNames: string, callback: (data: EventData) => void, thisArg?: any) {
+        super.on(eventNames, callback, thisArg);
+        const isLayoutEvent = typeof eventNames === "string" ? eventNames.indexOf(ViewCommon.layoutChangedEvent) !== -1 : false;
+
+        if (this.isLoaded && !this.layoutChangeListenerIsSet && isLayoutEvent) {
+            this.setOnLayoutChangeListener();
+        }
+    }
+
+    off(eventNames: string, callback?: any, thisArg?: any) {
+        super.off(eventNames, callback, thisArg);
+        const isLayoutEvent = typeof eventNames === "string" ? eventNames.indexOf(ViewCommon.layoutChangedEvent) !== -1 : false;
+
+        // Remove native listener only if there are no more user listeners for LayoutChanged event
+        if (this.isLoaded && this.layoutChangeListenerIsSet && isLayoutEvent && !this.hasListeners(ViewCommon.layoutChangedEvent)) {
+            this.nativeViewProtected.removeOnLayoutChangeListener(this.layoutChangeListener);
+            this.layoutChangeListenerIsSet = false;
+        }
+    }
+
     public _getFragmentManager(): android.app.FragmentManager {
         let manager = this._manager;
         if (!manager) {
@@ -307,6 +327,19 @@ export class View extends ViewCommon {
     public initNativeView(): void {
         super.initNativeView();
         this._isClickable = this.nativeViewProtected.isClickable();
+
+        if (this.hasListeners(ViewCommon.layoutChangedEvent)) {
+            this.setOnLayoutChangeListener();
+        }
+    }
+
+    public disposeNativeView(): void {
+        super.disposeNativeView();
+
+        if (this.layoutChangeListenerIsSet) {
+            this.layoutChangeListenerIsSet = false;
+            this.nativeViewProtected.removeOnLayoutChangeListener(this.layoutChangeListener);
+        }
     }
 
     private setOnTouchListener() {
@@ -322,6 +355,25 @@ export class View extends ViewCommon {
         }
     }
 
+    private setOnLayoutChangeListener() {
+        if (this.nativeViewProtected) {
+            const owner = this;
+            this.layoutChangeListenerIsSet = true;
+            this.layoutChangeListener = this.layoutChangeListener || new android.view.View.OnLayoutChangeListener({
+                onLayoutChange(
+                    v: android.view.View,
+                    left: number, top: number, right: number, bottom: number,
+                    oldLeft: number, oldTop: number, oldRight: number, oldBottom: number): void {
+                    if (left !== oldLeft || top !== oldTop || right !== oldRight || bottom !== oldBottom) {
+                        owner._raiseLayoutChangedEvent();
+                    }
+                }
+            });
+
+            this.nativeViewProtected.addOnLayoutChangeListener(this.layoutChangeListener);
+        }
+    }
+
     get isLayoutRequired(): boolean {
         return !this.isLayoutValid;
     }
diff --git a/tns-core-modules/ui/core/view/view.d.ts b/tns-core-modules/ui/core/view/view.d.ts
index 8071247c9b..bb267f0fa6 100644
--- a/tns-core-modules/ui/core/view/view.d.ts
+++ b/tns-core-modules/ui/core/view/view.d.ts
@@ -7,9 +7,11 @@ import { ViewBase, Property, EventData, Color } from "../view-base";
 import { Animation, AnimationDefinition, AnimationPromise } from "../../animation";
 import { HorizontalAlignment, VerticalAlignment, Visibility, Length, PercentLength } from "../../styling/style-properties";
 import { GestureTypes, GestureEventData, GesturesObserver } from "../../gestures";
+import { LinearGradient } from "../../styling/gradient";
 
 export * from "../view-base";
 export * from "../../styling/style-properties";
+export { LinearGradient };
 
 export function PseudoClassHandler(...pseudoClasses: string[]): MethodDecorator;
 
@@ -101,6 +103,10 @@ export interface ShownModallyData extends EventData {
  * A View occupies a rectangular area on the screen and is responsible for drawing and layouting of all UI components within. 
  */
 export abstract class View extends ViewBase {
+    /**
+     * String value used when hooking to layoutChanged event.
+     */
+    public static layoutChangedEvent: string;
     /**
      * String value used when hooking to showingModally event.
      */
@@ -219,7 +225,7 @@ export abstract class View extends ViewBase {
     /**
      * Gets or sets the background image of the view.
      */
-    backgroundImage: string;
+    backgroundImage: string | LinearGradient;
 
     /**
      * Gets or sets the minimum width the view may grow to.
@@ -506,39 +512,6 @@ export abstract class View extends ViewBase {
      */
     on(event: "shownModally", callback: (args: ShownModallyData) => void, thisArg?: any);
 
-    /**
-    * Shows the View contained in moduleName as a modal view.
-    * @param moduleName - The name of the module to load starting from the application root.
-    * @param context - Any context you want to pass to the modally shown view.
-    * This same context will be available in the arguments of the shownModally event handler.
-    * @param closeCallback - A function that will be called when the view is closed.
-    * Any arguments provided when calling ShownModallyData.closeCallback will be available here.
-    * @param fullscreen - An optional parameter specifying whether to show the modal page in full-screen mode.
-    * @param stretched - An optional parameter specifying whether to stretch the modal page when not in full-screen mode.
-    */
-    showModal(moduleName: string, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean): View;
-
-    /**
-     * Shows the view passed as parameter as a modal view.
-     * @param view - View instance to be shown modally.
-     * @param context - Any context you want to pass to the modally shown view. This same context will be available in the arguments of the shownModally event handler.
-     * @param closeCallback - A function that will be called when the view is closed. Any arguments provided when calling ShownModallyData.closeCallback will be available here.
-     * @param fullscreen - An optional parameter specifying whether to show the modal view in full-screen mode.
-     * @param stretched - An optional parameter specifying whether to stretch the modal page when not in full-screen mode.
-     */
-    showModal(view: View, context: any, closeCallback: Function, fullscreen?: boolean, animated?: boolean, stretched?: boolean): View;
-
-    /**
-     * Deprecated. Showing view as modal is deprecated.
-     * Use showModal method with arguments.
-     */
-    showModal(): View;
-
-    /**
-     * Closes the current modal view that this page is showing.
-     */
-    closeModal(): void;
-
     /**
      * Returns the current modal view that this page is showing (is parent of), if any.
      */
diff --git a/tns-core-modules/ui/core/view/view.ios.ts b/tns-core-modules/ui/core/view/view.ios.ts
index ece66256d4..fc47597a35 100644
--- a/tns-core-modules/ui/core/view/view.ios.ts
+++ b/tns-core-modules/ui/core/view/view.ios.ts
@@ -8,9 +8,6 @@ import {
 } from "./view-common";
 
 import { ios as iosBackground, Background } from "../../styling/background";
-// HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to
-// kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism.
-import * as uiUtils from "tns-core-modules/ui/utils";
 import { ios as iosUtils } from "../../../utils/utils";
 import {
     Visibility,
@@ -31,6 +28,7 @@ export class View extends ViewCommon {
     nativeViewProtected: UIView;
     viewController: UIViewController;
 
+    private _isLaidOut = false;
     private _hasTransfrom = false;
     private _privateFlags: number = PFLAG_LAYOUT_REQUIRED | PFLAG_FORCE_LAYOUT;
     private _cachedFrame: CGRect;
@@ -59,6 +57,10 @@ export class View extends ViewCommon {
         if (nativeView) {
             nativeView.setNeedsLayout();
         }
+
+        if (this.viewController && this.viewController.view !== nativeView) {
+            this.viewController.view.setNeedsLayout();
+        }
     }
 
     public measure(widthMeasureSpec: number, heightMeasureSpec: number): void {
@@ -159,6 +161,11 @@ export class View extends ViewCommon {
 
             const boundsOrigin = nativeView.bounds.origin;
             nativeView.bounds = CGRectMake(boundsOrigin.x, boundsOrigin.y, frame.size.width, frame.size.height);
+            this._raiseLayoutChangedEvent();
+            this._isLaidOut = true;
+        } else if (!this._isLaidOut) {
+            // Rects could be equal on the first layout and an event should be raised.
+            this._raiseLayoutChangedEvent();
         }
     }
 
@@ -317,7 +324,13 @@ export class View extends ViewCommon {
         super._showNativeModalView(parentWithController, context, closeCallback, fullscreen, stretched);
         let controller = this.viewController;
         if (!controller) {
+            const nativeView = this.ios || this.nativeViewProtected;
             controller = ios.UILayoutViewController.initWithOwner(new WeakRef(this));
+
+            if (nativeView instanceof UIView) {
+                controller.view.addSubview(nativeView);
+            }
+
             this.viewController = controller;
         }
 
@@ -588,7 +601,7 @@ export namespace ios {
             }
         }
 
-        return scrollableContent === true || scrollableContent === "true";;
+        return scrollableContent === true || scrollableContent === "true";
     }
 
     export function updateAutoAdjustScrollInsets(controller: UIViewController, owner: View): void {
@@ -641,9 +654,6 @@ export namespace ios {
         const scrollable = isContentScrollable(controller, owner);
         const hasChildControllers = controller.childViewControllers.count > 0;
 
-        const safeAreaTopLength = safeOrigin.y - fullscreenOrigin.y;
-        const safeAreaBottomLength = fullscreenSize.height - safeAreaSize.height - safeAreaTopLength;
-
         if (!(controller.edgesForExtendedLayout & UIRectEdge.Top)) {
             const statusBarHeight = getStatusBarHeight(controller);
             const navBarHeight = controller.navigationController ? controller.navigationController.navigationBar.frame.size.height : 0;
@@ -733,7 +743,7 @@ export namespace ios {
         public viewWillAppear(animated: boolean): void {
             super.viewWillAppear(animated);
             const owner = this.owner.get();
-            if(!owner){
+            if (!owner) {
                 return;
             }
 
diff --git a/tns-core-modules/ui/date-picker/date-picker.ios.ts b/tns-core-modules/ui/date-picker/date-picker.ios.ts
index 97b670ad91..64a0049c33 100644
--- a/tns-core-modules/ui/date-picker/date-picker.ios.ts
+++ b/tns-core-modules/ui/date-picker/date-picker.ios.ts
@@ -112,6 +112,6 @@ class UIDatePickerChangeHandlerImpl extends NSObject {
     }
 
     public static ObjCExposedMethods = {
-        'valueChanged': { returns: interop.types.void, params: [UIDatePicker] }
+        "valueChanged": { returns: interop.types.void, params: [UIDatePicker] }
     };
 }
diff --git a/tns-core-modules/ui/dialogs/dialogs.ios.ts b/tns-core-modules/ui/dialogs/dialogs.ios.ts
index 927d8eee4d..a38ee792ea 100644
--- a/tns-core-modules/ui/dialogs/dialogs.ios.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.ios.ts
@@ -8,31 +8,25 @@ import { isString, isDefined, isFunction } from "../../utils/types";
 
 export * from "./dialogs-common";
 
-enum allertButtons {
-    cancel = 1 << 0,
-    neutral = 1 << 1,
-    ok = 1 << 2,
-}
-
 function addButtonsToAlertController(alertController: UIAlertController, options: ConfirmOptions, callback?: Function): void {
     if (!options) {
         return;
     }
 
     if (isString(options.cancelButtonText)) {
-        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.cancelButtonText, UIAlertActionStyle.Default, (arg: UIAlertAction) => {
+        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.cancelButtonText, UIAlertActionStyle.Default, () => {
             raiseCallback(callback, false);
         }));
     }
 
     if (isString(options.neutralButtonText)) {
-        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.neutralButtonText, UIAlertActionStyle.Default, (arg: UIAlertAction) => {
+        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.neutralButtonText, UIAlertActionStyle.Default, () => {
             raiseCallback(callback, undefined);
         }));
     }
 
     if (isString(options.okButtonText)) {
-        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.okButtonText, UIAlertActionStyle.Default, (arg: UIAlertAction) => {
+        alertController.addAction(UIAlertAction.actionWithTitleStyleHandler(options.okButtonText, UIAlertActionStyle.Default, () => {
             raiseCallback(callback, true);
         }));
     }
@@ -129,7 +123,7 @@ export function prompt(arg: any): Promise<PromptResult> {
     });
 }
 
-export function login(arg: any): Promise<LoginResult> {
+export function login(): Promise<LoginResult> {
     let options: LoginOptions;
 
     let defaultOptions = { title: LOGIN, okButtonText: OK, cancelButtonText: CANCEL };
@@ -236,7 +230,7 @@ function showUIAlertController(alertController: UIAlertController) {
     }
 }
 
-export function action(arg: any): Promise<string> {
+export function action(): Promise<string> {
     let options: ActionOptions;
 
     let defaultOptions = { title: null, cancelButtonText: CANCEL };
diff --git a/tns-core-modules/ui/editable-text-base/editable-text-base-common.ts b/tns-core-modules/ui/editable-text-base/editable-text-base-common.ts
index 2f2c94561d..495df9f912 100644
--- a/tns-core-modules/ui/editable-text-base/editable-text-base-common.ts
+++ b/tns-core-modules/ui/editable-text-base/editable-text-base-common.ts
@@ -1,5 +1,5 @@
 import { EditableTextBase as EditableTextBaseDefinition, KeyboardType, ReturnKeyType, UpdateTextTrigger, AutocapitalizationType } from ".";
-import { TextBase, Property, CssProperty, Style, Color, booleanConverter, makeValidator, makeParser, resetSymbol } from "../text-base";
+import { TextBase, Property, CssProperty, Style, Color, booleanConverter, makeValidator, makeParser } from "../text-base";
 
 export * from "../text-base";
 
diff --git a/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
index c4c0a999e2..e7c54d1901 100644
--- a/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
+++ b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts
@@ -115,12 +115,8 @@ function initializeEditTextListeners(): void {
                 return false;
             }
 
-            if (actionId === android.view.inputmethod.EditorInfo.IME_NULL ||
+            if (actionId === android.view.inputmethod.EditorInfo.IME_ACTION_DONE ||
                 actionId === android.view.inputmethod.EditorInfo.IME_ACTION_UNSPECIFIED ||
-                actionId === android.view.inputmethod.EditorInfo.IME_ACTION_DONE ||
-                actionId === android.view.inputmethod.EditorInfo.IME_ACTION_GO ||
-                actionId === android.view.inputmethod.EditorInfo.IME_ACTION_SEARCH ||
-                actionId === android.view.inputmethod.EditorInfo.IME_ACTION_SEND ||
                 (event && event.getKeyCode() === android.view.KeyEvent.KEYCODE_ENTER)) {
                 // If it is TextField, close the keyboard. If it is TextView, do not close it since the TextView is multiline
                 // https://github.com/NativeScript/NativeScript/issues/3111
@@ -129,11 +125,9 @@ function initializeEditTextListeners(): void {
                 }
 
                 owner._onReturnPress();
-            }
-
-            // If action is ACTION_NEXT then do not close keyboard
-            if (actionId === android.view.inputmethod.EditorInfo.IME_ACTION_NEXT
-                || actionId === android.view.inputmethod.EditorInfo.IME_ACTION_PREVIOUS) {
+            } else if (actionId === android.view.inputmethod.EditorInfo.IME_ACTION_NEXT ||
+                actionId === android.view.inputmethod.EditorInfo.IME_ACTION_PREVIOUS) {
+                // do not close keyboard for ACTION_NEXT or ACTION_PREVIOUS
                 owner._onReturnPress();
             }
 
diff --git a/tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts
index f6ca8e1f3b..1cd401f938 100644
--- a/tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts
+++ b/tns-core-modules/ui/editable-text-base/editable-text-base.ios.ts
@@ -13,7 +13,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
         this.notify({ eventName: EditableTextBase.blurEvent, object: this });
     }
 
-    [keyboardTypeProperty.getDefault](): "datetime"| "phone" | "number" | "url" | "email" | string {
+    [keyboardTypeProperty.getDefault](): "datetime" | "phone" | "number" | "url" | "email" | string {
         let keyboardType = this.nativeViewProtected.keyboardType;
         switch (keyboardType) {
             case UIKeyboardType.NumbersAndPunctuation:
@@ -32,7 +32,7 @@ export abstract class EditableTextBase extends EditableTextBaseCommon {
                 return keyboardType.toString();
         }
     }
-    [keyboardTypeProperty.setNative](value: "datetime"| "phone" | "number" | "url" | "email" | string) {
+    [keyboardTypeProperty.setNative](value: "datetime" | "phone" | "number" | "url" | "email" | string) {
         let newKeyboardType: UIKeyboardType;
         switch (value) {
             case "datetime":
@@ -193,7 +193,7 @@ export function _updateCharactersInRangeReplacementString(formattedText: Formatt
     let currentLocation = 0;
     for (let i = 0, length = formattedText.spans.length; i < length; i++) {
         let span = formattedText.spans.getItem(i);
-        if (currentLocation <= rangeLocation && rangeLocation < (currentLocation + span.text.length)){
+        if (currentLocation <= rangeLocation && rangeLocation < (currentLocation + span.text.length)) {
             let newText = splice(span.text, rangeLocation - currentLocation, deletingText ? rangeLength : 0, replacementString);
             span._setTextInternal(newText); 
             return;
diff --git a/tns-core-modules/ui/enums/enums.ts b/tns-core-modules/ui/enums/enums.ts
index 5a2f598bf9..7b7779f4ea 100644
--- a/tns-core-modules/ui/enums/enums.ts
+++ b/tns-core-modules/ui/enums/enums.ts
@@ -175,7 +175,7 @@ export module AnimationCurve {
     export var spring = "spring";
     export function cubicBezier(x1: number, y1: number, x2: number, y2: number): Object {
         animationModule = animationModule || require("ui/animation");
-        return new animationModule.CubicBezierAnimationCurve(x1, y1 ,x2, y2);
+        return new animationModule.CubicBezierAnimationCurve(x1, y1 , x2, y2);
     }
 }
 
diff --git a/tns-core-modules/ui/frame/activity.android.ts b/tns-core-modules/ui/frame/activity.android.ts
index 5d935066b7..85453876c8 100644
--- a/tns-core-modules/ui/frame/activity.android.ts
+++ b/tns-core-modules/ui/frame/activity.android.ts
@@ -6,6 +6,7 @@ if ((<any>global).__snapshot || (<any>global).__snapshotEnabled) {
     globals.install();
 }
 
+//@ts-ignore
 @JavaProxy("com.tns.NativeScriptActivity")
 class NativeScriptActivity extends android.app.Activity {
     private _callbacks: AndroidActivityCallbacks;
diff --git a/tns-core-modules/ui/frame/fragment.transitions.android.ts b/tns-core-modules/ui/frame/fragment.transitions.android.ts
index 342604ecf7..6996bf8a3b 100644
--- a/tns-core-modules/ui/frame/fragment.transitions.android.ts
+++ b/tns-core-modules/ui/frame/fragment.transitions.android.ts
@@ -1,5 +1,5 @@
 // Definitions.
-import { NavigationTransition, BackstackEntry, Frame } from "../frame";
+import { NavigationTransition, BackstackEntry } from "../frame";
 import { AnimationType } from "./fragment.transitions";
 
 // Types.
@@ -46,15 +46,14 @@ interface ExpandedEntry extends BackstackEntry {
     frameId: number
 }
 
-interface FragmentCallbacks {
-    frame: Frame;
-    entry: ExpandedEntry;
-}
-
 const sdkVersion = lazy(() => parseInt(device.sdkVersion));
 const intEvaluator = lazy(() => new android.animation.IntEvaluator());
 const defaultInterpolator = lazy(() => new android.view.animation.AccelerateDecelerateInterpolator());
 
+// NOTE: Android P Beta SDK version returns 27, which is API level for Android 8.1
+// TODO: Update condition when Android P SDK version returns 28
+const isAndroidP = lazy(() => sdkVersion() >= 27);
+
 export const waitingQueue = new Map<number, Set<ExpandedEntry>>();
 export const completedEntries = new Map<number, ExpandedEntry>();
 
@@ -78,34 +77,36 @@ export function _setAndroidFragmentTransitions(
     const newFragment: android.app.Fragment = newEntry.fragment;
     const entries = waitingQueue.get(frameId);
     if (entries && entries.size > 0) {
-        throw new Error('Calling navigation before previous navigation finish.');
+        throw new Error("Calling navigation before previous navigation finish.");
     }
 
-    initDefaultAnimations(manager);
+    if (!isAndroidP()) {
+        initDefaultAnimations(manager);
+    }
 
     if (sdkVersion() >= 21) {
         allowTransitionOverlap(currentFragment);
         allowTransitionOverlap(newFragment);
     }
 
-    let name = '';
+    let name = "";
     let transition: Transition;
 
     if (navigationTransition) {
         transition = navigationTransition.instance;
-        name = navigationTransition.name ? navigationTransition.name.toLowerCase() : '';
+        name = navigationTransition.name ? navigationTransition.name.toLowerCase() : "";
     }
 
-    let useLollipopTransition = name && (name.indexOf('slide') === 0 || name === 'fade' || name === 'explode') && sdkVersion() >= 21;
+    let useLollipopTransition = name && (name.indexOf("slide") === 0 || name === "fade" || name === "explode") && sdkVersion() >= 21;
     if (!animated) {
-        name = 'none';
+        name = "none";
     } else if (transition) {
-        name = 'custom';
+        name = "custom";
         // specifiying transition should override default one even if name match the lollipop transition name.
         useLollipopTransition = false;
-    } else if (!useLollipopTransition && name.indexOf('slide') !== 0 && name !== 'fade' && name.indexOf('flip') !== 0) {
+    } else if (!useLollipopTransition && name.indexOf("slide") !== 0 && name !== "fade" && name.indexOf("flip") !== 0) {
         // If we are given name that doesn't match any of ours - fallback to default.
-        name = 'default';
+        name = "default";
     }
 
     let currentFragmentNeedsDifferentAnimation = false;
@@ -118,44 +119,48 @@ export function _setAndroidFragmentTransitions(
         }
     }
 
-    if (name === 'none') {
+    if (name === "none") {
         transition = new NoTransition(0, null);
-    } else if (name === 'default') {
-        transition = new DefaultTransition(0, null);
+    } else if (name === "default") {
+        if (isAndroidP()) {
+            transition = new FadeTransition(150, null);
+        } else {
+            transition = new DefaultTransition(0, null);
+        }
     } else if (useLollipopTransition) {
         // setEnterTransition: Enter
         // setExitTransition: Exit
         // setReenterTransition: Pop Enter, same as Exit if not specified
         // setReturnTransition: Pop Exit, same as Enter if not specified
 
-        if (name.indexOf('slide') === 0) {
+        if (name.indexOf("slide") === 0) {
             setupNewFragmentSlideTransition(navigationTransition, newEntry, name);
             if (currentFragmentNeedsDifferentAnimation) {
                 setupCurrentFragmentSlideTransition(navigationTransition, currentEntry, name);
             }
-        } else if (name === 'fade') {
+        } else if (name === "fade") {
             setupNewFragmentFadeTransition(navigationTransition, newEntry);
             if (currentFragmentNeedsDifferentAnimation) {
                 setupCurrentFragmentFadeTransition(navigationTransition, currentEntry);
             }
-        } else if (name === 'explode') {
+        } else if (name === "explode") {
             setupNewFragmentExplodeTransition(navigationTransition, newEntry);
             if (currentFragmentNeedsDifferentAnimation) {
                 setupCurrentFragmentExplodeTransition(navigationTransition, currentEntry);
             }
         }
-    } else if (name.indexOf('slide') === 0) {
-        const direction = name.substr('slide'.length) || 'left'; //Extract the direction from the string
+    } else if (name.indexOf("slide") === 0) {
+        const direction = name.substr("slide".length) || "left"; //Extract the direction from the string
         transition = new SlideTransition(direction, navigationTransition.duration, navigationTransition.curve);
-    } else if (name === 'fade') {
+    } else if (name === "fade") {
         transition = new FadeTransition(navigationTransition.duration, navigationTransition.curve);
-    } else if (name.indexOf('flip') === 0) {
-        const direction = name.substr('flip'.length) || 'right'; //Extract the direction from the string
+    } else if (name.indexOf("flip") === 0) {
+        const direction = name.substr("flip".length) || "right"; //Extract the direction from the string
         transition = new FlipTransition(direction, navigationTransition.duration, navigationTransition.curve);
     }
 
     newEntry.transitionName = name;
-    if (name === 'custom') {
+    if (name === "custom") {
         newEntry.transition = transition;
     }
 
@@ -170,12 +175,16 @@ export function _setAndroidFragmentTransitions(
 
     if (currentEntry) {
         currentEntry.transitionName = name;
-        if (name === 'custom') {
+        if (name === "custom") {
             currentEntry.transition = transition;
         }
     }
 
-    setupDefaultAnimations(newEntry, new DefaultTransition(0, null));
+    if (isAndroidP()) {
+        setupDefaultAnimations(newEntry, new FadeTransition(150, null));
+    } else {
+        setupDefaultAnimations(newEntry, new DefaultTransition(0, null));
+    }
 
     printTransitions(currentEntry);
     printTransitions(newEntry);
@@ -700,6 +709,14 @@ function addNativeTransitionListener(entry: ExpandedEntry, nativeTransition: and
 function transitionOrAnimationCompleted(entry: ExpandedEntry): void {
     const frameId = entry.frameId;
     const entries = waitingQueue.get(frameId);
+    // https://github.com/NativeScript/NativeScript/issues/5759
+    // https://github.com/NativeScript/NativeScript/issues/5780
+    // transitionOrAnimationCompleted fires again (probably bug in android)
+    // NOTE: we cannot reproduce this issue so this is a blind fix
+    if (!entries) {
+        return;
+    }
+
     entries.delete(entry);
     if (entries.size === 0) {
         const frame = entry.resolvedPage.frame;
@@ -712,7 +729,7 @@ function transitionOrAnimationCompleted(entry: ExpandedEntry): void {
         let current = frame.isCurrent(entry) ? previousCompletedAnimationEntry : entry;
         current = current || entry;
         // Will be null if Frame is shown modally...
-        // AnimationCompleted fires again (probably bug in android).
+        // transitionOrAnimationCompleted fires again (probably bug in android).
         if (current) {
             const isBack = frame._isBack;
             setTimeout(() => frame.setCurrent(current, isBack));
diff --git a/tns-core-modules/ui/frame/frame-common.ts b/tns-core-modules/ui/frame/frame-common.ts
index c45a2217a3..1c93c3d39f 100644
--- a/tns-core-modules/ui/frame/frame-common.ts
+++ b/tns-core-modules/ui/frame/frame-common.ts
@@ -3,10 +3,8 @@ import { Frame as FrameDefinition, NavigationEntry, BackstackEntry, NavigationTr
 import { Page } from "../page";
 
 // Types.
-import { View, CustomLayoutView, isIOS, isAndroid, traceEnabled, traceWrite, traceCategories, EventData, Property, CSSType } from "../core/view";
-import { resolveFileName } from "../../file-system/file-name-resolver";
-import { knownFolders, path } from "../../file-system";
-import { parse, createViewFromEntry } from "../builder";
+import { View, CustomLayoutView, isIOS, isAndroid, traceEnabled, traceWrite, traceCategories, Property, CSSType } from "../core/view";
+import { createViewFromEntry } from "../builder";
 import { profile } from "../../profiling";
 
 import { frameStack, topmost as frameStackTopmost, _pushInFrameStack, _popFromFrameStack, _removeFromFrameStack } from "./frame-stack";
@@ -216,8 +214,13 @@ export class FrameBase extends CustomLayoutView implements FrameDefinition {
         }
 
         this._currentEntry = entry;
-        this._executingEntry = null;
+
         newPage.onNavigatedTo(isBack);
+
+        // Reset executing entry after NavigatedTo is raised;
+        // we do not want to execute two navigations in parallel in case 
+        // additional navigation is triggered from the NavigatedTo handler.
+        this._executingEntry = null;
     }
 
     public _updateBackstack(entry: BackstackEntry, isBack: boolean): void {
diff --git a/tns-core-modules/ui/frame/frame.android.ts b/tns-core-modules/ui/frame/frame.android.ts
index cb471e4c55..8f4c2f51f1 100644
--- a/tns-core-modules/ui/frame/frame.android.ts
+++ b/tns-core-modules/ui/frame/frame.android.ts
@@ -1,6 +1,6 @@
 // Definitions.
 import {
-    AndroidFrame as AndroidFrameDefinition, BackstackEntry, NavigationEntry,
+    AndroidFrame as AndroidFrameDefinition, BackstackEntry,
     NavigationTransition, AndroidFragmentCallbacks, AndroidActivityCallbacks
 } from ".";
 import { Page } from "../page";
@@ -8,7 +8,7 @@ import { Page } from "../page";
 // Types.
 import * as application from "../../application";
 import {
-    FrameBase, NavigationContext, stack, goBack, View, Observable, topmost,
+    FrameBase, stack, goBack, View, Observable,
     traceEnabled, traceWrite, traceCategories
 } from "./frame-common";
 
@@ -22,6 +22,9 @@ import { profile } from "../../profiling";
 // TODO: Remove this and get it from global to decouple builder for angular
 import { createViewFromEntry } from "../builder";
 
+import { device } from "../../platform";
+import lazy from "../../utils/lazy";
+
 export * from "./frame-common";
 
 const INTENT_EXTRA = "com.tns.activity";
@@ -32,6 +35,8 @@ const CALLBACKS = "_callbacks";
 const ownerSymbol = Symbol("_owner");
 const activityRootViewsMap = new Map<number, WeakRef<View>>();
 
+const sdkVersion = lazy(() => parseInt(device.sdkVersion));
+
 let navDepth = -1;
 let fragmentId = -1;
 export let moduleLoaded: boolean;
@@ -89,7 +94,6 @@ export function reloadPage(): void {
 
 export class Frame extends FrameBase {
     private _android: AndroidFrame;
-    private _delayedNavigationEntry: BackstackEntry;
     private _containerViewId: number = -1;
     private _tearDownPending = false;
     private _attachedToWindow = false;
@@ -186,13 +190,28 @@ export class Frame extends FrameBase {
         super.onUnloaded();
     }
 
-    private disposeCurrentFragment(){
-        if (this._currentEntry && this._currentEntry.fragment) {
-            const manager: android.app.FragmentManager = this._getFragmentManager();
-            const transaction = manager.beginTransaction();
+    private disposeCurrentFragment(): void {
+        if (!this._currentEntry || !this._currentEntry.fragment) {
+            return;
+        }
+
+        const manager: android.app.FragmentManager = this._getFragmentManager();
+        const transaction = manager.beginTransaction();
+        const androidSdkVersion = sdkVersion();
+
+        if (androidSdkVersion !== 21 && androidSdkVersion !== 22) {
             transaction.remove(this._currentEntry.fragment);
-            transaction.commitAllowingStateLoss();
+        } else {
+            // https://github.com/NativeScript/NativeScript/issues/5674
+            // HACK: Add and remove dummy fragment to workaround a Lollipop issue
+            // with inFragment passed as null when adding transition targets: https://android.googlesource.com/platform/frameworks/base.git/+/lollipop-release/core/java/android/app/BackStackRecord.java#1127  
+            const dummyFragmentTag = "dummy";
+            const dummyFragment = this.createFragment(<BackstackEntry>{}, dummyFragmentTag);
+            transaction.replace(this.containerViewId, dummyFragment, dummyFragmentTag);
+            transaction.remove(dummyFragment);
         }
+
+        transaction.commitAllowingStateLoss();
     }
 
     private createFragment(backstackEntry: BackstackEntry, fragmentTag: string): android.app.Fragment {
@@ -291,7 +310,6 @@ export class Frame extends FrameBase {
                 startActivity(currentActivity, this._android.frameId);
             }
 
-            this._delayedNavigationEntry = newEntry;
             return;
         }
 
@@ -666,7 +684,7 @@ class FragmentCallbacksImplementation implements AndroidFragmentCallbacks {
         }
 
         if (traceEnabled()) {
-            traceWrite(`${fragment}.onCreateAnimator(${transit}, ${enter ? "enter" : "exit"}, ${nextAnimString}): ${animator ? 'animator' : 'no animator'}`, traceCategories.NativeLifecycle);
+            traceWrite(`${fragment}.onCreateAnimator(${transit}, ${enter ? "enter" : "exit"}, ${nextAnimString}): ${animator ? "animator" : "no animator"}`, traceCategories.NativeLifecycle);
         }
         return animator;
     }
diff --git a/tns-core-modules/ui/frame/frame.ios.ts b/tns-core-modules/ui/frame/frame.ios.ts
index 18c4091959..6ace89148c 100644
--- a/tns-core-modules/ui/frame/frame.ios.ts
+++ b/tns-core-modules/ui/frame/frame.ios.ts
@@ -1,14 +1,12 @@
 // Definitions.
-import { iOSFrame as iOSFrameDefinition, BackstackEntry, NavigationTransition, NavigationEntry } from ".";
+import { iOSFrame as iOSFrameDefinition, BackstackEntry, NavigationTransition } from ".";
 import { Page } from "../page";
 import { profile } from "../../profiling";
 
 //Types.
-import { FrameBase, View, topmost, layout, traceEnabled, traceWrite, traceCategories, isCategorySet } from "./frame-common";
+import { FrameBase, View, layout, traceEnabled, traceWrite, traceCategories, isCategorySet } from "./frame-common";
 import { _createIOSAnimatedTransitioning } from "./fragment.transitions";
-// HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to
-// kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism.
-import * as uiUtils from "../../ui/utils";
+
 import * as utils from "../../utils/utils";
 
 export * from "./frame-common";
@@ -569,14 +567,12 @@ class iOSFrame implements iOSFrameDefinition {
     private _controller: UINavigationControllerImpl;
     private _showNavigationBar: boolean;
     private _navBarVisibility: "auto" | "never" | "always" = "auto";
-    private _frame: Frame;
 
     // TabView uses this flag to disable animation while showing/hiding the navigation bar because of the "< More" bar.
     // See the TabView._handleTwoNavigationBars method for more details.
     public _disableNavBarAnimation: boolean;
 
     constructor(frame: Frame) {
-        this._frame = frame;
         this._controller = UINavigationControllerImpl.initWithOwner(new WeakRef(frame));
     }
 
@@ -589,14 +585,7 @@ class iOSFrame implements iOSFrameDefinition {
     }
     public set showNavigationBar(value: boolean) {
         this._showNavigationBar = value;
-
-        const viewController = this._controller.viewControllers;
-        const length = viewController ? viewController.count : 0;
-        const animated = length > 0 && !this._disableNavBarAnimation;
-
         this._controller.setNavigationBarHiddenAnimated(!value, true);
-        // this._controller.view.setNeedsLayout();
-        // this._controller.view.layoutIfNeeded();
     }
 
     public get navBarVisibility(): "auto" | "never" | "always" {
diff --git a/tns-core-modules/ui/gestures/gestures.android.ts b/tns-core-modules/ui/gestures/gestures.android.ts
index 9b76911a1d..b86f738174 100644
--- a/tns-core-modules/ui/gestures/gestures.android.ts
+++ b/tns-core-modules/ui/gestures/gestures.android.ts
@@ -81,14 +81,12 @@ function initializePinchGestureListener() {
         private _observer: GesturesObserver;
         private _target: View;
         private _scale: number;
-        private _density: number;
 
         constructor(observer: GesturesObserver, target: View) {
             super();
 
             this._observer = observer;
             this._target = target;
-            this._density = layout.getDisplayDensity();
 
             return global.__native(this);
         }
diff --git a/tns-core-modules/ui/gestures/gestures.d.ts b/tns-core-modules/ui/gestures/gestures.d.ts
index bbe54fd51c..6be6706e8e 100644
--- a/tns-core-modules/ui/gestures/gestures.d.ts
+++ b/tns-core-modules/ui/gestures/gestures.d.ts
@@ -141,7 +141,7 @@ export interface TouchGestureEventData extends GestureEventData {
     /**
      * Gets action of the touch. Possible values: 'up', 'move', 'down', 'cancel'
      */
-    action: 'up' | 'move' | 'down' | 'cancel';
+    action: "up" | "move" | "down" | "cancel";
 
     /**
      * Gets the X coordinate of this event inside the view that triggered the event.
diff --git a/tns-core-modules/ui/gestures/gestures.ios.ts b/tns-core-modules/ui/gestures/gestures.ios.ts
index 45d397e5c6..fb12142852 100644
--- a/tns-core-modules/ui/gestures/gestures.ios.ts
+++ b/tns-core-modules/ui/gestures/gestures.ios.ts
@@ -296,8 +296,8 @@ function _getPinchData(args: GestureEventData): PinchGestureEventData {
         ios: args.ios,
         android: undefined,
         scale: recognizer.scale,
-        getFocusX: () => { return center.x; },
-        getFocusY: () => { return center.y; },
+        getFocusX: () => center.x,
+        getFocusY: () => center.y,
         object: args.view,
         eventName: toString(args.type),
         state: getState(recognizer)
diff --git a/tns-core-modules/ui/image-cache/image-cache.ios.ts b/tns-core-modules/ui/image-cache/image-cache.ios.ts
index 61e7519dee..41f475c674 100644
--- a/tns-core-modules/ui/image-cache/image-cache.ios.ts
+++ b/tns-core-modules/ui/image-cache/image-cache.ios.ts
@@ -66,6 +66,7 @@ class MemmoryWarningHandler extends NSObject {
 export class Cache extends common.Cache {
     private _cache: NSCache<any, any>;
     //private _delegate: NSCacheDelegate;
+    //@ts-ignore
     private _memoryWarningHandler: MemmoryWarningHandler;
 
     constructor() {
diff --git a/tns-core-modules/ui/image/image.d.ts b/tns-core-modules/ui/image/image.d.ts
index 4228e445aa..0677cac30b 100644
--- a/tns-core-modules/ui/image/image.d.ts
+++ b/tns-core-modules/ui/image/image.d.ts
@@ -3,7 +3,7 @@
  * @module "ui/image"
  */ /** */
 
-import { View, Property, InheritedCssProperty, Color, Style } from "../core/view";
+import { View, Property, InheritedCssProperty, Color, Style, Length } from "../core/view";
 import { ImageSource } from "../../image-source";
 
 /**
@@ -52,6 +52,18 @@ export class Image extends View {
      * A color used to tint template images.
      */
     tintColor: Color;
+
+    /**
+     * Gets or sets the desired decode height of the image.
+     * This property is Android specific.
+     */
+    decodeHeight: Length;
+
+    /**
+     * Gets or sets the desired decode width of the image.
+     * This property is Android specific.
+     */
+    decodeWidth: Length;
 }
 
 export type Stretch = "none" | "aspectFill" | "aspectFit" | "fill";
@@ -61,4 +73,6 @@ export const srcProperty: Property<Image, any>;
 export const isLoadingProperty: Property<Image, string>;
 export const loadMode: Property<Image, "sync" | "async">;
 export const stretchProperty: Property<Image, Stretch>;
-export const tintColorProperty: InheritedCssProperty<Style, Color>;
\ No newline at end of file
+export const tintColorProperty: InheritedCssProperty<Style, Color>;
+export const decodeHeightProperty: Property<Image, Length>;
+export const decodeWidthProperty: Property<Image, Length>;
\ No newline at end of file
diff --git a/tns-core-modules/ui/label/label.ios.ts b/tns-core-modules/ui/label/label.ios.ts
index 7d00a2bb58..e35c13297d 100644
--- a/tns-core-modules/ui/label/label.ios.ts
+++ b/tns-core-modules/ui/label/label.ios.ts
@@ -68,7 +68,11 @@ export class Label extends TextBase implements LabelDefinition {
             this._fixedSize = (widthMode === layout.EXACTLY ? FixedSize.WIDTH : FixedSize.NONE)
                 | (heightMode === layout.EXACTLY ? FixedSize.HEIGHT : FixedSize.NONE);
 
-            const nativeSize = layout.measureNativeView(nativeView, width, widthMode, height, heightMode);
+            // NOTE: utils.measureNativeView(...) relies on UIView.sizeThatFits(...) that 
+            // seems to have various issues when laying out UILabel instances.
+            // We use custom measure logic here that relies on overriden 
+            // UILabel.textRectForBounds:limitedToNumberOfLines: in TNSLabel widget. 
+            const nativeSize = this._measureNativeView(width, widthMode, height, heightMode);
             let labelWidth = nativeSize.width;
 
             if (this.textWrap && widthMode === layout.AT_MOST) {
@@ -85,6 +89,22 @@ export class Label extends TextBase implements LabelDefinition {
         }
     }
 
+    private _measureNativeView(width: number, widthMode: number, height: number, heightMode: number): { width: number, height: number } {
+        const view = <UILabel>this.nativeViewProtected;
+
+        const nativeSize = view.textRectForBoundsLimitedToNumberOfLines(
+            CGRectMake(
+                0,
+                0,
+                widthMode === 0 /* layout.UNSPECIFIED */ ? Number.POSITIVE_INFINITY : layout.toDeviceIndependentPixels(width),
+                heightMode === 0 /* layout.UNSPECIFIED */ ? Number.POSITIVE_INFINITY : layout.toDeviceIndependentPixels(height)
+            ), 0).size;
+
+        nativeSize.width = layout.round(layout.toDevicePixels(nativeSize.width));
+        nativeSize.height = layout.round(layout.toDevicePixels(nativeSize.height));
+        return nativeSize;
+    }
+
     [whiteSpaceProperty.setNative](value: WhiteSpace) {
         const nativeView = this.nativeViewProtected;
         switch (value) {
diff --git a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
index ee28c43d7b..d376de88a4 100644
--- a/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
+++ b/tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts
@@ -595,8 +595,25 @@ export class FlexboxLayout extends FlexboxLayoutBase {
                     } else {
                         accumulatedRoundError = rawCalculatedWidth - roundedCalculatedWidth;
                     }
-                    child.measure(makeMeasureSpec(roundedCalculatedWidth, EXACTLY), makeMeasureSpec(child.getMeasuredHeight(), EXACTLY));
+
+                    const childWidthMeasureSpec = makeMeasureSpec(roundedCalculatedWidth, EXACTLY);
+
+                    // NOTE: for controls that support internal content wrapping (e.g. UILabel) reducing the width 
+                    // might result in increased height e.g. text that could be shown on one line for larger 
+                    // width needs to be wrapped in two when width is reduced. 
+                    // As a result we cannot unconditionally measure with EXACTLY the current measured height
+                    const childHeightMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentHeightMeasureSpec,
+                        lp.effectivePaddingTop + lp.effectivePaddingBottom + lp.effectiveMarginTop
+                        + lp.effectiveMarginBottom, lp.effectiveHeight < 0 ? WRAP_CONTENT : lp.effectiveHeight);
+
+                    child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
                     child.effectiveMinWidth = minWidth;
+
+                    // make sure crossSize is up-to-date as child calculated height might have increased
+                    flexLine._crossSize = Math.max(
+                        flexLine._crossSize,
+                        child.getMeasuredHeight() + lp.effectiveMarginTop + lp.effectiveMarginBottom
+                    );
                 }
                 flexLine._mainSize += child.getMeasuredWidth() + lp.effectiveMarginLeft + lp.effectiveMarginRight;
             } else {
@@ -803,7 +820,17 @@ export class FlexboxLayout extends FlexboxLayoutBase {
     private _stretchViewVertically(view: View, crossSize: number) {
         let newHeight = crossSize - view.effectiveMarginTop - view.effectiveMarginBottom;
         newHeight = Math.max(newHeight, 0);
-        view.measure(makeMeasureSpec(view.getMeasuredWidth(), EXACTLY), makeMeasureSpec(newHeight, EXACTLY));
+        let originalMeasuredWidth = view.getMeasuredWidth();
+        let childWidthMeasureSpec = FlexboxLayout.getChildMeasureSpec(this._currentWidthMeasureSpec,
+            view.effectivePaddingLeft + view.effectivePaddingRight + view.effectiveMarginLeft
+            + view.effectiveMarginRight, view.effectiveWidth < 0 ? WRAP_CONTENT : Math.min(view.effectiveWidth, originalMeasuredWidth));
+
+        view.measure(childWidthMeasureSpec, makeMeasureSpec(newHeight, EXACTLY));
+
+        if (originalMeasuredWidth > view.getMeasuredWidth()) {
+            childWidthMeasureSpec = makeMeasureSpec(originalMeasuredWidth, EXACTLY);
+            view.measure(childWidthMeasureSpec, makeMeasureSpec(newHeight, EXACTLY));
+        }
     }
 
     private _stretchViewHorizontally(view: View, crossSize: number) {
diff --git a/tns-core-modules/ui/list-picker/list-picker.android.ts b/tns-core-modules/ui/list-picker/list-picker.android.ts
index 77a6031cb0..051f9787dd 100644
--- a/tns-core-modules/ui/list-picker/list-picker.android.ts
+++ b/tns-core-modules/ui/list-picker/list-picker.android.ts
@@ -159,7 +159,7 @@ export class ListPicker extends ListPickerBase {
     }
 
     [colorProperty.getDefault](): { wheelColor: number, textColor: number } {
-	const editText = (<any>this.nativeViewProtected).editText;
+    const editText = (<any>this.nativeViewProtected).editText;
         return {
             wheelColor: this._selectorWheelPaint.getColor(),
             textColor: editText ? editText.getTextColors().getDefaultColor() : -1
diff --git a/tns-core-modules/ui/list-view/list-view.android.ts b/tns-core-modules/ui/list-view/list-view.android.ts
index e33dc63734..8cc6528f0c 100644
--- a/tns-core-modules/ui/list-view/list-view.android.ts
+++ b/tns-core-modules/ui/list-view/list-view.android.ts
@@ -7,7 +7,6 @@ import { StackLayout } from "../layouts/stack-layout";
 import { ProxyViewContainer } from "../proxy-view-container";
 import { LayoutBase } from "../layouts/layout-base";
 import { profile } from "../../profiling";
-import { onScroll } from '../../../apps/app/ui-tests-app/list-view/list-view';
 
 export * from "./list-view-common";
 
diff --git a/tns-core-modules/ui/list-view/list-view.ios.ts b/tns-core-modules/ui/list-view/list-view.ios.ts
index 93949ea5fa..35b9333276 100644
--- a/tns-core-modules/ui/list-view/list-view.ios.ts
+++ b/tns-core-modules/ui/list-view/list-view.ios.ts
@@ -1,14 +1,11 @@
-import { ScrollEventData } from "../scroll-view";
-import { ItemEventData } from ".";
+import { ItemEventData } from ".";
 import {
     ListViewBase, View, KeyedTemplate, Length, Observable, Color,
     separatorColorProperty, itemTemplatesProperty, iosEstimatedRowHeightProperty, layout, EventData
 } from "./list-view-common";
 import { StackLayout } from "../layouts/stack-layout";
 import { ProxyViewContainer } from "../proxy-view-container";
-import { ios } from "../../utils/utils";
 import { profile } from "../../profiling";
-import { device } from "../../platform";
 
 export * from "./list-view-common";
 
@@ -197,7 +194,7 @@ class UITableViewRowHeightDelegateImpl extends NSObject implements UITableViewDe
             return tableView.estimatedRowHeight;
         }
 
-        return owner._effectiveRowHeight;
+        return layout.toDeviceIndependentPixels(owner._effectiveRowHeight);
     }
 }
 
@@ -281,8 +278,8 @@ export class ListView extends ListViewBase {
         }
     }
 
-    public isItemAtIndexVisible( itemIndex: number ): boolean {
-        const indexes: NSIndexPath[] = Array.from(this._ios.indexPathsForVisibleRows); 
+    public isItemAtIndexVisible(itemIndex: number): boolean {
+        const indexes: NSIndexPath[] = Array.from(this._ios.indexPathsForVisibleRows);
         return indexes.some(visIndex => visIndex.row === itemIndex);
     }
 
@@ -295,7 +292,7 @@ export class ListView extends ListViewBase {
     }
 
     public _onRowHeightPropertyChanged(oldValue: Length, newValue: Length) {
-        const value = this._effectiveRowHeight;
+        const value = layout.toDeviceIndependentPixels(this._effectiveRowHeight);
         const nativeView = this._ios;
         if (value < 0) {
             nativeView.rowHeight = UITableViewAutomaticDimension;
diff --git a/tns-core-modules/ui/page/page-common.ts b/tns-core-modules/ui/page/page-common.ts
index 6764bc4dfa..0d85ab1ab6 100644
--- a/tns-core-modules/ui/page/page-common.ts
+++ b/tns-core-modules/ui/page/page-common.ts
@@ -1,12 +1,11 @@
 import { Page as PageDefinition, NavigatedData, ShownModallyData } from ".";
 import {
-    ContentView, View, eachDescendant, Property, CssProperty, Color, isIOS,
-    booleanConverter, resetCSSProperties, Style, EventData, CSSType
+    ContentView, View, Property, CssProperty, Color, isIOS,
+    booleanConverter, Style, EventData, CSSType
 } from "../content-view";
-import { Frame, topmost as topmostFrame } from "../frame";
+import { Frame } from "../frame";
 import { ActionBar } from "../action-bar";
 import { KeyframeAnimationInfo } from "../animation/keyframe-animation";
-import { File, path, knownFolders } from "../../file-system";
 import { profile } from "../../profiling";
 
 export * from "../content-view";
diff --git a/tns-core-modules/ui/page/page.android.ts b/tns-core-modules/ui/page/page.android.ts
index 6d7a257f8f..4e4adbb0f3 100644
--- a/tns-core-modules/ui/page/page.android.ts
+++ b/tns-core-modules/ui/page/page.android.ts
@@ -1,4 +1,4 @@
-import { View, PageBase, Color, actionBarHiddenProperty, statusBarStyleProperty, androidStatusBarBackgroundProperty, EventData } from "./page-common";
+import { View, PageBase, Color, actionBarHiddenProperty, statusBarStyleProperty, androidStatusBarBackgroundProperty } from "./page-common";
 import { ActionBar } from "../action-bar";
 import { GridLayout } from "../layouts/grid-layout";
 import { device } from "../../platform";
diff --git a/tns-core-modules/ui/page/page.ios.ts b/tns-core-modules/ui/page/page.ios.ts
index a7a1d98d6a..6f57c2c170 100644
--- a/tns-core-modules/ui/page/page.ios.ts
+++ b/tns-core-modules/ui/page/page.ios.ts
@@ -4,22 +4,14 @@ import { Frame } from "../frame";
 // Types.
 import { ios as iosView } from "../core/view";
 import {
-    PageBase, View, ViewBase, layout,
-    actionBarHiddenProperty, statusBarStyleProperty,
-    traceEnabled, traceWrite, traceCategories, PercentLength, Color
+    PageBase, View, layout,
+    actionBarHiddenProperty, statusBarStyleProperty, Color
 } from "./page-common";
-import { ios as iosApp } from "../../application";
-import { device } from "../../platform";
-// HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to
-// kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism.
-import * as uiUtils from "../../ui/utils";
+
 import { profile } from "../../profiling";
 
 export * from "./page-common";
 
-import { ios } from "../../utils/utils";
-import getter = ios.getter;
-
 const ENTRY = "_entry";
 const DELEGATE = "_delegate";
 
@@ -82,7 +74,6 @@ class UIViewControllerImpl extends UIViewController {
 
         const frame = this.navigationController ? (<any>this.navigationController).owner : null;
         const newEntry = this[ENTRY];
-        const modalParent = owner._modalParent;
 
         // Don't raise event if currentPage was showing modal page.
         if (!owner._presentedViewController && newEntry && (!frame || frame.currentPage !== owner)) {
diff --git a/tns-core-modules/ui/search-bar/search-bar.android.ts b/tns-core-modules/ui/search-bar/search-bar.android.ts
index 7b9f1df890..9b7982b6fa 100644
--- a/tns-core-modules/ui/search-bar/search-bar.android.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.android.ts
@@ -183,7 +183,7 @@ export class SearchBar extends SearchBarBase {
         return "";
     }
     [textProperty.setNative](value: string) {
-        const text = (value === null || value === undefined) ? '' : value.toString();
+        const text = (value === null || value === undefined) ? "" : value.toString();
         this.nativeViewProtected.setQuery(text, false);
     }
     [hintProperty.getDefault](): string {
diff --git a/tns-core-modules/ui/search-bar/search-bar.ios.ts b/tns-core-modules/ui/search-bar/search-bar.ios.ts
index eb7b00cd54..d7d2f73502 100644
--- a/tns-core-modules/ui/search-bar/search-bar.ios.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.ios.ts
@@ -3,9 +3,12 @@ import {
     SearchBarBase, Color, colorProperty, backgroundColorProperty, backgroundInternalProperty, fontInternalProperty,
     textProperty, hintProperty, textFieldHintColorProperty, textFieldBackgroundColorProperty
 } from "./search-bar-common";
+import { ios as iosUtils } from "../../utils/utils";
 
 export * from "./search-bar-common";
 
+const majorVersion = iosUtils.MajorVersion;
+
 class UISearchBarDelegateImpl extends NSObject implements UISearchBarDelegate {
     public static ObjCProtocols = [UISearchBarDelegate];
 
@@ -52,6 +55,18 @@ class UISearchBarDelegateImpl extends NSObject implements UISearchBarDelegate {
     }
 }
 
+class UISearchBarImpl extends UISearchBar {
+    sizeThatFits(size: CGSize): CGSize {
+        // iOS11 SDK does not support passing sizeThatFits(...) non-finite width value;
+        // iOS layout system will take care to size the element properly when passed 0
+        if (majorVersion >= 11 && size.width === Number.POSITIVE_INFINITY) {
+            size.width = 0;
+        }
+
+        return super.sizeThatFits(size);
+    }
+}
+
 export class SearchBar extends SearchBarBase {
     private _ios: UISearchBar;
     private _delegate;
@@ -61,7 +76,7 @@ export class SearchBar extends SearchBarBase {
     constructor() {
         super();
 
-        this.nativeViewProtected = this._ios = UISearchBar.new();
+        this.nativeViewProtected = this._ios = UISearchBarImpl.new();
         this._delegate = UISearchBarDelegateImpl.initWithOwner(new WeakRef(this));
     }
 
@@ -144,18 +159,18 @@ export class SearchBar extends SearchBarBase {
     }
 
     [textProperty.getDefault](): string {
-        return '';
+        return "";
     }
     [textProperty.setNative](value: string) {
-        const text = (value === null || value === undefined) ? '' : value.toString();
+        const text = (value === null || value === undefined) ? "" : value.toString();
         this._ios.text = text;
     }
 
     [hintProperty.getDefault](): string {
-        return '';
+        return "";
     }
     [hintProperty.setNative](value: string) {
-        const text = (value === null || value === undefined) ? '' : value.toString();
+        const text = (value === null || value === undefined) ? "" : value.toString();
         this._ios.placeholder = text;
     }
 
diff --git a/tns-core-modules/ui/slider/slider-common.ts b/tns-core-modules/ui/slider/slider-common.ts
index 714f6277ac..8d99222499 100644
--- a/tns-core-modules/ui/slider/slider-common.ts
+++ b/tns-core-modules/ui/slider/slider-common.ts
@@ -4,7 +4,7 @@ import { View, Property, CoercibleProperty, isIOS, CSSType } from "../core/view"
 export * from "../core/view";
 
 // TODO: Extract base Range class for slider and progress
-@CSSType("SliderBase")
+@CSSType("Slider")
 export class SliderBase extends View implements SliderDefinition {
     public value: number;
     public minValue: number;
diff --git a/tns-core-modules/ui/slider/slider.ios.ts b/tns-core-modules/ui/slider/slider.ios.ts
index 57bc9e4774..b738af4a99 100644
--- a/tns-core-modules/ui/slider/slider.ios.ts
+++ b/tns-core-modules/ui/slider/slider.ios.ts
@@ -26,7 +26,7 @@ class SliderChangeHandlerImpl extends NSObject {
     }
 
     public static ObjCExposedMethods = {
-        'sliderValueChanged': { returns: interop.types.void, params: [UISlider] }
+        "sliderValueChanged": { returns: interop.types.void, params: [UISlider] }
     };
 }
 
diff --git a/tns-core-modules/ui/styling/background-common.ts b/tns-core-modules/ui/styling/background-common.ts
index 02328b7cfc..fc1b133c6f 100644
--- a/tns-core-modules/ui/styling/background-common.ts
+++ b/tns-core-modules/ui/styling/background-common.ts
@@ -1,7 +1,7 @@
 // Deifinitions.
 import { Background as BackgroundDefinition } from "./background";
 import { BackgroundRepeat } from "../core/view";
-
+import { LinearGradient } from "./linear-gradient";
 // Types.
 import { Color } from "../../color";
 
@@ -9,7 +9,7 @@ export class Background implements BackgroundDefinition {
     public static default = new Background();
 
     public color: Color;
-    public image: string;
+    public image: string | LinearGradient;
     public repeat: BackgroundRepeat;
     public position: string;
     public size: string;
@@ -58,7 +58,7 @@ export class Background implements BackgroundDefinition {
         return clone;
     }
 
-    public withImage(value: string): Background {
+    public withImage(value: string | LinearGradient): Background {
         const clone = this.clone();
         clone.image = value;
         return clone;
@@ -179,8 +179,15 @@ export class Background implements BackgroundDefinition {
             return false;
         }
 
+        let imagesEqual = false;
+        if (value1 instanceof LinearGradient && value2 instanceof LinearGradient) {
+            imagesEqual = LinearGradient.equals(value1, value2);
+        } else {
+            imagesEqual = value1.image === value2.image;
+        }
+
         return Color.equals(value1.color, value2.color)
-            && value1.image === value2.image
+            && imagesEqual
             && value1.position === value2.position
             && value1.repeat === value2.repeat
             && value1.size === value2.size
diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts
index 6814753191..1aaf2f97f8 100644
--- a/tns-core-modules/ui/styling/background.android.ts
+++ b/tns-core-modules/ui/styling/background.android.ts
@@ -1,4 +1,6 @@
 import { View } from "../core/view";
+import { LinearGradient } from "./linear-gradient";
+
 import { isDataURI, isFileOrResourcePath, layout, RESOURCE_PREFIX, FILE_PREFIX } from "../../utils/utils";
 import { parse } from "../../css-value";
 import { path, knownFolders } from "../../file-system";
@@ -104,6 +106,38 @@ function fromBase64(source: string): android.graphics.Bitmap {
     return android.graphics.BitmapFactory.decodeByteArray(bytes, 0, bytes.length)
 }
 
+function fromGradient(gradient: LinearGradient): org.nativescript.widgets.LinearGradientDefinition {
+    const colors = Array.create("int", gradient.colorStops.length);
+    const stops = Array.create("float", gradient.colorStops.length);
+    let hasStops = false;
+    gradient.colorStops.forEach((stop, index) => {
+        colors[index] = stop.color.android;
+        if (stop.offset) {
+            stops[index] = stop.offset.value;
+            hasStops = true;
+        }
+    });
+
+    const alpha = gradient.angle / (Math.PI * 2);
+    const startX = Math.pow(
+      Math.sin(Math.PI * (alpha + 0.75)),
+      2
+    );
+    const startY = Math.pow(
+      Math.sin(Math.PI * (alpha + 0.5)),
+      2
+    );
+    const endX = Math.pow(
+      Math.sin(Math.PI * (alpha + 0.25)),
+      2
+    );
+    const endY = Math.pow(
+      Math.sin(Math.PI * alpha),
+      2
+    );
+    return new org.nativescript.widgets.LinearGradientDefinition(startX, startY, endX, endY, colors, hasStops ? stops : null);
+}
+
 const pattern: RegExp = /url\(('|")(.*?)\1\)/;
 function refreshBorderDrawable(this: void, view: View, borderDrawable: org.nativescript.widgets.BorderDrawable) {
     const nativeView = <android.view.View>view.nativeViewProtected;
@@ -115,8 +149,9 @@ function refreshBorderDrawable(this: void, view: View, borderDrawable: org.nativ
         const backgroundSizeParsedCSSValues = createNativeCSSValueArray(background.size);
         const blackColor = -16777216; //android.graphics.Color.BLACK;
 
-        let imageUri = background.image;
-        if (imageUri) {
+        let imageUri: string;
+        if (background.image && typeof background.image === "string") {
+            imageUri = background.image;
             const match = imageUri.match(pattern);
             if (match && match[2]) {
                 imageUri = match[2];
@@ -141,6 +176,11 @@ function refreshBorderDrawable(this: void, view: View, borderDrawable: org.nativ
             }
         }
 
+        let gradient: org.nativescript.widgets.LinearGradientDefinition = null;
+        if (background.image && background.image instanceof LinearGradient) {
+            gradient = fromGradient(background.image);
+        }
+
         borderDrawable.refresh(
             background.borderTopColor ? background.borderTopColor.android : blackColor,
             background.borderRightColor ? background.borderRightColor.android : blackColor,
@@ -162,6 +202,7 @@ function refreshBorderDrawable(this: void, view: View, borderDrawable: org.nativ
             background.color ? background.color.android : 0,
             imageUri,
             bitmap,
+            gradient,
             context,
             background.repeat,
             background.position,
diff --git a/tns-core-modules/ui/styling/background.d.ts b/tns-core-modules/ui/styling/background.d.ts
index f2780ac064..a41e75ff74 100644
--- a/tns-core-modules/ui/styling/background.d.ts
+++ b/tns-core-modules/ui/styling/background.d.ts
@@ -3,12 +3,12 @@
  */ /** */
 
 import { Color } from "../../color";
-import { View, BackgroundRepeat } from "../core/view";
+import { View, BackgroundRepeat, LinearGradient } from "../core/view";
 
 export class Background {
     public static default: Background;
     public color: Color;
-    public image: string;
+    public image: string | LinearGradient;
     public repeat: BackgroundRepeat;
     public position: string;
     public size: string;
@@ -27,7 +27,7 @@ export class Background {
     public clipPath: string;
 
     public withColor(value: Color): Background;
-    public withImage(value: string): Background;
+    public withImage(value: string | LinearGradient): Background;
     public withRepeat(value: BackgroundRepeat): Background;
     public withPosition(value: string): Background;
     public withSize(value: string): Background;
diff --git a/tns-core-modules/ui/styling/background.ios.ts b/tns-core-modules/ui/styling/background.ios.ts
index ff173ec54b..9a4440c623 100644
--- a/tns-core-modules/ui/styling/background.ios.ts
+++ b/tns-core-modules/ui/styling/background.ios.ts
@@ -2,6 +2,7 @@ import { ScrollEventData } from "../scroll-view";
 
 import { Background as BackgroundDefinition } from "./background";
 import { View, Point } from "../core/view";
+import { LinearGradient } from "./linear-gradient";
 import { Color } from "../../color";
 import { ios as utilsIos, isDataURI, isFileOrResourcePath, layout } from "../../utils/utils";
 import { fromFileOrResource, fromBase64, fromUrl } from "../../image-source";
@@ -21,6 +22,8 @@ interface NativeView extends UIView {
     rightBorderLayer: CALayer;
     bottomBorderLayer: CALayer;
     leftBorderLayer: CALayer;
+
+    gradientLayer: CAGradientLayer;
 }
 
 interface Rect {
@@ -43,6 +46,11 @@ export module ios {
             clearNonUniformBorders(nativeView);
         }
 
+        clearGradient(nativeView);
+        if (background.image instanceof LinearGradient) {
+            drawGradient(nativeView, background.image);
+        }
+
         const hasNonUniformBorderWidths = background.hasBorderWidth() && !background.hasUniformBorder();
         const hasNonUniformBorderRadiuses = background.hasBorderRadius() && !background.hasUniformBorderRadius();
         if (background.hasUniformBorderColor() && (hasNonUniformBorderWidths || hasNonUniformBorderRadiuses)) {
@@ -67,7 +75,7 @@ export module ios {
             drawClipPath(nativeView, background);
         }
 
-        if (!background.image) {
+        if (!background.image || background.image instanceof LinearGradient) {
             const uiColor = background.color ? background.color.ios : undefined;
             callback(uiColor);
         } else {
@@ -151,7 +159,7 @@ function setUIColorFromImage(view: View, nativeView: UIView, callback: (uiColor:
 
     const style = view.style;
     const background = style.backgroundInternal;
-    let imageUri = background.image;
+    let imageUri = background.image as string;
     if (imageUri) {
         const match = imageUri.match(pattern);
         if (match && match[2]) {
@@ -574,7 +582,7 @@ function drawNoRadiusNonUniformBorders(nativeView: NativeView, background: Backg
     const bottom = layout.toDeviceIndependentPixels(background.borderBottomWidth);
     const left = layout.toDeviceIndependentPixels(background.borderLeftWidth);
 
-    const lto: Point = { x: nativeViewLayerBounds.left, y: nativeViewLayerBounds.top };// left-top-outside
+    const lto: Point = { x: nativeViewLayerBounds.left, y: nativeViewLayerBounds.top }; // left-top-outside
     const lti: Point = { x: nativeViewLayerBounds.left + left, y: nativeViewLayerBounds.top + top }; // left-top-inside
 
     const rto: Point = { x: nativeViewLayerBounds.right, y: nativeViewLayerBounds.top }; // right-top-outside
@@ -663,6 +671,60 @@ function drawNoRadiusNonUniformBorders(nativeView: NativeView, background: Backg
     nativeView.hasNonUniformBorder = hasNonUniformBorder;
 }
 
+function drawGradient(nativeView: NativeView, gradient: LinearGradient) {
+
+    const gradientLayer = CAGradientLayer.layer();
+    gradientLayer.frame = nativeView.bounds;
+    nativeView.gradientLayer = gradientLayer;
+
+    const iosColors = NSMutableArray.alloc().initWithCapacity(gradient.colorStops.length);
+    const iosStops = NSMutableArray.alloc<number>().initWithCapacity(gradient.colorStops.length);
+    let hasStops = false;
+
+    gradient.colorStops.forEach(stop => {
+       iosColors.addObject(stop.color.ios.CGColor);
+       if (stop.offset) {
+           iosStops.addObject(stop.offset.value);
+           hasStops = true;
+       }
+    });
+
+    gradientLayer.colors = iosColors;
+
+    if (hasStops) {
+        gradientLayer.locations = iosStops;
+    }
+
+    const alpha = gradient.angle / (Math.PI * 2);
+    const startX = Math.pow(
+      Math.sin(Math.PI * (alpha + 0.75)),
+      2
+    );
+    const startY = Math.pow(
+      Math.sin(Math.PI * (alpha + 0.5)),
+      2
+    );
+    const endX = Math.pow(
+      Math.sin(Math.PI * (alpha + 0.25)),
+      2
+    );
+    const endY = Math.pow(
+      Math.sin(Math.PI * alpha),
+      2
+    );
+    gradientLayer.startPoint = {x: startX, y: startY};
+    gradientLayer.endPoint = {x: endX, y: endY};
+
+    nativeView.layer.insertSublayerAtIndex(gradientLayer, 0);
+
+}
+
+function clearGradient(nativeView: NativeView): void {
+    if (nativeView.gradientLayer) {
+        nativeView.gradientLayer.removeFromSuperlayer();
+    }
+}
+
 function drawClipPath(nativeView: UIView, background: BackgroundDefinition) {
     const layer = nativeView.layer;
     const layerBounds = layer.bounds;
diff --git a/tns-core-modules/ui/styling/css-selector/css-selector.ts b/tns-core-modules/ui/styling/css-selector/css-selector.ts
index da8e90d988..8754255084 100644
--- a/tns-core-modules/ui/styling/css-selector/css-selector.ts
+++ b/tns-core-modules/ui/styling/css-selector/css-selector.ts
@@ -164,7 +164,7 @@ export class AttributeSelector extends SimpleSelector {
 
         let escapedValue = escapeRegexSymbols(value);
         let regexp: RegExp = null;
-        switch(test) {
+        switch (test) {
             case "^=": // PrefixMatch
                 regexp = new RegExp("^" + escapedValue);
                 break;
@@ -197,7 +197,7 @@ export class AttributeSelector extends SimpleSelector {
             return;
         }
     }
-    public toString(): string { return `[${this.attribute}${wrap(this.test)}${(this.test && this.value) || ''}]${wrap(this.combinator)}`; }
+    public toString(): string { return `[${this.attribute}${wrap(this.test)}${(this.test && this.value) || ""}]${wrap(this.combinator)}`; }
     public match(node: Node): boolean { return false; }
     public mayMatch(node: Node): boolean { return true; }
     public trackChanges(node: Node, map: ChangeAccumulator): void { map.addAttribute(node, this.attribute); }
@@ -275,7 +275,7 @@ export class Selector extends SelectorCore {
                 return !!node;
             } else {
                 let ancestor = node;
-                while(ancestor = ancestor.parent) {
+                while (ancestor = ancestor.parent) {
                     if (node = group.match(ancestor)) {
                         return true;
                     }
@@ -303,7 +303,7 @@ export class Selector extends SelectorCore {
                 return !!node;
             } else {
                 let ancestor = node;
-                while(ancestor = ancestor.parent) {
+                while (ancestor = ancestor.parent) {
                     let nextNode = group.mayMatch(ancestor);
                     if (nextNode) {
                         bounds.push({ left: ancestor, right: null });
@@ -335,7 +335,7 @@ export class Selector extends SelectorCore {
                 if (group.mayMatch(node)) {
                     group.trackChanges(node, map);
                 }
-            } while((node !== bound.right) && (node = node.parent));
+            } while ((node !== bound.right) && (node = node.parent));
         }
 
         return mayMatch;
@@ -391,7 +391,7 @@ export class RuleSet {
     constructor(public selectors: SelectorCore[], private declarations: Declaration[]) {
         this.selectors.forEach(sel => sel.ruleset = this);
     }
-    public toString(): string { return `${this.selectors.join(", ")} {${this.declarations.map((d, i) => `${i === 0 ? " ": ""}${d.property}: ${d.value}`).join("; ")} }`; }
+    public toString(): string { return `${this.selectors.join(", ")} {${this.declarations.map((d, i) => `${i === 0 ? " " : ""}${d.property}: ${d.value}`).join("; ")} }`; }
     public lookupSort(sorter: LookupSorter): void { this.selectors.forEach(sel => sel.lookupSort(sorter)); }
 }
 
@@ -409,10 +409,10 @@ function createDeclaration(decl: cssParser.Declaration): any {
 }
 
 function createSimpleSelectorFromAst(ast: parser.SimpleSelector): SimpleSelector {
-    switch(ast.type) {
+    switch (ast.type) {
         case "*": return new UniversalSelector();
         case "#": return new IdSelector(ast.identifier);
-        case "": return new TypeSelector(ast.identifier.replace(/-/, '').toLowerCase());
+        case "": return new TypeSelector(ast.identifier.replace(/-/, "").toLowerCase());
         case ".": return new ClassSelector(ast.identifier);
         case ":": return new PseudoClassSelector(ast.identifier);
         case "[]": return ast.test ? new AttributeSelector(ast.property, ast.test, ast.value) : new AttributeSelector(ast.property);
@@ -455,7 +455,7 @@ export function createSelector(sel: string): SimpleSelector | SimpleSelectorSequ
             return new InvalidSelector(new Error("Empty selector"));
         }
         return createSelectorFromAst(parsedSelector.value);
-    } catch(e) {
+    } catch (e) {
         return new InvalidSelector(e);
     }
 }
diff --git a/tns-core-modules/ui/styling/font-common.ts b/tns-core-modules/ui/styling/font-common.ts
index 9c307c0dcb..251a1b9890 100644
--- a/tns-core-modules/ui/styling/font-common.ts
+++ b/tns-core-modules/ui/styling/font-common.ts
@@ -79,7 +79,7 @@ export function parseFontFamily(value: string): Array<string> {
 
     const split = value.split(",");
     for (let i = 0; i < split.length; i++) {
-        let str = split[i].trim().replace(/['"]+/g, '');
+        let str = split[i].trim().replace(/['"]+/g, "");
         if (str) {
             result.push(str);
         }
diff --git a/tns-core-modules/ui/styling/gradient.d.ts b/tns-core-modules/ui/styling/gradient.d.ts
new file mode 100644
index 0000000000..3dce43c83f
--- /dev/null
+++ b/tns-core-modules/ui/styling/gradient.d.ts
@@ -0,0 +1,21 @@
+/**
+ * @module "ui/styling/gradient"
+ */ /** */
+
+import { LengthPercentUnit } from "./style-properties";
+import { Color } from "../../color";
+import * as parser from "../../css/parser";
+
+export class LinearGradient {
+    public angle: number;
+    public colorStops: ColorStop[];
+
+    public static parse(value: parser.LinearGradient): LinearGradient;
+
+    public static equals(first: LinearGradient, second: LinearGradient): boolean;
+}
+
+export interface ColorStop {
+    color: Color;
+    offset?: LengthPercentUnit;
+}
diff --git a/tns-core-modules/ui/styling/linear-gradient.ts b/tns-core-modules/ui/styling/linear-gradient.ts
new file mode 100644
index 0000000000..a1de0b60a1
--- /dev/null
+++ b/tns-core-modules/ui/styling/linear-gradient.ts
@@ -0,0 +1,60 @@
+import { LengthPercentUnit } from "./style-properties";
+import { Color } from "../../color";
+import { ColorStop } from "./gradient";
+import * as parser from "../../css/parser";
+
+export class LinearGradient {
+    public angle: number;
+    public colorStops: ColorStop[];
+
+    public static parse(value: parser.LinearGradient): LinearGradient {
+        const result = new LinearGradient();
+        result.angle = value.angle;
+        result.colorStops = value.colors.map(color => {
+            const offset = color.offset || null;
+            let offsetUnit: LengthPercentUnit;
+
+            if (offset && offset.unit === "%") {
+                offsetUnit = {
+                    unit: "%",
+                    value: offset.value
+                };
+            }
+
+            return {
+                color: new Color(color.argb),
+                offset: offsetUnit
+            }
+        });
+        return result;
+    }
+
+    public static equals(first: LinearGradient, second: LinearGradient): boolean {
+        if (!first && !second) {
+            return true;
+        } else if (!first || !second) {
+            return false
+        }
+
+        if (first.angle !== second.angle) {
+            return false;
+        }
+
+        if (first.colorStops.length !== second.colorStops.length) {
+            return false;
+        }
+
+        for (let i = 0; i < first.colorStops.length; i++) {
+            const firstStop = first.colorStops[i];
+            const secondStop = second.colorStops[i];
+            if (firstStop.offset !== secondStop.offset) {
+                return false;
+            }
+            if (!Color.equals(firstStop.color, secondStop.color)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/tns-core-modules/ui/styling/style-properties.ts b/tns-core-modules/ui/styling/style-properties.ts
index 189c5ff48b..0b5d80bb7e 100644
--- a/tns-core-modules/ui/styling/style-properties.ts
+++ b/tns-core-modules/ui/styling/style-properties.ts
@@ -1,6 +1,6 @@
 // Types
-import { unsetValue, Style, 
-    CssProperty, CssAnimationProperty, 
+import { unsetValue, Style,
+    CssProperty, CssAnimationProperty,
     ShorthandProperty, InheritedCssProperty,
     makeValidator, makeParser } from "../core/properties";
 import {
@@ -27,6 +27,7 @@ import {
 } from "../../matrix";
 
 import * as parser from "../../css/parser";
+import { LinearGradient } from "./linear-gradient";
 
 export type LengthDipUnit = { readonly unit: "dip", readonly value: dip };
 export type LengthPxUnit = { readonly unit: "px", readonly value: px };
@@ -563,10 +564,28 @@ export const backgroundInternalProperty = new CssProperty<Style, Background>({
 backgroundInternalProperty.register(Style);
 
 // const pattern: RegExp = /url\(('|")(.*?)\1\)/;
-export const backgroundImageProperty = new CssProperty<Style, string>({
+export const backgroundImageProperty = new CssProperty<Style, string | LinearGradient>({
     name: "backgroundImage", cssName: "background-image", valueChanged: (target, oldValue, newValue) => {
         const background = target.backgroundInternal.withImage(newValue);
         target.backgroundInternal = background;
+    },
+    equalityComparer: (value1, value2) => {
+        if (value1 instanceof LinearGradient && value2 instanceof LinearGradient) {
+            return LinearGradient.equals(value1, value2)
+        } else {
+            return value1 === value2;
+        }
+    },
+    valueConverter: (value: any) => {
+        if (typeof value === "string") {
+            const parsed = parser.parseBackground(value);
+            if (parsed) {
+                const background = parsed.value;
+                value = (typeof background.image === "object") ? LinearGradient.parse(background.image) : value;
+            }
+        }
+
+        return value;
     }
 });
 backgroundImageProperty.register(Style);
@@ -618,7 +637,14 @@ function convertToBackgrounds(this: void, value: string): [CssProperty<any, any>
     if (typeof value === "string") {
         const backgrounds = parser.parseBackground(value).value;
         const backgroundColor = backgrounds.color ? new Color(backgrounds.color) : unsetValue;
-        const backgroundImage = backgrounds.image || unsetValue;
+
+        let backgroundImage: string | LinearGradient;
+        if (typeof backgrounds.image === "object" && backgrounds.image) {
+            backgroundImage = LinearGradient.parse(backgrounds.image);
+        } else {
+            backgroundImage = backgrounds.image || unsetValue;
+        }
+
         const backgroundRepeat = backgrounds.repeat || unsetValue;
         const backgroundPosition = backgrounds.position ? backgrounds.position.text : unsetValue;
 
diff --git a/tns-core-modules/ui/styling/style-scope.ts b/tns-core-modules/ui/styling/style-scope.ts
index 1779789c69..0d9b05ee13 100644
--- a/tns-core-modules/ui/styling/style-scope.ts
+++ b/tns-core-modules/ui/styling/style-scope.ts
@@ -53,7 +53,7 @@ try {
     if (appConfig && appConfig.cssParser === "nativescript") {
         parser = "nativescript";
     }
-} catch(e) {
+} catch (e) {
     //
 }
 
@@ -73,7 +73,6 @@ const pattern: RegExp = /('|")(.*?)\1/;
 
 class CSSSource {
     private _selectors: RuleSet[] = [];
-    private static cssFilesCache: { [path: string]: CSSSource } = {};
 
     private constructor(private _ast: SyntaxTree, private _url: string, private _file: string, private _keyframes: KeyframesMap, private _source: string) {
         this.parse();
@@ -103,7 +102,7 @@ class CSSSource {
                     return CSSSource.fromSource(cssOrAst.toString(), keyframes, appRelativeUri);
                 }
             }
-        } catch(e) {
+        } catch (e) {
             //
         }
 
@@ -173,7 +172,7 @@ class CSSSource {
     @profile
     private parseCSSAst() {
         if (this._source) {
-            switch(parser) {
+            switch (parser) {
                 case "nativescript":
                     const cssparser = new CSS3Parser(this._source);
                     const stylesheet = cssparser.parseAStylesheet();
@@ -237,7 +236,7 @@ class CSSSource {
     }
 }
 
-const onCssChanged = profile('"style-scope".onCssChanged', (args: applicationCommon.CssChangedEventData) => {
+const onCssChanged = profile("\"style-scope\".onCssChanged", (args: applicationCommon.CssChangedEventData) => {
     if (args.cssText) {
         const parsed = CSSSource.fromSource(args.cssText, applicationKeyframes, args.cssFile).selectors;
         if (parsed) {
@@ -268,7 +267,7 @@ const loadCss = profile(`"style-scope".loadCss`, (cssFile: string) => {
 applicationCommon.on("cssChanged", onCssChanged);
 applicationCommon.on("livesync", onLiveSync);
 
-export const loadAppCSS = profile('"style-scope".loadAppCSS', (args: applicationCommon.LoadAppCSSEventData) => {
+export const loadAppCSS = profile("\"style-scope\".loadAppCSS", (args: applicationCommon.LoadAppCSSEventData) => {
     loadCss(args.cssFile);
     applicationCommon.off("loadAppCss", loadAppCSS);
 });
@@ -399,7 +398,7 @@ export class CssState {
         Object.freeze(newPropertyValues);
 
         const oldProperties = this._appliedPropertyValues;
-        for(const key in oldProperties) {
+        for (const key in oldProperties) {
             if (!(key in newPropertyValues)) {
                 if (key in this.view.style) {
                     this.view.style[`css:${key}`] = unsetValue;
@@ -408,7 +407,7 @@ export class CssState {
                 }
             }
         }
-        for(const property in newPropertyValues) {
+        for (const property in newPropertyValues) {
             if (oldProperties && property in oldProperties && oldProperties[property] === newPropertyValues[property]) {
                 continue;
             }
@@ -480,13 +479,7 @@ CssState.prototype._matchInvalid = true;
 export class StyleScope {
 
     private _selectors: SelectorsMap;
-
-    // caches all the visual states by the key of the visual state selectors
-    private _statesByKey = {};
-    private _viewIdToKey = {};
-
     private _css: string = "";
-    private _cssFileName: string;
     private _mergedCssSelectors: RuleSet[];
     private _localCssSelectors: RuleSet[] = [];
     private _localCssSelectorVersion: number = 0;
@@ -499,7 +492,6 @@ export class StyleScope {
     }
 
     set css(value: string) {
-        this._cssFileName = undefined;
         this.setCss(value);
     }
 
@@ -514,7 +506,6 @@ export class StyleScope {
     @profile
     private setCss(cssString: string, cssFileName?): void {
         this._css = cssString;
-        this._reset();
 
         const cssFile = CSSSource.fromSource(cssString, this._keyframes, cssFileName);
         this._localCssSelectors = cssFile.selectors;
@@ -528,7 +519,6 @@ export class StyleScope {
             return;
         }
 
-        this._reset();
         let parsedCssSelectors = cssString ? CSSSource.fromSource(cssString, this._keyframes, cssFileName) : CSSSource.fromURI(cssFileName, this._keyframes);
         this._css = this._css + parsedCssSelectors.source;
         this._localCssSelectors.push.apply(this._localCssSelectors, parsedCssSelectors.selectors); 
@@ -591,11 +581,6 @@ export class StyleScope {
         return this._selectors.query(node).selectors;
     }
 
-    private _reset() {
-        this._statesByKey = {};
-        this._viewIdToKey = {};
-    }
-
     private _getSelectorsVersion() {
         // The counters can only go up. So we can return just appVersion + localVersion
         // The 100000 * appVersion is just for easier debugging
@@ -676,14 +661,14 @@ function isKeyframe(node: CssNode): node is KeyframesDefinition {
     return node.type === "keyframes";
 }
 
-class InlineSelector implements SelectorCore {
-    constructor(ruleSet: RuleSet) {
-        this.ruleset = ruleSet;
-    }
-
-    public specificity = 0x01000000;
-    public rarity = 0;
-    public dynamic: boolean = false;
-    public ruleset: RuleSet;
-    public match(node: Node): boolean { return true; }
-}
\ No newline at end of file
+// class InlineSelector implements SelectorCore {
+//     constructor(ruleSet: RuleSet) {
+//         this.ruleset = ruleSet;
+//     }
+
+//     public specificity = 0x01000000;
+//     public rarity = 0;
+//     public dynamic: boolean = false;
+//     public ruleset: RuleSet;
+//     public match(node: Node): boolean { return true; }
+// }
diff --git a/tns-core-modules/ui/styling/style/style.d.ts b/tns-core-modules/ui/styling/style/style.d.ts
index 39b5ff6f3b..b7c0091c87 100644
--- a/tns-core-modules/ui/styling/style/style.d.ts
+++ b/tns-core-modules/ui/styling/style/style.d.ts
@@ -11,6 +11,7 @@ import {
     FlexDirection, FlexWrap, JustifyContent, AlignItems, AlignContent,
     Order, FlexGrow, FlexShrink, FlexWrapBefore, AlignSelf
 } from "../../layouts/flexbox-layout";
+import { LinearGradient } from "../gradient";
 
 export interface Thickness {
     left: number;
@@ -64,7 +65,7 @@ export class Style extends Observable {
 
     public background: string;
     public backgroundColor: Color;
-    public backgroundImage: string;
+    public backgroundImage: string | LinearGradient;
     public backgroundRepeat: BackgroundRepeat;
     public backgroundSize: string;
     public backgroundPosition: string;
@@ -120,6 +121,7 @@ export class Style extends Observable {
     public verticalAlignment: VerticalAlignment;
 
     // TabView-specific props
+    public tabTextFontSize: number;
     public tabTextColor: Color;
     public tabBackgroundColor: Color;
     public selectedTabTextColor: Color;
diff --git a/tns-core-modules/ui/styling/style/style.ts b/tns-core-modules/ui/styling/style/style.ts
index 9dc705841e..656aa14f9a 100644
--- a/tns-core-modules/ui/styling/style/style.ts
+++ b/tns-core-modules/ui/styling/style/style.ts
@@ -2,7 +2,8 @@ import { Style as StyleDefinition } from ".";
 import { Color } from "../../../color";
 import { Font, FontStyle, FontWeight } from "../font";
 import { Background } from "../background";
-import { Length, PercentLength, ViewBase, BackgroundRepeat, Visibility, HorizontalAlignment, VerticalAlignment, dip } from "../../core/view";
+import { Length, PercentLength, ViewBase, BackgroundRepeat, Visibility,
+    HorizontalAlignment, VerticalAlignment, dip, LinearGradient } from "../../core/view";
 import { Observable } from "../../../data/observable";
 
 import {
@@ -37,7 +38,7 @@ export class Style extends Observable implements StyleDefinition {
 
     public background: string;
     public backgroundColor: Color;
-    public backgroundImage: string;
+    public backgroundImage: string | LinearGradient;
     public backgroundRepeat: BackgroundRepeat;
     public backgroundSize: string;
     public backgroundPosition: string;
@@ -93,6 +94,7 @@ export class Style extends Observable implements StyleDefinition {
     public verticalAlignment: VerticalAlignment;
 
     // TabView-specific props
+    public tabTextFontSize: number;
     public tabTextColor: Color;
     public tabBackgroundColor: Color;
     public selectedTabTextColor: Color;
diff --git a/tns-core-modules/ui/switch/switch.ios.ts b/tns-core-modules/ui/switch/switch.ios.ts
index e1ba5c38d0..957ba9d707 100644
--- a/tns-core-modules/ui/switch/switch.ios.ts
+++ b/tns-core-modules/ui/switch/switch.ios.ts
@@ -22,7 +22,7 @@ class SwitchChangeHandlerImpl extends NSObject {
     }
 
     public static ObjCExposedMethods = {
-        'valueChanged': { returns: interop.types.void, params: [UISwitch] }
+        "valueChanged": { returns: interop.types.void, params: [UISwitch] }
     };
 }
 
diff --git a/tns-core-modules/ui/tab-view/tab-view-common.ts b/tns-core-modules/ui/tab-view/tab-view-common.ts
index 062d19b152..b8a1251ed0 100644
--- a/tns-core-modules/ui/tab-view/tab-view-common.ts
+++ b/tns-core-modules/ui/tab-view/tab-view-common.ts
@@ -1,4 +1,4 @@
-import { TabView as TabViewDefinition, TabViewItem as TabViewItemDefinition, SelectedIndexChangedEventData, TabViewItem } from ".";
+import { TabView as TabViewDefinition, TabViewItem as TabViewItemDefinition, SelectedIndexChangedEventData } from ".";
 import {
     View, ViewBase, Style, Property, CssProperty, CoercibleProperty,
     Color, isIOS, AddArrayFromBuilder, AddChildFromBuilder, EventData, CSSType
@@ -103,6 +103,13 @@ export class TabViewBase extends View implements TabViewDefinition, AddChildFrom
         this.style.androidSelectedTabHighlightColor = value;
     }
 
+    get tabTextFontSize(): number {
+        return this.style.tabTextFontSize;
+    }
+    set tabTextFontSize(value: number) {
+        this.style.tabTextFontSize = value;
+    }
+
     get tabTextColor(): Color {
         return this.style.tabTextColor;
     }
@@ -240,6 +247,9 @@ androidOffscreenTabLimitProperty.register(TabViewBase);
 export const androidTabsPositionProperty = new Property<TabViewBase, "top" | "bottom">({ name: "androidTabsPosition", defaultValue: "top" });
 androidTabsPositionProperty.register(TabViewBase);
 
+export const tabTextFontSizeProperty = new CssProperty<Style, number>({ name: "tabTextFontSize", cssName: "tab-text-font-size", valueConverter: (v) => parseFloat(v) });
+tabTextFontSizeProperty.register(Style);
+
 export const tabTextColorProperty = new CssProperty<Style, Color>({ name: "tabTextColor", cssName: "tab-text-color", equalityComparer: Color.equals, valueConverter: (v) => new Color(v) });
 tabTextColorProperty.register(Style);
 
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
index a07315e353..738e037c65 100644
--- a/tns-core-modules/ui/tab-view/tab-view.android.ts
+++ b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -3,9 +3,9 @@ import { Font } from "../styling/font";
 
 import {
     TabViewBase, TabViewItemBase, itemsProperty, selectedIndexProperty,
-    tabTextColorProperty, tabBackgroundColorProperty, selectedTabTextColorProperty,
+    tabTextColorProperty, tabBackgroundColorProperty, tabTextFontSizeProperty, selectedTabTextColorProperty,
     androidSelectedTabHighlightColorProperty, androidOffscreenTabLimitProperty,
-    fontSizeProperty, fontInternalProperty, View, layout, traceCategory, traceEnabled,
+    fontSizeProperty, fontInternalProperty, layout, traceCategory, traceEnabled,
     traceWrite, Color
 } from "./tab-view-common"
 import { textTransformProperty, TextTransform, getTransformedText } from "../text-base";
@@ -15,7 +15,6 @@ import { Frame } from "../frame";
 
 export * from "./tab-view-common";
 
-const VIEWS_STATES = "_viewStates";
 const ACCENT_COLOR = "colorAccent";
 const PRIMARY_COLOR = "colorPrimary";
 const DEFAULT_ELEVATION = 4;
@@ -624,6 +623,17 @@ export class TabView extends TabViewBase {
         }
     }
 
+    [tabTextFontSizeProperty.getDefault](): number {
+        return this._tabLayout.getTabTextFontSize();
+    }
+    [tabTextFontSizeProperty.setNative](value: number | { nativeSize: number }) {
+        if (typeof value === "number") {
+            this._tabLayout.setTabTextFontSize(value);
+        } else {
+            this._tabLayout.setTabTextFontSize(value.nativeSize);
+        }
+    }
+
     [tabTextColorProperty.getDefault](): number {
         return this._tabLayout.getTabTextColor();
     }
diff --git a/tns-core-modules/ui/tab-view/tab-view.d.ts b/tns-core-modules/ui/tab-view/tab-view.d.ts
index 86db2cea6c..759cb8229c 100644
--- a/tns-core-modules/ui/tab-view/tab-view.d.ts
+++ b/tns-core-modules/ui/tab-view/tab-view.d.ts
@@ -64,6 +64,11 @@ export class TabView extends View {
      */
     selectedIndex: number;
 
+    /**
+     * Gets or sets the font size of the tabs titles.
+     */
+    tabTextFontSize: number;
+
     /**
      * Gets or sets the text color of the tabs titles.
      */
@@ -87,7 +92,7 @@ export class TabView extends View {
     /**
      * Gets the native [android widget](http://developer.android.com/reference/android/support/v4/view/ViewPager.html) that represents the user interface for this component. Valid only when running on Android OS.
      */
-    android: any /* android.view.View */;//android.support.v4.view.ViewPager;
+    android: any /* android.view.View */; //android.support.v4.view.ViewPager;
 
     /**
      * Gets the native iOS [UITabBarController](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UITabBarController_Class/) that represents the user interface for this component. Valid only when running on iOS.
@@ -139,6 +144,7 @@ export class TabView extends View {
 export const itemsProperty: Property<TabView, TabViewItem[]>;
 export const selectedIndexProperty: Property<TabView, number>;
 
+export const tabTextFontSizeProperty: CssProperty<Style, number>;
 export const tabTextColorProperty: CssProperty<Style, Color>;
 export const tabBackgroundColorProperty: CssProperty<Style, Color>;
 export const selectedTabTextColorProperty: CssProperty<Style, Color>;
diff --git a/tns-core-modules/ui/tab-view/tab-view.ios.ts b/tns-core-modules/ui/tab-view/tab-view.ios.ts
index e5af7b5988..4ce5ea5add 100644
--- a/tns-core-modules/ui/tab-view/tab-view.ios.ts
+++ b/tns-core-modules/ui/tab-view/tab-view.ios.ts
@@ -4,21 +4,16 @@ import { Font } from "../styling/font";
 import { ios as iosView, ViewBase } from "../core/view";
 import {
     TabViewBase, TabViewItemBase, itemsProperty, selectedIndexProperty,
-    tabTextColorProperty, tabBackgroundColorProperty, selectedTabTextColorProperty, iosIconRenderingModeProperty,
+    tabTextColorProperty, tabTextFontSizeProperty, tabBackgroundColorProperty, selectedTabTextColorProperty, iosIconRenderingModeProperty,
     View, fontInternalProperty, layout, traceEnabled, traceWrite, traceCategories, Color
 } from "./tab-view-common"
 import { textTransformProperty, TextTransform, getTransformedText } from "../text-base";
 import { fromFileOrResource } from "../../image-source";
-import { Page } from "../page";
 import { profile } from "../../profiling";
-import * as uiUtils from "../utils";
-import * as utils from "../../utils/utils";
 import { Frame } from "../frame";
 
 export * from "./tab-view-common";
 
-const getter = utils.ios.getter;
-
 class UITabBarControllerImpl extends UITabBarController {
 
     private _owner: WeakRef<TabView>;
@@ -203,8 +198,6 @@ export class TabView extends TabViewBase {
     public _ios: UITabBarControllerImpl;
     private _delegate: UITabBarControllerDelegateImpl;
     private _moreNavigationControllerDelegate: UINavigationControllerDelegateImpl;
-    private _tabBarHeight: number = 0;
-    private _navBarHeight: number = 0;
     private _iconsCache = {};
 
     constructor() {
@@ -448,6 +441,13 @@ export class TabView extends TabViewBase {
         selectedIndexProperty.coerce(this);
     }
 
+    [tabTextFontSizeProperty.getDefault](): number {
+        return null;
+    }
+    [tabTextFontSizeProperty.setNative](value: number | { nativeSize: number }) {
+        this._updateIOSTabBarColorsAndFonts();
+    }
+
     [tabTextColorProperty.getDefault](): UIColor {
         return null;
     }
@@ -504,7 +504,9 @@ interface TabStates {
 function getTitleAttributesForStates(tabView: TabView): TabStates {
     const result: TabStates = {};
 
-    const font = tabView.style.fontInternal.getUIFont(UIFont.systemFontOfSize(10));
+    const defaultTabItemFontSize = 10;
+    const tabItemFontSize = tabView.style.tabTextFontSize || defaultTabItemFontSize;
+    const font: UIFont = tabView.style.fontInternal.getUIFont(UIFont.systemFontOfSize(tabItemFontSize));
     const tabItemTextColor = tabView.style.tabTextColor;
     const textColor = tabItemTextColor instanceof Color ? tabItemTextColor.ios : null;
     result.normalState = { [NSFontAttributeName]: font }
diff --git a/tns-core-modules/ui/text-base/text-base.android.ts b/tns-core-modules/ui/text-base/text-base.android.ts
index 3540170c5d..07a8d8a077 100644
--- a/tns-core-modules/ui/text-base/text-base.android.ts
+++ b/tns-core-modules/ui/text-base/text-base.android.ts
@@ -127,7 +127,7 @@ export class TextBase extends TextBaseCommon {
         const spannableStringBuilder = createSpannableStringBuilder(value);
         nativeView.setText(<any>spannableStringBuilder);
 
-        textProperty.nativeValueChange(this, (value === null || value === undefined) ? '' : value.toString());
+        textProperty.nativeValueChange(this, (value === null || value === undefined) ? "" : value.toString());
 
         if (spannableStringBuilder && nativeView instanceof android.widget.Button &&
             !(nativeView.getTransformationMethod() instanceof TextTransformation)) {
@@ -302,7 +302,7 @@ export class TextBase extends TextBaseCommon {
             transformedText = createSpannableStringBuilder(this.formattedText);
         } else {
             const text = this.text;
-            const stringValue = (text === null || text === undefined) ? '' : text.toString();
+            const stringValue = (text === null || text === undefined) ? "" : text.toString();
             transformedText = getTransformedText(stringValue, this.textTransform);
         }
 
@@ -345,7 +345,7 @@ function createSpannableStringBuilder(formattedString: FormattedString): android
         const span = formattedString.spans.getItem(i);
         const text = span.text;
         const textTransform = (<TextBase>formattedString.parent).textTransform;
-        let spanText = (text === null || text === undefined) ? '' : text.toString();
+        let spanText = (text === null || text === undefined) ? "" : text.toString();
         if (textTransform && textTransform !== "none") {
             spanText = getTransformedText(spanText, textTransform);
         }
@@ -422,12 +422,12 @@ function setSpanModifiers(ssb: android.text.SpannableStringBuilder, span: Span,
 
     if (valueSource) {
         const textDecorations = valueSource.textDecoration;
-        const underline = textDecorations.indexOf('underline') !== -1;
+        const underline = textDecorations.indexOf("underline") !== -1;
         if (underline) {
             ssb.setSpan(new android.text.style.UnderlineSpan(), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
 
-        const strikethrough = textDecorations.indexOf('line-through') !== -1;
+        const strikethrough = textDecorations.indexOf("line-through") !== -1;
         if (strikethrough) {
             ssb.setSpan(new android.text.style.StrikethroughSpan(), start, end, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         }
diff --git a/tns-core-modules/ui/text-base/text-base.ios.ts b/tns-core-modules/ui/text-base/text-base.ios.ts
index 350522a890..5e109800a0 100644
--- a/tns-core-modules/ui/text-base/text-base.ios.ts
+++ b/tns-core-modules/ui/text-base/text-base.ios.ts
@@ -27,7 +27,7 @@ export class TextBase extends TextBaseCommon {
 
     [formattedTextProperty.setNative](value: FormattedString) {
         this._setNativeText();
-        textProperty.nativeValueChange(this, !value ? '' : value.toString());
+        textProperty.nativeValueChange(this, !value ? "" : value.toString());
         this._requestLayoutOnTextChanged();
     }
 
@@ -188,7 +188,7 @@ export class TextBase extends TextBaseCommon {
         }
 
         const text = this.text;
-        const string = (text === undefined || text === null) ? '' : text.toString();
+        const string = (text === undefined || text === null) ? "" : text.toString();
         const source = getTransformedText(string, this.textTransform);
         if (dict.size > 0 || isTextView) {
             if (isTextView) {
@@ -223,7 +223,7 @@ export class TextBase extends TextBaseCommon {
                 const span = formattedString.spans.getItem(i);
                 const text = span.text;
                 const textTransform = (<TextBase>formattedString.parent).textTransform;
-                let spanText = (text === null || text === undefined) ? '' : text.toString();
+                let spanText = (text === null || text === undefined) ? "" : text.toString();
                 if (textTransform !== "none" && textTransform !== "initial") {
                     spanText = getTransformedText(spanText, textTransform);
                 }
@@ -278,12 +278,12 @@ export class TextBase extends TextBaseCommon {
 
         if (valueSource) {
             const textDecorations = valueSource.textDecoration;
-            const underline = textDecorations.indexOf('underline') !== -1;
+            const underline = textDecorations.indexOf("underline") !== -1;
             if (underline) {
                 attrDict[NSUnderlineStyleAttributeName] = underline;
             }
 
-            const strikethrough = textDecorations.indexOf('line-through') !== -1;
+            const strikethrough = textDecorations.indexOf("line-through") !== -1;
             if (strikethrough) {
                 attrDict[NSStrikethroughStyleAttributeName] = strikethrough;
             }
diff --git a/tns-core-modules/ui/text-field/text-field.ios.ts b/tns-core-modules/ui/text-field/text-field.ios.ts
index e88c7684be..59a02d8881 100644
--- a/tns-core-modules/ui/text-field/text-field.ios.ts
+++ b/tns-core-modules/ui/text-field/text-field.ios.ts
@@ -55,7 +55,7 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
         this.firstEdit = false;
         const owner = this._owner.get();
         if (owner) {
-            textProperty.nativeValueChange(owner, '');
+            textProperty.nativeValueChange(owner, "");
         }
 
         return true;
diff --git a/tns-core-modules/ui/text-view/text-view.ios.ts b/tns-core-modules/ui/text-view/text-view.ios.ts
index 7245bba847..9486945ce7 100644
--- a/tns-core-modules/ui/text-view/text-view.ios.ts
+++ b/tns-core-modules/ui/text-view/text-view.ios.ts
@@ -8,7 +8,6 @@ import {
     CSSType
 } from "../editable-text-base";
 
-import { ios } from "../../utils/utils";
 import { profile } from "../../profiling";
 
 export * from "../editable-text-base";
@@ -133,13 +132,13 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
             return;
         }
 
-        if (text !== null && text !== undefined && text !== '') {
+        if (text !== null && text !== undefined && text !== "") {
             this.showText();
-        } else if (!this._isEditing && hint !== null && hint !== undefined && hint !== '') {
+        } else if (!this._isEditing && hint !== null && hint !== undefined && hint !== "") {
             this.showHint(hint);
         } else {
             this._isShowingHint = false;
-            this.nativeViewProtected.text = '';
+            this.nativeViewProtected.text = "";
         }
     }
 
@@ -175,7 +174,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
         this._isShowingHint = true;
         this._refreshColor();
 
-        const hintAsString: string = (hint === null || hint === undefined) ? '' : hint.toString();
+        const hintAsString: string = (hint === null || hint === undefined) ? "" : hint.toString();
         nativeView.text = hintAsString;
     }
 
diff --git a/tns-core-modules/ui/time-picker/time-picker.ios.ts b/tns-core-modules/ui/time-picker/time-picker.ios.ts
index 7dccdb33bd..83425a9ccd 100644
--- a/tns-core-modules/ui/time-picker/time-picker.ios.ts
+++ b/tns-core-modules/ui/time-picker/time-picker.ios.ts
@@ -144,6 +144,6 @@ class UITimePickerChangeHandlerImpl extends NSObject {
     }
 
     public static ObjCExposedMethods = {
-        'valueChanged': { returns: interop.types.void, params: [UIDatePicker] }
+        "valueChanged": { returns: interop.types.void, params: [UIDatePicker] }
     }
 }
diff --git a/tns-core-modules/ui/web-view/web-view.ios.ts b/tns-core-modules/ui/web-view/web-view.ios.ts
index 23a49ce391..403871ef6f 100644
--- a/tns-core-modules/ui/web-view/web-view.ios.ts
+++ b/tns-core-modules/ui/web-view/web-view.ios.ts
@@ -1,6 +1,5 @@
 import { WebViewBase, knownFolders, traceWrite, traceEnabled, traceCategories, NavigationType } from "./web-view-common";
 import { profile } from "../../profiling";
-import { layout } from "../core/view";
 export * from "./web-view-common";
 
 class WKNavigationDelegateImpl extends NSObject
@@ -89,17 +88,17 @@ export class WebView extends WebViewBase {
         const configuration = WKWebViewConfiguration.new();
         this._delegate = WKNavigationDelegateImpl.initWithOwner(new WeakRef(this));
         const jScript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'initial-scale=1.0'); document.getElementsByTagName('head')[0].appendChild(meta);";
-        const wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript,WKUserScriptInjectionTime.AtDocumentEnd,true);
+        const wkUScript = WKUserScript.alloc().initWithSourceInjectionTimeForMainFrameOnly(jScript, WKUserScriptInjectionTime.AtDocumentEnd, true);
         const wkUController = WKUserContentController.new();
         wkUController.addUserScript(wkUScript);
         configuration.userContentController = wkUController;
         configuration.preferences.setValueForKey(
             true,
-            'allowFileAccessFromFileURLs'
+            "allowFileAccessFromFileURLs"
         );
         this.nativeViewProtected = this._ios = new WKWebView({
             frame: CGRectZero,
-            configuration:configuration
+            configuration: configuration
         });
     }
 
@@ -123,9 +122,9 @@ export class WebView extends WebViewBase {
     }
 
     public _loadUrl(src: string) {
-        if(src.startsWith('file:///')){
+        if (src.startsWith("file:///")) {
             this._ios.loadFileURLAllowingReadAccessToURL(NSURL.URLWithString(src), NSURL.URLWithString(src));
-        }else{
+        } else {
             this._ios.loadRequest(NSURLRequest.requestWithURL(NSURL.URLWithString(src)));
         }
     }
diff --git a/tns-core-modules/utils/utils-common.ts b/tns-core-modules/utils/utils-common.ts
index 8b8ca04511..76bb98bbd3 100644
--- a/tns-core-modules/utils/utils-common.ts
+++ b/tns-core-modules/utils/utils-common.ts
@@ -107,8 +107,8 @@ export function isDataURI(uri: string): boolean {
         return false;
     }
 
-    const firstSegment = uri.trim().split(',')[0];
-    return firstSegment && firstSegment.indexOf("data:") === 0 && firstSegment.indexOf('base64') >= 0;
+    const firstSegment = uri.trim().split(",")[0];
+    return firstSegment && firstSegment.indexOf("data:") === 0 && firstSegment.indexOf("base64") >= 0;
 }
 
 export function mergeSort(arr, compareFunc) {
diff --git a/tns-core-modules/utils/utils.android.ts b/tns-core-modules/utils/utils.android.ts
index 3132b485ec..4926c9a63a 100644
--- a/tns-core-modules/utils/utils.android.ts
+++ b/tns-core-modules/utils/utils.android.ts
@@ -128,7 +128,7 @@ export module ad {
             var hashSet = new java.util.HashSet<string>();
             if (str !== undefined) {
                 for (var element in str) {
-                    hashSet.add('' + str[element]);
+                    hashSet.add("" + str[element]);
                 }
             }
             return hashSet;
@@ -139,7 +139,7 @@ export module ad {
             if (stringSet !== undefined) {
                 var it = stringSet.iterator();
                 while (it.hasNext()) {
-                    var element = '' + it.next();
+                    var element = "" + it.next();
                     arr.push(element);
                 }
             }
diff --git a/tns-core-modules/utils/utils.ios.ts b/tns-core-modules/utils/utils.ios.ts
index 214e99ee34..19d96af2ad 100644
--- a/tns-core-modules/utils/utils.ios.ts
+++ b/tns-core-modules/utils/utils.ios.ts
@@ -1,5 +1,4 @@
-import * as fsModule from "../file-system";
-import {
+import {
     write as traceWrite, categories as traceCategories, messageType as traceMessageType
 } from "../trace";
 
diff --git a/tns-core-modules/xhr/xhr.ts b/tns-core-modules/xhr/xhr.ts
index a4d71ea97f..2f03fd953e 100644
--- a/tns-core-modules/xhr/xhr.ts
+++ b/tns-core-modules/xhr/xhr.ts
@@ -72,7 +72,7 @@ export class XMLHttpRequest {
         this._status = null;
 
         if (types.isDefined(this._options)) {
-            if (types.isString(data) && this._options.method !== 'GET') {
+            if (types.isString(data) && this._options.method !== "GET") {
                 //The Android Java HTTP lib throws an exception if we provide a
                 //a request body for GET requests, so we avoid doing that.
                 //Browser implementations silently ignore it as well.
@@ -129,16 +129,16 @@ export class XMLHttpRequest {
     }
 
     private textTypes: string[] = [
-        'text/plain',
-        'application/xml',
-        'application/rss+xml',
-        'text/html',
-        'text/xml'
+        "text/plain",
+        "application/xml",
+        "application/rss+xml",
+        "text/html",
+        "text/xml"
     ];
 
     private isTextContentType(contentType: string): boolean {
         let result = false;
-        for(let i = 0; i < this.textTypes.length; i++) {
+        for (let i = 0; i < this.textTypes.length; i++) {
             if (contentType.toLowerCase().indexOf(this.textTypes[i]) >= 0) {
                 result = true;
                 break;
@@ -148,11 +148,11 @@ export class XMLHttpRequest {
     }
 
     private _setResponseType() {
-        const header = this.getResponseHeader('Content-Type');
+        const header = this.getResponseHeader("Content-Type");
         const contentType = header && header.toLowerCase();
 
         if (contentType) {
-            if (contentType.indexOf('application/json') >= 0 || contentType.indexOf('+json') >= 0) {
+            if (contentType.indexOf("application/json") >= 0 || contentType.indexOf("+json") >= 0) {
                 this.responseType = XMLHttpRequestResponseType.json;
             } else if (this.isTextContentType(contentType)) {
                 this.responseType = XMLHttpRequestResponseType.text;
@@ -165,8 +165,8 @@ export class XMLHttpRequest {
     private _listeners: Map<string, Array<Function>> = new Map<string, Array<Function>>();
 
     public addEventListener(eventName: string, handler: Function) {
-        if (eventName !== 'load' && eventName !== 'error') {
-            throw new Error('Event not supported: ' + eventName);
+        if (eventName !== "load" && eventName !== "error") {
+            throw new Error("Event not supported: " + eventName);
         }
 
         let handlers = this._listeners.get(eventName) || [];
@@ -256,12 +256,12 @@ export class XMLHttpRequest {
                 if (types.isFunction(this.onerror)) {
                     this.onerror(error);
                 }
-                this.emitEvent('error', error);
+                this.emitEvent("error", error);
             } else {
                 if (types.isFunction(this.onload)) {
                     this.onload();
                 }
-                this.emitEvent('load');
+                this.emitEvent("load");
             }
         }
     }
diff --git a/tns-core-modules/xml/xml.ts b/tns-core-modules/xml/xml.ts
index 4fd0ebc960..f9ab1a73f0 100644
--- a/tns-core-modules/xml/xml.ts
+++ b/tns-core-modules/xml/xml.ts
@@ -1,4 +1,4 @@
-import * as definition from ".";
+import * as definition from ".";
 import * as easysax from "../js-libs/easysax";
 
 export class ParserEventType implements definition.ParserEventType {
@@ -43,7 +43,7 @@ export class ParserEvent implements definition.ParserEvent {
     public get eventType(): string {
         return this._eventType;
     }
-    
+
     public get position(): definition.Position {
         return this._position;
     }
@@ -73,8 +73,8 @@ var _ampCodes;
 var _entitySearchRegEx = /&#(\d+);|&#x([0123456789abcdef]+);|&(\w+);/ig;
 
 function _generateAmpMap(): any {
-   var objCodes = {Tab: 9, NewLine: 10, excl: 33, quot: 34, QUOT: 34, num: 35, dollar: 36, percent: 37, amp: 38, AMP: 38, apos: 39, lpar: 40, rpar: 41, ast: 42, midast: 42, plus: 43, comma: 44, period: 46, sol: 47, colon: 58, semi: 59, lt: 60, LT: 60, equals: 61, gt: 62, GT: 62, quest: 63, commat: 64, lsqb: 91, lbrack: 91, bsol: 92, rsqb: 92, rbrack: 92, Hat: 94, lowbar: 95, grave: 96, DiacriticalGrave: 96, lcub: 123, lbrace: 123, verbar: 124, vert: 124, VerticalLine: 124, rcub: 125, rbrace: 125, nbsp: 160, iexcl: 161, cent: 162, pound:163, curren: 164, yen: 165, brvbar: 166, brkbar:166, sect:167, uml:168, copy:169, ordf:170, laquo:171, not: 172, shy:173, reg:174, macr:175, hibar: 175, deg:176, plusmn: 177, sup2: 178, sup3: 179, acute:180, micro:181, para:182, middot:183, cedil:184, sup1:185, ordm:186, raquo:187, frac14:188, frac12:189, frac34:190, iquest:191, Agrave:192, Aacute:193, Acirc:194, Atilde:195, Auml:196, Aring:197, AElig:198, Ccedil:199, Egrave:200, Eacute:201, Ecirc:202, Euml:203, Igrave:204, Iacute:205, Icirc:206, Iuml:207, ETH:208, Dstrok: 208, Ntilde:209, Ograve:210, Oacute:211, Ocirc:212, Otilde: 213, Ouml:214, times:215, Oslash:216, Ugrave:217, Uacute:218, Ucirc:219, Uuml:220, Yacute:221, THORN:222, szlig:223, agrave:224, aacute:225, acirc:226, atilde:227, auml:228, aring:229, aelig:230, ccedil:231, egrave:232, eacute:233, ecirc:234, euml:235, igrave:236, iacute:237, icirc:238, iuml:239, eth:240, ntilde:241, ograve:242, oacute:243, ocirc:244, otilde:245, ouml:246, divide:247, oslash:248, ugrave:249, uacute:250, ucirc:251, uuml:252, yacute:253, thorn:254, yuml: 255, fnof: 402, imped: 437, gacute: 501, jmath: 567, circ: 710, caron: 711, Hacek: 711, breve: 728, Breve: 728, dot: 729, DiacriticalDot: 729, ring: 730, ogon: 731, tilde: 732, DiacriticalTilde: 732, dblac: 733, DiacriticalDoubleAcute: 733, DownBreve: 785, UnderBar: 818, Alpha: 913, Beta: 914, Gamma: 915, Delta: 916, Epsilon: 917, Zeta: 918, Eta: 919, Theta: 920, Iota: 921, Kappa: 922, Lambda: 923, Mu: 924, Nu: 925, Xi: 926, Omicron: 927, Pi: 928, Rho: 929 /* 930 is not real */, Sigma: 931, Tau: 932, Upsilon: 933, Phi: 934, Chi: 935, Psi: 936, Omega: 937, alpha: 945, beta: 946, gamma: 947, delta: 948, epsilon: 949, epsiv: 949, varepsilon: 949, zeta: 950, eta: 951, theta: 952, iota: 953, kappa: 954, lambda: 955, mu: 956, nu: 957, xi: 958, omicron: 959, pi: 960, rho: 961, sigmaf: 962, sigmav: 962, varsigma: 962, sigma: 963, tau: 964, upsilon: 965, phi: 966, chi: 967, psi: 968, omega: 969, thetav: 977, vartheta: 977, thetasym: 977, Upsi: 978, upsih: 978, straightphi: 981, piv: 982, varpi: 982, Gammad: 988, gammad: 989, digamma: 989, kappav: 1008, varkappa: 1008, rhov: 1009, varrho: 1009, epsi:1013, straightepsilon: 1013, bepsi: 1014, backepsilon: 1014, /* Skipped Codes 1015 - 1119 */ euro: 8364, trade: 8482, TRADE: 8482, forall: 8704, part: 8706, larr: 8592, rarr: 8593, hyphen: 8208, dash: 8208, ndash: 8211, mdash: 8212, horbar: 8213, Vert: 8214, Verbar: 8214, lsquo: 8216, OpenCurlyQuote: 8216, rsquo: 8217, rsquor: 8217, CloseCurlyQuote: 8217, lsquor: 8218, sbquo: 8218, ldquo: 8220, OpenCurlyDoubleQuote: 8220, rdquo: 8221, rdquor: 8221, CloseCurlyDoubleQuote: 8221, ldquor: 8222, bdquo: 8222, dagger: 8224, Dagger: 8225, ddagger: 8225, bull: 8226, bullet: 8226, nldr: 8229, hellip: 8230, mldr: 8230, hybull: 8259, tdot: 8411, TripleDot: 8411 ,DotDot: 8412, star: 9734, phone: 9742, spades: 9824, clubs: 9827, hearts: 9829, diams: 9830, female: 9792, male: 9794, check: 10003, checkmark: 10003, cross: 10007, VerticalSeparator: 10072, EmptySmallSquare: 9723, FilledSmallSquare: 9724, starf: 9733, bigstar: 9733, square: 9633, squ: 9633, Square: 9633};
-   var ampCodes = new Map();
+    var objCodes = { Tab: 9, NewLine: 10, excl: 33, quot: 34, QUOT: 34, num: 35, dollar: 36, percent: 37, amp: 38, AMP: 38, apos: 39, lpar: 40, rpar: 41, ast: 42, midast: 42, plus: 43, comma: 44, period: 46, sol: 47, colon: 58, semi: 59, lt: 60, LT: 60, equals: 61, gt: 62, GT: 62, quest: 63, commat: 64, lsqb: 91, lbrack: 91, bsol: 92, rsqb: 92, rbrack: 92, Hat: 94, lowbar: 95, grave: 96, DiacriticalGrave: 96, lcub: 123, lbrace: 123, verbar: 124, vert: 124, VerticalLine: 124, rcub: 125, rbrace: 125, nbsp: 160, iexcl: 161, cent: 162, pound: 163, curren: 164, yen: 165, brvbar: 166, brkbar: 166, sect: 167, uml: 168, copy: 169, ordf: 170, laquo: 171, not: 172, shy: 173, reg: 174, macr: 175, hibar: 175, deg: 176, plusmn: 177, sup2: 178, sup3: 179, acute: 180, micro: 181, para: 182, middot: 183, cedil: 184, sup1: 185, ordm: 186, raquo: 187, frac14: 188, frac12: 189, frac34: 190, iquest: 191, Agrave: 192, Aacute: 193, Acirc: 194, Atilde: 195, Auml: 196, Aring: 197, AElig: 198, Ccedil: 199, Egrave: 200, Eacute: 201, Ecirc: 202, Euml: 203, Igrave: 204, Iacute: 205, Icirc: 206, Iuml: 207, ETH: 208, Dstrok: 208, Ntilde: 209, Ograve: 210, Oacute: 211, Ocirc: 212, Otilde: 213, Ouml: 214, times: 215, Oslash: 216, Ugrave: 217, Uacute: 218, Ucirc: 219, Uuml: 220, Yacute: 221, THORN: 222, szlig: 223, agrave: 224, aacute: 225, acirc: 226, atilde: 227, auml: 228, aring: 229, aelig: 230, ccedil: 231, egrave: 232, eacute: 233, ecirc: 234, euml: 235, igrave: 236, iacute: 237, icirc: 238, iuml: 239, eth: 240, ntilde: 241, ograve: 242, oacute: 243, ocirc: 244, otilde: 245, ouml: 246, divide: 247, oslash: 248, ugrave: 249, uacute: 250, ucirc: 251, uuml: 252, yacute: 253, thorn: 254, yuml: 255, fnof: 402, imped: 437, gacute: 501, jmath: 567, circ: 710, caron: 711, Hacek: 711, breve: 728, Breve: 728, dot: 729, DiacriticalDot: 729, ring: 730, ogon: 731, tilde: 732, DiacriticalTilde: 732, dblac: 733, DiacriticalDoubleAcute: 733, DownBreve: 785, UnderBar: 818, Alpha: 913, Beta: 914, Gamma: 915, Delta: 916, Epsilon: 917, Zeta: 918, Eta: 919, Theta: 920, Iota: 921, Kappa: 922, Lambda: 923, Mu: 924, Nu: 925, Xi: 926, Omicron: 927, Pi: 928, Rho: 929 /* 930 is not real */, Sigma: 931, Tau: 932, Upsilon: 933, Phi: 934, Chi: 935, Psi: 936, Omega: 937, alpha: 945, beta: 946, gamma: 947, delta: 948, epsilon: 949, epsiv: 949, varepsilon: 949, zeta: 950, eta: 951, theta: 952, iota: 953, kappa: 954, lambda: 955, mu: 956, nu: 957, xi: 958, omicron: 959, pi: 960, rho: 961, sigmaf: 962, sigmav: 962, varsigma: 962, sigma: 963, tau: 964, upsilon: 965, phi: 966, chi: 967, psi: 968, omega: 969, thetav: 977, vartheta: 977, thetasym: 977, Upsi: 978, upsih: 978, straightphi: 981, piv: 982, varpi: 982, Gammad: 988, gammad: 989, digamma: 989, kappav: 1008, varkappa: 1008, rhov: 1009, varrho: 1009, epsi: 1013, straightepsilon: 1013, bepsi: 1014, backepsilon: 1014, /* Skipped Codes 1015 - 1119 */ euro: 8364, trade: 8482, TRADE: 8482, forall: 8704, part: 8706, larr: 8592, rarr: 8593, hyphen: 8208, dash: 8208, ndash: 8211, mdash: 8212, horbar: 8213, Vert: 8214, Verbar: 8214, lsquo: 8216, OpenCurlyQuote: 8216, rsquo: 8217, rsquor: 8217, CloseCurlyQuote: 8217, lsquor: 8218, sbquo: 8218, ldquo: 8220, OpenCurlyDoubleQuote: 8220, rdquo: 8221, rdquor: 8221, CloseCurlyDoubleQuote: 8221, ldquor: 8222, bdquo: 8222, dagger: 8224, Dagger: 8225, ddagger: 8225, bull: 8226, bullet: 8226, nldr: 8229, hellip: 8230, mldr: 8230, hybull: 8259, tdot: 8411, TripleDot: 8411, DotDot: 8412, star: 9734, phone: 9742, spades: 9824, clubs: 9827, hearts: 9829, diams: 9830, female: 9792, male: 9794, check: 10003, checkmark: 10003, cross: 10007, VerticalSeparator: 10072, EmptySmallSquare: 9723, FilledSmallSquare: 9724, starf: 9733, bigstar: 9733, square: 9633, squ: 9633, Square: 9633 };
+    var ampCodes = new Map();
     for (var key in objCodes) {
         if (objCodes.hasOwnProperty(key)) {
             ampCodes.set(key, objCodes[key]);
@@ -120,7 +120,7 @@ export class XmlParser implements definition.XmlParser {
         this._parser = new easysax.EasySAXParser();
 
         var that = this;
-        this._parser.on('startNode', function (elem, attr, uq, tagend, str, pos) {
+        this._parser.on("startNode", function (elem, attr, uq, tagend, str, pos) {
             var attributes = attr();
 
             if (attributes === true) {//HACK: For some reason easysax returns the true literal when an element has no attributes.
@@ -142,7 +142,7 @@ export class XmlParser implements definition.XmlParser {
             var name = elem;
 
             if (that._processNamespaces) {
-                var stackEntry = XmlParser._getNamespacesStackEntry(attributes);    
+                var stackEntry = XmlParser._getNamespacesStackEntry(attributes);
                 that._namespaceStack.push(stackEntry);
 
                 var resolved = that._resolveNamespace(name);
@@ -154,12 +154,12 @@ export class XmlParser implements definition.XmlParser {
             onEvent(new ParserEvent(ParserEventType.StartElement, pos(), prefix, namespace, name, attributes, undefined));
         });
 
-        this._parser.on('textNode', function (text, uq, pos) {
-            var data = uq(XmlParser._dereferenceEntities(text));// Decode entity references such as &lt; and &gt;
+        this._parser.on("textNode", function (text, uq, pos) {
+            var data = uq(XmlParser._dereferenceEntities(text)); // Decode entity references such as &lt; and &gt;
             onEvent(new ParserEvent(ParserEventType.Text, pos(), undefined, undefined, undefined, undefined, data));
         });
 
-        this._parser.on('endNode', function (elem, uq, tagstart, str, pos) {
+        this._parser.on("endNode", function (elem, uq, tagstart, str, pos) {
 
             var prefix = undefined;
             var namespace = undefined;
@@ -179,22 +179,22 @@ export class XmlParser implements definition.XmlParser {
             }
         });
 
-        this._parser.on('cdata', function (data, res, pos) {
+        this._parser.on("cdata", function (data, res, pos) {
             onEvent(new ParserEvent(ParserEventType.CDATA, pos(), undefined, undefined, undefined, undefined, data));
         });
 
-        this._parser.on('comment', function (text, uq, pos) {
+        this._parser.on("comment", function (text, uq, pos) {
             onEvent(new ParserEvent(ParserEventType.Comment, pos(), undefined, undefined, undefined, undefined, text));
         });
 
         if (onError) {
-            this._parser.on('error', function (msg, pos) {
+            this._parser.on("error", function (msg, pos) {
                 onError(new Error(msg), pos());
             });
         }
     }
 
-    public get angularSyntax() : boolean {
+    public get angularSyntax(): boolean {
         return this._parser.angularSyntax;
     }
 
@@ -272,7 +272,7 @@ export class XmlParser implements definition.XmlParser {
 
     private static _dereferenceEntities(s: string): string {
         s = String(s);
-        if (s.length > 3 && s.indexOf('&') !== -1) {
+        if (s.length > 3 && s.indexOf("&") !== -1) {
             s = s.replace(_entitySearchRegEx, _HandleAmpEntities);
         }
 
diff --git a/tns-platform-declarations/android/org.nativescript.widgets.d.ts b/tns-platform-declarations/android/org.nativescript.widgets.d.ts
index 1d336d8276..4bc4667665 100644
--- a/tns-platform-declarations/android/org.nativescript.widgets.d.ts
+++ b/tns-platform-declarations/android/org.nativescript.widgets.d.ts
@@ -73,6 +73,7 @@
                     backgroundColor: number,
                     backgroundImage: string,
                     backgroundBitmap: android.graphics.Bitmap,
+                    backgroundGradient: LinearGradientDefinition,
                     context: android.content.Context,
                     backgroundRepeat: string,
                     backgroundPosition: string,
@@ -117,6 +118,18 @@
                 public toDebugString(): string;
             }
 
+            export class LinearGradientDefinition {
+                constructor(startX: number, endX: number, startY: number,
+                            endY: number, colors: number[], stops?: number[]);
+
+                public getStartX(): number;
+                public getStartY(): number;
+                public getEndX(): number;
+                public getEndY(): number;
+                public getColors(): number[];
+                public getStops(): number[];
+            }
+
             export class CSSValue {
                 constructor(type: string, str: string, unit: string, value: number);
                 public getType(): string;
@@ -362,6 +375,8 @@
                 getTabTextColor(): number;
                 setSelectedTabTextColor(color: number): void;
                 getSelectedTabTextColor(): number;
+                setTabTextFontSize(fontSize: number): void;
+                getTabTextFontSize(): number;
 
                 setItems(items: Array<TabItemSpec>, viewPager: android.support.v4.view.ViewPager): void;
                 updateItemAt(position: number, itemSpec: TabItemSpec): void;
diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json
index 3e0800e083..696883b370 100644
--- a/tns-platform-declarations/package.json
+++ b/tns-platform-declarations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tns-platform-declarations",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
   "main": "",
   "scripts": {
diff --git a/tsconfig.json b/tsconfig.json
index f3b576b87d..7c6663550c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,13 @@
 {
     "extends": "./tsconfig.shared",
     "exclude": [
-        "tns-core-modules/docs-shims.d.ts",
-        "tns-platform-declarations/node_modules/",
-        "tns-platform-declarations/package/",
         "tns-core-modules/node_modules/",
         "tns-core-modules/package/",
+        "tns-core-modules/references.d.ts",
+        "tns-platform-declarations/ios/objc-x86_64/",
+        "tns-platform-declarations/node_modules/",
+        "tns-platform-declarations/package/",
+        "tns-platform-declarations/references.d.ts",
         "tests/node_modules",
         "tests/package/",
         "tests/platforms",
@@ -19,10 +21,7 @@
         "build",
         "Deploy",
         "out",
-        "obj",
-        "tns-platform-declarations/references.d.ts",
-        "tns-core-modules/references.d.ts",
-        "tns-platform-declarations/ios/objc-x86_64/",
+        "obj",       
         "unit-tests/common-types.d.ts"
     ]
 }
diff --git a/tsconfig.modules.json b/tsconfig.modules.json
new file mode 100644
index 0000000000..29fced868c
--- /dev/null
+++ b/tsconfig.modules.json
@@ -0,0 +1,13 @@
+{
+    "extends": "./tsconfig.shared",
+    "compilerOptions": {
+        "noUnusedLocals": true
+    },
+    "include": [
+        "tns-core-modules/**/*.ts"
+    ],
+    "exclude": [
+        "tns-core-modules/node_modules/",
+        "tns-core-modules/package/"
+    ]
+}