diff --git a/CHANGELOG.md b/CHANGELOG.md
index 554fc48b4..51c07e20d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+<a name="8.20.4"></a>
+## [8.20.4](https://github.com/NativeScript/nativescript-angular/compare/8.20.3...8.20.4) (2020-01-07)
+
+
+### Bug Fixes
+
+* add context to frame navigation ([#2100](https://github.com/NativeScript/nativescript-angular/pull/2100))
+* wrong import path in compat package ([#2097](https://github.com/NativeScript/nativescript-angular/pull/2097))
+
+
+
 <a name="8.20.3"></a>
 ## [8.20.3](https://github.com/NativeScript/nativescript-angular/compare/8.20.2...8.20.3) (2019-11-13)
 
diff --git a/nativescript-angular-package/package.json b/nativescript-angular-package/package.json
index c0d951a42..9c0ce6a1d 100644
--- a/nativescript-angular-package/package.json
+++ b/nativescript-angular-package/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nativescript-angular",
-    "version": "8.30.0",
+    "version": "8.21.0",
     "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
     "homepage": "https://www.nativescript.org/",
     "bugs": "https://github.com/NativeScript/nativescript-angular/issues",
diff --git a/nativescript-angular-package/zone-js/testing.jasmine.ts b/nativescript-angular-package/zone-js/testing.jasmine.ts
index 0d852527d..06c6899df 100644
--- a/nativescript-angular-package/zone-js/testing.jasmine.ts
+++ b/nativescript-angular-package/zone-js/testing.jasmine.ts
@@ -1,3 +1,3 @@
 // Bootstrap helper module for jasmine spec tests
 import "@nativescript/angular/platform";
-import "@nativescript/angular/dist/zone-nativescript.jasmine.js";
+import "@nativescript/angular/zone-js/dist/zone-nativescript.jasmine.js";
diff --git a/nativescript-angular/package.json b/nativescript-angular/package.json
index 4e0527624..5d42c9747 100644
--- a/nativescript-angular/package.json
+++ b/nativescript-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/angular",
-  "version": "8.30.0",
+  "version": "8.21.0",
   "description": "An Angular renderer that lets you build mobile apps with NativeScript.",
   "homepage": "https://www.nativescript.org/",
   "bugs": "https://github.com/NativeScript/nativescript-angular/issues",
diff --git a/nativescript-angular/platform-common.ts b/nativescript-angular/platform-common.ts
index cd9d02dd4..40dc0cec5 100644
--- a/nativescript-angular/platform-common.ts
+++ b/nativescript-angular/platform-common.ts
@@ -191,19 +191,8 @@ export class NativeScriptPlatformRef extends PlatformRef {
     @profile
     private bootstrapNativeScriptApp() {
         const autoCreateFrame = !!this.appOptions.createFrameOnBootstrap;
-        let tempAppHostView: AppHostView;
         let rootContent: View;
 
-        if (autoCreateFrame) {
-            const { page, frame } = this.createFrameAndPage(false);
-            setRootPage(page);
-            rootContent = frame;
-        } else {
-            // Create a temp page for root of the renderer
-            tempAppHostView = new AppHostView();
-            setRootPage(<any>tempAppHostView);
-        }
-
         if (isLogEnabled()) {
             bootstrapLog("NativeScriptPlatform bootstrap started.");
         }
@@ -214,6 +203,17 @@ export class NativeScriptPlatformRef extends PlatformRef {
                     bootstrapLog("Application launch event fired");
                 }
 
+                let tempAppHostView: AppHostView;
+                if (autoCreateFrame) {
+                    const { page, frame } = this.createFrameAndPage(false);
+                    setRootPage(page);
+                    rootContent = frame;
+                } else {
+                    // Create a temp page for root of the renderer
+                    tempAppHostView = new AppHostView();
+                    setRootPage(<any>tempAppHostView);
+                }
+
                 let bootstrapPromiseCompleted = false;
                 this._bootstrapper().then(
                     moduleRef => {
diff --git a/nativescript-angular/router/page-router-outlet.ts b/nativescript-angular/router/page-router-outlet.ts
index 05c941c31..9cdd6634a 100644
--- a/nativescript-angular/router/page-router-outlet.ts
+++ b/nativescript-angular/router/page-router-outlet.ts
@@ -361,13 +361,13 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire
         this.changeDetector.markForCheck();
 
         this.activated = loaderRef.instance.loadWithFactory(factory);
-        this.loadComponentInPage(page, this.activated);
+        this.loadComponentInPage(page, this.activated, { activatedRoute });
 
         this.activated[loaderRefSymbol] = loaderRef;
     }
 
     @profile
-    private loadComponentInPage(page: Page, componentRef: ComponentRef<any>): void {
+    private loadComponentInPage(page: Page, componentRef: ComponentRef<any>, navigationContext): void {
         // Component loaded. Find its root native view.
         const componentView = componentRef.location.nativeElement;
         // Remove it from original native parent.
@@ -406,6 +406,7 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire
             create() {
                 return page;
             },
+            context: navigationContext,
             clearHistory: navOptions.clearHistory,
             animated: navOptions.animated,
             transition: navOptions.transition