diff --git a/angular.json b/angular.json
index e4ddb77a98..c08ca7152b 100644
--- a/angular.json
+++ b/angular.json
@@ -255,5 +255,8 @@
     "@schematics/angular:directive": {
       "prefix": "app"
     }
+  },
+  "cli": {
+    "analytics": false
   }
-}
+}
\ No newline at end of file
diff --git a/live-editing/configs/HierarchicalGridConfigGenerator.ts b/live-editing/configs/HierarchicalGridConfigGenerator.ts
index cb8bfb6205..7d8f73467d 100644
--- a/live-editing/configs/HierarchicalGridConfigGenerator.ts
+++ b/live-editing/configs/HierarchicalGridConfigGenerator.ts
@@ -23,6 +23,7 @@ IgxToggleModule} from 'igniteui-angular';
 import {AppModuleConfig} from './core/AppModuleConfig';
 import {Config} from './core/Config';
 import {IConfigGenerator} from './core/IConfigGenerator';
+import {Router, RouterModule} from '@angular/router'
 export class HierarchicalGridConfigGenerator implements IConfigGenerator {
     public additionalImports = {
         IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
@@ -718,16 +719,23 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             component: 'HGridRemotePagingDefaultTemplateComponent'
         }));
 
-        configs.push(new Config({
-            additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
+        const hGridSaveStateSampleConfig = new Config({
+            additionalFiles: [
+            "/src/app/directives/prevent-scroll.directive.ts", 
+            "/src/app/hierarchical-grid/data.ts",
+            "/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts",
+            "/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html"
+            ],
             appModuleConfig: new AppModuleConfig({
-                imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule'],
+                imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule', 'Router', 'RouterModule'],
                 ngDeclarations: ['HGridSaveStateComponent', 'HGridAboutComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HttpClientModule',
-                    "RouterModule.forRoot([\{component: 'HGridAboutComponent', path: 'hGrid-state-about'},\{component: 'HGridSaveStateComponent', path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])]"]
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 
+                    "RouterModule.forRoot([\{component: HGridAboutComponent, path: 'hGrid-state-about'},\{component: HGridSaveStateComponent, path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])"]
             }),
             component: 'HGridSaveStateComponent'
-        }));
+        });
+        hGridSaveStateSampleConfig.usesRouting = true;
+        configs.push(hGridSaveStateSampleConfig);
 
         configs.push(new Config({
             additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
diff --git a/src/app/hierarchical-grid/hierarchical-grid-routes-data.ts b/src/app/hierarchical-grid/hierarchical-grid-routes-data.ts
index 6645029532..8a68810973 100644
--- a/src/app/hierarchical-grid/hierarchical-grid-routes-data.ts
+++ b/src/app/hierarchical-grid/hierarchical-grid-routes-data.ts
@@ -68,7 +68,7 @@ export const hierarchicalGridRoutesData = {
     "hgrid-keyboard-guide": { displayName: "HGrid Keyboard navigation guide", parentName: "Hierarchical Grid" },
     "remote-paging-default-template": { displayName: "HGrid remote paging with default template", parentName: "Hierarchical Grid" },
     "hGrid-state": { displayName: "HGrid Save State", parentName: "Hierarchical Grid" },
-    "hGrid-state-about": { displayName: "About", parentName: "Hierarchical Grid" },
+    "hGrid-state-about": { displayName: "HGrid About", parentName: "Hierarchical Grid" },
     "hGrid-editing-lifecycle": { displayName: "Hierarchical Grid Editing lifecycle", parentName: "Hierarchical Grid" },
     "hGrid-cell-selection": {displayName: "HGrid Cell Selection", parentName: "Hierarchical Grid"}
 };
diff --git a/src/app/hierarchical-grid/hierarchical-grid.module.ts b/src/app/hierarchical-grid/hierarchical-grid.module.ts
index 77d907b477..e44aebab71 100644
--- a/src/app/hierarchical-grid/hierarchical-grid.module.ts
+++ b/src/app/hierarchical-grid/hierarchical-grid.module.ts
@@ -95,6 +95,7 @@ import { HierarchicalGridCellSelectionComponent } from './hierarchical-grid-cell
         HGridSummarySampleComponent,
         HGridSummaryStylingComponent,
         HGridSaveStateComponent,
+        HGridAboutComponent,
         HGridPagingSampleComponent,
         HGridPagingStyleSampleComponent,
         HGridRemotePagingSampleComponent,