diff --git a/package-lock.json b/package-lock.json
index e531a9b9b65..6b6f0160a3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,11 +105,11 @@
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1601.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.4.tgz",
-      "integrity": "sha512-OOSbNlDy+Q3jY0oFHaq8kkna9HYI1zaS8IHeCIDP6T/ZIAVad4+HqXAL4SKQrKJikkoBQv1Z/eaDBL5XPFK9Bw==",
+      "version": "0.1602.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.0.tgz",
+      "integrity": "sha512-ZRmUTBeD+uGr605eOHnsovEn6f1mOBI+kxP64DRvagNweX5TN04s3iyQ8jmLSAHQD9ush31LFxv3dVNxv3ceXQ==",
       "dependencies": {
-        "@angular-devkit/core": "16.1.4",
+        "@angular-devkit/core": "16.2.0",
         "rxjs": "7.8.1"
       },
       "engines": {
@@ -127,14 +127,14 @@
       }
     },
     "node_modules/@angular-devkit/architect/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@angular-devkit/core": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.4.tgz",
-      "integrity": "sha512-WCAzNi9LxpFIi2WVPaJQd2kHPqCnCexWzUZN05ltJuBGCQL1O+LgRHGwnQ4WZoqmrF5tcWt2a3GFtJ3DgMc1hw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.0.tgz",
+      "integrity": "sha512-l1k6Rqm3YM16BEn3CWyQKrk9xfu+2ux7Bw3oS+h1TO4/RoxO2PgHj8LLRh/WNrYVarhaqO7QZ5ePBkXNMkzJ1g==",
       "dependencies": {
         "ajv": "8.12.0",
         "ajv-formats": "2.1.1",
@@ -173,18 +173,18 @@
       }
     },
     "node_modules/@angular-devkit/core/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@angular-devkit/schematics": {
-      "version": "16.1.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.5.tgz",
-      "integrity": "sha512-s6D/I0pfJJ7+XaAYyXh6IsS3Tya4WKeBuVcWWE7IK6TMEd5a1yDQ5O9RO2/G8UcxBwlKZmeuFbJkclpF6q3hYA==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.0.tgz",
+      "integrity": "sha512-QMDJXPE0+YQJ9Ap3MMzb0v7rx6ZbBEokmHgpdIjN3eILYmbAdsSGE8HTV8NjS9nKmcyE9OGzFCMb7PFrDTlTAw==",
       "dependencies": {
-        "@angular-devkit/core": "16.1.5",
+        "@angular-devkit/core": "16.2.0",
         "jsonc-parser": "3.2.0",
-        "magic-string": "0.30.0",
+        "magic-string": "0.30.1",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
@@ -194,42 +194,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-      "version": "16.1.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.5.tgz",
-      "integrity": "sha512-0Mui2Nuib7kzOLWkz18v1OdxK6wd0SWdSFsAXavrRv03495vv+JUqVq0z0vGMtcbURkjOxIwdj3coj+Y0szkPQ==",
-      "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.0",
-        "rxjs": "7.8.1",
-        "source-map": "0.7.4"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "chokidar": "^3.5.2"
-      },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-devkit/schematics/node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -238,29 +202,21 @@
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/@angular-devkit/schematics/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/@angular-devkit/schematics/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/@angular/cli": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.1.4.tgz",
-      "integrity": "sha512-coSOLVLpOCOD5q9K9EAFFMrTES+HtdJiLy/iI9kdKNCKWUJpm8/svZ3JZOej3vPxYEp0AokXNOwORQnX21/qZQ==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.0.tgz",
+      "integrity": "sha512-xT8vJOyw6Rc2364XDW2jHagLgKu7342ktd/lt+c0u6R+AB2XVFMePR7VceLohX9N/vRUsbQ0nVSZr+ru/hA+HA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1601.4",
-        "@angular-devkit/core": "16.1.4",
-        "@angular-devkit/schematics": "16.1.4",
-        "@schematics/angular": "16.1.4",
+        "@angular-devkit/architect": "0.1602.0",
+        "@angular-devkit/core": "16.2.0",
+        "@angular-devkit/schematics": "16.2.0",
+        "@schematics/angular": "16.2.0",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "ini": "4.1.1",
@@ -272,7 +228,7 @@
         "ora": "5.4.1",
         "pacote": "15.2.0",
         "resolve": "1.22.2",
-        "semver": "7.5.3",
+        "semver": "7.5.4",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
@@ -285,24 +241,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/@angular-devkit/schematics": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.4.tgz",
-      "integrity": "sha512-yjRgwHAfFaeuimgbQtjwSUyXzEHpMSdTRb2zg+TOp6skoGvHOG8xXFJ7DjBkSMeAQdFF0fkxhPS9YmlxqNc+7A==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "16.1.4",
-        "jsonc-parser": "3.2.0",
-        "magic-string": "0.30.0",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
     "node_modules/@angular/cli/node_modules/ansi-colors": {
       "version": "4.1.3",
       "dev": true,
@@ -336,18 +274,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@angular/cli/node_modules/rxjs": {
       "version": "7.8.1",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -357,21 +283,6 @@
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/@angular/cli/node_modules/semver": {
-      "version": "7.5.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@angular/cli/node_modules/tslib": {
       "version": "2.5.0",
       "dev": true,
@@ -1571,6 +1482,7 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.14",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
@@ -2096,13 +2008,13 @@
       }
     },
     "node_modules/@schematics/angular": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.4.tgz",
-      "integrity": "sha512-XfoeL+aBVIR/DzgVKGVhHW/TGQnqWvngyJVuCwXEVWzNfjxHYFkchXa78OItpAvTEr6/Y0Me9FQVAGVA4mMUyg==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.0.tgz",
+      "integrity": "sha512-Ib0/ZCkjWt7a5p3209JVwEWwf41v03K3ylvlxLIEo1ZGijAZAlrBj4GrA5YQ+TmPm2hRyt+owss7x91/x+i0Gw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "16.1.4",
-        "@angular-devkit/schematics": "16.1.4",
+        "@angular-devkit/core": "16.2.0",
+        "@angular-devkit/schematics": "16.2.0",
         "jsonc-parser": "3.2.0"
       },
       "engines": {
@@ -2111,51 +2023,6 @@
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@schematics/angular/node_modules/@angular-devkit/schematics": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.4.tgz",
-      "integrity": "sha512-yjRgwHAfFaeuimgbQtjwSUyXzEHpMSdTRb2zg+TOp6skoGvHOG8xXFJ7DjBkSMeAQdFF0fkxhPS9YmlxqNc+7A==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/core": "16.1.4",
-        "jsonc-parser": "3.2.0",
-        "magic-string": "0.30.0",
-        "ora": "5.4.1",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.10.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.13"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/@schematics/angular/node_modules/tslib": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-      "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==",
-      "dev": true
-    },
     "node_modules/@sigstore/protobuf-specs": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz",
@@ -7073,6 +6940,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.30.1",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
+      "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/magic-string/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.15",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+    },
     "node_modules/make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
@@ -10865,13 +10748,13 @@
       "version": "0.4.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@angular-devkit/architect": "^0.1601.4",
-        "@angular-devkit/core": "^16.1.4",
-        "@angular-devkit/schematics": "^16.1.5"
+        "@angular-devkit/architect": "^0.1602.0",
+        "@angular-devkit/core": "^16.2.0",
+        "@angular-devkit/schematics": "^16.2.0"
       },
       "devDependencies": {
-        "@angular/cli": "^16.1.4",
-        "@schematics/angular": "^16.1.4",
+        "@angular/cli": "^16.2.0",
+        "@schematics/angular": "^16.2.0",
         "@types/node": "^16.11.7",
         "rxjs": "7.8.1"
       },
@@ -10996,11 +10879,11 @@
       }
     },
     "@angular-devkit/architect": {
-      "version": "0.1601.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1601.4.tgz",
-      "integrity": "sha512-OOSbNlDy+Q3jY0oFHaq8kkna9HYI1zaS8IHeCIDP6T/ZIAVad4+HqXAL4SKQrKJikkoBQv1Z/eaDBL5XPFK9Bw==",
+      "version": "0.1602.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.0.tgz",
+      "integrity": "sha512-ZRmUTBeD+uGr605eOHnsovEn6f1mOBI+kxP64DRvagNweX5TN04s3iyQ8jmLSAHQD9ush31LFxv3dVNxv3ceXQ==",
       "requires": {
-        "@angular-devkit/core": "16.1.4",
+        "@angular-devkit/core": "16.2.0",
         "rxjs": "7.8.1"
       },
       "dependencies": {
@@ -11013,16 +10896,16 @@
           }
         },
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@angular-devkit/core": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.4.tgz",
-      "integrity": "sha512-WCAzNi9LxpFIi2WVPaJQd2kHPqCnCexWzUZN05ltJuBGCQL1O+LgRHGwnQ4WZoqmrF5tcWt2a3GFtJ3DgMc1hw==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.0.tgz",
+      "integrity": "sha512-l1k6Rqm3YM16BEn3CWyQKrk9xfu+2ux7Bw3oS+h1TO4/RoxO2PgHj8LLRh/WNrYVarhaqO7QZ5ePBkXNMkzJ1g==",
       "requires": {
         "ajv": "8.12.0",
         "ajv-formats": "2.1.1",
@@ -11045,44 +10928,24 @@
           "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
         },
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@angular-devkit/schematics": {
-      "version": "16.1.5",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.5.tgz",
-      "integrity": "sha512-s6D/I0pfJJ7+XaAYyXh6IsS3Tya4WKeBuVcWWE7IK6TMEd5a1yDQ5O9RO2/G8UcxBwlKZmeuFbJkclpF6q3hYA==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.0.tgz",
+      "integrity": "sha512-QMDJXPE0+YQJ9Ap3MMzb0v7rx6ZbBEokmHgpdIjN3eILYmbAdsSGE8HTV8NjS9nKmcyE9OGzFCMb7PFrDTlTAw==",
       "requires": {
-        "@angular-devkit/core": "16.1.5",
+        "@angular-devkit/core": "16.2.0",
         "jsonc-parser": "3.2.0",
-        "magic-string": "0.30.0",
+        "magic-string": "0.30.1",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "16.1.5",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.1.5.tgz",
-          "integrity": "sha512-0Mui2Nuib7kzOLWkz18v1OdxK6wd0SWdSFsAXavrRv03495vv+JUqVq0z0vGMtcbURkjOxIwdj3coj+Y0szkPQ==",
-          "requires": {
-            "ajv": "8.12.0",
-            "ajv-formats": "2.1.1",
-            "jsonc-parser": "3.2.0",
-            "rxjs": "7.8.1",
-            "source-map": "0.7.4"
-          }
-        },
-        "magic-string": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-          "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.13"
-          }
-        },
         "rxjs": {
           "version": "7.8.1",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -11091,28 +10954,23 @@
             "tslib": "^2.1.0"
           }
         },
-        "source-map": {
-          "version": "0.7.4",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-          "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-        },
         "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+          "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
         }
       }
     },
     "@angular/cli": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.1.4.tgz",
-      "integrity": "sha512-coSOLVLpOCOD5q9K9EAFFMrTES+HtdJiLy/iI9kdKNCKWUJpm8/svZ3JZOej3vPxYEp0AokXNOwORQnX21/qZQ==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-16.2.0.tgz",
+      "integrity": "sha512-xT8vJOyw6Rc2364XDW2jHagLgKu7342ktd/lt+c0u6R+AB2XVFMePR7VceLohX9N/vRUsbQ0nVSZr+ru/hA+HA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1601.4",
-        "@angular-devkit/core": "16.1.4",
-        "@angular-devkit/schematics": "16.1.4",
-        "@schematics/angular": "16.1.4",
+        "@angular-devkit/architect": "0.1602.0",
+        "@angular-devkit/core": "16.2.0",
+        "@angular-devkit/schematics": "16.2.0",
+        "@schematics/angular": "16.2.0",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.3",
         "ini": "4.1.1",
@@ -11124,24 +10982,11 @@
         "ora": "5.4.1",
         "pacote": "15.2.0",
         "resolve": "1.22.2",
-        "semver": "7.5.3",
+        "semver": "7.5.4",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
       "dependencies": {
-        "@angular-devkit/schematics": {
-          "version": "16.1.4",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.4.tgz",
-          "integrity": "sha512-yjRgwHAfFaeuimgbQtjwSUyXzEHpMSdTRb2zg+TOp6skoGvHOG8xXFJ7DjBkSMeAQdFF0fkxhPS9YmlxqNc+7A==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "16.1.4",
-            "jsonc-parser": "3.2.0",
-            "magic-string": "0.30.0",
-            "ora": "5.4.1",
-            "rxjs": "7.8.1"
-          }
-        },
         "ansi-colors": {
           "version": "4.1.3",
           "dev": true
@@ -11167,15 +11012,6 @@
             "wrap-ansi": "^7.0.0"
           }
         },
-        "magic-string": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-          "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.13"
-          }
-        },
         "rxjs": {
           "version": "7.8.1",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
@@ -11185,15 +11021,6 @@
             "tslib": "^2.1.0"
           }
         },
-        "semver": {
-          "version": "7.5.3",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-          "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
         "tslib": {
           "version": "2.5.0",
           "dev": true
@@ -11867,7 +11694,8 @@
       }
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14"
+      "version": "1.4.14",
+      "dev": true
     },
     "@jridgewell/trace-mapping": {
       "version": "0.3.18",
@@ -12191,11 +12019,11 @@
     "@puppeteer/ng-schematics": {
       "version": "file:packages/ng-schematics",
       "requires": {
-        "@angular-devkit/architect": "^0.1601.4",
-        "@angular-devkit/core": "^16.1.4",
-        "@angular-devkit/schematics": "^16.1.5",
-        "@angular/cli": "^16.1.4",
-        "@schematics/angular": "^16.1.4",
+        "@angular-devkit/architect": "^0.1602.0",
+        "@angular-devkit/core": "^16.2.0",
+        "@angular-devkit/schematics": "^16.2.0",
+        "@angular/cli": "^16.2.0",
+        "@schematics/angular": "^16.2.0",
         "@types/node": "^16.11.7",
         "rxjs": "7.8.1"
       },
@@ -12318,53 +12146,14 @@
       }
     },
     "@schematics/angular": {
-      "version": "16.1.4",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.1.4.tgz",
-      "integrity": "sha512-XfoeL+aBVIR/DzgVKGVhHW/TGQnqWvngyJVuCwXEVWzNfjxHYFkchXa78OItpAvTEr6/Y0Me9FQVAGVA4mMUyg==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.0.tgz",
+      "integrity": "sha512-Ib0/ZCkjWt7a5p3209JVwEWwf41v03K3ylvlxLIEo1ZGijAZAlrBj4GrA5YQ+TmPm2hRyt+owss7x91/x+i0Gw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "16.1.4",
-        "@angular-devkit/schematics": "16.1.4",
+        "@angular-devkit/core": "16.2.0",
+        "@angular-devkit/schematics": "16.2.0",
         "jsonc-parser": "3.2.0"
-      },
-      "dependencies": {
-        "@angular-devkit/schematics": {
-          "version": "16.1.4",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.1.4.tgz",
-          "integrity": "sha512-yjRgwHAfFaeuimgbQtjwSUyXzEHpMSdTRb2zg+TOp6skoGvHOG8xXFJ7DjBkSMeAQdFF0fkxhPS9YmlxqNc+7A==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "16.1.4",
-            "jsonc-parser": "3.2.0",
-            "magic-string": "0.30.0",
-            "ora": "5.4.1",
-            "rxjs": "7.8.1"
-          }
-        },
-        "magic-string": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-          "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/sourcemap-codec": "^1.4.13"
-          }
-        },
-        "rxjs": {
-          "version": "7.8.1",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-          "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-          "dev": true,
-          "requires": {
-            "tslib": "^2.1.0"
-          }
-        },
-        "tslib": {
-          "version": "2.6.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz",
-          "integrity": "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==",
-          "dev": true
-        }
       }
     },
     "@sigstore/protobuf-specs": {
@@ -15700,6 +15489,21 @@
         "yallist": "^4.0.0"
       }
     },
+    "magic-string": {
+      "version": "0.30.1",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz",
+      "integrity": "sha512-mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA==",
+      "requires": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      },
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.15",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+          "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+        }
+      }
+    },
     "make-dir": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
index 1925bd2f58c..a544cb5257e 100644
--- a/packages/ng-schematics/package.json
+++ b/packages/ng-schematics/package.json
@@ -48,14 +48,14 @@
     "node": ">=16.3.0"
   },
   "dependencies": {
-    "@angular-devkit/architect": "^0.1601.4",
-    "@angular-devkit/core": "^16.1.4",
-    "@angular-devkit/schematics": "^16.1.5"
+    "@angular-devkit/architect": "^0.1602.0",
+    "@angular-devkit/core": "^16.2.0",
+    "@angular-devkit/schematics": "^16.2.0"
   },
   "devDependencies": {
     "@types/node": "^16.11.7",
-    "@schematics/angular": "^16.1.4",
-    "@angular/cli": "^16.1.4",
+    "@schematics/angular": "^16.2.0",
+    "@angular/cli": "^16.2.0",
     "rxjs": "7.8.1"
   },
   "files": [
diff --git a/packages/ng-schematics/src/schematics/e2e/index.ts b/packages/ng-schematics/src/schematics/e2e/index.ts
index 1f077437fc0..1610fcef9aa 100644
--- a/packages/ng-schematics/src/schematics/e2e/index.ts
+++ b/packages/ng-schematics/src/schematics/e2e/index.ts
@@ -52,7 +52,7 @@ function parseUserTestArgs(userArgs: Record<string, string>): SchematicsSpec {
     options['name'] = userArgs['n'];
   }
   if ('r' in userArgs) {
-    options['route'] = userArgs['n'];
+    options['route'] = userArgs['r'];
   }
 
   if (options['route'] && !options['route'].startsWith('/')) {
diff --git a/packages/ng-schematics/src/schematics/ng-add/files/common/e2e/.gitignore.template b/packages/ng-schematics/src/schematics/ng-add/files/common/e2e/.gitignore.template
index cc67360ed16..f038b2eb670 100644
--- a/packages/ng-schematics/src/schematics/ng-add/files/common/e2e/.gitignore.template
+++ b/packages/ng-schematics/src/schematics/ng-add/files/common/e2e/.gitignore.template
@@ -1,3 +1,2 @@
-# Compiled e2e tests output Node auto resolves files in folders named 'test'
-
-build/
\ No newline at end of file
+# Compiled e2e tests output
+build/