diff --git a/.gitignore b/.gitignore
index bfaaf29ce..9a3d7ca49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ package-lock.json
 .DS_Store
 .nsbuildinfo
 tsdoc-metadata.json
+thumbs.db
 
 # IDEs and editors
 /.idea
diff --git a/.travis.yml b/.travis.yml
index b9b29624e..768ac73dc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ script:
 - npm run setup
 - npm run unit-test
 
+# public API changes check
+- npm run api-extractor-ci
+
 # circular references check
 - cd tests && npm i
 - node_modules/.bin/webpack --env.android
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0da6639d9..eff760821 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,6 +69,7 @@ git checkout -b <my-fix-branch> master
     - Rebase your changes to the latest master: `git pull --rebase upstream master`.
     - Ensure all unit test are green for Android and iOS. Check [running unit tests](DevelopmentWorkflow.md#running-unit-tests).
     - Ensure your changes pass tslint validation. (run `npm run tslint` in the root of the repo).
+    - If you've made changes to a public API, make sure you update and add the `api-reports/NativeScript.api.md` file to the PR. (run `npm run api-extractor` to update the api-report and definitions).
 
 6. Push your fork. If you have rebased you might have to use force-push your branch:
 ```
diff --git a/README.md b/README.md
index 6a808e93f..f73f597f7 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Check out the links below to get started:
 
 ## For CTOs
 
-Making the right technology choices is key to success. Our [CTO’s guide to NativeScript](https://www.nativescript.org/ctos-guide) helps you understand why NativeScript is the right choice for your next mobile project.
+Making the right technology choices is the key to success. Our [CTO’s guide to NativeScript](https://www.nativescript.org/ctos-guide) helps you understand why NativeScript is the right choice for your next mobile project.
 
 ## Getting Started and Installation
 
diff --git a/build-docs.sh b/build-docs.sh
index def09eb11..dcf6cd329 100755
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -27,7 +27,7 @@ extract_snippets() {
 
     npm install markdown-snippet-injector
 
-    for SNIPPET_DIR in {tests/app,apps/app,tns-core-modules} ; do
+    for SNIPPET_DIR in {tests/app,apps/app,nativescript-core} ; do
         echo "Extracting snippets from: $SNIPPET_DIR"
         node "$BIN" --root="$SNIPPET_DIR" --target="$TARGET_DIR" \
             --sourceext=".js|.ts|.xml|.html|.css"
diff --git a/nativescript-core/package.json b/nativescript-core/package.json
index a6bc4365a..a0441e28b 100644
--- a/nativescript-core/package.json
+++ b/nativescript-core/package.json
@@ -3,7 +3,7 @@
   "main": "index",
   "types": "index.d.ts",
   "description": "Telerik NativeScript Core Modules",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "homepage": "https://www.nativescript.org",
   "repository": {
     "type": "git",
diff --git a/package.json b/package.json
index 5c18e302d..800119891 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "unit-test-watch": "mocha-typescript-watch -p unit-tests/tsconfig.json --opts unit-tests/mocha.opts",
     "dev-link-tns-core-modules-widgets": "(cd tns-core-modules-widgets/dist/package && npm link) && (cd nativescript-core && npm i ../tns-core-modules-widgets/dist/package --save)",
     "api-extractor": "api-extractor run --local --verbose && (cd nativescript-core && cat nativescript-core.header nativescript-core.d.ts > tmp_file && mv tmp_file nativescript-core.d.ts)",
+    "api-extractor-ci": "api-extractor run --verbose",
     "typedoc": "npm run api-extractor && typedoc --tsconfig tsconfig.typedoc.json",
     "typedoc-dev": "npm run typedoc && cd bin/dist/apiref && npx http-server",
     "build-core": "sh ./build/build-core.sh",
diff --git a/tns-core-modules-package/package.json b/tns-core-modules-package/package.json
index 71981a748..80898b426 100644
--- a/tns-core-modules-package/package.json
+++ b/tns-core-modules-package/package.json
@@ -3,7 +3,7 @@
   "main": "index",
   "types": "index.d.ts",
   "description": "Telerik NativeScript Core Modules",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "homepage": "https://www.nativescript.org",
   "repository": {
     "type": "git",
diff --git a/tns-core-modules-widgets/package.json b/tns-core-modules-widgets/package.json
index 7a5a212c4..edc6372b7 100644
--- a/tns-core-modules-widgets/package.json
+++ b/tns-core-modules-widgets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tns-core-modules-widgets",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "description": "Native widgets used in the NativeScript framework.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json
index 83b9b9f7e..efdf880e3 100644
--- a/tns-platform-declarations/package.json
+++ b/tns-platform-declarations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tns-platform-declarations",
-  "version": "6.2.0",
+  "version": "6.3.0",
   "description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
   "main": "",
   "scripts": {