diff --git a/package.json b/package.json
index 0fa39fa5412..31e43dfb256 100644
--- a/package.json
+++ b/package.json
@@ -97,22 +97,22 @@
     "@algolia/client-search": "~4.14.2",
     "@types/glob": "~8.0.0",
     "@types/markdown-it": "~12.2.3",
-    "@types/node": "~18.11.13",
+    "@types/node": "~18.11.17",
     "@types/prettier": "~2.7.1",
     "@types/react": "~18.0.26",
-    "@types/sanitize-html": "~2.6.2",
+    "@types/sanitize-html": "~2.8.0",
     "@types/semver": "~7.3.13",
     "@types/validator": "~13.7.10",
-    "@typescript-eslint/eslint-plugin": "~5.46.0",
-    "@typescript-eslint/parser": "~5.46.0",
-    "@vitest/coverage-c8": "~0.25.7",
-    "@vitest/ui": "~0.25.7",
-    "@vueuse/core": "~9.6.0",
+    "@typescript-eslint/eslint-plugin": "~5.47.0",
+    "@typescript-eslint/parser": "~5.47.0",
+    "@vitest/coverage-c8": "~0.26.0",
+    "@vitest/ui": "~0.26.1",
+    "@vueuse/core": "~9.8.2",
     "c8": "~7.12.0",
     "conventional-changelog-cli": "~2.2.2",
-    "cypress": "~12.0.2",
-    "esbuild": "~0.16.4",
-    "eslint": "~8.29.0",
+    "cypress": "~12.1.0",
+    "esbuild": "~0.16.10",
+    "eslint": "~8.30.0",
     "eslint-config-prettier": "~8.5.0",
     "eslint-define-config": "~1.12.0",
     "eslint-gitignore": "~0.1.0",
@@ -128,7 +128,7 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "rimraf": "~3.0.2",
-    "sanitize-html": "~2.7.3",
+    "sanitize-html": "~2.8.0",
     "semver": "~7.3.8",
     "simple-git-hooks": "~2.8.1",
     "standard-version": "~9.5.0",
@@ -137,12 +137,12 @@
     "typedoc-plugin-missing-exports": "~1.0.0",
     "typescript": "~4.9.4",
     "validator": "~13.7.0",
-    "vite": "~4.0.0",
+    "vite": "~4.0.2",
     "vitepress": "1.0.0-alpha.31",
-    "vitest": "~0.25.7",
+    "vitest": "~0.26.1",
     "vue": "~3.2.45"
   },
-  "packageManager": "pnpm@7.18.1",
+  "packageManager": "pnpm@7.18.2",
   "engines": {
     "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
     "npm": ">=6.14.13"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index db945be2a90..a289708e76f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,22 +5,22 @@ specifiers:
   '@algolia/client-search': ~4.14.2
   '@types/glob': ~8.0.0
   '@types/markdown-it': ~12.2.3
-  '@types/node': ~18.11.13
+  '@types/node': ~18.11.17
   '@types/prettier': ~2.7.1
   '@types/react': ~18.0.26
-  '@types/sanitize-html': ~2.6.2
+  '@types/sanitize-html': ~2.8.0
   '@types/semver': ~7.3.13
   '@types/validator': ~13.7.10
-  '@typescript-eslint/eslint-plugin': ~5.46.0
-  '@typescript-eslint/parser': ~5.46.0
-  '@vitest/coverage-c8': ~0.25.7
-  '@vitest/ui': ~0.25.7
-  '@vueuse/core': ~9.6.0
+  '@typescript-eslint/eslint-plugin': ~5.47.0
+  '@typescript-eslint/parser': ~5.47.0
+  '@vitest/coverage-c8': ~0.26.0
+  '@vitest/ui': ~0.26.1
+  '@vueuse/core': ~9.8.2
   c8: ~7.12.0
   conventional-changelog-cli: ~2.2.2
-  cypress: ~12.0.2
-  esbuild: ~0.16.4
-  eslint: ~8.29.0
+  cypress: ~12.1.0
+  esbuild: ~0.16.10
+  eslint: ~8.30.0
   eslint-config-prettier: ~8.5.0
   eslint-define-config: ~1.12.0
   eslint-gitignore: ~0.1.0
@@ -36,7 +36,7 @@ specifiers:
   react: ~18.2.0
   react-dom: ~18.2.0
   rimraf: ~3.0.2
-  sanitize-html: ~2.7.3
+  sanitize-html: ~2.8.0
   semver: ~7.3.8
   simple-git-hooks: ~2.8.1
   standard-version: ~9.5.0
@@ -45,9 +45,9 @@ specifiers:
   typedoc-plugin-missing-exports: ~1.0.0
   typescript: ~4.9.4
   validator: ~13.7.0
-  vite: ~4.0.0
+  vite: ~4.0.2
   vitepress: 1.0.0-alpha.31
-  vitest: ~0.25.7
+  vitest: ~0.26.1
   vue: ~3.2.45
 
 devDependencies:
@@ -55,27 +55,27 @@ devDependencies:
   '@algolia/client-search': 4.14.2
   '@types/glob': 8.0.0
   '@types/markdown-it': 12.2.3
-  '@types/node': 18.11.13
+  '@types/node': 18.11.17
   '@types/prettier': 2.7.1
   '@types/react': 18.0.26
-  '@types/sanitize-html': 2.6.2
+  '@types/sanitize-html': 2.8.0
   '@types/semver': 7.3.13
   '@types/validator': 13.7.10
-  '@typescript-eslint/eslint-plugin': 5.46.0_5mle7isnkfgjmrghnnczirv6iy
-  '@typescript-eslint/parser': 5.46.0_ha6vam6werchizxrnqvarmz2zu
-  '@vitest/coverage-c8': 0.25.7_@vitest+ui@0.25.7
-  '@vitest/ui': 0.25.7
-  '@vueuse/core': 9.6.0_vue@3.2.45
+  '@typescript-eslint/eslint-plugin': 5.47.0_ncmi6noazr3nzas7jxykisekym
+  '@typescript-eslint/parser': 5.47.0_lzzuuodtsqwxnvqeq4g4likcqa
+  '@vitest/coverage-c8': 0.26.0_@vitest+ui@0.26.1
+  '@vitest/ui': 0.26.1
+  '@vueuse/core': 9.8.2_vue@3.2.45
   c8: 7.12.0
   conventional-changelog-cli: 2.2.2
-  cypress: 12.0.2
-  esbuild: 0.16.4
-  eslint: 8.29.0
-  eslint-config-prettier: 8.5.0_eslint@8.29.0
+  cypress: 12.1.0
+  esbuild: 0.16.10
+  eslint: 8.30.0
+  eslint-config-prettier: 8.5.0_eslint@8.30.0
   eslint-define-config: 1.12.0
-  eslint-gitignore: 0.1.0_eslint@8.29.0
-  eslint-plugin-jsdoc: 39.6.4_eslint@8.29.0
-  eslint-plugin-prettier: 4.2.1_5dgjrgoi64tgrv3zzn3walur3u
+  eslint-gitignore: 0.1.0_eslint@8.30.0
+  eslint-plugin-jsdoc: 39.6.4_eslint@8.30.0
+  eslint-plugin-prettier: 4.2.1_kl4pe43v5b43npmso5hoplpbyi
   glob: 8.0.3
   lint-staged: 13.1.0
   mime-db: 1.52.0
@@ -86,7 +86,7 @@ devDependencies:
   react: 18.2.0
   react-dom: 18.2.0_react@18.2.0
   rimraf: 3.0.2
-  sanitize-html: 2.7.3
+  sanitize-html: 2.8.0
   semver: 7.3.8
   simple-git-hooks: 2.8.1
   standard-version: 9.5.0
@@ -95,9 +95,9 @@ devDependencies:
   typedoc-plugin-missing-exports: 1.0.0_typedoc@0.23.22
   typescript: 4.9.4
   validator: 13.7.0
-  vite: 4.0.0_@types+node@18.11.13
-  vitepress: 1.0.0-alpha.31_cfacmysgm7orey33c3nw6yk2o4
-  vitest: 0.25.7_@vitest+ui@0.25.7
+  vite: 4.0.2_@types+node@18.11.17
+  vitepress: 1.0.0-alpha.31_bjrhytsn5onygssywbycnrkjdm
+  vitest: 0.26.1_@vitest+ui@0.26.1
   vue: 3.2.45
 
 packages:
@@ -397,8 +397,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm/0.16.4:
-    resolution: {integrity: sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw==}
+  /@esbuild/android-arm/0.16.10:
+    resolution: {integrity: sha512-RmJjQTRrO6VwUWDrzTBLmV4OJZTarYsiepLGlF2rYTVB701hSorPywPGvP6d8HCuuRibyXa5JX4s3jN2kHEtjQ==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -406,8 +406,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm64/0.16.4:
-    resolution: {integrity: sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q==}
+  /@esbuild/android-arm64/0.16.10:
+    resolution: {integrity: sha512-47Y+NwVKTldTlDhSgJHZ/RpvBQMUDG7eKihqaF/u6g7s0ZPz4J1vy8A3rwnnUOF2CuDn7w7Gj/QcMoWz3U3SJw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -415,8 +415,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64/0.16.4:
-    resolution: {integrity: sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g==}
+  /@esbuild/android-x64/0.16.10:
+    resolution: {integrity: sha512-C4PfnrBMcuAcOurQzpF1tTtZz94IXO5JmICJJ3NFJRHbXXsQUg9RFG45KvydKqtFfBaFLCHpduUkUfXwIvGnRg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -424,8 +424,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64/0.16.4:
-    resolution: {integrity: sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg==}
+  /@esbuild/darwin-arm64/0.16.10:
+    resolution: {integrity: sha512-bH/bpFwldyOKdi9HSLCLhhKeVgRYr9KblchwXgY2NeUHBB/BzTUHtUSBgGBmpydB1/4E37m+ggXXfSrnD7/E7g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -433,8 +433,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64/0.16.4:
-    resolution: {integrity: sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA==}
+  /@esbuild/darwin-x64/0.16.10:
+    resolution: {integrity: sha512-OXt7ijoLuy+AjDSKQWu+KdDFMBbdeaL6wtgMKtDUXKWHiAMKHan5+R1QAG6HD4+K0nnOvEJXKHeA9QhXNAjOTQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -442,8 +442,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64/0.16.4:
-    resolution: {integrity: sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w==}
+  /@esbuild/freebsd-arm64/0.16.10:
+    resolution: {integrity: sha512-shSQX/3GHuspE3Uxtq5kcFG/zqC+VuMnJkqV7LczO41cIe6CQaXHD3QdMLA4ziRq/m0vZo7JdterlgbmgNIAlQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -451,8 +451,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64/0.16.4:
-    resolution: {integrity: sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q==}
+  /@esbuild/freebsd-x64/0.16.10:
+    resolution: {integrity: sha512-5YVc1zdeaJGASijZmTzSO4h6uKzsQGG3pkjI6fuXvolhm3hVRhZwnHJkforaZLmzvNv5Tb7a3QL2FAVmrgySIA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -460,8 +460,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm/0.16.4:
-    resolution: {integrity: sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA==}
+  /@esbuild/linux-arm/0.16.10:
+    resolution: {integrity: sha512-c360287ZWI2miBnvIj23bPyVctgzeMT2kQKR+x94pVqIN44h3GF8VMEs1SFPH1UgyDr3yBbx3vowDS1SVhyVhA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -469,8 +469,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64/0.16.4:
-    resolution: {integrity: sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g==}
+  /@esbuild/linux-arm64/0.16.10:
+    resolution: {integrity: sha512-2aqeNVxIaRfPcIaMZIFoblLh588sWyCbmj1HHCCs9WmeNWm+EIN0SmvsmPvTa/TsNZFKnxTcvkX2eszTcCqIrA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -478,8 +478,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32/0.16.4:
-    resolution: {integrity: sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw==}
+  /@esbuild/linux-ia32/0.16.10:
+    resolution: {integrity: sha512-sqMIEWeyrLGU7J5RB5fTkLRIFwsgsQ7ieWXlDLEmC2HblPYGb3AucD7inw2OrKFpRPKsec1l+lssiM3+NV5aOw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -496,8 +496,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64/0.16.4:
-    resolution: {integrity: sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg==}
+  /@esbuild/linux-loong64/0.16.10:
+    resolution: {integrity: sha512-O7Pd5hLEtTg37NC73pfhUOGTjx/+aXu5YoSq3ahCxcN7Bcr2F47mv+kG5t840thnsEzrv0oB70+LJu3gUgchvg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -505,8 +505,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el/0.16.4:
-    resolution: {integrity: sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA==}
+  /@esbuild/linux-mips64el/0.16.10:
+    resolution: {integrity: sha512-FN8mZOH7531iPHM0kaFhAOqqNHoAb6r/YHW2ZIxNi0a85UBi2DO4Vuyn7t1p4UN8a4LoAnLOT1PqNgHkgBJgbA==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -514,8 +514,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64/0.16.4:
-    resolution: {integrity: sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g==}
+  /@esbuild/linux-ppc64/0.16.10:
+    resolution: {integrity: sha512-Dg9RiqdvHOAWnOKIOTsIx8dFX9EDlY2IbPEY7YFzchrCiTZmMkD7jWA9UdZbNUygPjdmQBVPRCrLydReFlX9yg==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -523,8 +523,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64/0.16.4:
-    resolution: {integrity: sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA==}
+  /@esbuild/linux-riscv64/0.16.10:
+    resolution: {integrity: sha512-XMqtpjwzbmlar0BJIxmzu/RZ7EWlfVfH68Vadrva0Wj5UKOdKvqskuev2jY2oPV3aoQUyXwnMbMrFmloO2GfAw==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -532,8 +532,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x/0.16.4:
-    resolution: {integrity: sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A==}
+  /@esbuild/linux-s390x/0.16.10:
+    resolution: {integrity: sha512-fu7XtnoeRNFMx8DjK3gPWpFBDM2u5ba+FYwg27SjMJwKvJr4bDyKz5c+FLXLUSSAkMAt/UL+cUbEbra+rYtUgw==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -541,8 +541,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64/0.16.4:
-    resolution: {integrity: sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw==}
+  /@esbuild/linux-x64/0.16.10:
+    resolution: {integrity: sha512-61lcjVC/RldNNMUzQQdyCWjCxp9YLEQgIxErxU9XluX7juBdGKb0pvddS0vPNuCvotRbzijZ1pzII+26haWzbA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -550,8 +550,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64/0.16.4:
-    resolution: {integrity: sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ==}
+  /@esbuild/netbsd-x64/0.16.10:
+    resolution: {integrity: sha512-JeZXCX3viSA9j4HqSoygjssdqYdfHd6yCFWyfSekLbz4Ef+D2EjvsN02ZQPwYl5a5gg/ehdHgegHhlfOFP0HCA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -559,8 +559,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64/0.16.4:
-    resolution: {integrity: sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw==}
+  /@esbuild/openbsd-x64/0.16.10:
+    resolution: {integrity: sha512-3qpxQKuEVIIg8SebpXsp82OBrqjPV/OwNWmG+TnZDr3VGyChNnGMHccC1xkbxCHDQNnnXjxhMQNyHmdFJbmbRA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -568,8 +568,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64/0.16.4:
-    resolution: {integrity: sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ==}
+  /@esbuild/sunos-x64/0.16.10:
+    resolution: {integrity: sha512-z+q0xZ+et/7etz7WoMyXTHZ1rB8PMSNp/FOqURLJLOPb3GWJ2aj4oCqFCjPwEbW1rsT7JPpxeH/DwGAWk/I1Bg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -577,8 +577,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64/0.16.4:
-    resolution: {integrity: sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ==}
+  /@esbuild/win32-arm64/0.16.10:
+    resolution: {integrity: sha512-+YYu5sbQ9npkNT9Dec+tn1F/kjg6SMgr6bfi/6FpXYZvCRfu2YFPZGb+3x8K30s8eRxFpoG4sGhiSUkr1xbHEw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -586,8 +586,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32/0.16.4:
-    resolution: {integrity: sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w==}
+  /@esbuild/win32-ia32/0.16.10:
+    resolution: {integrity: sha512-Aw7Fupk7XNehR1ftHGYwUteyJ2q+em/aE+fVU3YMTBN2V5A7Z4aVCSV+SvCp9HIIHZavPFBpbdP3VfjQpdf6Xg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -595,8 +595,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64/0.16.4:
-    resolution: {integrity: sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ==}
+  /@esbuild/win32-x64/0.16.10:
+    resolution: {integrity: sha512-qddWullt3sC1EIpfHvCRBq3H4g3L86DZpD6n8k2XFjFVyp01D++uNbN1hT/JRsHxTbyyemZcpwL5aRlJwc/zFw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -604,14 +604,14 @@ packages:
     dev: true
     optional: true
 
-  /@eslint/eslintrc/1.3.3:
-    resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==}
+  /@eslint/eslintrc/1.4.0:
+    resolution: {integrity: sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       ajv: 6.12.6
       debug: 4.3.4
       espree: 9.4.0
-      globals: 13.17.0
+      globals: 13.19.0
       ignore: 5.2.0
       import-fresh: 3.3.0
       js-yaml: 4.1.0
@@ -621,8 +621,8 @@ packages:
       - supports-color
     dev: true
 
-  /@humanwhocodes/config-array/0.11.6:
-    resolution: {integrity: sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==}
+  /@humanwhocodes/config-array/0.11.8:
+    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -783,18 +783,18 @@ packages:
   /@types/chai-subset/1.3.3:
     resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
     dependencies:
-      '@types/chai': 4.3.3
+      '@types/chai': 4.3.4
     dev: true
 
-  /@types/chai/4.3.3:
-    resolution: {integrity: sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==}
+  /@types/chai/4.3.4:
+    resolution: {integrity: sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==}
     dev: true
 
   /@types/glob/8.0.0:
     resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 18.11.13
+      '@types/node': 18.11.17
     dev: true
 
   /@types/istanbul-lib-coverage/2.0.4:
@@ -832,8 +832,8 @@ packages:
     resolution: {integrity: sha512-Y6S38pFr04yb13qqHf8uk1nHE3lXgQ30WZbv1mLliV9pt0NjvqdWttLcrOYLnXbOafknVYRHZGoMSpR9UwfYow==}
     dev: true
 
-  /@types/node/18.11.13:
-    resolution: {integrity: sha512-IASpMGVcWpUsx5xBOrxMj7Bl8lqfuTY7FKAnPmu5cHkfQVWF8GulWS1jbRqA934qZL35xh5xN/+Xe/i26Bod4w==}
+  /@types/node/18.11.17:
+    resolution: {integrity: sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==}
     dev: true
 
   /@types/normalize-package-data/2.4.1:
@@ -856,10 +856,10 @@ packages:
       csstype: 3.1.1
     dev: true
 
-  /@types/sanitize-html/2.6.2:
-    resolution: {integrity: sha512-7Lu2zMQnmHHQGKXVvCOhSziQMpa+R2hMHFefzbYoYMHeaXR0uXqNeOc3JeQQQ8/6Xa2Br/P1IQTLzV09xxAiUQ==}
+  /@types/sanitize-html/2.8.0:
+    resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
     dependencies:
-      htmlparser2: 6.1.0
+      htmlparser2: 8.0.1
     dev: true
 
   /@types/scheduler/0.16.2:
@@ -890,12 +890,12 @@ packages:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 18.11.13
+      '@types/node': 18.11.17
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/5.46.0_5mle7isnkfgjmrghnnczirv6iy:
-    resolution: {integrity: sha512-QrZqaIOzJAjv0sfjY4EjbXUi3ZOFpKfzntx22gPGr9pmFcTjcFw/1sS1LJhEubfAGwuLjNrPV0rH+D1/XZFy7Q==}
+  /@typescript-eslint/eslint-plugin/5.47.0_ncmi6noazr3nzas7jxykisekym:
+    resolution: {integrity: sha512-AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       '@typescript-eslint/parser': ^5.0.0
@@ -905,12 +905,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.46.0_ha6vam6werchizxrnqvarmz2zu
-      '@typescript-eslint/scope-manager': 5.46.0
-      '@typescript-eslint/type-utils': 5.46.0_ha6vam6werchizxrnqvarmz2zu
-      '@typescript-eslint/utils': 5.46.0_ha6vam6werchizxrnqvarmz2zu
+      '@typescript-eslint/parser': 5.47.0_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/scope-manager': 5.47.0
+      '@typescript-eslint/type-utils': 5.47.0_lzzuuodtsqwxnvqeq4g4likcqa
+      '@typescript-eslint/utils': 5.47.0_lzzuuodtsqwxnvqeq4g4likcqa
       debug: 4.3.4
-      eslint: 8.29.0
+      eslint: 8.30.0
       ignore: 5.2.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
@@ -921,8 +921,8 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.46.0_ha6vam6werchizxrnqvarmz2zu:
-    resolution: {integrity: sha512-joNO6zMGUZg+C73vwrKXCd8usnsmOYmgW/w5ZW0pG0RGvqeznjtGDk61EqqTpNrFLUYBW2RSBFrxdAZMqA4OZA==}
+  /@typescript-eslint/parser/5.47.0_lzzuuodtsqwxnvqeq4g4likcqa:
+    resolution: {integrity: sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -931,26 +931,26 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 5.46.0
-      '@typescript-eslint/types': 5.46.0
-      '@typescript-eslint/typescript-estree': 5.46.0_typescript@4.9.4
+      '@typescript-eslint/scope-manager': 5.47.0
+      '@typescript-eslint/types': 5.47.0
+      '@typescript-eslint/typescript-estree': 5.47.0_typescript@4.9.4
       debug: 4.3.4
-      eslint: 8.29.0
+      eslint: 8.30.0
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager/5.46.0:
-    resolution: {integrity: sha512-7wWBq9d/GbPiIM6SqPK9tfynNxVbfpihoY5cSFMer19OYUA3l4powA2uv0AV2eAZV6KoAh6lkzxv4PoxOLh1oA==}
+  /@typescript-eslint/scope-manager/5.47.0:
+    resolution: {integrity: sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.46.0
-      '@typescript-eslint/visitor-keys': 5.46.0
+      '@typescript-eslint/types': 5.47.0
+      '@typescript-eslint/visitor-keys': 5.47.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.46.0_ha6vam6werchizxrnqvarmz2zu:
-    resolution: {integrity: sha512-dwv4nimVIAsVS2dTA0MekkWaRnoYNXY26dKz8AN5W3cBFYwYGFQEqm/cG+TOoooKlncJS4RTbFKgcFY/pOiBCg==}
+  /@typescript-eslint/type-utils/5.47.0_lzzuuodtsqwxnvqeq4g4likcqa:
+    resolution: {integrity: sha512-1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '*'
@@ -959,23 +959,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.46.0_typescript@4.9.4
-      '@typescript-eslint/utils': 5.46.0_ha6vam6werchizxrnqvarmz2zu
+      '@typescript-eslint/typescript-estree': 5.47.0_typescript@4.9.4
+      '@typescript-eslint/utils': 5.47.0_lzzuuodtsqwxnvqeq4g4likcqa
       debug: 4.3.4
-      eslint: 8.29.0
+      eslint: 8.30.0
       tsutils: 3.21.0_typescript@4.9.4
       typescript: 4.9.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/types/5.46.0:
-    resolution: {integrity: sha512-wHWgQHFB+qh6bu0IAPAJCdeCdI0wwzZnnWThlmHNY01XJ9Z97oKqKOzWYpR2I83QmshhQJl6LDM9TqMiMwJBTw==}
+  /@typescript-eslint/types/5.47.0:
+    resolution: {integrity: sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.46.0_typescript@4.9.4:
-    resolution: {integrity: sha512-kDLNn/tQP+Yp8Ro2dUpyyVV0Ksn2rmpPpB0/3MO874RNmXtypMwSeazjEN/Q6CTp8D7ExXAAekPEcCEB/vtJkw==}
+  /@typescript-eslint/typescript-estree/5.47.0_typescript@4.9.4:
+    resolution: {integrity: sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       typescript: '*'
@@ -983,8 +983,8 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 5.46.0
-      '@typescript-eslint/visitor-keys': 5.46.0
+      '@typescript-eslint/types': 5.47.0
+      '@typescript-eslint/visitor-keys': 5.47.0
       debug: 4.3.4
       globby: 11.1.0
       is-glob: 4.0.3
@@ -995,50 +995,50 @@ packages:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.46.0_ha6vam6werchizxrnqvarmz2zu:
-    resolution: {integrity: sha512-4O+Ps1CRDw+D+R40JYh5GlKLQERXRKW5yIQoNDpmXPJ+C7kaPF9R7GWl+PxGgXjB3PQCqsaaZUpZ9dG4U6DO7g==}
+  /@typescript-eslint/utils/5.47.0_lzzuuodtsqwxnvqeq4g4likcqa:
+    resolution: {integrity: sha512-U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
       '@types/json-schema': 7.0.11
       '@types/semver': 7.3.13
-      '@typescript-eslint/scope-manager': 5.46.0
-      '@typescript-eslint/types': 5.46.0
-      '@typescript-eslint/typescript-estree': 5.46.0_typescript@4.9.4
-      eslint: 8.29.0
+      '@typescript-eslint/scope-manager': 5.47.0
+      '@typescript-eslint/types': 5.47.0
+      '@typescript-eslint/typescript-estree': 5.47.0_typescript@4.9.4
+      eslint: 8.30.0
       eslint-scope: 5.1.1
-      eslint-utils: 3.0.0_eslint@8.29.0
+      eslint-utils: 3.0.0_eslint@8.30.0
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys/5.46.0:
-    resolution: {integrity: sha512-E13gBoIXmaNhwjipuvQg1ByqSAu/GbEpP/qzFihugJ+MomtoJtFAJG/+2DRPByf57B863m0/q7Zt16V9ohhANw==}
+  /@typescript-eslint/visitor-keys/5.47.0:
+    resolution: {integrity: sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      '@typescript-eslint/types': 5.46.0
+      '@typescript-eslint/types': 5.47.0
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-vue/4.0.0_vite@4.0.0+vue@3.2.45:
+  /@vitejs/plugin-vue/4.0.0_vite@4.0.2+vue@3.2.45:
     resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.0.0_@types+node@18.11.13
+      vite: 4.0.2_@types+node@18.11.17
       vue: 3.2.45
     dev: true
 
-  /@vitest/coverage-c8/0.25.7_@vitest+ui@0.25.7:
-    resolution: {integrity: sha512-TEoYjW4YIDXKCMmLqduIGpIq2JmlhE3M0Q68apjNM0ljrJyEvYpaDI5b7OyfXbAJjhmZvIlfEZfZnmhbExHLHg==}
+  /@vitest/coverage-c8/0.26.0_@vitest+ui@0.26.1:
+    resolution: {integrity: sha512-1LSMHvX1Winy1dIV1XqQanIskYBvd3+TlQtxO6BeyFa57Lah2uNBm3gh5iDB+ZWCySN5o6bl7qOJdaZjEQZZeg==}
     dependencies:
       c8: 7.12.0
-      vitest: 0.25.7_@vitest+ui@0.25.7
+      vitest: 0.26.0_@vitest+ui@0.26.1
     transitivePeerDependencies:
       - '@edge-runtime/vm'
       - '@vitest/browser'
@@ -1053,9 +1053,11 @@ packages:
       - terser
     dev: true
 
-  /@vitest/ui/0.25.7:
-    resolution: {integrity: sha512-mL/7SbXE11jMaSq/ynQuQvmR63amQ9/u60ZXgg9zFGJ3glTkfGfKIKSsGB64Z4vNEh8hf6MeF3vDfErlbJo0xA==}
+  /@vitest/ui/0.26.1:
+    resolution: {integrity: sha512-lb9BMQFlsGJ7xK/PPo95dK8fTLMttb0ymxKsfkTMI+41yxWKWPjUZAE6OioVmYBWY3zNOo4Lo1/eihB9hbefLQ==}
     dependencies:
+      fast-glob: 3.2.12
+      flatted: 3.2.7
       sirv: 2.0.2
     dev: true
 
@@ -1146,24 +1148,24 @@ packages:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
     dev: true
 
-  /@vueuse/core/9.6.0_vue@3.2.45:
-    resolution: {integrity: sha512-qGUcjKQXHgN+jqXEgpeZGoxdCbIDCdVPz3QiF1uyecVGbMuM63o96I1GjYx5zskKgRI0FKSNsVWM7rwrRMTf6A==}
+  /@vueuse/core/9.8.2_vue@3.2.45:
+    resolution: {integrity: sha512-aWiCmcYIpPt7xjuqYiceODEMHchDYthrJ4AqI+FXPZrR23PZOqdiktbUVyQl2kGlR3H4i9UJ/uimQrwhz9UouQ==}
     dependencies:
       '@types/web-bluetooth': 0.0.16
-      '@vueuse/metadata': 9.6.0
-      '@vueuse/shared': 9.6.0_vue@3.2.45
+      '@vueuse/metadata': 9.8.2
+      '@vueuse/shared': 9.8.2_vue@3.2.45
       vue-demi: 0.13.11_vue@3.2.45
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
     dev: true
 
-  /@vueuse/metadata/9.6.0:
-    resolution: {integrity: sha512-sIC8R+kWkIdpi5X2z2Gk8TRYzmczDwHRhEFfCu2P+XW2JdPoXrziqsGpDDsN7ykBx4ilwieS7JUIweVGhvZ93w==}
+  /@vueuse/metadata/9.8.2:
+    resolution: {integrity: sha512-N4E/BKS+9VsUeD4WLVRU1J2kCOLh+iikBcMtipFcTyL204132vDYHs27zLAVabJYGnhC0dIVGdhg9pbOZiY2TQ==}
     dev: true
 
-  /@vueuse/shared/9.6.0_vue@3.2.45:
-    resolution: {integrity: sha512-/eDchxYYhkHnFyrb00t90UfjCx94kRHxc7J1GtBCqCG4HyPMX+krV9XJgVtWIsAMaxKVU4fC8NSUviG1JkwhUQ==}
+  /@vueuse/shared/9.8.2_vue@3.2.45:
+    resolution: {integrity: sha512-ACjrPQzowd5dnabNJt9EoGVobco9/ENiA5qP53vjiuxndlJYuc/UegwhXC7KdQbPX4F45a50+45K3g1wNqOzmA==}
     dependencies:
       vue-demi: 0.13.11_vue@3.2.45
     transitivePeerDependencies:
@@ -1192,12 +1194,6 @@ packages:
     engines: {node: '>=0.4.0'}
     dev: true
 
-  /acorn/8.8.0:
-    resolution: {integrity: sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
   /acorn/8.8.1:
     resolution: {integrity: sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==}
     engines: {node: '>=0.4.0'}
@@ -1477,13 +1473,13 @@ packages:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
     dev: true
 
-  /chai/4.3.6:
-    resolution: {integrity: sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==}
+  /chai/4.3.7:
+    resolution: {integrity: sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==}
     engines: {node: '>=4'}
     dependencies:
       assertion-error: 1.1.0
       check-error: 1.0.2
-      deep-eql: 3.0.1
+      deep-eql: 4.1.3
       get-func-name: 2.0.0
       loupe: 2.3.4
       pathval: 1.1.1
@@ -1855,8 +1851,8 @@ packages:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
     dev: true
 
-  /cypress/12.0.2:
-    resolution: {integrity: sha512-WnLx1DpnbF1vbpDBkgP14rK5yS3U+Gvxrv2fsB4Owma26oIyENj7DDRnsJbSZuTfG4mcuUJxAkRHJR2wBqBfMA==}
+  /cypress/12.1.0:
+    resolution: {integrity: sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==}
     engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
     hasBin: true
     requiresBuild: true
@@ -1975,9 +1971,9 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /deep-eql/3.0.1:
-    resolution: {integrity: sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==}
-    engines: {node: '>=0.12'}
+  /deep-eql/4.1.3:
+    resolution: {integrity: sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==}
+    engines: {node: '>=6'}
     dependencies:
       type-detect: 4.0.8
     dev: true
@@ -2032,31 +2028,31 @@ packages:
       esutils: 2.0.3
     dev: true
 
-  /dom-serializer/1.4.1:
-    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
+  /dom-serializer/2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
     dependencies:
       domelementtype: 2.3.0
-      domhandler: 4.3.1
-      entities: 2.2.0
+      domhandler: 5.0.3
+      entities: 4.4.0
     dev: true
 
   /domelementtype/2.3.0:
     resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
     dev: true
 
-  /domhandler/4.3.1:
-    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
+  /domhandler/5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
     dev: true
 
-  /domutils/2.8.0:
-    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+  /domutils/3.0.1:
+    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
     dependencies:
-      dom-serializer: 1.4.1
+      dom-serializer: 2.0.0
       domelementtype: 2.3.0
-      domhandler: 4.3.1
+      domhandler: 5.0.3
     dev: true
 
   /dot-prop/5.3.0:
@@ -2106,8 +2102,9 @@ packages:
       ansi-colors: 4.1.3
     dev: true
 
-  /entities/2.2.0:
-    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+  /entities/4.4.0:
+    resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
+    engines: {node: '>=0.12'}
     dev: true
 
   /error-ex/1.3.2:
@@ -2371,34 +2368,34 @@ packages:
       esbuild-windows-arm64: 0.15.18
     dev: true
 
-  /esbuild/0.16.4:
-    resolution: {integrity: sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA==}
+  /esbuild/0.16.10:
+    resolution: {integrity: sha512-z5dIViHoVnw2l+NCJ3zj5behdXjYvXne9gL18OOivCadXDUhyDkeSvEtLcGVAJW2fNmh33TDUpsi704XYlDodw==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.16.4
-      '@esbuild/android-arm64': 0.16.4
-      '@esbuild/android-x64': 0.16.4
-      '@esbuild/darwin-arm64': 0.16.4
-      '@esbuild/darwin-x64': 0.16.4
-      '@esbuild/freebsd-arm64': 0.16.4
-      '@esbuild/freebsd-x64': 0.16.4
-      '@esbuild/linux-arm': 0.16.4
-      '@esbuild/linux-arm64': 0.16.4
-      '@esbuild/linux-ia32': 0.16.4
-      '@esbuild/linux-loong64': 0.16.4
-      '@esbuild/linux-mips64el': 0.16.4
-      '@esbuild/linux-ppc64': 0.16.4
-      '@esbuild/linux-riscv64': 0.16.4
-      '@esbuild/linux-s390x': 0.16.4
-      '@esbuild/linux-x64': 0.16.4
-      '@esbuild/netbsd-x64': 0.16.4
-      '@esbuild/openbsd-x64': 0.16.4
-      '@esbuild/sunos-x64': 0.16.4
-      '@esbuild/win32-arm64': 0.16.4
-      '@esbuild/win32-ia32': 0.16.4
-      '@esbuild/win32-x64': 0.16.4
+      '@esbuild/android-arm': 0.16.10
+      '@esbuild/android-arm64': 0.16.10
+      '@esbuild/android-x64': 0.16.10
+      '@esbuild/darwin-arm64': 0.16.10
+      '@esbuild/darwin-x64': 0.16.10
+      '@esbuild/freebsd-arm64': 0.16.10
+      '@esbuild/freebsd-x64': 0.16.10
+      '@esbuild/linux-arm': 0.16.10
+      '@esbuild/linux-arm64': 0.16.10
+      '@esbuild/linux-ia32': 0.16.10
+      '@esbuild/linux-loong64': 0.16.10
+      '@esbuild/linux-mips64el': 0.16.10
+      '@esbuild/linux-ppc64': 0.16.10
+      '@esbuild/linux-riscv64': 0.16.10
+      '@esbuild/linux-s390x': 0.16.10
+      '@esbuild/linux-x64': 0.16.10
+      '@esbuild/netbsd-x64': 0.16.10
+      '@esbuild/openbsd-x64': 0.16.10
+      '@esbuild/sunos-x64': 0.16.10
+      '@esbuild/win32-arm64': 0.16.10
+      '@esbuild/win32-ia32': 0.16.10
+      '@esbuild/win32-x64': 0.16.10
     dev: true
 
   /escalade/3.1.1:
@@ -2416,13 +2413,13 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /eslint-config-prettier/8.5.0_eslint@8.29.0:
+  /eslint-config-prettier/8.5.0_eslint@8.30.0:
     resolution: {integrity: sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 8.29.0
+      eslint: 8.30.0
     dev: true
 
   /eslint-define-config/1.12.0:
@@ -2430,7 +2427,7 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13', pnpm: '>= 7.0.0'}
     dev: true
 
-  /eslint-gitignore/0.1.0_eslint@8.29.0:
+  /eslint-gitignore/0.1.0_eslint@8.30.0:
     resolution: {integrity: sha512-VFvY5Wyjuz5xXDC/NeONHzsh4YQNok2Gzg4SftAAuhkbrdHv5CChjfiFyLKhRlgOdCJr5kBquaLXHtuDBTW2/Q==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -2438,13 +2435,13 @@ packages:
     dependencies:
       array.prototype.flatmap: 1.3.0
       debug: 4.3.4
-      eslint: 8.29.0
+      eslint: 8.30.0
       fast-glob: 3.2.12
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /eslint-plugin-jsdoc/39.6.4_eslint@8.29.0:
+  /eslint-plugin-jsdoc/39.6.4_eslint@8.30.0:
     resolution: {integrity: sha512-fskvdLCfwmPjHb6e+xNGDtGgbF8X7cDwMtVLAP2WwSf9Htrx68OAx31BESBM1FAwsN2HTQyYQq7m4aW4Q4Nlag==}
     engines: {node: ^14 || ^16 || ^17 || ^18 || ^19}
     peerDependencies:
@@ -2454,7 +2451,7 @@ packages:
       comment-parser: 1.3.1
       debug: 4.3.4
       escape-string-regexp: 4.0.0
-      eslint: 8.29.0
+      eslint: 8.30.0
       esquery: 1.4.0
       semver: 7.3.8
       spdx-expression-parse: 3.0.1
@@ -2462,7 +2459,7 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-prettier/4.2.1_5dgjrgoi64tgrv3zzn3walur3u:
+  /eslint-plugin-prettier/4.2.1_kl4pe43v5b43npmso5hoplpbyi:
     resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -2473,8 +2470,8 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 8.29.0
-      eslint-config-prettier: 8.5.0_eslint@8.29.0
+      eslint: 8.30.0
+      eslint-config-prettier: 8.5.0_eslint@8.30.0
       prettier: 2.8.1
       prettier-linter-helpers: 1.0.0
     dev: true
@@ -2495,13 +2492,13 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-utils/3.0.0_eslint@8.29.0:
+  /eslint-utils/3.0.0_eslint@8.30.0:
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
     engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
     peerDependencies:
       eslint: '>=5'
     dependencies:
-      eslint: 8.29.0
+      eslint: 8.30.0
       eslint-visitor-keys: 2.1.0
     dev: true
 
@@ -2515,13 +2512,13 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint/8.29.0:
-    resolution: {integrity: sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==}
+  /eslint/8.30.0:
+    resolution: {integrity: sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.3.3
-      '@humanwhocodes/config-array': 0.11.6
+      '@eslint/eslintrc': 1.4.0
+      '@humanwhocodes/config-array': 0.11.8
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
@@ -2531,7 +2528,7 @@ packages:
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
       eslint-scope: 7.1.1
-      eslint-utils: 3.0.0_eslint@8.29.0
+      eslint-utils: 3.0.0_eslint@8.30.0
       eslint-visitor-keys: 3.3.0
       espree: 9.4.0
       esquery: 1.4.0
@@ -2540,7 +2537,7 @@ packages:
       file-entry-cache: 6.0.1
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.17.0
+      globals: 13.19.0
       grapheme-splitter: 1.0.4
       ignore: 5.2.0
       import-fresh: 3.3.0
@@ -2974,8 +2971,8 @@ packages:
       ini: 2.0.0
     dev: true
 
-  /globals/13.17.0:
-    resolution: {integrity: sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==}
+  /globals/13.19.0:
+    resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
@@ -3073,13 +3070,13 @@ packages:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
-  /htmlparser2/6.1.0:
-    resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
+  /htmlparser2/8.0.1:
+    resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
     dependencies:
       domelementtype: 2.3.0
-      domhandler: 4.3.1
-      domutils: 2.8.0
-      entities: 2.2.0
+      domhandler: 5.0.3
+      domutils: 3.0.1
+      entities: 4.4.0
     dev: true
 
   /http-signature/1.3.6:
@@ -3749,6 +3746,15 @@ packages:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
     dev: true
 
+  /mlly/1.0.0:
+    resolution: {integrity: sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g==}
+    dependencies:
+      acorn: 8.8.1
+      pathe: 1.0.0
+      pkg-types: 1.0.1
+      ufo: 1.0.1
+    dev: true
+
   /modify-values/1.0.1:
     resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
     engines: {node: '>=0.10.0'}
@@ -4051,6 +4057,14 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /pathe/0.2.0:
+    resolution: {integrity: sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==}
+    dev: true
+
+  /pathe/1.0.0:
+    resolution: {integrity: sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==}
+    dev: true
+
   /pathval/1.1.1:
     resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
     dev: true
@@ -4094,13 +4108,12 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /postcss/8.4.17:
-    resolution: {integrity: sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==}
-    engines: {node: ^10 || ^12 || >=14}
+  /pkg-types/1.0.1:
+    resolution: {integrity: sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g==}
     dependencies:
-      nanoid: 3.3.4
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
+      jsonc-parser: 3.2.0
+      mlly: 1.0.0
+      pathe: 1.0.0
     dev: true
 
   /postcss/8.4.18:
@@ -4393,15 +4406,15 @@ packages:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
 
-  /sanitize-html/2.7.3:
-    resolution: {integrity: sha512-jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw==}
+  /sanitize-html/2.8.0:
+    resolution: {integrity: sha512-ZsGyc6avnqgvEm3eMKrcy8xa7WM1MrGrfkGsUgQee2CU+vg3PCfNCexXwBDF/6dEPvaQ4k/QqRjnYKHL8xgNjg==}
     dependencies:
       deepmerge: 4.2.2
       escape-string-regexp: 4.0.0
-      htmlparser2: 6.1.0
+      htmlparser2: 8.0.1
       is-plain-object: 5.0.0
       parse-srcset: 1.0.2
-      postcss: 8.4.17
+      postcss: 8.4.20
     dev: true
 
   /scheduler/0.23.0:
@@ -4971,6 +4984,10 @@ packages:
     hasBin: true
     dev: true
 
+  /ufo/1.0.1:
+    resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
+    dev: true
+
   /uglify-js/3.17.3:
     resolution: {integrity: sha512-JmMFDME3iufZnBpyKL+uS78LRiC+mK55zWfM5f/pWBJfpOttXAqYfdDGRukYhJuyRinvPVAtUhvy7rlDybNtFg==}
     engines: {node: '>=0.8.0'}
@@ -5053,8 +5070,50 @@ packages:
       extsprintf: 1.3.0
     dev: true
 
-  /vite/4.0.0_@types+node@18.11.13:
-    resolution: {integrity: sha512-ynad+4kYs8Jcnn8J7SacS9vAbk7eMy0xWg6E7bAhS1s79TK+D7tVFGXVZ55S7RNLRROU1rxoKlvZ/qjaB41DGA==}
+  /vite-node/0.26.0_@types+node@18.11.17:
+    resolution: {integrity: sha512-nLtHWCv6reONl1oFsKhQ/LT7n3UNLpvVARAJlmGrQV6qSElht/9AdN41Pa+WSkw2Winh682UzM0Yw0GNlfqejw==}
+    engines: {node: '>=v14.16.0'}
+    hasBin: true
+    dependencies:
+      debug: 4.3.4
+      mlly: 1.0.0
+      pathe: 0.2.0
+      source-map: 0.6.1
+      source-map-support: 0.5.21
+      vite: 4.0.2_@types+node@18.11.17
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+    dev: true
+
+  /vite-node/0.26.1_@types+node@18.11.17:
+    resolution: {integrity: sha512-5FJSKZZJz48zFRKHE55WyevZe61hLMQEsqGn+ungfd60kxEztFybZ3yG9ToGFtOWNCCy7Vn5EVuXD8bdeHOSdw==}
+    engines: {node: '>=v14.16.0'}
+    hasBin: true
+    dependencies:
+      debug: 4.3.4
+      mlly: 1.0.0
+      pathe: 0.2.0
+      source-map: 0.6.1
+      source-map-support: 0.5.21
+      vite: 4.0.2_@types+node@18.11.17
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+    dev: true
+
+  /vite/4.0.2_@types+node@18.11.17:
+    resolution: {integrity: sha512-QJaY3R+tFlTagH0exVqbgkkw45B+/bXVBzF2ZD1KB5Z8RiAoiKo60vSUf6/r4c2Vh9jfGBKM4oBI9b4/1ZJYng==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -5078,8 +5137,8 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 18.11.13
-      esbuild: 0.16.4
+      '@types/node': 18.11.17
+      esbuild: 0.16.10
       postcss: 8.4.20
       resolve: 1.22.1
       rollup: 3.7.3
@@ -5087,18 +5146,18 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /vitepress/1.0.0-alpha.31_cfacmysgm7orey33c3nw6yk2o4:
+  /vitepress/1.0.0-alpha.31_bjrhytsn5onygssywbycnrkjdm:
     resolution: {integrity: sha512-FWFXLs7WLbFbemxjBWo2S2+qUZCIoeLLyAKfVUpIu3LUB8oQ8cyIANRGO6f6zsM51u2bvJU9Sm+V6Z0WjOWS2Q==}
     hasBin: true
     dependencies:
       '@docsearch/css': 3.3.0
       '@docsearch/js': 3.3.0_5hc3kenz2rcl74lgbiauumrhqq
-      '@vitejs/plugin-vue': 4.0.0_vite@4.0.0+vue@3.2.45
+      '@vitejs/plugin-vue': 4.0.0_vite@4.0.2+vue@3.2.45
       '@vue/devtools-api': 6.4.5
-      '@vueuse/core': 9.6.0_vue@3.2.45
+      '@vueuse/core': 9.8.2_vue@3.2.45
       body-scroll-lock: 4.0.0-beta.0
       shiki: 0.11.1
-      vite: 4.0.0_@types+node@18.11.13
+      vite: 4.0.2_@types+node@18.11.17
       vue: 3.2.45
     transitivePeerDependencies:
       - '@algolia/client-search'
@@ -5114,8 +5173,55 @@ packages:
       - terser
     dev: true
 
-  /vitest/0.25.7_@vitest+ui@0.25.7:
-    resolution: {integrity: sha512-lJ+Ue+v8kHl2JzjaKHJ9u5Yo/loU7zrWK2/Whn8OKQjtq5G7nkeWfXuq3elZaC8xKdkdIuWiiIicaNBG1F5yzg==}
+  /vitest/0.26.0_@vitest+ui@0.26.1:
+    resolution: {integrity: sha512-5kUnms5WOa0qrDCJePEPB13v9mhr+ZT1Qy0qNg0eVj1X7/Fx4GY4L1e5s3OH+BQ/J7M5WtaKsUGv9l1pbC7v2Q==}
+    engines: {node: '>=v14.16.0'}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@vitest/browser': '*'
+      '@vitest/ui': '*'
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+    dependencies:
+      '@types/chai': 4.3.4
+      '@types/chai-subset': 1.3.3
+      '@types/node': 18.11.17
+      '@vitest/ui': 0.26.1
+      acorn: 8.8.1
+      acorn-walk: 8.2.0
+      chai: 4.3.7
+      debug: 4.3.4
+      local-pkg: 0.4.2
+      source-map: 0.6.1
+      strip-literal: 1.0.0
+      tinybench: 2.3.1
+      tinypool: 0.3.0
+      tinyspy: 1.0.2
+      vite: 4.0.2_@types+node@18.11.17
+      vite-node: 0.26.0_@types+node@18.11.17
+    transitivePeerDependencies:
+      - less
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+    dev: true
+
+  /vitest/0.26.1_@vitest+ui@0.26.1:
+    resolution: {integrity: sha512-qTLRnjYmjmJpHlLUtErxtlRqGCe8WItFhGXKklpWivu7CLP9KXN9iTezROe+vf51Kb+BB/fzxK6fUG9DvFGL5Q==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:
@@ -5136,13 +5242,13 @@ packages:
       jsdom:
         optional: true
     dependencies:
-      '@types/chai': 4.3.3
+      '@types/chai': 4.3.4
       '@types/chai-subset': 1.3.3
-      '@types/node': 18.11.13
-      '@vitest/ui': 0.25.7
-      acorn: 8.8.0
+      '@types/node': 18.11.17
+      '@vitest/ui': 0.26.1
+      acorn: 8.8.1
       acorn-walk: 8.2.0
-      chai: 4.3.6
+      chai: 4.3.7
       debug: 4.3.4
       local-pkg: 0.4.2
       source-map: 0.6.1
@@ -5150,7 +5256,8 @@ packages:
       tinybench: 2.3.1
       tinypool: 0.3.0
       tinyspy: 1.0.2
-      vite: 4.0.0_@types+node@18.11.13
+      vite: 4.0.2_@types+node@18.11.17
+      vite-node: 0.26.1_@types+node@18.11.17
     transitivePeerDependencies:
       - less
       - sass
diff --git a/src/internal/merge.ts b/src/internal/merge.ts
new file mode 100644
index 00000000000..88204e29cea
--- /dev/null
+++ b/src/internal/merge.ts
@@ -0,0 +1,12 @@
+/**
+ * Merges and sorts the given arrays.
+ *
+ * @template T The type of the elements in the arrays.
+ *
+ * @internal
+ *
+ * @param args The arrays to merge.
+ */
+export function mergeArrays<T>(...args: T[][]): T[] {
+  return Array.from(new Set(args.flat())).sort();
+}
diff --git a/src/locales/az/person/first_name.ts b/src/locales/az/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/az/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/az/person/index.ts b/src/locales/az/person/index.ts
index 2ebec1b1c77..2aa50080963 100644
--- a/src/locales/az/person/index.ts
+++ b/src/locales/az/person/index.ts
@@ -5,6 +5,7 @@
 import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
+import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
 import name_ from './name';
@@ -14,6 +15,7 @@ import suffix from './suffix';
 const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
+  first_name,
   male_first_name,
   male_last_name,
   name: name_,
diff --git a/src/locales/cz/person/first_name.ts b/src/locales/cz/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/cz/person/first_name.ts
+++ b/src/locales/cz/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/cz/person/last_name.ts b/src/locales/cz/person/last_name.ts
index 0ce6d456740..6ff69f6004f 100644
--- a/src/locales/cz/person/last_name.ts
+++ b/src/locales/cz/person/last_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_last_name from './female_last_name';
 import male_last_name from './male_last_name';
 
-export default [...new Set([...female_last_name, ...male_last_name])];
+export default mergeArrays(female_last_name, male_last_name);
diff --git a/src/locales/de_AT/person/female_first_name.ts b/src/locales/de_AT/person/female_first_name.ts
new file mode 100644
index 00000000000..132a5f6a173
--- /dev/null
+++ b/src/locales/de_AT/person/female_first_name.ts
@@ -0,0 +1,575 @@
+export default [
+  'Aaliyah',
+  'Abby',
+  'Abigail',
+  'Ada',
+  'Adelina',
+  'Adriana',
+  'Aileen',
+  'Aimee',
+  'Alana',
+  'Alea',
+  'Alena',
+  'Alessa',
+  'Alessia',
+  'Alexa',
+  'Alexandra',
+  'Alexia',
+  'Alexis',
+  'Aleyna',
+  'Alia',
+  'Alica',
+  'Alice',
+  'Alicia',
+  'Alina',
+  'Alisa',
+  'Alisha',
+  'Alissa',
+  'Aliya',
+  'Aliyah',
+  'Allegra',
+  'Alma',
+  'Alyssa',
+  'Amalia',
+  'Amanda',
+  'Amelia',
+  'Amelie',
+  'Amina',
+  'Amira',
+  'Amy',
+  'Ana',
+  'Anabel',
+  'Anastasia',
+  'Andrea',
+  'Angela',
+  'Angelina',
+  'Angelique',
+  'Anja',
+  'Ann',
+  'Anna',
+  'Annabel',
+  'Annabell',
+  'Annabelle',
+  'Annalena',
+  'Anne',
+  'Anneke',
+  'Annelie',
+  'Annemarie',
+  'Anni',
+  'Annie',
+  'Annika',
+  'Anny',
+  'Anouk',
+  'Antonia',
+  'Ariana',
+  'Ariane',
+  'Arwen',
+  'Ashley',
+  'Asya',
+  'Aurelia',
+  'Aurora',
+  'Ava',
+  'Ayleen',
+  'Aylin',
+  'Ayse',
+  'Azra',
+  'Betty',
+  'Bianca',
+  'Bianka',
+  'Caitlin',
+  'Cara',
+  'Carina',
+  'Carla',
+  'Carlotta',
+  'Carmen',
+  'Carolin',
+  'Carolina',
+  'Caroline',
+  'Cassandra',
+  'Catharina',
+  'Catrin',
+  'Cecile',
+  'Cecilia',
+  'Celia',
+  'Celina',
+  'Celine',
+  'Ceyda',
+  'Ceylin',
+  'Chantal',
+  'Charleen',
+  'Charlotta',
+  'Charlotte',
+  'Chayenne',
+  'Cheyenne',
+  'Chiara',
+  'Christin',
+  'Christina',
+  'Cindy',
+  'Claire',
+  'Clara',
+  'Clarissa',
+  'Colleen',
+  'Collien',
+  'Cora',
+  'Corinna',
+  'Cosima',
+  'Dana',
+  'Daniela',
+  'Daria',
+  'Darleen',
+  'Defne',
+  'Delia',
+  'Denise',
+  'Diana',
+  'Dilara',
+  'Dina',
+  'Dorothea',
+  'Eda',
+  'Eileen',
+  'Ela',
+  'Elaine',
+  'Elanur',
+  'Elea',
+  'Elena',
+  'Eleni',
+  'Eleonora',
+  'Eliana',
+  'Elif',
+  'Elina',
+  'Elisa',
+  'Elisabeth',
+  'Ella',
+  'Ellen',
+  'Elli',
+  'Elly',
+  'Elsa',
+  'Emelie',
+  'Emely',
+  'Emilia',
+  'Emilie',
+  'Emily',
+  'Emma',
+  'Emmely',
+  'Emmi',
+  'Emmy',
+  'Enie',
+  'Enna',
+  'Enya',
+  'Esma',
+  'Estelle',
+  'Esther',
+  'Eva',
+  'Evelin',
+  'Evelina',
+  'Eveline',
+  'Evelyn',
+  'Fabienne',
+  'Fatima',
+  'Fatma',
+  'Felicia',
+  'Felicitas',
+  'Felina',
+  'Femke',
+  'Fenja',
+  'Fine',
+  'Finia',
+  'Finja',
+  'Finnja',
+  'Fiona',
+  'Flora',
+  'Florentine',
+  'Francesca',
+  'Franka',
+  'Franziska',
+  'Frederike',
+  'Freya',
+  'Frida',
+  'Frieda',
+  'Friederike',
+  'Giada',
+  'Gina',
+  'Giulia',
+  'Giuliana',
+  'Greta',
+  'Hailey',
+  'Hana',
+  'Hanna',
+  'Hannah',
+  'Heidi',
+  'Helen',
+  'Helena',
+  'Helene',
+  'Helin',
+  'Henriette',
+  'Henrike',
+  'Hermine',
+  'Ida',
+  'Ilayda',
+  'Imke',
+  'Ina',
+  'Ines',
+  'Inga',
+  'Inka',
+  'Irem',
+  'Isa',
+  'Isabel',
+  'Isabell',
+  'Isabella',
+  'Isabelle',
+  'Ivonne',
+  'Jacqueline',
+  'Jamila',
+  'Jana',
+  'Jane',
+  'Janin',
+  'Janina',
+  'Janine',
+  'Janna',
+  'Jara',
+  'Jasmin',
+  'Jasmina',
+  'Jasmine',
+  'Jella',
+  'Jenna',
+  'Jennifer',
+  'Jenny',
+  'Jessica',
+  'Jessy',
+  'Jette',
+  'Jil',
+  'Jill',
+  'Joana',
+  'Joanna',
+  'Joelina',
+  'Joeline',
+  'Joelle',
+  'Johanna',
+  'Joleen',
+  'Jolie',
+  'Jolien',
+  'Jolin',
+  'Jolina',
+  'Joline',
+  'Jonna',
+  'Josefin',
+  'Josefine',
+  'Josephin',
+  'Josephine',
+  'Josie',
+  'Josy',
+  'Joy',
+  'Joyce',
+  'Judith',
+  'Judy',
+  'Jule',
+  'Julia',
+  'Juliana',
+  'Juliane',
+  'Julie',
+  'Julienne',
+  'Julika',
+  'Julina',
+  'Juna',
+  'Justine',
+  'Kaja',
+  'Karina',
+  'Karla',
+  'Karlotta',
+  'Karolina',
+  'Karoline',
+  'Kassandra',
+  'Katarina',
+  'Katharina',
+  'Kathrin',
+  'Katja',
+  'Katrin',
+  'Kaya',
+  'Kayra',
+  'Kiana',
+  'Kiara',
+  'Kimberley',
+  'Kimberly',
+  'Kira',
+  'Klara',
+  'Korinna',
+  'Kristin',
+  'Kyra',
+  'Laila',
+  'Lana',
+  'Lara',
+  'Larissa',
+  'Laura',
+  'Laureen',
+  'Lavinia',
+  'Lea',
+  'Leah',
+  'Leana',
+  'Leandra',
+  'Leann',
+  'Lee',
+  'Leila',
+  'Lena',
+  'Lene',
+  'Leni',
+  'Lenia',
+  'Lenja',
+  'Lenya',
+  'Leona',
+  'Leoni',
+  'Leonie',
+  'Leonora',
+  'Leticia',
+  'Letizia',
+  'Levke',
+  'Leyla',
+  'Lia',
+  'Liah',
+  'Liana',
+  'Lili',
+  'Lilia',
+  'Lilian',
+  'Liliana',
+  'Lilith',
+  'Lilli',
+  'Lillian',
+  'Lilly',
+  'Lily',
+  'Lina',
+  'Linda',
+  'Lindsay',
+  'Line',
+  'Linn',
+  'Linnea',
+  'Lisa',
+  'Lisann',
+  'Lisanne',
+  'Liv',
+  'Livia',
+  'Liz',
+  'Lola',
+  'Loreen',
+  'Lorena',
+  'Lotta',
+  'Lotte',
+  'Louisa',
+  'Louise',
+  'Luana',
+  'Lucia',
+  'Lucie',
+  'Lucienne',
+  'Lucy',
+  'Luisa',
+  'Luise',
+  'Luna',
+  'Luzie',
+  'Lya',
+  'Lydia',
+  'Lyn',
+  'Lynn',
+  'Madeleine',
+  'Madita',
+  'Madleen',
+  'Madlen',
+  'Magdalena',
+  'Maike',
+  'Mailin',
+  'Maira',
+  'Maja',
+  'Malena',
+  'Malia',
+  'Malin',
+  'Malina',
+  'Mandy',
+  'Mara',
+  'Marah',
+  'Mareike',
+  'Maren',
+  'Maria',
+  'Mariam',
+  'Marie',
+  'Marieke',
+  'Mariella',
+  'Marika',
+  'Marina',
+  'Marisa',
+  'Marissa',
+  'Marit',
+  'Marla',
+  'Marleen',
+  'Marlen',
+  'Marlena',
+  'Marlene',
+  'Marta',
+  'Martha',
+  'Mary',
+  'Maryam',
+  'Mathilda',
+  'Mathilde',
+  'Matilda',
+  'Maxi',
+  'Maxima',
+  'Maxine',
+  'Maya',
+  'Mayra',
+  'Medina',
+  'Medine',
+  'Meike',
+  'Melanie',
+  'Melek',
+  'Melike',
+  'Melina',
+  'Melinda',
+  'Melis',
+  'Melisa',
+  'Melissa',
+  'Merle',
+  'Merve',
+  'Meryem',
+  'Mette',
+  'Mia',
+  'Michaela',
+  'Michelle',
+  'Mieke',
+  'Mila',
+  'Milana',
+  'Milena',
+  'Milla',
+  'Mina',
+  'Mira',
+  'Miray',
+  'Miriam',
+  'Mirja',
+  'Mona',
+  'Monique',
+  'Nadine',
+  'Nadja',
+  'Naemi',
+  'Nancy',
+  'Naomi',
+  'Natalia',
+  'Natalie',
+  'Nathalie',
+  'Neele',
+  'Nela',
+  'Nele',
+  'Nelli',
+  'Nelly',
+  'Nia',
+  'Nicole',
+  'Nika',
+  'Nike',
+  'Nila',
+  'Nina',
+  'Nisa',
+  'Noemi',
+  'Nora',
+  'Olivia',
+  'Patricia',
+  'Patrizia',
+  'Paula',
+  'Paulina',
+  'Pauline',
+  'Penelope',
+  'Philine',
+  'Phoebe',
+  'Pia',
+  'Rahel',
+  'Rania',
+  'Rebecca',
+  'Rebekka',
+  'Riana',
+  'Rieke',
+  'Rike',
+  'Romina',
+  'Romy',
+  'Ronja',
+  'Rosa',
+  'Rosalie',
+  'Ruby',
+  'Sabrina',
+  'Sahra',
+  'Sally',
+  'Salome',
+  'Samantha',
+  'Samia',
+  'Samira',
+  'Sandra',
+  'Sandy',
+  'Sanja',
+  'Saphira',
+  'Sara',
+  'Sarah',
+  'Saskia',
+  'Selin',
+  'Selina',
+  'Selma',
+  'Sena',
+  'Sidney',
+  'Sienna',
+  'Silja',
+  'Sina',
+  'Sinja',
+  'Smilla',
+  'Sofia',
+  'Sofie',
+  'Sonja',
+  'Sophia',
+  'Sophie',
+  'Soraya',
+  'Stefanie',
+  'Stella',
+  'Stephanie',
+  'Stina',
+  'Sude',
+  'Summer',
+  'Susanne',
+  'Svea',
+  'Svenja',
+  'Sydney',
+  'Tabea',
+  'Talea',
+  'Talia',
+  'Tamara',
+  'Tamia',
+  'Tamina',
+  'Tanja',
+  'Tara',
+  'Tarja',
+  'Teresa',
+  'Tessa',
+  'Thalea',
+  'Thalia',
+  'Thea',
+  'Theresa',
+  'Tia',
+  'Tina',
+  'Tomke',
+  'Tuana',
+  'Valentina',
+  'Valeria',
+  'Valerie',
+  'Vanessa',
+  'Vera',
+  'Veronika',
+  'Victoria',
+  'Viktoria',
+  'Viola',
+  'Vivian',
+  'Vivien',
+  'Vivienne',
+  'Wibke',
+  'Wiebke',
+  'Xenia',
+  'Yara',
+  'Yaren',
+  'Yasmin',
+  'Ylvi',
+  'Ylvie',
+  'Yvonne',
+  'Zara',
+  'Zehra',
+  'Zeynep',
+  'Zoe',
+  'Zoey',
+  'Zoé',
+];
diff --git a/src/locales/de_AT/person/first_name.ts b/src/locales/de_AT/person/first_name.ts
index 0fff500180b..40a647ec054 100644
--- a/src/locales/de_AT/person/first_name.ts
+++ b/src/locales/de_AT/person/first_name.ts
@@ -1,1147 +1,8 @@
-export default [
-  'Aaron',
-  'Abdul',
-  'Abdullah',
-  'Adam',
-  'Adrian',
-  'Adriano',
-  'Ahmad',
-  'Ahmed',
-  'Ahmet',
-  'Alan',
-  'Albert',
-  'Alessandro',
-  'Alessio',
-  'Alex',
-  'Alexander',
-  'Alfred',
-  'Ali',
-  'Amar',
-  'Amir',
-  'Amon',
-  'Andre',
-  'Andreas',
-  'Andrew',
-  'Angelo',
-  'Ansgar',
-  'Anthony',
-  'Anton',
-  'Antonio',
-  'Arda',
-  'Arian',
-  'Armin',
-  'Arne',
-  'Arno',
-  'Arthur',
-  'Artur',
-  'Arved',
-  'Arvid',
-  'Ayman',
-  'Baran',
-  'Baris',
-  'Bastian',
-  'Batuhan',
-  'Bela',
-  'Ben',
-  'Benedikt',
-  'Benjamin',
-  'Bennet',
-  'Bennett',
-  'Benno',
-  'Bent',
-  'Berat',
-  'Berkay',
-  'Bernd',
-  'Bilal',
-  'Bjarne',
-  'Björn',
-  'Bo',
-  'Boris',
-  'Brandon',
-  'Brian',
-  'Bruno',
-  'Bryan',
-  'Burak',
-  'Calvin',
-  'Can',
-  'Carl',
-  'Carlo',
-  'Carlos',
-  'Caspar',
-  'Cedric',
-  'Cedrik',
-  'Cem',
-  'Charlie',
-  'Chris',
-  'Christian',
-  'Christiano',
-  'Christoph',
-  'Christopher',
-  'Claas',
-  'Clemens',
-  'Colin',
-  'Collin',
-  'Conner',
-  'Connor',
-  'Constantin',
-  'Corvin',
-  'Curt',
-  'Damian',
-  'Damien',
-  'Daniel',
-  'Danilo',
-  'Danny',
-  'Darian',
-  'Dario',
-  'Darius',
-  'Darren',
-  'David',
-  'Davide',
-  'Davin',
-  'Dean',
-  'Deniz',
-  'Dennis',
-  'Denny',
-  'Devin',
-  'Diego',
-  'Dion',
-  'Domenic',
-  'Domenik',
-  'Dominic',
-  'Dominik',
-  'Dorian',
-  'Dustin',
-  'Dylan',
-  'Ecrin',
-  'Eddi',
-  'Eddy',
-  'Edgar',
-  'Edwin',
-  'Efe',
-  'Ege',
-  'Elia',
-  'Eliah',
-  'Elias',
-  'Elijah',
-  'Emanuel',
-  'Emil',
-  'Emilian',
-  'Emilio',
-  'Emir',
-  'Emirhan',
-  'Emre',
-  'Enes',
-  'Enno',
-  'Enrico',
-  'Eren',
-  'Eric',
-  'Erik',
-  'Etienne',
-  'Fabian',
-  'Fabien',
-  'Fabio',
-  'Fabrice',
-  'Falk',
-  'Felix',
-  'Ferdinand',
-  'Fiete',
-  'Filip',
-  'Finlay',
-  'Finley',
-  'Finn',
-  'Finnley',
-  'Florian',
-  'Francesco',
-  'Franz',
-  'Frederic',
-  'Frederick',
-  'Frederik',
-  'Friedrich',
-  'Fritz',
-  'Furkan',
-  'Fynn',
-  'Gabriel',
-  'Georg',
-  'Gerrit',
-  'Gian',
-  'Gianluca',
-  'Gino',
-  'Giuliano',
-  'Giuseppe',
-  'Gregor',
-  'Gustav',
-  'Hagen',
-  'Hamza',
-  'Hannes',
-  'Hanno',
-  'Hans',
-  'Hasan',
-  'Hassan',
-  'Hauke',
-  'Hendrik',
-  'Hennes',
-  'Henning',
-  'Henri',
-  'Henrick',
-  'Henrik',
-  'Henry',
-  'Hugo',
-  'Hussein',
-  'Ian',
-  'Ibrahim',
-  'Ilias',
-  'Ilja',
-  'Ilyas',
-  'Immanuel',
-  'Ismael',
-  'Ismail',
-  'Ivan',
-  'Iven',
-  'Jack',
-  'Jacob',
-  'Jaden',
-  'Jakob',
-  'Jamal',
-  'James',
-  'Jamie',
-  'Jan',
-  'Janek',
-  'Janis',
-  'Janne',
-  'Jannek',
-  'Jannes',
-  'Jannik',
-  'Jannis',
-  'Jano',
-  'Janosch',
-  'Jared',
-  'Jari',
-  'Jarne',
-  'Jarno',
-  'Jaron',
-  'Jason',
-  'Jasper',
-  'Jay',
-  'Jayden',
-  'Jayson',
-  'Jean',
-  'Jens',
-  'Jeremias',
-  'Jeremie',
-  'Jeremy',
-  'Jermaine',
-  'Jerome',
-  'Jesper',
-  'Jesse',
-  'Jim',
-  'Jimmy',
-  'Joe',
-  'Joel',
-  'Joey',
-  'Johann',
-  'Johannes',
-  'John',
-  'Johnny',
-  'Jon',
-  'Jona',
-  'Jonah',
-  'Jonas',
-  'Jonathan',
-  'Jonte',
-  'Joost',
-  'Jordan',
-  'Joris',
-  'Joscha',
-  'Joschua',
-  'Josef',
-  'Joseph',
-  'Josh',
-  'Joshua',
-  'Josua',
-  'Juan',
-  'Julian',
-  'Julien',
-  'Julius',
-  'Juri',
-  'Justin',
-  'Justus',
-  'Kaan',
-  'Kai',
-  'Kalle',
-  'Karim',
-  'Karl',
-  'Karlo',
-  'Kay',
-  'Keanu',
-  'Kenan',
-  'Kenny',
-  'Keno',
-  'Kerem',
-  'Kerim',
-  'Kevin',
-  'Kian',
-  'Kilian',
-  'Kim',
-  'Kimi',
-  'Kjell',
-  'Klaas',
-  'Klemens',
-  'Konrad',
-  'Konstantin',
-  'Koray',
-  'Korbinian',
-  'Kurt',
-  'Lars',
-  'Lasse',
-  'Laurence',
-  'Laurens',
-  'Laurenz',
-  'Laurin',
-  'Lean',
-  'Leander',
-  'Leandro',
-  'Leif',
-  'Len',
-  'Lenn',
-  'Lennard',
-  'Lennart',
-  'Lennert',
-  'Lennie',
-  'Lennox',
-  'Lenny',
-  'Leo',
-  'Leon',
-  'Leonard',
-  'Leonardo',
-  'Leonhard',
-  'Leonidas',
-  'Leopold',
-  'Leroy',
-  'Levent',
-  'Levi',
-  'Levin',
-  'Lewin',
-  'Lewis',
-  'Liam',
-  'Lian',
-  'Lias',
-  'Lino',
-  'Linus',
-  'Lio',
-  'Lion',
-  'Lionel',
-  'Logan',
-  'Lorenz',
-  'Lorenzo',
-  'Loris',
-  'Louis',
-  'Luan',
-  'Luc',
-  'Luca',
-  'Lucas',
-  'Lucian',
-  'Lucien',
-  'Ludwig',
-  'Luis',
-  'Luiz',
-  'Luk',
-  'Luka',
-  'Lukas',
-  'Luke',
-  'Lutz',
-  'Maddox',
-  'Mads',
-  'Magnus',
-  'Maik',
-  'Maksim',
-  'Malik',
-  'Malte',
-  'Manuel',
-  'Marc',
-  'Marcel',
-  'Marco',
-  'Marcus',
-  'Marek',
-  'Marian',
-  'Mario',
-  'Marius',
-  'Mark',
-  'Marko',
-  'Markus',
-  'Marlo',
-  'Marlon',
-  'Marten',
-  'Martin',
-  'Marvin',
-  'Marwin',
-  'Mateo',
-  'Mathis',
-  'Matis',
-  'Mats',
-  'Matteo',
-  'Mattes',
-  'Matthias',
-  'Matthis',
-  'Matti',
-  'Mattis',
-  'Maurice',
-  'Max',
-  'Maxim',
-  'Maximilian',
-  'Mehmet',
-  'Meik',
-  'Melvin',
-  'Merlin',
-  'Mert',
-  'Michael',
-  'Michel',
-  'Mick',
-  'Miguel',
-  'Mika',
-  'Mikail',
-  'Mike',
-  'Milan',
-  'Milo',
-  'Mio',
-  'Mirac',
-  'Mirco',
-  'Mirko',
-  'Mohamed',
-  'Mohammad',
-  'Mohammed',
-  'Moritz',
-  'Morten',
-  'Muhammed',
-  'Murat',
-  'Mustafa',
-  'Nathan',
-  'Nathanael',
-  'Nelson',
-  'Neo',
-  'Nevio',
-  'Nick',
-  'Niclas',
-  'Nico',
-  'Nicolai',
-  'Nicolas',
-  'Niels',
-  'Nikita',
-  'Niklas',
-  'Niko',
-  'Nikolai',
-  'Nikolas',
-  'Nils',
-  'Nino',
-  'Noah',
-  'Noel',
-  'Norman',
-  'Odin',
-  'Oke',
-  'Ole',
-  'Oliver',
-  'Omar',
-  'Onur',
-  'Oscar',
-  'Oskar',
-  'Pascal',
-  'Patrice',
-  'Patrick',
-  'Paul',
-  'Peer',
-  'Pepe',
-  'Peter',
-  'Phil',
-  'Philip',
-  'Philipp',
-  'Pierre',
-  'Piet',
-  'Pit',
-  'Pius',
-  'Quentin',
-  'Quirin',
-  'Rafael',
-  'Raik',
-  'Ramon',
-  'Raphael',
-  'Rasmus',
-  'Raul',
-  'Rayan',
-  'René',
-  'Ricardo',
-  'Riccardo',
-  'Richard',
-  'Rick',
-  'Rico',
-  'Robert',
-  'Robin',
-  'Rocco',
-  'Roman',
-  'Romeo',
-  'Ron',
-  'Ruben',
-  'Ryan',
-  'Said',
-  'Salih',
-  'Sam',
-  'Sami',
-  'Sammy',
-  'Samuel',
-  'Sandro',
-  'Santino',
-  'Sascha',
-  'Sean',
-  'Sebastian',
-  'Selim',
-  'Semih',
-  'Shawn',
-  'Silas',
-  'Simeon',
-  'Simon',
-  'Sinan',
-  'Sky',
-  'Stefan',
-  'Steffen',
-  'Stephan',
-  'Steve',
-  'Steven',
-  'Sven',
-  'Sönke',
-  'Sören',
-  'Taha',
-  'Tamino',
-  'Tammo',
-  'Tarik',
-  'Tayler',
-  'Taylor',
-  'Teo',
-  'Theo',
-  'Theodor',
-  'Thies',
-  'Thilo',
-  'Thomas',
-  'Thorben',
-  'Thore',
-  'Thorge',
-  'Tiago',
-  'Til',
-  'Till',
-  'Tillmann',
-  'Tim',
-  'Timm',
-  'Timo',
-  'Timon',
-  'Timothy',
-  'Tino',
-  'Titus',
-  'Tizian',
-  'Tjark',
-  'Tobias',
-  'Tom',
-  'Tommy',
-  'Toni',
-  'Tony',
-  'Torben',
-  'Tore',
-  'Tristan',
-  'Tyler',
-  'Tyron',
-  'Umut',
-  'Valentin',
-  'Valentino',
-  'Veit',
-  'Victor',
-  'Viktor',
-  'Vin',
-  'Vincent',
-  'Vito',
-  'Vitus',
-  'Wilhelm',
-  'Willi',
-  'William',
-  'Willy',
-  'Xaver',
-  'Yannic',
-  'Yannick',
-  'Yannik',
-  'Yannis',
-  'Yasin',
-  'Youssef',
-  'Yunus',
-  'Yusuf',
-  'Yven',
-  'Yves',
-  'Ömer',
-  'Aaliyah',
-  'Abby',
-  'Abigail',
-  'Ada',
-  'Adelina',
-  'Adriana',
-  'Aileen',
-  'Aimee',
-  'Alana',
-  'Alea',
-  'Alena',
-  'Alessa',
-  'Alessia',
-  'Alexa',
-  'Alexandra',
-  'Alexia',
-  'Alexis',
-  'Aleyna',
-  'Alia',
-  'Alica',
-  'Alice',
-  'Alicia',
-  'Alina',
-  'Alisa',
-  'Alisha',
-  'Alissa',
-  'Aliya',
-  'Aliyah',
-  'Allegra',
-  'Alma',
-  'Alyssa',
-  'Amalia',
-  'Amanda',
-  'Amelia',
-  'Amelie',
-  'Amina',
-  'Amira',
-  'Amy',
-  'Ana',
-  'Anabel',
-  'Anastasia',
-  'Andrea',
-  'Angela',
-  'Angelina',
-  'Angelique',
-  'Anja',
-  'Ann',
-  'Anna',
-  'Annabel',
-  'Annabell',
-  'Annabelle',
-  'Annalena',
-  'Anne',
-  'Anneke',
-  'Annelie',
-  'Annemarie',
-  'Anni',
-  'Annie',
-  'Annika',
-  'Anny',
-  'Anouk',
-  'Antonia',
-  'Ariana',
-  'Ariane',
-  'Arwen',
-  'Ashley',
-  'Asya',
-  'Aurelia',
-  'Aurora',
-  'Ava',
-  'Ayleen',
-  'Aylin',
-  'Ayse',
-  'Azra',
-  'Betty',
-  'Bianca',
-  'Bianka',
-  'Caitlin',
-  'Cara',
-  'Carina',
-  'Carla',
-  'Carlotta',
-  'Carmen',
-  'Carolin',
-  'Carolina',
-  'Caroline',
-  'Cassandra',
-  'Catharina',
-  'Catrin',
-  'Cecile',
-  'Cecilia',
-  'Celia',
-  'Celina',
-  'Celine',
-  'Ceyda',
-  'Ceylin',
-  'Chantal',
-  'Charleen',
-  'Charlotta',
-  'Charlotte',
-  'Chayenne',
-  'Cheyenne',
-  'Chiara',
-  'Christin',
-  'Christina',
-  'Cindy',
-  'Claire',
-  'Clara',
-  'Clarissa',
-  'Colleen',
-  'Collien',
-  'Cora',
-  'Corinna',
-  'Cosima',
-  'Dana',
-  'Daniela',
-  'Daria',
-  'Darleen',
-  'Defne',
-  'Delia',
-  'Denise',
-  'Diana',
-  'Dilara',
-  'Dina',
-  'Dorothea',
-  'Eda',
-  'Eileen',
-  'Ela',
-  'Elaine',
-  'Elanur',
-  'Elea',
-  'Elena',
-  'Eleni',
-  'Eleonora',
-  'Eliana',
-  'Elif',
-  'Elina',
-  'Elisa',
-  'Elisabeth',
-  'Ella',
-  'Ellen',
-  'Elli',
-  'Elly',
-  'Elsa',
-  'Emelie',
-  'Emely',
-  'Emilia',
-  'Emilie',
-  'Emily',
-  'Emma',
-  'Emmely',
-  'Emmi',
-  'Emmy',
-  'Enie',
-  'Enna',
-  'Enya',
-  'Esma',
-  'Estelle',
-  'Esther',
-  'Eva',
-  'Evelin',
-  'Evelina',
-  'Eveline',
-  'Evelyn',
-  'Fabienne',
-  'Fatima',
-  'Fatma',
-  'Felicia',
-  'Felicitas',
-  'Felina',
-  'Femke',
-  'Fenja',
-  'Fine',
-  'Finia',
-  'Finja',
-  'Finnja',
-  'Fiona',
-  'Flora',
-  'Florentine',
-  'Francesca',
-  'Franka',
-  'Franziska',
-  'Frederike',
-  'Freya',
-  'Frida',
-  'Frieda',
-  'Friederike',
-  'Giada',
-  'Gina',
-  'Giulia',
-  'Giuliana',
-  'Greta',
-  'Hailey',
-  'Hana',
-  'Hanna',
-  'Hannah',
-  'Heidi',
-  'Helen',
-  'Helena',
-  'Helene',
-  'Helin',
-  'Henriette',
-  'Henrike',
-  'Hermine',
-  'Ida',
-  'Ilayda',
-  'Imke',
-  'Ina',
-  'Ines',
-  'Inga',
-  'Inka',
-  'Irem',
-  'Isa',
-  'Isabel',
-  'Isabell',
-  'Isabella',
-  'Isabelle',
-  'Ivonne',
-  'Jacqueline',
-  'Jamila',
-  'Jana',
-  'Jane',
-  'Janin',
-  'Janina',
-  'Janine',
-  'Janna',
-  'Jara',
-  'Jasmin',
-  'Jasmina',
-  'Jasmine',
-  'Jella',
-  'Jenna',
-  'Jennifer',
-  'Jenny',
-  'Jessica',
-  'Jessy',
-  'Jette',
-  'Jil',
-  'Jill',
-  'Joana',
-  'Joanna',
-  'Joelina',
-  'Joeline',
-  'Joelle',
-  'Johanna',
-  'Joleen',
-  'Jolie',
-  'Jolien',
-  'Jolin',
-  'Jolina',
-  'Joline',
-  'Jonna',
-  'Josefin',
-  'Josefine',
-  'Josephin',
-  'Josephine',
-  'Josie',
-  'Josy',
-  'Joy',
-  'Joyce',
-  'Judith',
-  'Judy',
-  'Jule',
-  'Julia',
-  'Juliana',
-  'Juliane',
-  'Julie',
-  'Julienne',
-  'Julika',
-  'Julina',
-  'Juna',
-  'Justine',
-  'Kaja',
-  'Karina',
-  'Karla',
-  'Karlotta',
-  'Karolina',
-  'Karoline',
-  'Kassandra',
-  'Katarina',
-  'Katharina',
-  'Kathrin',
-  'Katja',
-  'Katrin',
-  'Kaya',
-  'Kayra',
-  'Kiana',
-  'Kiara',
-  'Kimberley',
-  'Kimberly',
-  'Kira',
-  'Klara',
-  'Korinna',
-  'Kristin',
-  'Kyra',
-  'Laila',
-  'Lana',
-  'Lara',
-  'Larissa',
-  'Laura',
-  'Laureen',
-  'Lavinia',
-  'Lea',
-  'Leah',
-  'Leana',
-  'Leandra',
-  'Leann',
-  'Lee',
-  'Leila',
-  'Lena',
-  'Lene',
-  'Leni',
-  'Lenia',
-  'Lenja',
-  'Lenya',
-  'Leona',
-  'Leoni',
-  'Leonie',
-  'Leonora',
-  'Leticia',
-  'Letizia',
-  'Levke',
-  'Leyla',
-  'Lia',
-  'Liah',
-  'Liana',
-  'Lili',
-  'Lilia',
-  'Lilian',
-  'Liliana',
-  'Lilith',
-  'Lilli',
-  'Lillian',
-  'Lilly',
-  'Lily',
-  'Lina',
-  'Linda',
-  'Lindsay',
-  'Line',
-  'Linn',
-  'Linnea',
-  'Lisa',
-  'Lisann',
-  'Lisanne',
-  'Liv',
-  'Livia',
-  'Liz',
-  'Lola',
-  'Loreen',
-  'Lorena',
-  'Lotta',
-  'Lotte',
-  'Louisa',
-  'Louise',
-  'Luana',
-  'Lucia',
-  'Lucie',
-  'Lucienne',
-  'Lucy',
-  'Luisa',
-  'Luise',
-  'Luna',
-  'Luzie',
-  'Lya',
-  'Lydia',
-  'Lyn',
-  'Lynn',
-  'Madeleine',
-  'Madita',
-  'Madleen',
-  'Madlen',
-  'Magdalena',
-  'Maike',
-  'Mailin',
-  'Maira',
-  'Maja',
-  'Malena',
-  'Malia',
-  'Malin',
-  'Malina',
-  'Mandy',
-  'Mara',
-  'Marah',
-  'Mareike',
-  'Maren',
-  'Maria',
-  'Mariam',
-  'Marie',
-  'Marieke',
-  'Mariella',
-  'Marika',
-  'Marina',
-  'Marisa',
-  'Marissa',
-  'Marit',
-  'Marla',
-  'Marleen',
-  'Marlen',
-  'Marlena',
-  'Marlene',
-  'Marta',
-  'Martha',
-  'Mary',
-  'Maryam',
-  'Mathilda',
-  'Mathilde',
-  'Matilda',
-  'Maxi',
-  'Maxima',
-  'Maxine',
-  'Maya',
-  'Mayra',
-  'Medina',
-  'Medine',
-  'Meike',
-  'Melanie',
-  'Melek',
-  'Melike',
-  'Melina',
-  'Melinda',
-  'Melis',
-  'Melisa',
-  'Melissa',
-  'Merle',
-  'Merve',
-  'Meryem',
-  'Mette',
-  'Mia',
-  'Michaela',
-  'Michelle',
-  'Mieke',
-  'Mila',
-  'Milana',
-  'Milena',
-  'Milla',
-  'Mina',
-  'Mira',
-  'Miray',
-  'Miriam',
-  'Mirja',
-  'Mona',
-  'Monique',
-  'Nadine',
-  'Nadja',
-  'Naemi',
-  'Nancy',
-  'Naomi',
-  'Natalia',
-  'Natalie',
-  'Nathalie',
-  'Neele',
-  'Nela',
-  'Nele',
-  'Nelli',
-  'Nelly',
-  'Nia',
-  'Nicole',
-  'Nika',
-  'Nike',
-  'Nila',
-  'Nina',
-  'Nisa',
-  'Noemi',
-  'Nora',
-  'Olivia',
-  'Patricia',
-  'Patrizia',
-  'Paula',
-  'Paulina',
-  'Pauline',
-  'Penelope',
-  'Philine',
-  'Phoebe',
-  'Pia',
-  'Rahel',
-  'Rania',
-  'Rebecca',
-  'Rebekka',
-  'Riana',
-  'Rieke',
-  'Rike',
-  'Romina',
-  'Romy',
-  'Ronja',
-  'Rosa',
-  'Rosalie',
-  'Ruby',
-  'Sabrina',
-  'Sahra',
-  'Sally',
-  'Salome',
-  'Samantha',
-  'Samia',
-  'Samira',
-  'Sandra',
-  'Sandy',
-  'Sanja',
-  'Saphira',
-  'Sara',
-  'Sarah',
-  'Saskia',
-  'Selin',
-  'Selina',
-  'Selma',
-  'Sena',
-  'Sidney',
-  'Sienna',
-  'Silja',
-  'Sina',
-  'Sinja',
-  'Smilla',
-  'Sofia',
-  'Sofie',
-  'Sonja',
-  'Sophia',
-  'Sophie',
-  'Soraya',
-  'Stefanie',
-  'Stella',
-  'Stephanie',
-  'Stina',
-  'Sude',
-  'Summer',
-  'Susanne',
-  'Svea',
-  'Svenja',
-  'Sydney',
-  'Tabea',
-  'Talea',
-  'Talia',
-  'Tamara',
-  'Tamia',
-  'Tamina',
-  'Tanja',
-  'Tara',
-  'Tarja',
-  'Teresa',
-  'Tessa',
-  'Thalea',
-  'Thalia',
-  'Thea',
-  'Theresa',
-  'Tia',
-  'Tina',
-  'Tomke',
-  'Tuana',
-  'Valentina',
-  'Valeria',
-  'Valerie',
-  'Vanessa',
-  'Vera',
-  'Veronika',
-  'Victoria',
-  'Viktoria',
-  'Viola',
-  'Vivian',
-  'Vivien',
-  'Vivienne',
-  'Wibke',
-  'Wiebke',
-  'Xenia',
-  'Yara',
-  'Yaren',
-  'Yasmin',
-  'Ylvi',
-  'Ylvie',
-  'Yvonne',
-  'Zara',
-  'Zehra',
-  'Zeynep',
-  'Zoe',
-  'Zoey',
-  'Zoé',
-];
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/de_AT/person/index.ts b/src/locales/de_AT/person/index.ts
index 559f8e7755c..8973cc7eddc 100644
--- a/src/locales/de_AT/person/index.ts
+++ b/src/locales/de_AT/person/index.ts
@@ -3,15 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
+import male_first_name from './male_first_name';
 import name_ from './name';
 import nobility_title_prefix from './nobility_title_prefix';
 import prefix from './prefix';
 
 const person: PersonDefinitions = {
+  female_first_name,
   first_name,
   last_name,
+  male_first_name,
   name: name_,
   nobility_title_prefix,
   prefix,
diff --git a/src/locales/de_AT/person/male_first_name.ts b/src/locales/de_AT/person/male_first_name.ts
new file mode 100644
index 00000000000..3b151717292
--- /dev/null
+++ b/src/locales/de_AT/person/male_first_name.ts
@@ -0,0 +1,574 @@
+export default [
+  'Aaron',
+  'Abdul',
+  'Abdullah',
+  'Adam',
+  'Adrian',
+  'Adriano',
+  'Ahmad',
+  'Ahmed',
+  'Ahmet',
+  'Alan',
+  'Albert',
+  'Alessandro',
+  'Alessio',
+  'Alex',
+  'Alexander',
+  'Alfred',
+  'Ali',
+  'Amar',
+  'Amir',
+  'Amon',
+  'Andre',
+  'Andreas',
+  'Andrew',
+  'Angelo',
+  'Ansgar',
+  'Anthony',
+  'Anton',
+  'Antonio',
+  'Arda',
+  'Arian',
+  'Armin',
+  'Arne',
+  'Arno',
+  'Arthur',
+  'Artur',
+  'Arved',
+  'Arvid',
+  'Ayman',
+  'Baran',
+  'Baris',
+  'Bastian',
+  'Batuhan',
+  'Bela',
+  'Ben',
+  'Benedikt',
+  'Benjamin',
+  'Bennet',
+  'Bennett',
+  'Benno',
+  'Bent',
+  'Berat',
+  'Berkay',
+  'Bernd',
+  'Bilal',
+  'Bjarne',
+  'Björn',
+  'Bo',
+  'Boris',
+  'Brandon',
+  'Brian',
+  'Bruno',
+  'Bryan',
+  'Burak',
+  'Calvin',
+  'Can',
+  'Carl',
+  'Carlo',
+  'Carlos',
+  'Caspar',
+  'Cedric',
+  'Cedrik',
+  'Cem',
+  'Charlie',
+  'Chris',
+  'Christian',
+  'Christiano',
+  'Christoph',
+  'Christopher',
+  'Claas',
+  'Clemens',
+  'Colin',
+  'Collin',
+  'Conner',
+  'Connor',
+  'Constantin',
+  'Corvin',
+  'Curt',
+  'Damian',
+  'Damien',
+  'Daniel',
+  'Danilo',
+  'Danny',
+  'Darian',
+  'Dario',
+  'Darius',
+  'Darren',
+  'David',
+  'Davide',
+  'Davin',
+  'Dean',
+  'Deniz',
+  'Dennis',
+  'Denny',
+  'Devin',
+  'Diego',
+  'Dion',
+  'Domenic',
+  'Domenik',
+  'Dominic',
+  'Dominik',
+  'Dorian',
+  'Dustin',
+  'Dylan',
+  'Ecrin',
+  'Eddi',
+  'Eddy',
+  'Edgar',
+  'Edwin',
+  'Efe',
+  'Ege',
+  'Elia',
+  'Eliah',
+  'Elias',
+  'Elijah',
+  'Emanuel',
+  'Emil',
+  'Emilian',
+  'Emilio',
+  'Emir',
+  'Emirhan',
+  'Emre',
+  'Enes',
+  'Enno',
+  'Enrico',
+  'Eren',
+  'Eric',
+  'Erik',
+  'Etienne',
+  'Fabian',
+  'Fabien',
+  'Fabio',
+  'Fabrice',
+  'Falk',
+  'Felix',
+  'Ferdinand',
+  'Fiete',
+  'Filip',
+  'Finlay',
+  'Finley',
+  'Finn',
+  'Finnley',
+  'Florian',
+  'Francesco',
+  'Franz',
+  'Frederic',
+  'Frederick',
+  'Frederik',
+  'Friedrich',
+  'Fritz',
+  'Furkan',
+  'Fynn',
+  'Gabriel',
+  'Georg',
+  'Gerrit',
+  'Gian',
+  'Gianluca',
+  'Gino',
+  'Giuliano',
+  'Giuseppe',
+  'Gregor',
+  'Gustav',
+  'Hagen',
+  'Hamza',
+  'Hannes',
+  'Hanno',
+  'Hans',
+  'Hasan',
+  'Hassan',
+  'Hauke',
+  'Hendrik',
+  'Hennes',
+  'Henning',
+  'Henri',
+  'Henrick',
+  'Henrik',
+  'Henry',
+  'Hugo',
+  'Hussein',
+  'Ian',
+  'Ibrahim',
+  'Ilias',
+  'Ilja',
+  'Ilyas',
+  'Immanuel',
+  'Ismael',
+  'Ismail',
+  'Ivan',
+  'Iven',
+  'Jack',
+  'Jacob',
+  'Jaden',
+  'Jakob',
+  'Jamal',
+  'James',
+  'Jamie',
+  'Jan',
+  'Janek',
+  'Janis',
+  'Janne',
+  'Jannek',
+  'Jannes',
+  'Jannik',
+  'Jannis',
+  'Jano',
+  'Janosch',
+  'Jared',
+  'Jari',
+  'Jarne',
+  'Jarno',
+  'Jaron',
+  'Jason',
+  'Jasper',
+  'Jay',
+  'Jayden',
+  'Jayson',
+  'Jean',
+  'Jens',
+  'Jeremias',
+  'Jeremie',
+  'Jeremy',
+  'Jermaine',
+  'Jerome',
+  'Jesper',
+  'Jesse',
+  'Jim',
+  'Jimmy',
+  'Joe',
+  'Joel',
+  'Joey',
+  'Johann',
+  'Johannes',
+  'John',
+  'Johnny',
+  'Jon',
+  'Jona',
+  'Jonah',
+  'Jonas',
+  'Jonathan',
+  'Jonte',
+  'Joost',
+  'Jordan',
+  'Joris',
+  'Joscha',
+  'Joschua',
+  'Josef',
+  'Joseph',
+  'Josh',
+  'Joshua',
+  'Josua',
+  'Juan',
+  'Julian',
+  'Julien',
+  'Julius',
+  'Juri',
+  'Justin',
+  'Justus',
+  'Kaan',
+  'Kai',
+  'Kalle',
+  'Karim',
+  'Karl',
+  'Karlo',
+  'Kay',
+  'Keanu',
+  'Kenan',
+  'Kenny',
+  'Keno',
+  'Kerem',
+  'Kerim',
+  'Kevin',
+  'Kian',
+  'Kilian',
+  'Kim',
+  'Kimi',
+  'Kjell',
+  'Klaas',
+  'Klemens',
+  'Konrad',
+  'Konstantin',
+  'Koray',
+  'Korbinian',
+  'Kurt',
+  'Lars',
+  'Lasse',
+  'Laurence',
+  'Laurens',
+  'Laurenz',
+  'Laurin',
+  'Lean',
+  'Leander',
+  'Leandro',
+  'Leif',
+  'Len',
+  'Lenn',
+  'Lennard',
+  'Lennart',
+  'Lennert',
+  'Lennie',
+  'Lennox',
+  'Lenny',
+  'Leo',
+  'Leon',
+  'Leonard',
+  'Leonardo',
+  'Leonhard',
+  'Leonidas',
+  'Leopold',
+  'Leroy',
+  'Levent',
+  'Levi',
+  'Levin',
+  'Lewin',
+  'Lewis',
+  'Liam',
+  'Lian',
+  'Lias',
+  'Lino',
+  'Linus',
+  'Lio',
+  'Lion',
+  'Lionel',
+  'Logan',
+  'Lorenz',
+  'Lorenzo',
+  'Loris',
+  'Louis',
+  'Luan',
+  'Luc',
+  'Luca',
+  'Lucas',
+  'Lucian',
+  'Lucien',
+  'Ludwig',
+  'Luis',
+  'Luiz',
+  'Luk',
+  'Luka',
+  'Lukas',
+  'Luke',
+  'Lutz',
+  'Maddox',
+  'Mads',
+  'Magnus',
+  'Maik',
+  'Maksim',
+  'Malik',
+  'Malte',
+  'Manuel',
+  'Marc',
+  'Marcel',
+  'Marco',
+  'Marcus',
+  'Marek',
+  'Marian',
+  'Mario',
+  'Marius',
+  'Mark',
+  'Marko',
+  'Markus',
+  'Marlo',
+  'Marlon',
+  'Marten',
+  'Martin',
+  'Marvin',
+  'Marwin',
+  'Mateo',
+  'Mathis',
+  'Matis',
+  'Mats',
+  'Matteo',
+  'Mattes',
+  'Matthias',
+  'Matthis',
+  'Matti',
+  'Mattis',
+  'Maurice',
+  'Max',
+  'Maxim',
+  'Maximilian',
+  'Mehmet',
+  'Meik',
+  'Melvin',
+  'Merlin',
+  'Mert',
+  'Michael',
+  'Michel',
+  'Mick',
+  'Miguel',
+  'Mika',
+  'Mikail',
+  'Mike',
+  'Milan',
+  'Milo',
+  'Mio',
+  'Mirac',
+  'Mirco',
+  'Mirko',
+  'Mohamed',
+  'Mohammad',
+  'Mohammed',
+  'Moritz',
+  'Morten',
+  'Muhammed',
+  'Murat',
+  'Mustafa',
+  'Nathan',
+  'Nathanael',
+  'Nelson',
+  'Neo',
+  'Nevio',
+  'Nick',
+  'Niclas',
+  'Nico',
+  'Nicolai',
+  'Nicolas',
+  'Niels',
+  'Nikita',
+  'Niklas',
+  'Niko',
+  'Nikolai',
+  'Nikolas',
+  'Nils',
+  'Nino',
+  'Noah',
+  'Noel',
+  'Norman',
+  'Odin',
+  'Oke',
+  'Ole',
+  'Oliver',
+  'Omar',
+  'Onur',
+  'Oscar',
+  'Oskar',
+  'Pascal',
+  'Patrice',
+  'Patrick',
+  'Paul',
+  'Peer',
+  'Pepe',
+  'Peter',
+  'Phil',
+  'Philip',
+  'Philipp',
+  'Pierre',
+  'Piet',
+  'Pit',
+  'Pius',
+  'Quentin',
+  'Quirin',
+  'Rafael',
+  'Raik',
+  'Ramon',
+  'Raphael',
+  'Rasmus',
+  'Raul',
+  'Rayan',
+  'René',
+  'Ricardo',
+  'Riccardo',
+  'Richard',
+  'Rick',
+  'Rico',
+  'Robert',
+  'Robin',
+  'Rocco',
+  'Roman',
+  'Romeo',
+  'Ron',
+  'Ruben',
+  'Ryan',
+  'Said',
+  'Salih',
+  'Sam',
+  'Sami',
+  'Sammy',
+  'Samuel',
+  'Sandro',
+  'Santino',
+  'Sascha',
+  'Sean',
+  'Sebastian',
+  'Selim',
+  'Semih',
+  'Shawn',
+  'Silas',
+  'Simeon',
+  'Simon',
+  'Sinan',
+  'Sky',
+  'Stefan',
+  'Steffen',
+  'Stephan',
+  'Steve',
+  'Steven',
+  'Sven',
+  'Sönke',
+  'Sören',
+  'Taha',
+  'Tamino',
+  'Tammo',
+  'Tarik',
+  'Tayler',
+  'Taylor',
+  'Teo',
+  'Theo',
+  'Theodor',
+  'Thies',
+  'Thilo',
+  'Thomas',
+  'Thorben',
+  'Thore',
+  'Thorge',
+  'Tiago',
+  'Til',
+  'Till',
+  'Tillmann',
+  'Tim',
+  'Timm',
+  'Timo',
+  'Timon',
+  'Timothy',
+  'Tino',
+  'Titus',
+  'Tizian',
+  'Tjark',
+  'Tobias',
+  'Tom',
+  'Tommy',
+  'Toni',
+  'Tony',
+  'Torben',
+  'Tore',
+  'Tristan',
+  'Tyler',
+  'Tyron',
+  'Umut',
+  'Valentin',
+  'Valentino',
+  'Veit',
+  'Victor',
+  'Viktor',
+  'Vin',
+  'Vincent',
+  'Vito',
+  'Vitus',
+  'Wilhelm',
+  'Willi',
+  'William',
+  'Willy',
+  'Xaver',
+  'Yannic',
+  'Yannick',
+  'Yannik',
+  'Yannis',
+  'Yasin',
+  'Youssef',
+  'Yunus',
+  'Yusuf',
+  'Yven',
+  'Yves',
+  'Ömer',
+];
diff --git a/src/locales/dv/person/first_name.ts b/src/locales/dv/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/dv/person/first_name.ts
+++ b/src/locales/dv/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/dv/person/last_name.ts b/src/locales/dv/person/last_name.ts
index 0ce6d456740..6ff69f6004f 100644
--- a/src/locales/dv/person/last_name.ts
+++ b/src/locales/dv/person/last_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_last_name from './female_last_name';
 import male_last_name from './male_last_name';
 
-export default [...new Set([...female_last_name, ...male_last_name])];
+export default mergeArrays(female_last_name, male_last_name);
diff --git a/src/locales/el/person/female_first_name.ts b/src/locales/el/person/female_first_name.ts
new file mode 100644
index 00000000000..5677bcadad3
--- /dev/null
+++ b/src/locales/el/person/female_first_name.ts
@@ -0,0 +1,21 @@
+export default [
+  'Μαρια',
+  'Ελενη',
+  'Αικατερινη',
+  'Ιωαννα',
+  'Δημητρα',
+  'Ευαγγελια',
+  'Γεωργια',
+  'Αναστασια',
+  'Παναγιωτα',
+  'Σοφια',
+  'Κωνσταντινα',
+  'Παρασκευη',
+  'Αννα',
+  'Χριστινα',
+  'Αθανασια',
+  'Δεσποινα',
+  'Χρυσουλα',
+  'Αλεξανδρα',
+  'Σταυρουλα',
+];
diff --git a/src/locales/el/person/first_name.ts b/src/locales/el/person/first_name.ts
index 4d4ecbd90dd..40a647ec054 100644
--- a/src/locales/el/person/first_name.ts
+++ b/src/locales/el/person/first_name.ts
@@ -1,38 +1,8 @@
-export default [
-  'Γεώργιος',
-  'Ιωάννης',
-  'Κώστας',
-  'Δημήτρης',
-  'Νικόλαος',
-  'Παναγιώτης',
-  'Βασίλης',
-  'Χρήστος',
-  'Αθανάσιος',
-  'Μιχαήλ',
-  'Ευάγγελος',
-  'Σπύρος',
-  'Αντώνης',
-  'Αναστάσιος',
-  'Θεόδωρος',
-  'Ανδρέας',
-  'Χαράλαμπος',
-  'Αλέξανδρος',
-  'Εμμανουήλ',
-  'Ηλίας',
-  'Σταύρος',
-  'Πέτρος',
-  'Σωτήριος',
-  'Στυλιανός',
-  'Ελευθέριος',
-  'Απόστολος',
-  'Φώτιος',
-  'Διονύσιος',
-  'Γρηγόριος',
-  'Άγγελος',
-  'Στέφανος',
-  'Ευστάθιος',
-  'Παύλος',
-  'Παρασκευάς',
-  'Αριστείδης',
-  'Λεωνίδας',
-];
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/el/person/index.ts b/src/locales/el/person/index.ts
index 55a45eb2707..7a045ad777c 100644
--- a/src/locales/el/person/index.ts
+++ b/src/locales/el/person/index.ts
@@ -3,15 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
+import male_first_name from './male_first_name';
 import name_ from './name';
 import prefix from './prefix';
 import title from './title';
 
 const person: PersonDefinitions = {
+  female_first_name,
   first_name,
   last_name,
+  male_first_name,
   name: name_,
   prefix,
   title,
diff --git a/src/locales/el/person/male_first_name.ts b/src/locales/el/person/male_first_name.ts
new file mode 100644
index 00000000000..4d4ecbd90dd
--- /dev/null
+++ b/src/locales/el/person/male_first_name.ts
@@ -0,0 +1,38 @@
+export default [
+  'Γεώργιος',
+  'Ιωάννης',
+  'Κώστας',
+  'Δημήτρης',
+  'Νικόλαος',
+  'Παναγιώτης',
+  'Βασίλης',
+  'Χρήστος',
+  'Αθανάσιος',
+  'Μιχαήλ',
+  'Ευάγγελος',
+  'Σπύρος',
+  'Αντώνης',
+  'Αναστάσιος',
+  'Θεόδωρος',
+  'Ανδρέας',
+  'Χαράλαμπος',
+  'Αλέξανδρος',
+  'Εμμανουήλ',
+  'Ηλίας',
+  'Σταύρος',
+  'Πέτρος',
+  'Σωτήριος',
+  'Στυλιανός',
+  'Ελευθέριος',
+  'Απόστολος',
+  'Φώτιος',
+  'Διονύσιος',
+  'Γρηγόριος',
+  'Άγγελος',
+  'Στέφανος',
+  'Ευστάθιος',
+  'Παύλος',
+  'Παρασκευάς',
+  'Αριστείδης',
+  'Λεωνίδας',
+];
diff --git a/src/locales/en/location/time_zone.ts b/src/locales/en/location/time_zone.ts
index 932c7e24713..58bc6b2d8a2 100644
--- a/src/locales/en/location/time_zone.ts
+++ b/src/locales/en/location/time_zone.ts
@@ -1,127 +1,420 @@
 export default [
-  'Pacific/Midway',
-  'Pacific/Pago_Pago',
-  'Pacific/Honolulu',
+  'Africa/Abidjan',
+  'Africa/Accra',
+  'Africa/Addis_Ababa',
+  'Africa/Algiers',
+  'Africa/Asmara',
+  'Africa/Bamako',
+  'Africa/Bangui',
+  'Africa/Banjul',
+  'Africa/Bissau',
+  'Africa/Blantyre',
+  'Africa/Brazzaville',
+  'Africa/Bujumbura',
+  'Africa/Cairo',
+  'Africa/Casablanca',
+  'Africa/Ceuta',
+  'Africa/Conakry',
+  'Africa/Dakar',
+  'Africa/Dar_es_Salaam',
+  'Africa/Djibouti',
+  'Africa/Douala',
+  'Africa/El_Aaiun',
+  'Africa/Freetown',
+  'Africa/Gaborone',
+  'Africa/Harare',
+  'Africa/Johannesburg',
+  'Africa/Juba',
+  'Africa/Kampala',
+  'Africa/Khartoum',
+  'Africa/Kigali',
+  'Africa/Kinshasa',
+  'Africa/Lagos',
+  'Africa/Libreville',
+  'Africa/Lome',
+  'Africa/Luanda',
+  'Africa/Lubumbashi',
+  'Africa/Lusaka',
+  'Africa/Malabo',
+  'Africa/Maputo',
+  'Africa/Maseru',
+  'Africa/Mbabane',
+  'Africa/Mogadishu',
+  'Africa/Monrovia',
+  'Africa/Nairobi',
+  'Africa/Ndjamena',
+  'Africa/Niamey',
+  'Africa/Nouakchott',
+  'Africa/Ouagadougou',
+  'Africa/Porto-Novo',
+  'Africa/Sao_Tome',
+  'Africa/Tripoli',
+  'Africa/Tunis',
+  'Africa/Windhoek',
+  'America/Adak',
+  'America/Anchorage',
+  'America/Anguilla',
+  'America/Antigua',
+  'America/Araguaina',
+  'America/Argentina/Buenos_Aires',
+  'America/Argentina/Catamarca',
+  'America/Argentina/Cordoba',
+  'America/Argentina/Jujuy',
+  'America/Argentina/La_Rioja',
+  'America/Argentina/Mendoza',
+  'America/Argentina/Rio_Gallegos',
+  'America/Argentina/Salta',
+  'America/Argentina/San_Juan',
+  'America/Argentina/San_Luis',
+  'America/Argentina/Tucuman',
+  'America/Argentina/Ushuaia',
+  'America/Aruba',
+  'America/Asuncion',
+  'America/Atikokan',
+  'America/Bahia',
+  'America/Bahia_Banderas',
+  'America/Barbados',
+  'America/Belem',
+  'America/Belize',
+  'America/Blanc-Sablon',
+  'America/Boa_Vista',
+  'America/Bogota',
+  'America/Boise',
+  'America/Cambridge_Bay',
+  'America/Campo_Grande',
+  'America/Cancun',
+  'America/Caracas',
+  'America/Cayenne',
+  'America/Cayman',
+  'America/Chicago',
+  'America/Chihuahua',
+  'America/Costa_Rica',
+  'America/Creston',
+  'America/Cuiaba',
+  'America/Curacao',
+  'America/Danmarkshavn',
+  'America/Dawson',
+  'America/Dawson_Creek',
+  'America/Denver',
+  'America/Detroit',
+  'America/Dominica',
+  'America/Edmonton',
+  'America/Eirunepe',
+  'America/El_Salvador',
+  'America/Fort_Nelson',
+  'America/Fortaleza',
+  'America/Glace_Bay',
+  'America/Goose_Bay',
+  'America/Grand_Turk',
+  'America/Grenada',
+  'America/Guadeloupe',
+  'America/Guatemala',
+  'America/Guayaquil',
+  'America/Guyana',
+  'America/Halifax',
+  'America/Havana',
+  'America/Hermosillo',
+  'America/Indiana/Indianapolis',
+  'America/Indiana/Knox',
+  'America/Indiana/Marengo',
+  'America/Indiana/Petersburg',
+  'America/Indiana/Tell_City',
+  'America/Indiana/Vevay',
+  'America/Indiana/Vincennes',
+  'America/Indiana/Winamac',
+  'America/Inuvik',
+  'America/Iqaluit',
+  'America/Jamaica',
   'America/Juneau',
+  'America/Kentucky/Louisville',
+  'America/Kentucky/Monticello',
+  'America/Kralendijk',
+  'America/La_Paz',
+  'America/Lima',
   'America/Los_Angeles',
-  'America/Tijuana',
-  'America/Denver',
-  'America/Phoenix',
-  'America/Chihuahua',
+  'America/Lower_Princes',
+  'America/Maceio',
+  'America/Managua',
+  'America/Manaus',
+  'America/Marigot',
+  'America/Martinique',
+  'America/Matamoros',
   'America/Mazatlan',
-  'America/Chicago',
-  'America/Regina',
+  'America/Menominee',
+  'America/Merida',
+  'America/Metlakatla',
   'America/Mexico_City',
+  'America/Miquelon',
+  'America/Moncton',
   'America/Monterrey',
-  'America/Guatemala',
+  'America/Montevideo',
+  'America/Montserrat',
+  'America/Nassau',
   'America/New_York',
-  'America/Indiana/Indianapolis',
-  'America/Bogota',
-  'America/Lima',
-  'America/Halifax',
-  'America/Caracas',
-  'America/La_Paz',
+  'America/Nome',
+  'America/Noronha',
+  'America/North_Dakota/Beulah',
+  'America/North_Dakota/Center',
+  'America/North_Dakota/New_Salem',
+  'America/Nuuk',
+  'America/Ojinaga',
+  'America/Panama',
+  'America/Paramaribo',
+  'America/Phoenix',
+  'America/Port-au-Prince',
+  'America/Port_of_Spain',
+  'America/Porto_Velho',
+  'America/Puerto_Rico',
+  'America/Punta_Arenas',
+  'America/Rankin_Inlet',
+  'America/Recife',
+  'America/Regina',
+  'America/Resolute',
+  'America/Rio_Branco',
+  'America/Santarem',
   'America/Santiago',
-  'America/St_Johns',
+  'America/Santo_Domingo',
   'America/Sao_Paulo',
-  'America/Argentina/Buenos_Aires',
-  'America/Guyana',
-  'America/Godthab',
-  'Atlantic/South_Georgia',
-  'Atlantic/Azores',
-  'Atlantic/Cape_Verde',
-  'Europe/Dublin',
-  'Europe/London',
-  'Europe/Lisbon',
-  'Africa/Casablanca',
-  'Africa/Monrovia',
-  'Etc/UTC',
-  'Europe/Belgrade',
-  'Europe/Bratislava',
-  'Europe/Budapest',
-  'Europe/Ljubljana',
-  'Europe/Prague',
-  'Europe/Sarajevo',
-  'Europe/Skopje',
-  'Europe/Warsaw',
-  'Europe/Zagreb',
-  'Europe/Brussels',
-  'Europe/Copenhagen',
-  'Europe/Madrid',
-  'Europe/Paris',
-  'Europe/Amsterdam',
-  'Europe/Berlin',
-  'Europe/Rome',
-  'Europe/Stockholm',
-  'Europe/Vienna',
-  'Africa/Algiers',
-  'Europe/Bucharest',
-  'Africa/Cairo',
-  'Europe/Helsinki',
-  'Europe/Kiev',
-  'Europe/Riga',
-  'Europe/Sofia',
-  'Europe/Tallinn',
-  'Europe/Vilnius',
-  'Europe/Athens',
-  'Europe/Istanbul',
-  'Europe/Minsk',
-  'Asia/Jerusalem',
-  'Africa/Harare',
-  'Africa/Johannesburg',
-  'Europe/Moscow',
-  'Asia/Kuwait',
-  'Asia/Riyadh',
-  'Africa/Nairobi',
+  'America/Scoresbysund',
+  'America/Sitka',
+  'America/St_Barthelemy',
+  'America/St_Johns',
+  'America/St_Kitts',
+  'America/St_Lucia',
+  'America/St_Thomas',
+  'America/St_Vincent',
+  'America/Swift_Current',
+  'America/Tegucigalpa',
+  'America/Thule',
+  'America/Tijuana',
+  'America/Toronto',
+  'America/Tortola',
+  'America/Vancouver',
+  'America/Whitehorse',
+  'America/Winnipeg',
+  'America/Yakutat',
+  'America/Yellowknife',
+  'Antarctica/Casey',
+  'Antarctica/Davis',
+  'Antarctica/DumontDUrville',
+  'Antarctica/Macquarie',
+  'Antarctica/Mawson',
+  'Antarctica/McMurdo',
+  'Antarctica/Palmer',
+  'Antarctica/Rothera',
+  'Antarctica/Syowa',
+  'Antarctica/Troll',
+  'Antarctica/Vostok',
+  'Arctic/Longyearbyen',
+  'Asia/Aden',
+  'Asia/Almaty',
+  'Asia/Amman',
+  'Asia/Anadyr',
+  'Asia/Aqtau',
+  'Asia/Aqtobe',
+  'Asia/Ashgabat',
+  'Asia/Atyrau',
   'Asia/Baghdad',
-  'Asia/Tehran',
-  'Asia/Muscat',
+  'Asia/Bahrain',
   'Asia/Baku',
-  'Asia/Tbilisi',
-  'Asia/Yerevan',
+  'Asia/Bangkok',
+  'Asia/Barnaul',
+  'Asia/Beirut',
+  'Asia/Bishkek',
+  'Asia/Brunei',
+  'Asia/Chita',
+  'Asia/Choibalsan',
+  'Asia/Colombo',
+  'Asia/Damascus',
+  'Asia/Dhaka',
+  'Asia/Dili',
+  'Asia/Dubai',
+  'Asia/Dushanbe',
+  'Asia/Famagusta',
+  'Asia/Gaza',
+  'Asia/Hebron',
+  'Asia/Ho_Chi_Minh',
+  'Asia/Hong_Kong',
+  'Asia/Hovd',
+  'Asia/Irkutsk',
+  'Asia/Jakarta',
+  'Asia/Jayapura',
+  'Asia/Jerusalem',
   'Asia/Kabul',
-  'Asia/Yekaterinburg',
+  'Asia/Kamchatka',
   'Asia/Karachi',
-  'Asia/Tashkent',
-  'Asia/Kolkata',
   'Asia/Kathmandu',
-  'Asia/Dhaka',
-  'Asia/Colombo',
-  'Asia/Almaty',
-  'Asia/Novosibirsk',
-  'Asia/Rangoon',
-  'Asia/Bangkok',
-  'Asia/Jakarta',
+  'Asia/Khandyga',
+  'Asia/Kolkata',
   'Asia/Krasnoyarsk',
-  'Asia/Shanghai',
-  'Asia/Chongqing',
-  'Asia/Hong_Kong',
-  'Asia/Urumqi',
   'Asia/Kuala_Lumpur',
+  'Asia/Kuching',
+  'Asia/Kuwait',
+  'Asia/Macau',
+  'Asia/Magadan',
+  'Asia/Makassar',
+  'Asia/Manila',
+  'Asia/Muscat',
+  'Asia/Nicosia',
+  'Asia/Novokuznetsk',
+  'Asia/Novosibirsk',
+  'Asia/Omsk',
+  'Asia/Oral',
+  'Asia/Phnom_Penh',
+  'Asia/Pontianak',
+  'Asia/Pyongyang',
+  'Asia/Qatar',
+  'Asia/Qostanay',
+  'Asia/Qyzylorda',
+  'Asia/Riyadh',
+  'Asia/Sakhalin',
+  'Asia/Samarkand',
+  'Asia/Seoul',
+  'Asia/Shanghai',
   'Asia/Singapore',
+  'Asia/Srednekolymsk',
   'Asia/Taipei',
-  'Australia/Perth',
-  'Asia/Irkutsk',
-  'Asia/Ulaanbaatar',
-  'Asia/Seoul',
+  'Asia/Tashkent',
+  'Asia/Tbilisi',
+  'Asia/Tehran',
+  'Asia/Thimphu',
   'Asia/Tokyo',
+  'Asia/Tomsk',
+  'Asia/Ulaanbaatar',
+  'Asia/Urumqi',
+  'Asia/Ust-Nera',
+  'Asia/Vientiane',
+  'Asia/Vladivostok',
   'Asia/Yakutsk',
-  'Australia/Darwin',
+  'Asia/Yangon',
+  'Asia/Yekaterinburg',
+  'Asia/Yerevan',
+  'Atlantic/Azores',
+  'Atlantic/Bermuda',
+  'Atlantic/Canary',
+  'Atlantic/Cape_Verde',
+  'Atlantic/Faroe',
+  'Atlantic/Madeira',
+  'Atlantic/Reykjavik',
+  'Atlantic/South_Georgia',
+  'Atlantic/St_Helena',
+  'Atlantic/Stanley',
   'Australia/Adelaide',
-  'Australia/Melbourne',
-  'Australia/Sydney',
   'Australia/Brisbane',
+  'Australia/Broken_Hill',
+  'Australia/Darwin',
+  'Australia/Eucla',
   'Australia/Hobart',
-  'Asia/Vladivostok',
-  'Pacific/Guam',
-  'Pacific/Port_Moresby',
-  'Asia/Magadan',
-  'Pacific/Noumea',
+  'Australia/Lindeman',
+  'Australia/Lord_Howe',
+  'Australia/Melbourne',
+  'Australia/Perth',
+  'Australia/Sydney',
+  'Europe/Amsterdam',
+  'Europe/Andorra',
+  'Europe/Astrakhan',
+  'Europe/Athens',
+  'Europe/Belgrade',
+  'Europe/Berlin',
+  'Europe/Bratislava',
+  'Europe/Brussels',
+  'Europe/Bucharest',
+  'Europe/Budapest',
+  'Europe/Busingen',
+  'Europe/Chisinau',
+  'Europe/Copenhagen',
+  'Europe/Dublin',
+  'Europe/Gibraltar',
+  'Europe/Guernsey',
+  'Europe/Helsinki',
+  'Europe/Isle_of_Man',
+  'Europe/Istanbul',
+  'Europe/Jersey',
+  'Europe/Kaliningrad',
+  'Europe/Kirov',
+  'Europe/Kyiv',
+  'Europe/Lisbon',
+  'Europe/Ljubljana',
+  'Europe/London',
+  'Europe/Luxembourg',
+  'Europe/Madrid',
+  'Europe/Malta',
+  'Europe/Mariehamn',
+  'Europe/Minsk',
+  'Europe/Monaco',
+  'Europe/Moscow',
+  'Europe/Oslo',
+  'Europe/Paris',
+  'Europe/Podgorica',
+  'Europe/Prague',
+  'Europe/Riga',
+  'Europe/Rome',
+  'Europe/Samara',
+  'Europe/San_Marino',
+  'Europe/Sarajevo',
+  'Europe/Saratov',
+  'Europe/Simferopol',
+  'Europe/Skopje',
+  'Europe/Sofia',
+  'Europe/Stockholm',
+  'Europe/Tallinn',
+  'Europe/Tirane',
+  'Europe/Ulyanovsk',
+  'Europe/Vaduz',
+  'Europe/Vatican',
+  'Europe/Vienna',
+  'Europe/Vilnius',
+  'Europe/Volgograd',
+  'Europe/Warsaw',
+  'Europe/Zagreb',
+  'Europe/Zurich',
+  'Indian/Antananarivo',
+  'Indian/Chagos',
+  'Indian/Christmas',
+  'Indian/Cocos',
+  'Indian/Comoro',
+  'Indian/Kerguelen',
+  'Indian/Mahe',
+  'Indian/Maldives',
+  'Indian/Mauritius',
+  'Indian/Mayotte',
+  'Indian/Reunion',
+  'Pacific/Apia',
+  'Pacific/Auckland',
+  'Pacific/Bougainville',
+  'Pacific/Chatham',
+  'Pacific/Chuuk',
+  'Pacific/Easter',
+  'Pacific/Efate',
+  'Pacific/Fakaofo',
   'Pacific/Fiji',
-  'Asia/Kamchatka',
+  'Pacific/Funafuti',
+  'Pacific/Galapagos',
+  'Pacific/Gambier',
+  'Pacific/Guadalcanal',
+  'Pacific/Guam',
+  'Pacific/Honolulu',
+  'Pacific/Kanton',
+  'Pacific/Kiritimati',
+  'Pacific/Kosrae',
+  'Pacific/Kwajalein',
   'Pacific/Majuro',
-  'Pacific/Auckland',
+  'Pacific/Marquesas',
+  'Pacific/Midway',
+  'Pacific/Nauru',
+  'Pacific/Niue',
+  'Pacific/Norfolk',
+  'Pacific/Noumea',
+  'Pacific/Pago_Pago',
+  'Pacific/Palau',
+  'Pacific/Pitcairn',
+  'Pacific/Pohnpei',
+  'Pacific/Port_Moresby',
+  'Pacific/Rarotonga',
+  'Pacific/Saipan',
+  'Pacific/Tahiti',
+  'Pacific/Tarawa',
   'Pacific/Tongatapu',
-  'Pacific/Fakaofo',
-  'Pacific/Apia',
+  'Pacific/Wake',
+  'Pacific/Wallis',
 ];
diff --git a/src/locales/en_AU/person/female_first_name.ts b/src/locales/en_AU/person/female_first_name.ts
new file mode 100644
index 00000000000..866c06f8c86
--- /dev/null
+++ b/src/locales/en_AU/person/female_first_name.ts
@@ -0,0 +1,102 @@
+export default [
+  'Isabella',
+  'Ruby',
+  'Chloe',
+  'Olivia',
+  'Charlotte',
+  'Mia',
+  'Lily',
+  'Emily',
+  'Ella',
+  'Sienna',
+  'Sophie',
+  'Amelia',
+  'Grace',
+  'Ava',
+  'Zoe',
+  'Emma',
+  'Sophia',
+  'Matilda',
+  'Hannah',
+  'Jessica',
+  'Lucy',
+  'Georgia',
+  'Sarah',
+  'Abigail',
+  'Zara',
+  'Eva',
+  'Scarlett',
+  'Jasmine',
+  'Chelsea',
+  'Lilly',
+  'Ivy',
+  'Isla',
+  'Evie',
+  'Isabelle',
+  'Maddison',
+  'Layla',
+  'Summer',
+  'Annabelle',
+  'Alexis',
+  'Elizabeth',
+  'Bella',
+  'Holly',
+  'Lara',
+  'Madison',
+  'Alyssa',
+  'Maya',
+  'Tahlia',
+  'Claire',
+  'Hayley',
+  'Imogen',
+  'Jade',
+  'Ellie',
+  'Sofia',
+  'Addison',
+  'Molly',
+  'Phoebe',
+  'Alice',
+  'Savannah',
+  'Gabriella',
+  'Kayla',
+  'Mikayla',
+  'Abbey',
+  'Eliza',
+  'Willow',
+  'Alexandra',
+  'Poppy',
+  'Samantha',
+  'Stella',
+  'Amy',
+  'Amelie',
+  'Anna',
+  'Piper',
+  'Gemma',
+  'Isabel',
+  'Victoria',
+  'Stephanie',
+  'Caitlin',
+  'Heidi',
+  'Paige',
+  'Rose',
+  'Amber',
+  'Audrey',
+  'Claudia',
+  'Taylor',
+  'Madeline',
+  'Angelina',
+  'Natalie',
+  'Charli',
+  'Lauren',
+  'Ashley',
+  'Violet',
+  'Mackenzie',
+  'Abby',
+  'Skye',
+  'Lillian',
+  'Alana',
+  'Lola',
+  'Leah',
+  'Eve',
+  'Kiara',
+];
diff --git a/src/locales/en_AU/person/first_name.ts b/src/locales/en_AU/person/first_name.ts
index 0fdc0c26f89..40a647ec054 100644
--- a/src/locales/en_AU/person/first_name.ts
+++ b/src/locales/en_AU/person/first_name.ts
@@ -1,202 +1,8 @@
-export default [
-  'William',
-  'Jack',
-  'Oliver',
-  'Joshua',
-  'Thomas',
-  'Lachlan',
-  'Cooper',
-  'Noah',
-  'Ethan',
-  'Lucas',
-  'James',
-  'Samuel',
-  'Jacob',
-  'Liam',
-  'Alexander',
-  'Benjamin',
-  'Max',
-  'Isaac',
-  'Daniel',
-  'Riley',
-  'Ryan',
-  'Charlie',
-  'Tyler',
-  'Jake',
-  'Matthew',
-  'Xavier',
-  'Harry',
-  'Jayden',
-  'Nicholas',
-  'Harrison',
-  'Levi',
-  'Luke',
-  'Adam',
-  'Henry',
-  'Aiden',
-  'Dylan',
-  'Oscar',
-  'Michael',
-  'Jackson',
-  'Logan',
-  'Joseph',
-  'Blake',
-  'Nathan',
-  'Connor',
-  'Elijah',
-  'Nate',
-  'Archie',
-  'Bailey',
-  'Marcus',
-  'Cameron',
-  'Jordan',
-  'Zachary',
-  'Caleb',
-  'Hunter',
-  'Ashton',
-  'Toby',
-  'Aidan',
-  'Hayden',
-  'Mason',
-  'Hamish',
-  'Edward',
-  'Angus',
-  'Eli',
-  'Sebastian',
-  'Christian',
-  'Patrick',
-  'Andrew',
-  'Anthony',
-  'Luca',
-  'Kai',
-  'Beau',
-  'Alex',
-  'George',
-  'Callum',
-  'Finn',
-  'Zac',
-  'Mitchell',
-  'Jett',
-  'Jesse',
-  'Gabriel',
-  'Leo',
-  'Declan',
-  'Charles',
-  'Jasper',
-  'Jonathan',
-  'Aaron',
-  'Hugo',
-  'David',
-  'Christopher',
-  'Chase',
-  'Owen',
-  'Justin',
-  'Ali',
-  'Darcy',
-  'Lincoln',
-  'Cody',
-  'Phoenix',
-  'Sam',
-  'John',
-  'Joel',
-  'Isabella',
-  'Ruby',
-  'Chloe',
-  'Olivia',
-  'Charlotte',
-  'Mia',
-  'Lily',
-  'Emily',
-  'Ella',
-  'Sienna',
-  'Sophie',
-  'Amelia',
-  'Grace',
-  'Ava',
-  'Zoe',
-  'Emma',
-  'Sophia',
-  'Matilda',
-  'Hannah',
-  'Jessica',
-  'Lucy',
-  'Georgia',
-  'Sarah',
-  'Abigail',
-  'Zara',
-  'Eva',
-  'Scarlett',
-  'Jasmine',
-  'Chelsea',
-  'Lilly',
-  'Ivy',
-  'Isla',
-  'Evie',
-  'Isabelle',
-  'Maddison',
-  'Layla',
-  'Summer',
-  'Annabelle',
-  'Alexis',
-  'Elizabeth',
-  'Bella',
-  'Holly',
-  'Lara',
-  'Madison',
-  'Alyssa',
-  'Maya',
-  'Tahlia',
-  'Claire',
-  'Hayley',
-  'Imogen',
-  'Jade',
-  'Ellie',
-  'Sofia',
-  'Addison',
-  'Molly',
-  'Phoebe',
-  'Alice',
-  'Savannah',
-  'Gabriella',
-  'Kayla',
-  'Mikayla',
-  'Abbey',
-  'Eliza',
-  'Willow',
-  'Alexandra',
-  'Poppy',
-  'Samantha',
-  'Stella',
-  'Amy',
-  'Amelie',
-  'Anna',
-  'Piper',
-  'Gemma',
-  'Isabel',
-  'Victoria',
-  'Stephanie',
-  'Caitlin',
-  'Heidi',
-  'Paige',
-  'Rose',
-  'Amber',
-  'Audrey',
-  'Claudia',
-  'Taylor',
-  'Madeline',
-  'Angelina',
-  'Natalie',
-  'Charli',
-  'Lauren',
-  'Ashley',
-  'Violet',
-  'Mackenzie',
-  'Abby',
-  'Skye',
-  'Lillian',
-  'Alana',
-  'Lola',
-  'Leah',
-  'Eve',
-  'Kiara',
-];
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/en_AU/person/index.ts b/src/locales/en_AU/person/index.ts
index bb956ea585c..b61cf10830a 100644
--- a/src/locales/en_AU/person/index.ts
+++ b/src/locales/en_AU/person/index.ts
@@ -3,12 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
+import male_first_name from './male_first_name';
 
 const person: PersonDefinitions = {
+  female_first_name,
   first_name,
   last_name,
+  male_first_name,
 };
 
 export default person;
diff --git a/src/locales/en_AU/person/male_first_name.ts b/src/locales/en_AU/person/male_first_name.ts
new file mode 100644
index 00000000000..ecd8ebab62d
--- /dev/null
+++ b/src/locales/en_AU/person/male_first_name.ts
@@ -0,0 +1,102 @@
+export default [
+  'William',
+  'Jack',
+  'Oliver',
+  'Joshua',
+  'Thomas',
+  'Lachlan',
+  'Cooper',
+  'Noah',
+  'Ethan',
+  'Lucas',
+  'James',
+  'Samuel',
+  'Jacob',
+  'Liam',
+  'Alexander',
+  'Benjamin',
+  'Max',
+  'Isaac',
+  'Daniel',
+  'Riley',
+  'Ryan',
+  'Charlie',
+  'Tyler',
+  'Jake',
+  'Matthew',
+  'Xavier',
+  'Harry',
+  'Jayden',
+  'Nicholas',
+  'Harrison',
+  'Levi',
+  'Luke',
+  'Adam',
+  'Henry',
+  'Aiden',
+  'Dylan',
+  'Oscar',
+  'Michael',
+  'Jackson',
+  'Logan',
+  'Joseph',
+  'Blake',
+  'Nathan',
+  'Connor',
+  'Elijah',
+  'Nate',
+  'Archie',
+  'Bailey',
+  'Marcus',
+  'Cameron',
+  'Jordan',
+  'Zachary',
+  'Caleb',
+  'Hunter',
+  'Ashton',
+  'Toby',
+  'Aidan',
+  'Hayden',
+  'Mason',
+  'Hamish',
+  'Edward',
+  'Angus',
+  'Eli',
+  'Sebastian',
+  'Christian',
+  'Patrick',
+  'Andrew',
+  'Anthony',
+  'Luca',
+  'Kai',
+  'Beau',
+  'Alex',
+  'George',
+  'Callum',
+  'Finn',
+  'Zac',
+  'Mitchell',
+  'Jett',
+  'Jesse',
+  'Gabriel',
+  'Leo',
+  'Declan',
+  'Charles',
+  'Jasper',
+  'Jonathan',
+  'Aaron',
+  'Hugo',
+  'David',
+  'Christopher',
+  'Chase',
+  'Owen',
+  'Justin',
+  'Ali',
+  'Darcy',
+  'Lincoln',
+  'Cody',
+  'Phoenix',
+  'Sam',
+  'John',
+  'Joel',
+];
diff --git a/src/locales/en_GB/location/building_number.ts b/src/locales/en_GB/location/building_number.ts
new file mode 100644
index 00000000000..20cefab6b18
--- /dev/null
+++ b/src/locales/en_GB/location/building_number.ts
@@ -0,0 +1 @@
+export default ['###', '##', '#'];
diff --git a/src/locales/en_GB/location/city.ts b/src/locales/en_GB/location/city.ts
index 7375aa8378a..ed5e7f31aed 100644
--- a/src/locales/en_GB/location/city.ts
+++ b/src/locales/en_GB/location/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
-  '{{location.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.lastName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.lastName}}',
   '{{person.lastName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_infix}}{{person.lastName}}',
 ];
diff --git a/src/locales/en_GB/location/city_infix.ts b/src/locales/en_GB/location/city_infix.ts
new file mode 100644
index 00000000000..2e10a7171cb
--- /dev/null
+++ b/src/locales/en_GB/location/city_infix.ts
@@ -0,0 +1 @@
+export default ['-under-', '-over-', '-le-', '-upon-', '-on-'];
diff --git a/src/locales/en_GB/location/city_prefix.ts b/src/locales/en_GB/location/city_prefix.ts
new file mode 100644
index 00000000000..12e5533e550
--- /dev/null
+++ b/src/locales/en_GB/location/city_prefix.ts
@@ -0,0 +1,19 @@
+export default [
+  'Great',
+  'Little',
+  'St.',
+  'West',
+  'East',
+  'North',
+  'South',
+  'Upper',
+  'Lower',
+  'Old',
+  'Long',
+  'New',
+  'High',
+  'Nether',
+  'Castle',
+  'Upton',
+  'Newton',
+];
diff --git a/src/locales/en_GB/location/city_suffix.ts b/src/locales/en_GB/location/city_suffix.ts
new file mode 100644
index 00000000000..6db9822a5d3
--- /dev/null
+++ b/src/locales/en_GB/location/city_suffix.ts
@@ -0,0 +1,33 @@
+export default [
+  'ton',
+  'ham',
+  'ley',
+  'ington',
+  'ford',
+  'field',
+  'bury',
+  'don',
+  'ing',
+  'worth',
+  'well',
+  'ingham',
+  'wood',
+  'ridge',
+  'borough',
+  'stone',
+  'hill',
+  'thorpe',
+  'hampton',
+  'wick',
+  ' Green',
+  ' Park',
+  ' Hill',
+  ' Court',
+  ' Heath',
+  ' Bridge',
+  ' End',
+  ' Common',
+  ' Place',
+  ' Cross',
+  ' Gardens',
+];
diff --git a/src/locales/en_GB/location/index.ts b/src/locales/en_GB/location/index.ts
index 6a7064fa214..6039d1ae2b8 100644
--- a/src/locales/en_GB/location/index.ts
+++ b/src/locales/en_GB/location/index.ts
@@ -3,19 +3,29 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocationDefinitions } from '../../..';
+import building_number from './building_number';
 import city from './city';
+import city_infix from './city_infix';
+import city_prefix from './city_prefix';
+import city_suffix from './city_suffix';
 import county from './county';
 import default_country from './default_country';
 import postcode from './postcode';
 import street from './street';
+import street_suffix from './street_suffix';
 import uk_country from './uk_country';
 
 const location: LocationDefinitions = {
+  building_number,
   city,
+  city_infix,
+  city_prefix,
+  city_suffix,
   county,
   default_country,
   postcode,
   street,
+  street_suffix,
   uk_country,
 };
 
diff --git a/src/locales/en_GB/location/street_suffix.ts b/src/locales/en_GB/location/street_suffix.ts
new file mode 100644
index 00000000000..1afdad60d8f
--- /dev/null
+++ b/src/locales/en_GB/location/street_suffix.ts
@@ -0,0 +1,57 @@
+export default [
+  'Road',
+  'Close',
+  'Street',
+  'Lane',
+  'Avenue',
+  'Drive',
+  'Way',
+  'Place',
+  'Court',
+  'Gardens',
+  'Crescent',
+  'Grove',
+  'Terrace',
+  'Hill',
+  'View',
+  'Walk',
+  'Park',
+  'Mews',
+  'Rise',
+  'Green',
+  'Square',
+  'Croft',
+  'Bank',
+  'Row',
+  'Meadow',
+  'Gate',
+  'End',
+  'Drove',
+  'Mead',
+  'Field',
+  'Chase',
+  'Mount',
+  'Meadows',
+  'Orchard',
+  'Fields',
+  'Yard',
+  'Garth',
+  'Fold',
+  'Wynd',
+  'Parade',
+  'Vale',
+  'Brae',
+  'Grange',
+  'Approach',
+  'Wood',
+  'Paddock',
+  'Brow',
+  'Lea',
+  'Path',
+  'Side',
+  'Heights',
+  'Copse',
+  'Corner',
+  'Ridge',
+  'Glade',
+];
diff --git a/src/locales/en_GH/person/first_name.ts b/src/locales/en_GH/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/en_GH/person/first_name.ts
+++ b/src/locales/en_GH/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/en_IN/person/female_first_name.ts b/src/locales/en_IN/person/female_first_name.ts
new file mode 100644
index 00000000000..cf5cb3f51fa
--- /dev/null
+++ b/src/locales/en_IN/person/female_first_name.ts
@@ -0,0 +1,290 @@
+export default [
+  'Aadrika',
+  'Aanandinii',
+  'Aaratrika',
+  'Aarya',
+  'Arya',
+  'Aashritha',
+  'Aatmaja',
+  'Atmaja',
+  'Abhaya',
+  'Adwitiya',
+  'Agrata',
+  'Ahilya',
+  'Ahalya',
+  'Aishani',
+  'Akshainie',
+  'Akshata',
+  'Akshita',
+  'Akula',
+  'Ambar',
+  'Amodini',
+  'Amrita',
+  'Amritambu',
+  'Anala',
+  'Anamika',
+  'Ananda',
+  'Anandamayi',
+  'Ananta',
+  'Anila',
+  'Anjali',
+  'Anjushri',
+  'Anjushree',
+  'Annapurna',
+  'Anshula',
+  'Anuja',
+  'Anusuya',
+  'Anasuya',
+  'Anasooya',
+  'Anwesha',
+  'Apsara',
+  'Aruna',
+  'Asha',
+  'Aasa',
+  'Aasha',
+  'Aslesha',
+  'Atreyi',
+  'Atreyee',
+  'Avani',
+  'Abani',
+  'Avantika',
+  'Ayushmati',
+  'Baidehi',
+  'Vaidehi',
+  'Bala',
+  'Baala',
+  'Balamani',
+  'Basanti',
+  'Vasanti',
+  'Bela',
+  'Bhadra',
+  'Bhagirathi',
+  'Bhagwanti',
+  'Bhagwati',
+  'Bhamini',
+  'Bhanumati',
+  'Bhaanumati',
+  'Bhargavi',
+  'Bhavani',
+  'Bhilangana',
+  'Bilwa',
+  'Bilva',
+  'Buddhana',
+  'Chakrika',
+  'Chanda',
+  'Chandi',
+  'Chandni',
+  'Chandini',
+  'Chandani',
+  'Chandra',
+  'Chandira',
+  'Chandrabhaga',
+  'Chandrakala',
+  'Chandrakin',
+  'Chandramani',
+  'Chandrani',
+  'Chandraprabha',
+  'Chandraswaroopa',
+  'Chandravati',
+  'Chapala',
+  'Charumati',
+  'Charvi',
+  'Chatura',
+  'Chitrali',
+  'Chitramala',
+  'Chitrangada',
+  'Daksha',
+  'Dakshayani',
+  'Damayanti',
+  'Darshwana',
+  'Deepali',
+  'Dipali',
+  'Deeptimoyee',
+  'Deeptimayee',
+  'Devangana',
+  'Devani',
+  'Devasree',
+  'Devi',
+  'Daevi',
+  'Devika',
+  'Daevika',
+  'Dhaanyalakshmi',
+  'Dhanalakshmi',
+  'Dhana',
+  'Dhanadeepa',
+  'Dhara',
+  'Dharani',
+  'Dharitri',
+  'Dhatri',
+  'Diksha',
+  'Deeksha',
+  'Divya',
+  'Draupadi',
+  'Dulari',
+  'Durga',
+  'Durgeshwari',
+  'Ekaparnika',
+  'Elakshi',
+  'Enakshi',
+  'Esha',
+  'Eshana',
+  'Eshita',
+  'Gautami',
+  'Gayatri',
+  'Geeta',
+  'Geetanjali',
+  'Gitanjali',
+  'Gemine',
+  'Gemini',
+  'Girja',
+  'Girija',
+  'Gita',
+  'Hamsini',
+  'Harinakshi',
+  'Harita',
+  'Heema',
+  'Himadri',
+  'Himani',
+  'Hiranya',
+  'Indira',
+  'Jaimini',
+  'Jaya',
+  'Jyoti',
+  'Jyotsana',
+  'Kali',
+  'Kalinda',
+  'Kalpana',
+  'Kalyani',
+  'Kama',
+  'Kamala',
+  'Kamla',
+  'Kanchan',
+  'Kanishka',
+  'Kanti',
+  'Kashyapi',
+  'Kumari',
+  'Kumuda',
+  'Lakshmi',
+  'Laxmi',
+  'Lalita',
+  'Lavanya',
+  'Leela',
+  'Lila',
+  'Madhuri',
+  'Malti',
+  'Malati',
+  'Mandakini',
+  'Mandaakin',
+  'Mangala',
+  'Mangalya',
+  'Mani',
+  'Manisha',
+  'Manjusha',
+  'Meena',
+  'Mina',
+  'Meenakshi',
+  'Minakshi',
+  'Menka',
+  'Menaka',
+  'Mohana',
+  'Mohini',
+  'Nalini',
+  'Nikita',
+  'Ojaswini',
+  'Omana',
+  'Oormila',
+  'Urmila',
+  'Opalina',
+  'Opaline',
+  'Padma',
+  'Parvati',
+  'Poornima',
+  'Purnima',
+  'Pramila',
+  'Prasanna',
+  'Preity',
+  'Prema',
+  'Priya',
+  'Priyala',
+  'Pushti',
+  'Radha',
+  'Rageswari',
+  'Rageshwari',
+  'Rajinder',
+  'Ramaa',
+  'Rati',
+  'Rita',
+  'Rohana',
+  'Rukhmani',
+  'Rukmin',
+  'Rupinder',
+  'Sanya',
+  'Sarada',
+  'Sharda',
+  'Sarala',
+  'Sarla',
+  'Saraswati',
+  'Sarisha',
+  'Saroja',
+  'Shakti',
+  'Shakuntala',
+  'Shanti',
+  'Sharmila',
+  'Shashi',
+  'Shashikala',
+  'Sheela',
+  'Shivakari',
+  'Shobhana',
+  'Shresth',
+  'Shresthi',
+  'Shreya',
+  'Shreyashi',
+  'Shridevi',
+  'Shrishti',
+  'Shubha',
+  'Shubhaprada',
+  'Siddhi',
+  'Sitara',
+  'Sloka',
+  'Smita',
+  'Smriti',
+  'Soma',
+  'Subhashini',
+  'Subhasini',
+  'Sucheta',
+  'Sudeva',
+  'Sujata',
+  'Sukanya',
+  'Suma',
+  'Sumitra',
+  'Sunita',
+  'Suryakantam',
+  'Sushma',
+  'Swara',
+  'Swarnalata',
+  'Sweta',
+  'Shwet',
+  'Tanirika',
+  'Tanushree',
+  'Tanushri',
+  'Tanya',
+  'Tara',
+  'Trisha',
+  'Uma',
+  'Usha',
+  'Vaijayanti',
+  'Vaijayanthi',
+  'Baijayanti',
+  'Vaishvi',
+  'Vaishnavi',
+  'Vaishno',
+  'Varalakshmi',
+  'Vasudha',
+  'Vasundhara',
+  'Veda',
+  'Vedanshi',
+  'Vidya',
+  'Vimala',
+  'Vrinda',
+  'Vrund',
+];
diff --git a/src/locales/en_IN/person/first_name.ts b/src/locales/en_IN/person/first_name.ts
index 2aae1669a50..40a647ec054 100644
--- a/src/locales/en_IN/person/first_name.ts
+++ b/src/locales/en_IN/person/first_name.ts
@@ -1,744 +1,8 @@
-export default [
-  'Aadrika',
-  'Aanandinii',
-  'Aaratrika',
-  'Aarya',
-  'Arya',
-  'Aashritha',
-  'Aatmaja',
-  'Atmaja',
-  'Abhaya',
-  'Adwitiya',
-  'Agrata',
-  'Ahilya',
-  'Ahalya',
-  'Aishani',
-  'Akshainie',
-  'Akshata',
-  'Akshita',
-  'Akula',
-  'Ambar',
-  'Amodini',
-  'Amrita',
-  'Amritambu',
-  'Anala',
-  'Anamika',
-  'Ananda',
-  'Anandamayi',
-  'Ananta',
-  'Anila',
-  'Anjali',
-  'Anjushri',
-  'Anjushree',
-  'Annapurna',
-  'Anshula',
-  'Anuja',
-  'Anusuya',
-  'Anasuya',
-  'Anasooya',
-  'Anwesha',
-  'Apsara',
-  'Aruna',
-  'Asha',
-  'Aasa',
-  'Aasha',
-  'Aslesha',
-  'Atreyi',
-  'Atreyee',
-  'Avani',
-  'Abani',
-  'Avantika',
-  'Ayushmati',
-  'Baidehi',
-  'Vaidehi',
-  'Bala',
-  'Baala',
-  'Balamani',
-  'Basanti',
-  'Vasanti',
-  'Bela',
-  'Bhadra',
-  'Bhagirathi',
-  'Bhagwanti',
-  'Bhagwati',
-  'Bhamini',
-  'Bhanumati',
-  'Bhaanumati',
-  'Bhargavi',
-  'Bhavani',
-  'Bhilangana',
-  'Bilwa',
-  'Bilva',
-  'Buddhana',
-  'Chakrika',
-  'Chanda',
-  'Chandi',
-  'Chandni',
-  'Chandini',
-  'Chandani',
-  'Chandra',
-  'Chandira',
-  'Chandrabhaga',
-  'Chandrakala',
-  'Chandrakin',
-  'Chandramani',
-  'Chandrani',
-  'Chandraprabha',
-  'Chandraswaroopa',
-  'Chandravati',
-  'Chapala',
-  'Charumati',
-  'Charvi',
-  'Chatura',
-  'Chitrali',
-  'Chitramala',
-  'Chitrangada',
-  'Daksha',
-  'Dakshayani',
-  'Damayanti',
-  'Darshwana',
-  'Deepali',
-  'Dipali',
-  'Deeptimoyee',
-  'Deeptimayee',
-  'Devangana',
-  'Devani',
-  'Devasree',
-  'Devi',
-  'Daevi',
-  'Devika',
-  'Daevika',
-  'Dhaanyalakshmi',
-  'Dhanalakshmi',
-  'Dhana',
-  'Dhanadeepa',
-  'Dhara',
-  'Dharani',
-  'Dharitri',
-  'Dhatri',
-  'Diksha',
-  'Deeksha',
-  'Divya',
-  'Draupadi',
-  'Dulari',
-  'Durga',
-  'Durgeshwari',
-  'Ekaparnika',
-  'Elakshi',
-  'Enakshi',
-  'Esha',
-  'Eshana',
-  'Eshita',
-  'Gautami',
-  'Gayatri',
-  'Geeta',
-  'Geetanjali',
-  'Gitanjali',
-  'Gemine',
-  'Gemini',
-  'Girja',
-  'Girija',
-  'Gita',
-  'Hamsini',
-  'Harinakshi',
-  'Harita',
-  'Heema',
-  'Himadri',
-  'Himani',
-  'Hiranya',
-  'Indira',
-  'Jaimini',
-  'Jaya',
-  'Jyoti',
-  'Jyotsana',
-  'Kali',
-  'Kalinda',
-  'Kalpana',
-  'Kalyani',
-  'Kama',
-  'Kamala',
-  'Kamla',
-  'Kanchan',
-  'Kanishka',
-  'Kanti',
-  'Kashyapi',
-  'Kumari',
-  'Kumuda',
-  'Lakshmi',
-  'Laxmi',
-  'Lalita',
-  'Lavanya',
-  'Leela',
-  'Lila',
-  'Madhuri',
-  'Malti',
-  'Malati',
-  'Mandakini',
-  'Mandaakin',
-  'Mangala',
-  'Mangalya',
-  'Mani',
-  'Manisha',
-  'Manjusha',
-  'Meena',
-  'Mina',
-  'Meenakshi',
-  'Minakshi',
-  'Menka',
-  'Menaka',
-  'Mohana',
-  'Mohini',
-  'Nalini',
-  'Nikita',
-  'Ojaswini',
-  'Omana',
-  'Oormila',
-  'Urmila',
-  'Opalina',
-  'Opaline',
-  'Padma',
-  'Parvati',
-  'Poornima',
-  'Purnima',
-  'Pramila',
-  'Prasanna',
-  'Preity',
-  'Prema',
-  'Priya',
-  'Priyala',
-  'Pushti',
-  'Radha',
-  'Rageswari',
-  'Rageshwari',
-  'Rajinder',
-  'Ramaa',
-  'Rati',
-  'Rita',
-  'Rohana',
-  'Rukhmani',
-  'Rukmin',
-  'Rupinder',
-  'Sanya',
-  'Sarada',
-  'Sharda',
-  'Sarala',
-  'Sarla',
-  'Saraswati',
-  'Sarisha',
-  'Saroja',
-  'Shakti',
-  'Shakuntala',
-  'Shanti',
-  'Sharmila',
-  'Shashi',
-  'Shashikala',
-  'Sheela',
-  'Shivakari',
-  'Shobhana',
-  'Shresth',
-  'Shresthi',
-  'Shreya',
-  'Shreyashi',
-  'Shridevi',
-  'Shrishti',
-  'Shubha',
-  'Shubhaprada',
-  'Siddhi',
-  'Sitara',
-  'Sloka',
-  'Smita',
-  'Smriti',
-  'Soma',
-  'Subhashini',
-  'Subhasini',
-  'Sucheta',
-  'Sudeva',
-  'Sujata',
-  'Sukanya',
-  'Suma',
-  'Sumitra',
-  'Sunita',
-  'Suryakantam',
-  'Sushma',
-  'Swara',
-  'Swarnalata',
-  'Sweta',
-  'Shwet',
-  'Tanirika',
-  'Tanushree',
-  'Tanushri',
-  'Tanya',
-  'Tara',
-  'Trisha',
-  'Uma',
-  'Usha',
-  'Vaijayanti',
-  'Vaijayanthi',
-  'Baijayanti',
-  'Vaishvi',
-  'Vaishnavi',
-  'Vaishno',
-  'Varalakshmi',
-  'Vasudha',
-  'Vasundhara',
-  'Veda',
-  'Vedanshi',
-  'Vidya',
-  'Vimala',
-  'Vrinda',
-  'Vrund',
-  'Aadi',
-  'Aadidev',
-  'Aadinath',
-  'Aaditya',
-  'Aagam',
-  'Aagney',
-  'Aamod',
-  'Aanandaswarup',
-  'Anand Swarup',
-  'Aanjaneya',
-  'Anjaneya',
-  'Aaryan',
-  'Aryan',
-  'Aatmaj',
-  'Aatreya',
-  'Aayushmaan',
-  'Aayushman',
-  'Abhaidev',
-  'Abhirath',
-  'Abhisyanta',
-  'Acaryatanaya',
-  'Achalesvara',
-  'Acharyanandana',
-  'Acharyasuta',
-  'Achintya',
-  'Achyut',
-  'Adheesh',
-  'Adhiraj',
-  'Adhrit',
-  'Adikavi',
-  'Adinath',
-  'Aditeya',
-  'Aditya',
-  'Adityanandan',
-  'Adityanandana',
-  'Adripathi',
-  'Advaya',
-  'Agasti',
-  'Agastya',
-  'Agneya',
-  'Aagneya',
-  'Agnimitra',
-  'Agniprava',
-  'Agnivesh',
-  'Ajit',
-  'Ajeet',
-  'Akroor',
-  'Akshaj',
-  'Akshat',
-  'Akshayakeerti',
-  'Alok',
-  'Aalok',
-  'Amaranaath',
-  'Amarnath',
-  'Amaresh',
-  'Ameyatma',
-  'Amish',
-  'Amogh',
-  'Amrit',
-  'Anaadi',
-  'Anagh',
-  'Anal',
-  'Anand',
-  'Aanand',
-  'Anang',
-  'Anil',
-  'Anilaabh',
-  'Anilabh',
-  'Anish',
-  'Ankal',
-  'Anunay',
-  'Anurag',
-  'Anuraag',
-  'Archan',
-  'Arindam',
-  'Arjun',
-  'Arnesh',
-  'Arun',
-  'Ashlesh',
-  'Ashok',
-  'Atmanand',
-  'Atmananda',
-  'Avadhesh',
-  'Baalaaditya',
-  'Baladitya',
-  'Baalagopaal',
-  'Balgopal',
-  'Balagopal',
-  'Bahula',
-  'Bakula',
-  'Balaaditya',
-  'Balachandra',
-  'Balagovind',
-  'Bandhu',
-  'Bandhul',
-  'Bankim',
-  'Bankimchandra',
-  'Bhadrak',
-  'Bhadraksh',
-  'Bhadran',
-  'Bhagavaan',
-  'Bhagvan',
-  'Bharadwaj',
-  'Bhardwaj',
-  'Bharat',
-  'Bhargava',
-  'Bhasvan',
-  'Bhaasvan',
-  'Bhaswar',
-  'Bhaaswar',
-  'Bhaumik',
-  'Bhaves',
-  'Bheeshma',
-  'Bhisham',
-  'Bhishma',
-  'Bhima',
-  'Bhoj',
-  'Bhramar',
-  'Bhudev',
-  'Bhudeva',
-  'Bhupati',
-  'Bhoopati',
-  'Bhoopat',
-  'Bhupen',
-  'Bhushan',
-  'Bhooshan',
-  'Bhushit',
-  'Bhooshit',
-  'Bhuvanesh',
-  'Bhuvaneshwar',
-  'Bodhan',
-  'Brahma',
-  'Brahmabrata',
-  'Brahmanandam',
-  'Brahmaanand',
-  'Brahmdev',
-  'Brajendra',
-  'Brajesh',
-  'Brijesh',
-  'Birjesh',
-  'Budhil',
-  'Chakor',
-  'Chakradhar',
-  'Chakravartee',
-  'Chakravarti',
-  'Chanakya',
-  'Chaanakya',
-  'Chandak',
-  'Chandan',
-  'Chandraayan',
-  'Chandrabhan',
-  'Chandradev',
-  'Chandraketu',
-  'Chandramauli',
-  'Chandramohan',
-  'Chandran',
-  'Chandranath',
-  'Chapal',
-  'Charak',
-  'Charuchandra',
-  'Chaaruchandra',
-  'Charuvrat',
-  'Chatur',
-  'Chaturaanan',
-  'Chaturbhuj',
-  'Chetan',
-  'Chaten',
-  'Chaitan',
-  'Chetanaanand',
-  'Chidaakaash',
-  'Chidaatma',
-  'Chidambar',
-  'Chidambaram',
-  'Chidananda',
-  'Chinmayanand',
-  'Chinmayananda',
-  'Chiranjeev',
-  'Chiranjeeve',
-  'Chitraksh',
-  'Daiwik',
-  'Damodara',
-  'Dandak',
-  'Dandapaani',
-  'Darshan',
-  'Datta',
-  'Dayaamay',
-  'Dayamayee',
-  'Dayaananda',
-  'Dayaanidhi',
-  'Kin',
-  'Deenabandhu',
-  'Deepan',
-  'Deepankar',
-  'Dipankar',
-  'Deependra',
-  'Dipendra',
-  'Deepesh',
-  'Dipesh',
-  'Deeptanshu',
-  'Deeptendu',
-  'Diptendu',
-  'Deeptiman',
-  'Deeptimoy',
-  'Deeptimay',
-  'Dev',
-  'Deb',
-  'Devadatt',
-  'Devagya',
-  'Devajyoti',
-  'Devak',
-  'Devdan',
-  'Deven',
-  'Devesh',
-  'Deveshwar',
-  'Devvrat',
-  'Dhananjay',
-  'Dhanapati',
-  'Dhanpati',
-  'Dhanesh',
-  'Dhanu',
-  'Dhanvin',
-  'Dharmaketu',
-  'Dhruv',
-  'Dhyanesh',
-  'Dhyaneshwar',
-  'Digambar',
-  'Digambara',
-  'Dinakar',
-  'Dinkar',
-  'Dinesh',
-  'Divaakar',
-  'Divakar',
-  'Deevakar',
-  'Divjot',
-  'Dron',
-  'Drona',
-  'Dwaipayan',
-  'Dwaipayana',
-  'Eekalabya',
-  'Ekalavya',
-  'Ekaksh',
-  'Ekaaksh',
-  'Ekaling',
-  'Ekdant',
-  'Ekadant',
-  'Gajaadhar',
-  'Gajadhar',
-  'Gajbaahu',
-  'Gajabahu',
-  'Ganak',
-  'Ganaka',
-  'Ganapati',
-  'Gandharv',
-  'Gandharva',
-  'Ganesh',
-  'Gangesh',
-  'Garud',
-  'Garuda',
-  'Gati',
-  'Gatik',
-  'Gaurang',
-  'Gauraang',
-  'Gauranga',
-  'Gouranga',
-  'Gautam',
-  'Gautama',
-  'Goutam',
-  'Ghanaanand',
-  'Ghanshyam',
-  'Ghanashyam',
-  'Giri',
-  'Girik',
-  'Girika',
-  'Girindra',
-  'Giriraaj',
-  'Giriraj',
-  'Girish',
-  'Gopal',
-  'Gopaal',
-  'Gopi',
-  'Gopee',
-  'Gorakhnath',
-  'Gorakhanatha',
-  'Goswamee',
-  'Goswami',
-  'Gotum',
-  'Govinda',
-  'Gobinda',
-  'Gudakesha',
-  'Gudakesa',
-  'Gurdev',
-  'Guru',
-  'Hari',
-  'Harinarayan',
-  'Harit',
-  'Hiranmay',
-  'Hiranmaya',
-  'Inder',
-  'Indra',
-  'Jagadish',
-  'Jagadisha',
-  'Jagathi',
-  'Jagdeep',
-  'Jagdish',
-  'Jagmeet',
-  'Jahnu',
-  'Jai',
-  'Javas',
-  'Jay',
-  'Jitendra',
-  'Jitender',
-  'Jyotis',
-  'Kailash',
-  'Kamalesh',
-  'Kamlesh',
-  'Kanak',
-  'Kanaka',
-  'Kannan',
-  'Kannen',
-  'Karan',
-  'Karthik',
-  'Kartik',
-  'Karunanidhi',
-  'Kashyap',
-  'Kiran',
-  'Kirti',
-  'Keerti',
-  'Krishna',
-  'Krishnadas',
-  'Krishnadasa',
-  'Kumar',
-  'Lai',
-  'Lakshman',
-  'Laxman',
-  'Lakshmidhar',
-  'Lakshminath',
-  'Lal',
-  'Laal',
-  'Mahendra',
-  'Mohinder',
-  'Mahesh',
-  'Maheswar',
-  'Manik',
-  'Manikya',
-  'Manoj',
-  'Marut',
-  'Mayoor',
-  'Meghnad',
-  'Meghnath',
-  'Mohan',
-  'Mukesh',
-  'Mukul',
-  'Nagabhushanam',
-  'Nanda',
-  'Narayan',
-  'Narendra',
-  'Narinder',
-  'Naveen',
-  'Navin',
-  'Nawal',
-  'Naval',
-  'Nimit',
-  'Niranjan',
-  'Nirbhay',
-  'Niro',
-  'Param',
-  'Paramartha',
-  'Pran',
-  'Pranay',
-  'Prasad',
-  'Prathamesh',
-  'Prayag',
-  'Prem',
-  'Puneet',
-  'Purushottam',
-  'Rahul',
-  'Raj',
-  'Rajan',
-  'Rajendra',
-  'Rajiv',
-  'Rakesh',
-  'Ramesh',
-  'Rameshwar',
-  'Ranjit',
-  'Ranjeet',
-  'Ravi',
-  'Ritesh',
-  'Rohan',
-  'Rohit',
-  'Rudra',
-  'Sachin',
-  'Sameer',
-  'Samir',
-  'Sanjay',
-  'Sanka',
-  'Sarvin',
-  'Satish',
-  'Satyen',
-  'Shankar',
-  'Shantanu',
-  'Sher',
-  'Shiv',
-  'Siddarth',
-  'Siddhran',
-  'Som',
-  'Somu',
-  'Somnath',
-  'Subhash',
-  'Subodh',
-  'Suman',
-  'Suresh',
-  'Surya',
-  'Suryakant',
-  'Suryakanta',
-  'Sushil',
-  'Susheel',
-  'Swami',
-  'Swapnil',
-  'Tapan',
-  'Tarun',
-  'Tej',
-  'Tejas',
-  'Trilochan',
-  'Trilochana',
-  'Trilok',
-  'Trilokesh',
-  'Triloki',
-  'Triloki Nath',
-  'Trilokanath',
-  'Tushar',
-  'Udai',
-  'Udit',
-  'Ujjawal',
-  'Ujjwal',
-  'Umang',
-  'Upendra',
-  'Uttam',
-  'Vasudev',
-  'Vasudeva',
-  'Vedang',
-  'Vedanga',
-  'Vidhya',
-  'Vidur',
-  'Vidhur',
-  'Vijay',
-  'Vimal',
-  'Vinay',
-  'Vishnu',
-  'Bishnu',
-  'Vishwamitra',
-  'Vyas',
-  'Yogendra',
-  'Yoginder',
-  'Yogesh',
-];
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/en_IN/person/index.ts b/src/locales/en_IN/person/index.ts
index bb956ea585c..b61cf10830a 100644
--- a/src/locales/en_IN/person/index.ts
+++ b/src/locales/en_IN/person/index.ts
@@ -3,12 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
+import male_first_name from './male_first_name';
 
 const person: PersonDefinitions = {
+  female_first_name,
   first_name,
   last_name,
+  male_first_name,
 };
 
 export default person;
diff --git a/src/locales/en_IN/person/male_first_name.ts b/src/locales/en_IN/person/male_first_name.ts
new file mode 100644
index 00000000000..8f9bd5ba2f0
--- /dev/null
+++ b/src/locales/en_IN/person/male_first_name.ts
@@ -0,0 +1,456 @@
+export default [
+  'Aadi',
+  'Aadidev',
+  'Aadinath',
+  'Aaditya',
+  'Aagam',
+  'Aagney',
+  'Aamod',
+  'Aanandaswarup',
+  'Anand Swarup',
+  'Aanjaneya',
+  'Anjaneya',
+  'Aaryan',
+  'Aryan',
+  'Aatmaj',
+  'Aatreya',
+  'Aayushmaan',
+  'Aayushman',
+  'Abhaidev',
+  'Abhirath',
+  'Abhisyanta',
+  'Acaryatanaya',
+  'Achalesvara',
+  'Acharyanandana',
+  'Acharyasuta',
+  'Achintya',
+  'Achyut',
+  'Adheesh',
+  'Adhiraj',
+  'Adhrit',
+  'Adikavi',
+  'Adinath',
+  'Aditeya',
+  'Aditya',
+  'Adityanandan',
+  'Adityanandana',
+  'Adripathi',
+  'Advaya',
+  'Agasti',
+  'Agastya',
+  'Agneya',
+  'Aagneya',
+  'Agnimitra',
+  'Agniprava',
+  'Agnivesh',
+  'Ajit',
+  'Ajeet',
+  'Akroor',
+  'Akshaj',
+  'Akshat',
+  'Akshayakeerti',
+  'Alok',
+  'Aalok',
+  'Amaranaath',
+  'Amarnath',
+  'Amaresh',
+  'Ameyatma',
+  'Amish',
+  'Amogh',
+  'Amrit',
+  'Anaadi',
+  'Anagh',
+  'Anal',
+  'Anand',
+  'Aanand',
+  'Anang',
+  'Anil',
+  'Anilaabh',
+  'Anilabh',
+  'Anish',
+  'Ankal',
+  'Anunay',
+  'Anurag',
+  'Anuraag',
+  'Archan',
+  'Arindam',
+  'Arjun',
+  'Arnesh',
+  'Arun',
+  'Ashlesh',
+  'Ashok',
+  'Atmanand',
+  'Atmananda',
+  'Avadhesh',
+  'Baalaaditya',
+  'Baladitya',
+  'Baalagopaal',
+  'Balgopal',
+  'Balagopal',
+  'Bahula',
+  'Bakula',
+  'Balaaditya',
+  'Balachandra',
+  'Balagovind',
+  'Bandhu',
+  'Bandhul',
+  'Bankim',
+  'Bankimchandra',
+  'Bhadrak',
+  'Bhadraksh',
+  'Bhadran',
+  'Bhagavaan',
+  'Bhagvan',
+  'Bharadwaj',
+  'Bhardwaj',
+  'Bharat',
+  'Bhargava',
+  'Bhasvan',
+  'Bhaasvan',
+  'Bhaswar',
+  'Bhaaswar',
+  'Bhaumik',
+  'Bhaves',
+  'Bheeshma',
+  'Bhisham',
+  'Bhishma',
+  'Bhima',
+  'Bhoj',
+  'Bhramar',
+  'Bhudev',
+  'Bhudeva',
+  'Bhupati',
+  'Bhoopati',
+  'Bhoopat',
+  'Bhupen',
+  'Bhushan',
+  'Bhooshan',
+  'Bhushit',
+  'Bhooshit',
+  'Bhuvanesh',
+  'Bhuvaneshwar',
+  'Bodhan',
+  'Brahma',
+  'Brahmabrata',
+  'Brahmanandam',
+  'Brahmaanand',
+  'Brahmdev',
+  'Brajendra',
+  'Brajesh',
+  'Brijesh',
+  'Birjesh',
+  'Budhil',
+  'Chakor',
+  'Chakradhar',
+  'Chakravartee',
+  'Chakravarti',
+  'Chanakya',
+  'Chaanakya',
+  'Chandak',
+  'Chandan',
+  'Chandraayan',
+  'Chandrabhan',
+  'Chandradev',
+  'Chandraketu',
+  'Chandramauli',
+  'Chandramohan',
+  'Chandran',
+  'Chandranath',
+  'Chapal',
+  'Charak',
+  'Charuchandra',
+  'Chaaruchandra',
+  'Charuvrat',
+  'Chatur',
+  'Chaturaanan',
+  'Chaturbhuj',
+  'Chetan',
+  'Chaten',
+  'Chaitan',
+  'Chetanaanand',
+  'Chidaakaash',
+  'Chidaatma',
+  'Chidambar',
+  'Chidambaram',
+  'Chidananda',
+  'Chinmayanand',
+  'Chinmayananda',
+  'Chiranjeev',
+  'Chiranjeeve',
+  'Chitraksh',
+  'Daiwik',
+  'Damodara',
+  'Dandak',
+  'Dandapaani',
+  'Darshan',
+  'Datta',
+  'Dayaamay',
+  'Dayamayee',
+  'Dayaananda',
+  'Dayaanidhi',
+  'Kin',
+  'Deenabandhu',
+  'Deepan',
+  'Deepankar',
+  'Dipankar',
+  'Deependra',
+  'Dipendra',
+  'Deepesh',
+  'Dipesh',
+  'Deeptanshu',
+  'Deeptendu',
+  'Diptendu',
+  'Deeptiman',
+  'Deeptimoy',
+  'Deeptimay',
+  'Dev',
+  'Deb',
+  'Devadatt',
+  'Devagya',
+  'Devajyoti',
+  'Devak',
+  'Devdan',
+  'Deven',
+  'Devesh',
+  'Deveshwar',
+  'Devvrat',
+  'Dhananjay',
+  'Dhanapati',
+  'Dhanpati',
+  'Dhanesh',
+  'Dhanu',
+  'Dhanvin',
+  'Dharmaketu',
+  'Dhruv',
+  'Dhyanesh',
+  'Dhyaneshwar',
+  'Digambar',
+  'Digambara',
+  'Dinakar',
+  'Dinkar',
+  'Dinesh',
+  'Divaakar',
+  'Divakar',
+  'Deevakar',
+  'Divjot',
+  'Dron',
+  'Drona',
+  'Dwaipayan',
+  'Dwaipayana',
+  'Eekalabya',
+  'Ekalavya',
+  'Ekaksh',
+  'Ekaaksh',
+  'Ekaling',
+  'Ekdant',
+  'Ekadant',
+  'Gajaadhar',
+  'Gajadhar',
+  'Gajbaahu',
+  'Gajabahu',
+  'Ganak',
+  'Ganaka',
+  'Ganapati',
+  'Gandharv',
+  'Gandharva',
+  'Ganesh',
+  'Gangesh',
+  'Garud',
+  'Garuda',
+  'Gati',
+  'Gatik',
+  'Gaurang',
+  'Gauraang',
+  'Gauranga',
+  'Gouranga',
+  'Gautam',
+  'Gautama',
+  'Goutam',
+  'Ghanaanand',
+  'Ghanshyam',
+  'Ghanashyam',
+  'Giri',
+  'Girik',
+  'Girika',
+  'Girindra',
+  'Giriraaj',
+  'Giriraj',
+  'Girish',
+  'Gopal',
+  'Gopaal',
+  'Gopi',
+  'Gopee',
+  'Gorakhnath',
+  'Gorakhanatha',
+  'Goswamee',
+  'Goswami',
+  'Gotum',
+  'Govinda',
+  'Gobinda',
+  'Gudakesha',
+  'Gudakesa',
+  'Gurdev',
+  'Guru',
+  'Hari',
+  'Harinarayan',
+  'Harit',
+  'Hiranmay',
+  'Hiranmaya',
+  'Inder',
+  'Indra',
+  'Jagadish',
+  'Jagadisha',
+  'Jagathi',
+  'Jagdeep',
+  'Jagdish',
+  'Jagmeet',
+  'Jahnu',
+  'Jai',
+  'Javas',
+  'Jay',
+  'Jitendra',
+  'Jitender',
+  'Jyotis',
+  'Kailash',
+  'Kamalesh',
+  'Kamlesh',
+  'Kanak',
+  'Kanaka',
+  'Kannan',
+  'Kannen',
+  'Karan',
+  'Karthik',
+  'Kartik',
+  'Karunanidhi',
+  'Kashyap',
+  'Kiran',
+  'Kirti',
+  'Keerti',
+  'Krishna',
+  'Krishnadas',
+  'Krishnadasa',
+  'Kumar',
+  'Lai',
+  'Lakshman',
+  'Laxman',
+  'Lakshmidhar',
+  'Lakshminath',
+  'Lal',
+  'Laal',
+  'Mahendra',
+  'Mohinder',
+  'Mahesh',
+  'Maheswar',
+  'Manik',
+  'Manikya',
+  'Manoj',
+  'Marut',
+  'Mayoor',
+  'Meghnad',
+  'Meghnath',
+  'Mohan',
+  'Mukesh',
+  'Mukul',
+  'Nagabhushanam',
+  'Nanda',
+  'Narayan',
+  'Narendra',
+  'Narinder',
+  'Naveen',
+  'Navin',
+  'Nawal',
+  'Naval',
+  'Nimit',
+  'Niranjan',
+  'Nirbhay',
+  'Niro',
+  'Param',
+  'Paramartha',
+  'Pran',
+  'Pranay',
+  'Prasad',
+  'Prathamesh',
+  'Prayag',
+  'Prem',
+  'Puneet',
+  'Purushottam',
+  'Rahul',
+  'Raj',
+  'Rajan',
+  'Rajendra',
+  'Rajiv',
+  'Rakesh',
+  'Ramesh',
+  'Rameshwar',
+  'Ranjit',
+  'Ranjeet',
+  'Ravi',
+  'Ritesh',
+  'Rohan',
+  'Rohit',
+  'Rudra',
+  'Sachin',
+  'Sameer',
+  'Samir',
+  'Sanjay',
+  'Sanka',
+  'Sarvin',
+  'Satish',
+  'Satyen',
+  'Shankar',
+  'Shantanu',
+  'Sher',
+  'Shiv',
+  'Siddarth',
+  'Siddhran',
+  'Som',
+  'Somu',
+  'Somnath',
+  'Subhash',
+  'Subodh',
+  'Suman',
+  'Suresh',
+  'Surya',
+  'Suryakant',
+  'Suryakanta',
+  'Sushil',
+  'Susheel',
+  'Swami',
+  'Swapnil',
+  'Tapan',
+  'Tarun',
+  'Tej',
+  'Tejas',
+  'Trilochan',
+  'Trilochana',
+  'Trilok',
+  'Trilokesh',
+  'Triloki',
+  'Triloki Nath',
+  'Trilokanath',
+  'Tushar',
+  'Udai',
+  'Udit',
+  'Ujjawal',
+  'Ujjwal',
+  'Umang',
+  'Upendra',
+  'Uttam',
+  'Vasudev',
+  'Vasudeva',
+  'Vedang',
+  'Vedanga',
+  'Vidhya',
+  'Vidur',
+  'Vidhur',
+  'Vijay',
+  'Vimal',
+  'Vinay',
+  'Vishnu',
+  'Bishnu',
+  'Vishwamitra',
+  'Vyas',
+  'Yogendra',
+  'Yoginder',
+  'Yogesh',
+];
diff --git a/src/locales/es/location/country.ts b/src/locales/es/location/country.ts
index e29dd2b7c70..72065e9d287 100644
--- a/src/locales/es/location/country.ts
+++ b/src/locales/es/location/country.ts
@@ -119,7 +119,7 @@ export default [
   'Namibia',
   'Nauru',
   'Nepal',
-  'Holanda',
+  'Países Bajos',
   'Nueva Zelanda',
   'Nicaragua',
   'Niger',
diff --git a/src/locales/es/location/index.ts b/src/locales/es/location/index.ts
index 5d589f9c904..a2e96b31a47 100644
--- a/src/locales/es/location/index.ts
+++ b/src/locales/es/location/index.ts
@@ -16,7 +16,6 @@ import state_abbr from './state_abbr';
 import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
-import time_zone from './time_zone';
 
 const location: LocationDefinitions = {
   building_number,
@@ -32,7 +31,6 @@ const location: LocationDefinitions = {
   street,
   street_address,
   street_suffix,
-  time_zone,
 };
 
 export default location;
diff --git a/src/locales/es/location/time_zone.ts b/src/locales/es/location/time_zone.ts
deleted file mode 100644
index e5a7b192de1..00000000000
--- a/src/locales/es/location/time_zone.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-export default [
-  'Pacífico/Midway',
-  'Pacífico/Pago_Pago',
-  'Pacífico/Honolulu',
-  'America/Juneau',
-  'America/Los_Angeles',
-  'America/Tijuana',
-  'America/Denver',
-  'America/Phoenix',
-  'America/Chihuahua',
-  'America/Mazatlan',
-  'America/Chicago',
-  'America/Regina',
-  'America/Mexico_City',
-  'America/Monterrey',
-  'America/Guatemala',
-  'America/New_York',
-  'America/Indiana/Indianapolis',
-  'America/Bogota',
-  'America/Lima',
-  'America/Halifax',
-  'America/Caracas',
-  'America/La_Paz',
-  'America/Santiago',
-  'America/St_Johns',
-  'America/Sao_Paulo',
-  'America/Argentina/Buenos_Aires',
-  'America/Guyana',
-  'America/Godthab',
-  'Atlantic/South_Georgia',
-  'Atlantic/Azores',
-  'Atlantic/Cape_Verde',
-  'Europa/Dublin',
-  'Europa/London',
-  'Europa/Lisbon',
-  'Africa/Casablanca',
-  'Africa/Monrovia',
-  'Etc/UTC',
-  'Europa/Belgrade',
-  'Europa/Bratislava',
-  'Europa/Budapest',
-  'Europa/Ljubljana',
-  'Europa/Prague',
-  'Europa/Sarajevo',
-  'Europa/Skopje',
-  'Europa/Warsaw',
-  'Europa/Zagreb',
-  'Europa/Brussels',
-  'Europa/Copenhagen',
-  'Europa/Madrid',
-  'Europa/Paris',
-  'Europa/Amsterdam',
-  'Europa/Berlin',
-  'Europa/Rome',
-  'Europa/Stockholm',
-  'Europa/Vienna',
-  'Africa/Algiers',
-  'Europa/Bucharest',
-  'Africa/Cairo',
-  'Europa/Helsinki',
-  'Europa/Kiev',
-  'Europa/Riga',
-  'Europa/Sofia',
-  'Europa/Tallinn',
-  'Europa/Vilnius',
-  'Europa/Athens',
-  'Europa/Istanbul',
-  'Europa/Minsk',
-  'Asia/Jerusalen',
-  'Africa/Harare',
-  'Africa/Johannesburg',
-  'Europa/Moscú',
-  'Asia/Kuwait',
-  'Asia/Riyadh',
-  'Africa/Nairobi',
-  'Asia/Baghdad',
-  'Asia/Tehran',
-  'Asia/Muscat',
-  'Asia/Baku',
-  'Asia/Tbilisi',
-  'Asia/Yerevan',
-  'Asia/Kabul',
-  'Asia/Yekaterinburg',
-  'Asia/Karachi',
-  'Asia/Tashkent',
-  'Asia/Kolkata',
-  'Asia/Kathmandu',
-  'Asia/Dhaka',
-  'Asia/Colombo',
-  'Asia/Almaty',
-  'Asia/Novosibirsk',
-  'Asia/Rangoon',
-  'Asia/Bangkok',
-  'Asia/Jakarta',
-  'Asia/Krasnoyarsk',
-  'Asia/Shanghai',
-  'Asia/Chongqing',
-  'Asia/Hong_Kong',
-  'Asia/Urumqi',
-  'Asia/Kuala_Lumpur',
-  'Asia/Singapore',
-  'Asia/Taipei',
-  'Australia/Perth',
-  'Asia/Irkutsk',
-  'Asia/Ulaanbaatar',
-  'Asia/Seoul',
-  'Asia/Tokyo',
-  'Asia/Yakutsk',
-  'Australia/Darwin',
-  'Australia/Adelaide',
-  'Australia/Melbourne',
-  'Australia/Sydney',
-  'Australia/Brisbane',
-  'Australia/Hobart',
-  'Asia/Vladivostok',
-  'Pacífico/Guam',
-  'Pacífico/Port_Moresby',
-  'Asia/Magadan',
-  'Pacífico/Noumea',
-  'Pacífico/Fiji',
-  'Asia/Kamchatka',
-  'Pacífico/Majuro',
-  'Pacífico/Auckland',
-  'Pacífico/Tongatapu',
-  'Pacífico/Fakaofo',
-  'Pacífico/Apia',
-];
diff --git a/src/locales/es_MX/location/country.ts b/src/locales/es_MX/location/country.ts
index 8b0ca27c95f..2f1cf98f760 100644
--- a/src/locales/es_MX/location/country.ts
+++ b/src/locales/es_MX/location/country.ts
@@ -119,7 +119,7 @@ export default [
   'Namibia',
   'Nauru',
   'Nepal',
-  'Holanda',
+  'Países Bajos',
   'Nueva Zelanda',
   'Nicaragua',
   'Niger',
diff --git a/src/locales/es_MX/location/index.ts b/src/locales/es_MX/location/index.ts
index c0728fac1ec..b7646887fd4 100644
--- a/src/locales/es_MX/location/index.ts
+++ b/src/locales/es_MX/location/index.ts
@@ -17,7 +17,6 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
-import time_zone from './time_zone';
 
 const location: LocationDefinitions = {
   building_number,
@@ -34,7 +33,6 @@ const location: LocationDefinitions = {
   street_address,
   street_name,
   street_suffix,
-  time_zone,
 };
 
 export default location;
diff --git a/src/locales/es_MX/location/time_zone.ts b/src/locales/es_MX/location/time_zone.ts
deleted file mode 100644
index e5a7b192de1..00000000000
--- a/src/locales/es_MX/location/time_zone.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-export default [
-  'Pacífico/Midway',
-  'Pacífico/Pago_Pago',
-  'Pacífico/Honolulu',
-  'America/Juneau',
-  'America/Los_Angeles',
-  'America/Tijuana',
-  'America/Denver',
-  'America/Phoenix',
-  'America/Chihuahua',
-  'America/Mazatlan',
-  'America/Chicago',
-  'America/Regina',
-  'America/Mexico_City',
-  'America/Monterrey',
-  'America/Guatemala',
-  'America/New_York',
-  'America/Indiana/Indianapolis',
-  'America/Bogota',
-  'America/Lima',
-  'America/Halifax',
-  'America/Caracas',
-  'America/La_Paz',
-  'America/Santiago',
-  'America/St_Johns',
-  'America/Sao_Paulo',
-  'America/Argentina/Buenos_Aires',
-  'America/Guyana',
-  'America/Godthab',
-  'Atlantic/South_Georgia',
-  'Atlantic/Azores',
-  'Atlantic/Cape_Verde',
-  'Europa/Dublin',
-  'Europa/London',
-  'Europa/Lisbon',
-  'Africa/Casablanca',
-  'Africa/Monrovia',
-  'Etc/UTC',
-  'Europa/Belgrade',
-  'Europa/Bratislava',
-  'Europa/Budapest',
-  'Europa/Ljubljana',
-  'Europa/Prague',
-  'Europa/Sarajevo',
-  'Europa/Skopje',
-  'Europa/Warsaw',
-  'Europa/Zagreb',
-  'Europa/Brussels',
-  'Europa/Copenhagen',
-  'Europa/Madrid',
-  'Europa/Paris',
-  'Europa/Amsterdam',
-  'Europa/Berlin',
-  'Europa/Rome',
-  'Europa/Stockholm',
-  'Europa/Vienna',
-  'Africa/Algiers',
-  'Europa/Bucharest',
-  'Africa/Cairo',
-  'Europa/Helsinki',
-  'Europa/Kiev',
-  'Europa/Riga',
-  'Europa/Sofia',
-  'Europa/Tallinn',
-  'Europa/Vilnius',
-  'Europa/Athens',
-  'Europa/Istanbul',
-  'Europa/Minsk',
-  'Asia/Jerusalen',
-  'Africa/Harare',
-  'Africa/Johannesburg',
-  'Europa/Moscú',
-  'Asia/Kuwait',
-  'Asia/Riyadh',
-  'Africa/Nairobi',
-  'Asia/Baghdad',
-  'Asia/Tehran',
-  'Asia/Muscat',
-  'Asia/Baku',
-  'Asia/Tbilisi',
-  'Asia/Yerevan',
-  'Asia/Kabul',
-  'Asia/Yekaterinburg',
-  'Asia/Karachi',
-  'Asia/Tashkent',
-  'Asia/Kolkata',
-  'Asia/Kathmandu',
-  'Asia/Dhaka',
-  'Asia/Colombo',
-  'Asia/Almaty',
-  'Asia/Novosibirsk',
-  'Asia/Rangoon',
-  'Asia/Bangkok',
-  'Asia/Jakarta',
-  'Asia/Krasnoyarsk',
-  'Asia/Shanghai',
-  'Asia/Chongqing',
-  'Asia/Hong_Kong',
-  'Asia/Urumqi',
-  'Asia/Kuala_Lumpur',
-  'Asia/Singapore',
-  'Asia/Taipei',
-  'Australia/Perth',
-  'Asia/Irkutsk',
-  'Asia/Ulaanbaatar',
-  'Asia/Seoul',
-  'Asia/Tokyo',
-  'Asia/Yakutsk',
-  'Australia/Darwin',
-  'Australia/Adelaide',
-  'Australia/Melbourne',
-  'Australia/Sydney',
-  'Australia/Brisbane',
-  'Australia/Hobart',
-  'Asia/Vladivostok',
-  'Pacífico/Guam',
-  'Pacífico/Port_Moresby',
-  'Asia/Magadan',
-  'Pacífico/Noumea',
-  'Pacífico/Fiji',
-  'Asia/Kamchatka',
-  'Pacífico/Majuro',
-  'Pacífico/Auckland',
-  'Pacífico/Tongatapu',
-  'Pacífico/Fakaofo',
-  'Pacífico/Apia',
-];
diff --git a/src/locales/fr/person/first_name.ts b/src/locales/fr/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/fr/person/first_name.ts
+++ b/src/locales/fr/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/fr_CH/person/first_name.ts b/src/locales/fr_CH/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/fr_CH/person/first_name.ts
+++ b/src/locales/fr_CH/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/he/location/index.ts b/src/locales/he/location/index.ts
index 2a4aa12d314..ecad5d07256 100644
--- a/src/locales/he/location/index.ts
+++ b/src/locales/he/location/index.ts
@@ -19,7 +19,6 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 import street_prefix from './street_prefix';
-import time_zone from './time_zone';
 
 const location: LocationDefinitions = {
   building_number,
@@ -38,7 +37,6 @@ const location: LocationDefinitions = {
   street_address,
   street_name,
   street_prefix,
-  time_zone,
 };
 
 export default location;
diff --git a/src/locales/he/location/time_zone.ts b/src/locales/he/location/time_zone.ts
deleted file mode 100644
index 932c7e24713..00000000000
--- a/src/locales/he/location/time_zone.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-export default [
-  'Pacific/Midway',
-  'Pacific/Pago_Pago',
-  'Pacific/Honolulu',
-  'America/Juneau',
-  'America/Los_Angeles',
-  'America/Tijuana',
-  'America/Denver',
-  'America/Phoenix',
-  'America/Chihuahua',
-  'America/Mazatlan',
-  'America/Chicago',
-  'America/Regina',
-  'America/Mexico_City',
-  'America/Monterrey',
-  'America/Guatemala',
-  'America/New_York',
-  'America/Indiana/Indianapolis',
-  'America/Bogota',
-  'America/Lima',
-  'America/Halifax',
-  'America/Caracas',
-  'America/La_Paz',
-  'America/Santiago',
-  'America/St_Johns',
-  'America/Sao_Paulo',
-  'America/Argentina/Buenos_Aires',
-  'America/Guyana',
-  'America/Godthab',
-  'Atlantic/South_Georgia',
-  'Atlantic/Azores',
-  'Atlantic/Cape_Verde',
-  'Europe/Dublin',
-  'Europe/London',
-  'Europe/Lisbon',
-  'Africa/Casablanca',
-  'Africa/Monrovia',
-  'Etc/UTC',
-  'Europe/Belgrade',
-  'Europe/Bratislava',
-  'Europe/Budapest',
-  'Europe/Ljubljana',
-  'Europe/Prague',
-  'Europe/Sarajevo',
-  'Europe/Skopje',
-  'Europe/Warsaw',
-  'Europe/Zagreb',
-  'Europe/Brussels',
-  'Europe/Copenhagen',
-  'Europe/Madrid',
-  'Europe/Paris',
-  'Europe/Amsterdam',
-  'Europe/Berlin',
-  'Europe/Rome',
-  'Europe/Stockholm',
-  'Europe/Vienna',
-  'Africa/Algiers',
-  'Europe/Bucharest',
-  'Africa/Cairo',
-  'Europe/Helsinki',
-  'Europe/Kiev',
-  'Europe/Riga',
-  'Europe/Sofia',
-  'Europe/Tallinn',
-  'Europe/Vilnius',
-  'Europe/Athens',
-  'Europe/Istanbul',
-  'Europe/Minsk',
-  'Asia/Jerusalem',
-  'Africa/Harare',
-  'Africa/Johannesburg',
-  'Europe/Moscow',
-  'Asia/Kuwait',
-  'Asia/Riyadh',
-  'Africa/Nairobi',
-  'Asia/Baghdad',
-  'Asia/Tehran',
-  'Asia/Muscat',
-  'Asia/Baku',
-  'Asia/Tbilisi',
-  'Asia/Yerevan',
-  'Asia/Kabul',
-  'Asia/Yekaterinburg',
-  'Asia/Karachi',
-  'Asia/Tashkent',
-  'Asia/Kolkata',
-  'Asia/Kathmandu',
-  'Asia/Dhaka',
-  'Asia/Colombo',
-  'Asia/Almaty',
-  'Asia/Novosibirsk',
-  'Asia/Rangoon',
-  'Asia/Bangkok',
-  'Asia/Jakarta',
-  'Asia/Krasnoyarsk',
-  'Asia/Shanghai',
-  'Asia/Chongqing',
-  'Asia/Hong_Kong',
-  'Asia/Urumqi',
-  'Asia/Kuala_Lumpur',
-  'Asia/Singapore',
-  'Asia/Taipei',
-  'Australia/Perth',
-  'Asia/Irkutsk',
-  'Asia/Ulaanbaatar',
-  'Asia/Seoul',
-  'Asia/Tokyo',
-  'Asia/Yakutsk',
-  'Australia/Darwin',
-  'Australia/Adelaide',
-  'Australia/Melbourne',
-  'Australia/Sydney',
-  'Australia/Brisbane',
-  'Australia/Hobart',
-  'Asia/Vladivostok',
-  'Pacific/Guam',
-  'Pacific/Port_Moresby',
-  'Asia/Magadan',
-  'Pacific/Noumea',
-  'Pacific/Fiji',
-  'Asia/Kamchatka',
-  'Pacific/Majuro',
-  'Pacific/Auckland',
-  'Pacific/Tongatapu',
-  'Pacific/Fakaofo',
-  'Pacific/Apia',
-];
diff --git a/src/locales/he/person/first_name.ts b/src/locales/he/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/he/person/first_name.ts
+++ b/src/locales/he/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/hr/location/index.ts b/src/locales/hr/location/index.ts
index 28fdcbff7cc..7b286a9d3ac 100644
--- a/src/locales/hr/location/index.ts
+++ b/src/locales/hr/location/index.ts
@@ -13,7 +13,6 @@ import secondary_address from './secondary_address';
 import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
-import time_zone from './time_zone';
 
 const location: LocationDefinitions = {
   building_number,
@@ -26,7 +25,6 @@ const location: LocationDefinitions = {
   street,
   street_address,
   street_name,
-  time_zone,
 };
 
 export default location;
diff --git a/src/locales/hr/location/time_zone.ts b/src/locales/hr/location/time_zone.ts
deleted file mode 100644
index e2b05f6ccb5..00000000000
--- a/src/locales/hr/location/time_zone.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-export default [
-  'Pacifik/Midway',
-  'Pacifik/Pago_Pago',
-  'Pacifik/Honolulu',
-  'Amerika/Juneau',
-  'Amerika/Los_Angeles',
-  'Amerika/Tijuana',
-  'Amerika/Denver',
-  'Amerika/Phoenix',
-  'Amerika/Chihuahua',
-  'Amerika/Mazatlan',
-  'Amerika/Chicago',
-  'Amerika/Regina',
-  'Amerika/Mexico_City',
-  'Amerika/Monterrey',
-  'Amerika/Guatemala',
-  'Amerika/New_York',
-  'Amerika/Indiana/Indianapolis',
-  'Amerika/Bogota',
-  'Amerika/Lima',
-  'Amerika/Halifax',
-  'Amerika/Caracas',
-  'Amerika/La_Paz',
-  'Amerika/Santiago',
-  'Amerika/St_Johns',
-  'Amerika/Sao_Paulo',
-  'Amerika/Argentina/Buenos_Aires',
-  'Amerika/Guyana',
-  'Amerika/Godthab',
-  'Atlantik/South_Georgia',
-  'Atlantik/Azori',
-  'Atlantik/Cape_Verde',
-  'Europa/Dublin',
-  'Europa/London',
-  'Europa/Lisbon',
-  'Africa/Casablanca',
-  'Africa/Monrovia',
-  'Etc/UTC',
-  'Europa/Beograd',
-  'Europa/Bratislava',
-  'Europa/Budapest',
-  'Europa/Ljubljana',
-  'Europa/Prague',
-  'Europa/Sarajevo',
-  'Europa/Skopje',
-  'Europa/Varšava',
-  'Europa/Zagreb',
-  'Europa/Brussels',
-  'Europa/Copenhagen',
-  'Europa/Madrid',
-  'Europa/Paris',
-  'Europa/Amsterdam',
-  'Europa/Berlin',
-  'Europa/Rim',
-  'Europa/Stockholm',
-  'Europa/Beč',
-  'Africa/Alžir',
-  'Europa/Bukurešt',
-  'Africa/Kairo',
-  'Europa/Helsinki',
-  'Europa/Kiev',
-  'Europa/Riga',
-  'Europa/Sofia',
-  'Europa/Tallinn',
-  'Europa/Vilnius',
-  'Europa/Atena',
-  'Europa/Istanbul',
-  'Europa/Minsk',
-  'Azija/Jeruzalem',
-  'Africa/Harare',
-  'Africa/Johannesburg',
-  'Europa/Moskva',
-  'Azija/Kuwait',
-  'Azija/Riyadh',
-  'Africa/Nairobi',
-  'Azija/Baghdad',
-  'Azija/Tehran',
-  'Azija/Muscat',
-  'Azija/Baku',
-  'Azija/Tbilisi',
-  'Azija/Yerevan',
-  'Azija/Kabul',
-  'Azija/Yekaterinburg',
-  'Azija/Karachi',
-  'Azija/Tashkent',
-  'Azija/Kolkata',
-  'Azija/Kathmandu',
-  'Azija/Dhaka',
-  'Azija/Colombo',
-  'Azija/Almaty',
-  'Azija/Novosibirsk',
-  'Azija/Rangoon',
-  'Azija/Bangkok',
-  'Azija/Jakarta',
-  'Azija/Krasnoyarsk',
-  'Azija/Shanghai',
-  'Azija/Chongqing',
-  'Azija/Hong_Kong',
-  'Azija/Urumqi',
-  'Azija/Kuala_Lumpur',
-  'Azija/Singapore',
-  'Azija/Taipei',
-  'Australia/Perth',
-  'Azija/Irkutsk',
-  'Azija/Ulaanbaatar',
-  'Azija/Seoul',
-  'Azija/Tokyo',
-  'Azija/Yakutsk',
-  'Australia/Darwin',
-  'Australia/Adelaide',
-  'Australia/Melbourne',
-  'Australia/Sydney',
-  'Australia/Brisbane',
-  'Australia/Hobart',
-  'Azija/Vladivostok',
-  'Pacifik/Guam',
-  'Pacifik/Port_Moresby',
-  'Azija/Magadan',
-  'Pacifik/Noumea',
-  'Pacifik/Fiji',
-  'Azija/Kamchatka',
-  'Pacifik/Majuro',
-  'Pacifik/Auckland',
-  'Pacifik/Tongatapu',
-  'Pacifik/Fakaofo',
-  'Pacifik/Apia',
-];
diff --git a/src/locales/hu/person/first_name.ts b/src/locales/hu/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/hu/person/first_name.ts
+++ b/src/locales/hu/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/id_ID/person/first_name.ts b/src/locales/id_ID/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/id_ID/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/id_ID/person/index.ts b/src/locales/id_ID/person/index.ts
index 38afd8b48e5..dd110277103 100644
--- a/src/locales/id_ID/person/index.ts
+++ b/src/locales/id_ID/person/index.ts
@@ -6,6 +6,7 @@ import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_title from './female_title';
+import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
 import male_title from './male_title';
@@ -17,6 +18,7 @@ const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_title,
+  first_name,
   male_first_name,
   male_last_name,
   male_title,
diff --git a/src/locales/lv/person/first_name.ts b/src/locales/lv/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/lv/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/lv/person/index.ts b/src/locales/lv/person/index.ts
index 7eef036ce1f..f1ac9682f93 100644
--- a/src/locales/lv/person/index.ts
+++ b/src/locales/lv/person/index.ts
@@ -5,6 +5,7 @@
 import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
+import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
 import name_ from './name';
@@ -15,6 +16,7 @@ import title from './title';
 const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
+  first_name,
   male_first_name,
   male_last_name,
   name: name_,
diff --git a/src/locales/mk/person/first_name.ts b/src/locales/mk/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/mk/person/first_name.ts
+++ b/src/locales/mk/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/mk/person/last_name.ts b/src/locales/mk/person/last_name.ts
index 0ce6d456740..6ff69f6004f 100644
--- a/src/locales/mk/person/last_name.ts
+++ b/src/locales/mk/person/last_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_last_name from './female_last_name';
 import male_last_name from './male_last_name';
 
-export default [...new Set([...female_last_name, ...male_last_name])];
+export default mergeArrays(female_last_name, male_last_name);
diff --git a/src/locales/nl_BE/person/female_first_name.ts b/src/locales/nl_BE/person/female_first_name.ts
new file mode 100644
index 00000000000..6d34e507313
--- /dev/null
+++ b/src/locales/nl_BE/person/female_first_name.ts
@@ -0,0 +1,101 @@
+export default [
+  'Emma',
+  'Louise',
+  'Marie',
+  'Elise',
+  'Noor',
+  'Ella',
+  'Julie',
+  'Lotte',
+  'Lore',
+  'Fien',
+  'Lena',
+  'Mila',
+  'Olivia',
+  'Amber',
+  'Anna',
+  'Elena',
+  'Hanne',
+  'Laura',
+  'Charlotte',
+  'Lina',
+  'Nina',
+  'Fleur',
+  'Lisa',
+  'Nora',
+  'Juliette',
+  'Luna',
+  'Amelie',
+  'Kato',
+  'Sara',
+  'Febe',
+  'Axelle',
+  'Janne',
+  'Eline',
+  'Helena',
+  'Noa',
+  'Camille',
+  'Roos',
+  'Lily',
+  'Jade',
+  'Nore',
+  'Jana',
+  'Manon',
+  'Sarah',
+  'Liv',
+  'Amélie',
+  'Lara',
+  'Mona',
+  'Alice',
+  'Tess',
+  'Kaat',
+  'Femke',
+  'Aya',
+  'Eva',
+  'Lien',
+  'Bo',
+  'Zoe',
+  'Oona',
+  'Sofia',
+  'Leonie',
+  'Linde',
+  'Jolien',
+  'Fran',
+  'Pauline',
+  'Laure',
+  'Merel',
+  'Marthe',
+  'Yana',
+  'Renée',
+  'Paulien',
+  'Margot',
+  'Yasmine',
+  'Ines',
+  'Elisa',
+  'Emily',
+  'Maya',
+  'Floor',
+  'Amy',
+  'Lize',
+  'Amina',
+  'Lucie',
+  'Julia',
+  'Lise',
+  'Hailey',
+  'Hannah',
+  'Alicia',
+  'Norah',
+  'Margaux',
+  'Lieze',
+  'Sien',
+  'Zoë',
+  'Inaya',
+  'Aline',
+  'Amira',
+  'Victoria',
+  'Flore',
+  'Lana',
+  'Sterre',
+  'Maud',
+  'Chloe',
+];
diff --git a/src/locales/nl_BE/person/first_name.ts b/src/locales/nl_BE/person/first_name.ts
index aec8110c8b1..40a647ec054 100644
--- a/src/locales/nl_BE/person/first_name.ts
+++ b/src/locales/nl_BE/person/first_name.ts
@@ -1,201 +1,8 @@
-export default [
-  'Lucas',
-  'Liam',
-  'Louis',
-  'Noah',
-  'Lars',
-  'Arthur',
-  'Mathis',
-  'Kobe',
-  'Wout',
-  'Milan',
-  'Alexander',
-  'Daan',
-  'Adam',
-  'Vince',
-  'Jules',
-  'Victor',
-  'Finn',
-  'Stan',
-  'Leon',
-  'Seppe',
-  'Senne',
-  'Thomas',
-  'Mats',
-  'Robbe',
-  'Matteo',
-  'Ferre',
-  'Nathan',
-  'Warre',
-  'Jasper',
-  'Vic',
-  'Elias',
-  'Tuur',
-  'Lowie',
-  'Mauro',
-  'Maxim',
-  'Ruben',
-  'Rune',
-  'Mohamed',
-  'Simon',
-  'Rayan',
-  'Lukas',
-  'Lander',
-  'Xander',
-  'Emiel',
-  'Siebe',
-  'Jonas',
-  'Sam',
-  'Luca',
-  'Arne',
-  'Cas',
-  'Felix',
-  'Jack',
-  'Mathias',
-  'Jayden',
-  'Quinten',
-  'Tibo',
-  'Lewis',
-  'Sem',
-  'Maxime',
-  'Viktor',
-  'Emile',
-  'Sander',
-  'Aaron',
-  'Oscar',
-  'Bas',
-  'Niels',
-  'Jef',
-  'Nand',
-  'Lou',
-  'Tristan',
-  'Gust',
-  'David',
-  'Brent',
-  'Jelle',
-  'Lenn',
-  'Miel',
-  'Wannes',
-  'Gilles',
-  'Jarne',
-  'Alex',
-  'Imran',
-  'Lennert',
-  'Milo',
-  'Jens',
-  'Matthias',
-  'Dries',
-  'Axel',
-  'Juul',
-  'Hamza',
-  'Ilias',
-  'Thibo',
-  'Nicolas',
-  'Bent',
-  'Jesse',
-  'Bram',
-  'Maurice',
-  'Ilyas',
-  'Gabriel',
-  'Robin',
-  'Kasper',
-  'Emma',
-  'Louise',
-  'Marie',
-  'Elise',
-  'Noor',
-  'Ella',
-  'Julie',
-  'Lotte',
-  'Lore',
-  'Fien',
-  'Lena',
-  'Mila',
-  'Olivia',
-  'Amber',
-  'Anna',
-  'Elena',
-  'Hanne',
-  'Laura',
-  'Charlotte',
-  'Lina',
-  'Nina',
-  'Fleur',
-  'Lisa',
-  'Nora',
-  'Juliette',
-  'Luna',
-  'Amelie',
-  'Kato',
-  'Sara',
-  'Febe',
-  'Axelle',
-  'Janne',
-  'Eline',
-  'Helena',
-  'Noa',
-  'Camille',
-  'Roos',
-  'Lily',
-  'Jade',
-  'Nore',
-  'Jana',
-  'Manon',
-  'Sarah',
-  'Liv',
-  'Amélie',
-  'Lara',
-  'Mona',
-  'Alice',
-  'Tess',
-  'Kaat',
-  'Femke',
-  'Aya',
-  'Eva',
-  'Lien',
-  'Bo',
-  'Zoe',
-  'Oona',
-  'Sofia',
-  'Leonie',
-  'Linde',
-  'Jolien',
-  'Fran',
-  'Pauline',
-  'Laure',
-  'Merel',
-  'Marthe',
-  'Yana',
-  'Renée',
-  'Paulien',
-  'Margot',
-  'Yasmine',
-  'Ines',
-  'Elisa',
-  'Emily',
-  'Maya',
-  'Floor',
-  'Amy',
-  'Lize',
-  'Amina',
-  'Lucie',
-  'Julia',
-  'Lise',
-  'Hailey',
-  'Hannah',
-  'Alicia',
-  'Norah',
-  'Margaux',
-  'Lieze',
-  'Sien',
-  'Zoë',
-  'Inaya',
-  'Aline',
-  'Amira',
-  'Victoria',
-  'Flore',
-  'Lana',
-  'Sterre',
-  'Maud',
-  'Chloe',
-];
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/nl_BE/person/index.ts b/src/locales/nl_BE/person/index.ts
index 1019bd29783..55193f15df2 100644
--- a/src/locales/nl_BE/person/index.ts
+++ b/src/locales/nl_BE/person/index.ts
@@ -3,15 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
+import male_first_name from './male_first_name';
 import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
 const person: PersonDefinitions = {
+  female_first_name,
   first_name,
   last_name,
+  male_first_name,
   name: name_,
   prefix,
   suffix,
diff --git a/src/locales/nl_BE/person/male_first_name.ts b/src/locales/nl_BE/person/male_first_name.ts
new file mode 100644
index 00000000000..7638602a660
--- /dev/null
+++ b/src/locales/nl_BE/person/male_first_name.ts
@@ -0,0 +1,102 @@
+export default [
+  'Lucas',
+  'Liam',
+  'Louis',
+  'Noah',
+  'Lars',
+  'Arthur',
+  'Mathis',
+  'Kobe',
+  'Wout',
+  'Milan',
+  'Alexander',
+  'Daan',
+  'Adam',
+  'Vince',
+  'Jules',
+  'Victor',
+  'Finn',
+  'Stan',
+  'Leon',
+  'Seppe',
+  'Senne',
+  'Thomas',
+  'Mats',
+  'Robbe',
+  'Matteo',
+  'Ferre',
+  'Nathan',
+  'Warre',
+  'Jasper',
+  'Vic',
+  'Elias',
+  'Tuur',
+  'Lowie',
+  'Mauro',
+  'Maxim',
+  'Ruben',
+  'Rune',
+  'Mohamed',
+  'Simon',
+  'Rayan',
+  'Lukas',
+  'Lander',
+  'Xander',
+  'Emiel',
+  'Siebe',
+  'Jonas',
+  'Sam',
+  'Luca',
+  'Arne',
+  'Cas',
+  'Felix',
+  'Jack',
+  'Mathias',
+  'Jayden',
+  'Quinten',
+  'Tibo',
+  'Lewis',
+  'Sem',
+  'Maxime',
+  'Viktor',
+  'Emile',
+  'Sander',
+  'Aaron',
+  'Oscar',
+  'Bas',
+  'Niels',
+  'Jef',
+  'Nand',
+  'Lou',
+  'Tristan',
+  'Gust',
+  'David',
+  'Brent',
+  'Jelle',
+  'Lenn',
+  'Miel',
+  'Wannes',
+  'Gilles',
+  'Jarne',
+  'Alex',
+  'Imran',
+  'Lennert',
+  'Milo',
+  'Jens',
+  'Matthias',
+  'Dries',
+  'Axel',
+  'Juul',
+  'Hamza',
+  'Ilias',
+  'Thibo',
+  'Nicolas',
+  'Bent',
+  'Jesse',
+  'Bram',
+  'Maurice',
+  'Ilyas',
+  'Gabriel',
+  'Robin',
+  'Kasper',
+];
diff --git a/src/locales/pl/person/first_name.ts b/src/locales/pl/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/pl/person/first_name.ts
+++ b/src/locales/pl/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/pt_BR/location/country.ts b/src/locales/pt_BR/location/country.ts
index b1c15104472..03d68b1615e 100644
--- a/src/locales/pt_BR/location/country.ts
+++ b/src/locales/pt_BR/location/country.ts
@@ -149,7 +149,7 @@ export default [
   'Nauru',
   'Nepal',
   'Antilhas Holandesas',
-  'Holanda',
+  'Países Baixos',
   'Nova Caledonia',
   'Nova Zelândia',
   'Nicarágua',
diff --git a/src/locales/ro/person/first_name.ts b/src/locales/ro/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/ro/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/ro/person/index.ts b/src/locales/ro/person/index.ts
index f1a7a7c8161..55193f15df2 100644
--- a/src/locales/ro/person/index.ts
+++ b/src/locales/ro/person/index.ts
@@ -4,6 +4,7 @@
  */
 import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
+import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 import name_ from './name';
@@ -12,6 +13,7 @@ import suffix from './suffix';
 
 const person: PersonDefinitions = {
   female_first_name,
+  first_name,
   last_name,
   male_first_name,
   name: name_,
diff --git a/src/locales/ru/person/first_name.ts b/src/locales/ru/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/ru/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/ru/person/index.ts b/src/locales/ru/person/index.ts
index 7413a1521d8..d14b2f9939d 100644
--- a/src/locales/ru/person/index.ts
+++ b/src/locales/ru/person/index.ts
@@ -6,6 +6,7 @@ import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_middle_name from './female_middle_name';
+import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
 import male_middle_name from './male_middle_name';
@@ -18,6 +19,7 @@ const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_middle_name,
+  first_name,
   male_first_name,
   male_last_name,
   male_middle_name,
diff --git a/src/locales/sk/person/first_name.ts b/src/locales/sk/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/sk/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/sk/person/index.ts b/src/locales/sk/person/index.ts
index 7eef036ce1f..f1ac9682f93 100644
--- a/src/locales/sk/person/index.ts
+++ b/src/locales/sk/person/index.ts
@@ -5,6 +5,7 @@
 import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
+import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
 import name_ from './name';
@@ -15,6 +16,7 @@ import title from './title';
 const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
+  first_name,
   male_first_name,
   male_last_name,
   name: name_,
diff --git a/src/locales/uk/person/first_name.ts b/src/locales/uk/person/first_name.ts
new file mode 100644
index 00000000000..40a647ec054
--- /dev/null
+++ b/src/locales/uk/person/first_name.ts
@@ -0,0 +1,8 @@
+// We don't have a generic first name list for this locale
+// So simply concatenate male and female lists and remove any duplicates
+// This avoids falling back to fallback locale
+import { mergeArrays } from './../../../internal/merge';
+import female_first_name from './female_first_name';
+import male_first_name from './male_first_name';
+
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/locales/uk/person/index.ts b/src/locales/uk/person/index.ts
index 7413a1521d8..d14b2f9939d 100644
--- a/src/locales/uk/person/index.ts
+++ b/src/locales/uk/person/index.ts
@@ -6,6 +6,7 @@ import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_middle_name from './female_middle_name';
+import first_name from './first_name';
 import male_first_name from './male_first_name';
 import male_last_name from './male_last_name';
 import male_middle_name from './male_middle_name';
@@ -18,6 +19,7 @@ const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_middle_name,
+  first_name,
   male_first_name,
   male_last_name,
   male_middle_name,
diff --git a/src/locales/vi/person/first_name.ts b/src/locales/vi/person/first_name.ts
index 6926a090728..3c787970a71 100644
--- a/src/locales/vi/person/first_name.ts
+++ b/src/locales/vi/person/first_name.ts
@@ -1,4 +1,5 @@
+import { mergeArrays } from './../../../internal/merge';
 import female_first_name from './female_first_name';
 import male_first_name from './male_first_name';
 
-export default [...new Set([...female_first_name, ...male_first_name])];
+export default mergeArrays(female_first_name, male_first_name);
diff --git a/src/modules/company/index.ts b/src/modules/company/index.ts
index e9e9bf09b31..d4b181f6be7 100644
--- a/src/modules/company/index.ts
+++ b/src/modules/company/index.ts
@@ -36,11 +36,9 @@ export class CompanyModule {
    * @since 7.4.0
    */
   name(): string {
-    const pattern = this.faker.helpers.arrayElement(
+    return this.faker.helpers.fake(
       this.faker.definitions.company.name_patterns
     );
-
-    return this.faker.helpers.fake(pattern);
   }
 
   /**
diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts
index 4cf9ad38b45..cb4f768074b 100644
--- a/src/modules/helpers/index.ts
+++ b/src/modules/helpers/index.ts
@@ -506,7 +506,7 @@ export class HelpersModule {
    * It checks the given string for placeholders and replaces them by calling faker methods:
    *
    * ```js
-   * const hello = faker.helpers.fake('Hi, my name is {{person.firstName}} {{person.lastName}}!')
+   * const hello = faker.helpers.fake('Hi, my name is {{person.firstName}} {{person.lastName}}!');
    * ```
    *
    * This would use the `faker.person.firstName()` and `faker.person.lastName()` method to resolve the placeholders respectively.
@@ -515,18 +515,18 @@ export class HelpersModule {
    * and if that isn't possible, we will fall back to string:
    *
    * ```js
-   * const message = faker.helpers.fake('You can call me at {{phone.number(+!# !## #### #####!)}}.')
+   * const message = faker.helpers.fake('You can call me at {{phone.number(+!# !## #### #####!)}}.');
    * ```
    *
    * It is also possible to use multiple parameters (comma separated).
    *
    * ```js
-   * const message = faker.helpers.fake('Your pin is {{string.numeric(4, {"allowLeadingZeros": true})}}.')
+   * const message = faker.helpers.fake('Your pin is {{string.numeric(4, {"allowLeadingZeros": true})}}.');
    * ```
    *
-   * It is also NOT possible to use any non-faker methods or plain javascript in such templates.
+   * It is also NOT possible to use any non-faker methods or plain javascript in such patterns.
    *
-   * @param str The template string that will get interpolated. Must not be empty.
+   * @param pattern The pattern string that will get interpolated. Must not be empty.
    *
    * @see faker.helpers.mustache() to use custom functions for resolution.
    *
@@ -541,24 +541,127 @@ export class HelpersModule {
    *
    * @since 7.4.0
    */
-  fake(str: string): string {
+  fake(pattern: string): string;
+  /**
+   * Generator for combining faker methods based on an array containing static string inputs.
+   *
+   * Note: We recommend using string template literals instead of `fake()`,
+   * which are faster and strongly typed (if you are using TypeScript),
+   * e.g. ``const address = `${faker.location.zipCode()} ${faker.location.city()}`;``
+   *
+   * This method is useful if you have to build a random string from a static, non-executable source
+   * (e.g. string coming from a user, stored in a database or a file).
+   *
+   * It checks the given string for placeholders and replaces them by calling faker methods:
+   *
+   * ```js
+   * const hello = faker.helpers.fake(['Hi, my name is {{person.firstName}} {{person.lastName}}!']);
+   * ```
+   *
+   * This would use the `faker.person.firstName()` and `faker.person.lastName()` method to resolve the placeholders respectively.
+   *
+   * It is also possible to provide parameters. At first, they will be parsed as json,
+   * and if that isn't possible, it will fall back to string:
+   *
+   * ```js
+   * const message = faker.helpers.fake([
+   *   'You can call me at {{phone.number(+!# !## #### #####!)}}.',
+   *   'My email is {{internet.email}}.',
+   * ]);
+   * ```
+   *
+   * It is also possible to use multiple parameters (comma separated).
+   *
+   * ```js
+   * const message = faker.helpers.fake(['Your pin is {{string.numeric(4, {"allowLeadingZeros": true})}}.']);
+   * ```
+   *
+   * It is also NOT possible to use any non-faker methods or plain javascript in such patterns.
+   *
+   * @param patterns The array to select a pattern from, that will then get interpolated. Must not be empty.
+   *
+   * @see faker.helpers.mustache() to use custom functions for resolution.
+   *
+   * @example
+   * faker.helpers.fake(['A: {{person.firstName}}', 'B: {{person.lastName}}']) // 'A: Barry'
+   *
+   * @since 8.0.0
+   */
+  fake(patterns: string[]): string;
+  /**
+   * Generator for combining faker methods based on a static string input or an array of static string inputs.
+   *
+   * Note: We recommend using string template literals instead of `fake()`,
+   * which are faster and strongly typed (if you are using TypeScript),
+   * e.g. ``const address = `${faker.location.zipCode()} ${faker.location.city()}`;``
+   *
+   * This method is useful if you have to build a random string from a static, non-executable source
+   * (e.g. string coming from a user, stored in a database or a file).
+   *
+   * It checks the given string for placeholders and replaces them by calling faker methods:
+   *
+   * ```js
+   * const hello = faker.helpers.fake('Hi, my name is {{person.firstName}} {{person.lastName}}!');
+   * ```
+   *
+   * This would use the `faker.person.firstName()` and `faker.person.lastName()` method to resolve the placeholders respectively.
+   *
+   * It is also possible to provide parameters. At first, they will be parsed as json,
+   * and if that isn't possible, it will fall back to string:
+   *
+   * ```js
+   * const message = faker.helpers.fake('You can call me at {{phone.number(+!# !## #### #####!)}}.');
+   * ```
+   *
+   * It is also possible to use multiple parameters (comma separated).
+   *
+   * ```js
+   * const message = faker.helpers.fake('Your pin is {{string.numeric(4, {"allowLeadingZeros": true})}}.');
+   * ```
+   *
+   * It is also NOT possible to use any non-faker methods or plain javascript in such patterns.
+   *
+   * @param pattern The pattern string that will get interpolated. Must not be empty. If an array is passed, a random element will be picked and interpolated.
+   *
+   * @see faker.helpers.mustache() to use custom functions for resolution.
+   *
+   * @example
+   * faker.helpers.fake('{{person.lastName}}') // 'Barrows'
+   * faker.helpers.fake('{{person.lastName}}, {{person.firstName}} {{person.suffix}}') // 'Durgan, Noe MD'
+   * faker.helpers.fake('This is static test.') // 'This is static test.'
+   * faker.helpers.fake('Good Morning {{person.firstName}}!') // 'Good Morning Estelle!'
+   * faker.helpers.fake('You can call me at {{phone.number(!## ### #####!)}}.') // 'You can call me at 202 555 973722.'
+   * faker.helpers.fake('I flipped the coin and got: {{helpers.arrayElement(["heads", "tails"])}}') // 'I flipped the coin and got: tails'
+   * faker.helpers.fake(['A: {{person.firstName}}', 'B: {{person.lastName}}']) // 'A: Barry'
+   *
+   * @since 7.4.0
+   */
+  fake(pattern: string | string[]): string;
+  fake(pattern: string | string[]): string {
+    if (Array.isArray(pattern)) {
+      pattern = this.arrayElement(pattern);
+      // TODO @ST-DDT 2022-10-15: Remove this check after we fail in `arrayElement` when the array is empty
+      if (pattern == null) {
+        throw new FakerError('Array of pattern strings cannot be empty.');
+      }
+    }
     // if incoming str parameter is not provided, return error message
-    if (typeof str !== 'string' || str.length === 0) {
-      throw new FakerError('string parameter is required!');
+    if (pattern.length === 0) {
+      throw new FakerError('Pattern string cannot be empty.');
     }
 
     // find first matching {{ and }}
-    const start = str.search(/{{[a-z]/);
-    const end = str.indexOf('}}', start);
+    const start = pattern.search(/{{[a-z]/);
+    const end = pattern.indexOf('}}', start);
 
     // if no {{ and }} is found, we are done
     if (start === -1 || end === -1) {
-      return str;
+      return pattern;
     }
 
     // extract method name from between the {{ }} that we found
     // for example: {{person.firstName}}
-    const token = str.substring(start + 2, end + 2);
+    const token = pattern.substring(start + 2, end + 2);
     let method = token.replace('}}', '').replace('{{', '');
 
     // extract method parameters
@@ -615,7 +718,8 @@ export class HelpersModule {
 
     // Replace the found tag with the returned fake value
     // We cannot use string.replace here because the result might contain evaluated characters
-    const res = str.substring(0, start) + result + str.substring(end + 2);
+    const res =
+      pattern.substring(0, start) + result + pattern.substring(end + 2);
 
     if (res === '') {
       return '';
diff --git a/src/modules/internet/index.ts b/src/modules/internet/index.ts
index 4f3132752be..2bac0668928 100644
--- a/src/modules/internet/index.ts
+++ b/src/modules/internet/index.ts
@@ -358,10 +358,8 @@ export class InternetModule {
    * @since 2.0.1
    */
   domainWord(): string {
-    return `${this.faker.word.adjective()}-${this.faker.word.noun()}`
-      .replace(/([\\~#&*{}/:<>?|\"'])/gi, '')
-      .replace(/\s/g, '-')
-      .replace(/-{2,}/g, '-')
+    return this.faker.helpers
+      .slugify(`${this.faker.word.adjective()}-${this.faker.word.noun()}`)
       .toLowerCase();
   }
 
diff --git a/src/modules/location/index.ts b/src/modules/location/index.ts
index a4238241008..a53c11d7abc 100644
--- a/src/modules/location/index.ts
+++ b/src/modules/location/index.ts
@@ -75,10 +75,7 @@ export class LocationModule {
    * @since 8.0.0
    */
   city(): string {
-    const pattern = this.faker.helpers.arrayElement(
-      this.faker.definitions.location.city
-    );
-    return this.faker.helpers.fake(pattern);
+    return this.faker.helpers.fake(this.faker.definitions.location.city);
   }
 
   /**
@@ -121,10 +118,7 @@ export class LocationModule {
    * @since 8.0.0
    */
   street(): string {
-    const format = this.faker.helpers.arrayElement(
-      this.faker.definitions.location.street
-    );
-    return this.faker.helpers.fake(format);
+    return this.faker.helpers.fake(this.faker.definitions.location.street);
   }
 
   /**
diff --git a/src/modules/number/index.ts b/src/modules/number/index.ts
index 62036ab1752..d3f27453429 100644
--- a/src/modules/number/index.ts
+++ b/src/modules/number/index.ts
@@ -22,7 +22,7 @@ export class NumberModule {
    *
    * @param options Maximum value or options object. Defaults to `{}`.
    * @param options.min Lower bound for generated number. Defaults to `0`.
-   * @param options.max Upper bound for generated number. Defaults to `min + 99999`.
+   * @param options.max Upper bound for generated number. Defaults to `Number.MAX_SAFE_INTEGER`.
    *
    * @throws When options define `max < min`.
    *
@@ -42,7 +42,7 @@ export class NumberModule {
       options = { max: options };
     }
 
-    const { min = 0, max = min + 99999 } = options;
+    const { min = 0, max = Number.MAX_SAFE_INTEGER } = options;
     const effectiveMin = Math.ceil(min);
     const effectiveMax = Math.floor(max);
 
diff --git a/test/__snapshots__/datatype.spec.ts.snap b/test/__snapshots__/datatype.spec.ts.snap
index 0a070497c7b..b4dae898336 100644
--- a/test/__snapshots__/datatype.spec.ts.snap
+++ b/test/__snapshots__/datatype.spec.ts.snap
@@ -4,13 +4,13 @@ exports[`datatype > 42 > array > noArgs 1`] = `
 [
   "ky2eiXX/J/",
   "&Kq@X.b]\\"&",
-  72199,
-  93855,
+  6503186795855872,
+  8453731307749376,
   "!1}2Z=YQ!I",
   "<QYF-%<{C6",
   ")jZ3DP|XL%",
-  60754,
-  17052,
+  5472277529362432,
+  1535944771502080,
   "'\\"yxzUlD=\\"",
 ]
 `;
@@ -19,17 +19,17 @@ exports[`datatype > 42 > array > with length 1`] = `
 [
   "ky2eiXX/J/",
   "&Kq@X.b]\\"&",
-  72199,
-  93855,
+  6503186795855872,
+  8453731307749376,
 ]
 `;
 
 exports[`datatype > 42 > array > with length range 1`] = `
 [
-  95071,
+  8563273238577152,
   "eiXX/J/*&K",
-  33370,
-  14286,
+  3005779955154944,
+  1286829863075840,
 ]
 `;
 
@@ -93,7 +93,7 @@ exports[`datatype > 42 > hexadecimal > with length, prefix, and casing 1`] = `"0
 
 exports[`datatype > 42 > hexadecimal > with prefix 1`] = `"0x8"`;
 
-exports[`datatype > 42 > json 1`] = `"{\\"foo\\":\\"ky2eiXX/J/\\",\\"bar\\":\\"&Kq@X.b]\\\\\\"&\\",\\"bike\\":72199,\\"a\\":93855,\\"b\\":\\"!1}2Z=YQ!I\\",\\"name\\":\\"<QYF-%<{C6\\",\\"prop\\":\\")jZ3DP|XL%\\"}"`;
+exports[`datatype > 42 > json 1`] = `"{\\"foo\\":\\"ky2eiXX/J/\\",\\"bar\\":\\"&Kq@X.b]\\\\\\"&\\",\\"bike\\":6503186795855872,\\"a\\":8453731307749376,\\"b\\":\\"!1}2Z=YQ!I\\",\\"name\\":\\"<QYF-%<{C6\\",\\"prop\\":\\")jZ3DP|XL%\\"}"`;
 
 exports[`datatype > 42 > number > noArgs 1`] = `37454`;
 
@@ -131,14 +131,14 @@ exports[`datatype > 42 > uuid 5`] = `"d95f4984-24c2-410f-ac63-400d3bbbcc91"`;
 
 exports[`datatype > 1211 > array > noArgs 1`] = `
 [
-  45901,
-  77826,
+  4134441414819840,
+  7010029022478336,
   "-}$_/\`4hHA",
   "afl\\"h^]dnw",
   "<q|p|5KWu3",
   "CZ|Jh!E=x\\"",
-  42131,
-  15894,
+  3794869965291520,
+  1431627091673088,
   "V<1bEQuA|p",
   "DW9F=V1(U7",
 ]
@@ -146,8 +146,8 @@ exports[`datatype > 1211 > array > noArgs 1`] = `
 
 exports[`datatype > 1211 > array > with length 1`] = `
 [
-  45901,
-  77826,
+  4134441414819840,
+  7010029022478336,
   "-}$_/\`4hHA",
   "afl\\"h^]dnw",
 ]
@@ -156,9 +156,9 @@ exports[`datatype > 1211 > array > with length 1`] = `
 exports[`datatype > 1211 > array > with length range 1`] = `
 [
   "ti5-}$_/\`4",
-  42075,
+  3789861976801280,
   "0afl\\"h^]dn",
-  43503,
+  3918465303838720,
   "q|p|5KWu3/",
 ]
 `;
@@ -223,7 +223,7 @@ exports[`datatype > 1211 > hexadecimal > with length, prefix, and casing 1`] = `
 
 exports[`datatype > 1211 > hexadecimal > with prefix 1`] = `"0xE"`;
 
-exports[`datatype > 1211 > json 1`] = `"{\\"foo\\":45901,\\"bar\\":77826,\\"bike\\":\\"-}$_/\`4hHA\\",\\"a\\":\\"afl\\\\\\"h^]dnw\\",\\"b\\":\\"<q|p|5KWu3\\",\\"name\\":\\"CZ|Jh!E=x\\\\\\"\\",\\"prop\\":42131}"`;
+exports[`datatype > 1211 > json 1`] = `"{\\"foo\\":4134441414819840,\\"bar\\":7010029022478336,\\"bike\\":\\"-}$_/\`4hHA\\",\\"a\\":\\"afl\\\\\\"h^]dnw\\",\\"b\\":\\"<q|p|5KWu3\\",\\"name\\":\\"CZ|Jh!E=x\\\\\\"\\",\\"prop\\":3794869965291520}"`;
 
 exports[`datatype > 1211 > number > noArgs 1`] = `92852`;
 
@@ -262,22 +262,22 @@ exports[`datatype > 1211 > uuid 5`] = `"7b91ce88-effb-4d1d-93bb-ad759e00b86c"`;
 exports[`datatype > 1337 > array > noArgs 1`] = `
 [
   "U/4:SK$>6Q",
-  26194,
+  2359372120326144,
   "{:e=+kD)[B",
   "e|/Jqjjj!B",
   "GDWQgC2M;q",
-  40502,
-  44050,
+  3648103756333056,
+  3967686428065792,
   ".Gm3tRwnZ2",
-  95735,
-  42541,
+  8623125245722624,
+  3831794621218816,
 ]
 `;
 
 exports[`datatype > 1337 > array > with length 1`] = `
 [
   "U/4:SK$>6Q",
-  26194,
+  2359372120326144,
   "{:e=+kD)[B",
   "e|/Jqjjj!B",
 ]
@@ -285,9 +285,9 @@ exports[`datatype > 1337 > array > with length 1`] = `
 
 exports[`datatype > 1337 > array > with length range 1`] = `
 [
-  15868,
+  1429298200182784,
   ":SK$>6QX9@",
-  27048,
+  2436284417048576,
 ]
 `;
 
@@ -351,7 +351,7 @@ exports[`datatype > 1337 > hexadecimal > with length, prefix, and casing 1`] = `
 
 exports[`datatype > 1337 > hexadecimal > with prefix 1`] = `"0x5"`;
 
-exports[`datatype > 1337 > json 1`] = `"{\\"foo\\":\\"U/4:SK$>6Q\\",\\"bar\\":26194,\\"bike\\":\\"{:e=+kD)[B\\",\\"a\\":\\"e|/Jqjjj!B\\",\\"b\\":\\"GDWQgC2M;q\\",\\"name\\":40502,\\"prop\\":44050}"`;
+exports[`datatype > 1337 > json 1`] = `"{\\"foo\\":\\"U/4:SK$>6Q\\",\\"bar\\":2359372120326144,\\"bike\\":\\"{:e=+kD)[B\\",\\"a\\":\\"e|/Jqjjj!B\\",\\"b\\":\\"GDWQgC2M;q\\",\\"name\\":3648103756333056,\\"prop\\":3967686428065792}"`;
 
 exports[`datatype > 1337 > number > noArgs 1`] = `26202`;
 
diff --git a/test/__snapshots__/helpers.spec.ts.snap b/test/__snapshots__/helpers.spec.ts.snap
index 68fba3bcc08..4ce3183266e 100644
--- a/test/__snapshots__/helpers.spec.ts.snap
+++ b/test/__snapshots__/helpers.spec.ts.snap
@@ -21,7 +21,7 @@ exports[`helpers > 42 > arrayElements > with array 1`] = `
 ]
 `;
 
-exports[`helpers > 42 > arrayElements > with array 2`] = `
+exports[`helpers > 42 > arrayElements > with array and count 1`] = `
 [
   "l",
   "r",
@@ -29,9 +29,13 @@ exports[`helpers > 42 > arrayElements > with array 2`] = `
 ]
 `;
 
-exports[`helpers > 42 > fake > with args 1`] = `"my string: Cky2eiXX/J"`;
+exports[`helpers > 42 > fake > with a dynamic template 1`] = `"my string: Cky2eiXX/J"`;
 
-exports[`helpers > 42 > fake > with plain string 1`] = `"my test string"`;
+exports[`helpers > 42 > fake > with a static template 1`] = `"my test string"`;
+
+exports[`helpers > 42 > fake > with multiple dynamic templates 1`] = `"Sandy"`;
+
+exports[`helpers > 42 > fake > with multiple static templates 1`] = `"B"`;
 
 exports[`helpers > 42 > maybe > with only value 1`] = `"Hello World!"`;
 
@@ -155,7 +159,7 @@ exports[`helpers > 42 > slugify > noArgs 1`] = `""`;
 
 exports[`helpers > 42 > slugify > some string 1`] = `"hello-world"`;
 
-exports[`helpers > 42 > unique > with () => number 1`] = `37454`;
+exports[`helpers > 42 > unique > with () => number 1`] = `3373557438480384`;
 
 exports[`helpers > 42 > unique > with () => number and args 1`] = `19`;
 
@@ -200,7 +204,7 @@ exports[`helpers > 1211 > arrayElements > with array 1`] = `
 ]
 `;
 
-exports[`helpers > 1211 > arrayElements > with array 2`] = `
+exports[`helpers > 1211 > arrayElements > with array and count 1`] = `
 [
   "r",
   "o",
@@ -208,9 +212,13 @@ exports[`helpers > 1211 > arrayElements > with array 2`] = `
 ]
 `;
 
-exports[`helpers > 1211 > fake > with args 1`] = `"my string: wKti5-}$_/"`;
+exports[`helpers > 1211 > fake > with a dynamic template 1`] = `"my string: wKti5-}$_/"`;
+
+exports[`helpers > 1211 > fake > with a static template 1`] = `"my test string"`;
 
-exports[`helpers > 1211 > fake > with plain string 1`] = `"my test string"`;
+exports[`helpers > 1211 > fake > with multiple dynamic templates 1`] = `"La Crosse"`;
+
+exports[`helpers > 1211 > fake > with multiple static templates 1`] = `"C"`;
 
 exports[`helpers > 1211 > maybe > with only value 1`] = `undefined`;
 
@@ -340,7 +348,7 @@ exports[`helpers > 1211 > slugify > noArgs 1`] = `""`;
 
 exports[`helpers > 1211 > slugify > some string 1`] = `"hello-world"`;
 
-exports[`helpers > 1211 > unique > with () => number 1`] = `92852`;
+exports[`helpers > 1211 > unique > with () => number 1`] = `8363366036799488`;
 
 exports[`helpers > 1211 > unique > with () => number and args 1`] = `47`;
 
@@ -375,7 +383,7 @@ exports[`helpers > 1337 > arrayElements > with array 1`] = `
 ]
 `;
 
-exports[`helpers > 1337 > arrayElements > with array 2`] = `
+exports[`helpers > 1337 > arrayElements > with array and count 1`] = `
 [
   "e",
   "W",
@@ -383,9 +391,13 @@ exports[`helpers > 1337 > arrayElements > with array 2`] = `
 ]
 `;
 
-exports[`helpers > 1337 > fake > with args 1`] = `"my string: 9U/4:SK$>6"`;
+exports[`helpers > 1337 > fake > with a dynamic template 1`] = `"my string: 9U/4:SK$>6"`;
+
+exports[`helpers > 1337 > fake > with a static template 1`] = `"my test string"`;
+
+exports[`helpers > 1337 > fake > with multiple dynamic templates 1`] = `"U/4:SK$>6Q"`;
 
-exports[`helpers > 1337 > fake > with plain string 1`] = `"my test string"`;
+exports[`helpers > 1337 > fake > with multiple static templates 1`] = `"A"`;
 
 exports[`helpers > 1337 > maybe > with only value 1`] = `"Hello World!"`;
 
@@ -508,7 +520,7 @@ exports[`helpers > 1337 > slugify > noArgs 1`] = `""`;
 
 exports[`helpers > 1337 > slugify > some string 1`] = `"hello-world"`;
 
-exports[`helpers > 1337 > unique > with () => number 1`] = `26202`;
+exports[`helpers > 1337 > unique > with () => number 1`] = `2360108468142080`;
 
 exports[`helpers > 1337 > unique > with () => number and args 1`] = `13`;
 
diff --git a/test/__snapshots__/image.spec.ts.snap b/test/__snapshots__/image.spec.ts.snap
index 61a4d245447..f42ac02f011 100644
--- a/test/__snapshots__/image.spec.ts.snap
+++ b/test/__snapshots__/image.spec.ts.snap
@@ -6,25 +6,25 @@ exports[`image > 42 > avatarGitHub 1`] = `"https://avatars.githubusercontent.com
 
 exports[`image > 42 > avatarLegacy 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/468.jpg"`;
 
-exports[`image > 42 > url > noArgs 1`] = `"https://loremflickr.com/640/480?lock=79654"`;
+exports[`image > 42 > url > noArgs 1`] = `"https://loremflickr.com/640/480?lock=7174621373661184"`;
 
-exports[`image > 42 > url > with height 1`] = `"https://loremflickr.com/640/128?lock=79654"`;
+exports[`image > 42 > url > with height 1`] = `"https://loremflickr.com/640/128?lock=7174621373661184"`;
 
-exports[`image > 42 > url > with width 1`] = `"https://loremflickr.com/128/480?lock=79654"`;
+exports[`image > 42 > url > with width 1`] = `"https://loremflickr.com/128/480?lock=7174621373661184"`;
 
-exports[`image > 42 > url > with width and height 1`] = `"https://loremflickr.com/128/128?lock=79654"`;
+exports[`image > 42 > url > with width and height 1`] = `"https://loremflickr.com/128/128?lock=7174621373661184"`;
 
-exports[`image > 42 > urlLoremFlickr > noArgs 1`] = `"https://loremflickr.com/640/480?lock=37454"`;
+exports[`image > 42 > urlLoremFlickr > noArgs 1`] = `"https://loremflickr.com/640/480?lock=3373557438480384"`;
 
-exports[`image > 42 > urlLoremFlickr > with all options 1`] = `"https://loremflickr.com/128/128/cats?lock=37454"`;
+exports[`image > 42 > urlLoremFlickr > with all options 1`] = `"https://loremflickr.com/128/128/cats?lock=3373557438480384"`;
 
-exports[`image > 42 > urlLoremFlickr > with category 1`] = `"https://loremflickr.com/640/480/cats?lock=37454"`;
+exports[`image > 42 > urlLoremFlickr > with category 1`] = `"https://loremflickr.com/640/480/cats?lock=3373557438480384"`;
 
-exports[`image > 42 > urlLoremFlickr > with height 1`] = `"https://loremflickr.com/640/128?lock=37454"`;
+exports[`image > 42 > urlLoremFlickr > with height 1`] = `"https://loremflickr.com/640/128?lock=3373557438480384"`;
 
-exports[`image > 42 > urlLoremFlickr > with width 1`] = `"https://loremflickr.com/128/480?lock=37454"`;
+exports[`image > 42 > urlLoremFlickr > with width 1`] = `"https://loremflickr.com/128/480?lock=3373557438480384"`;
 
-exports[`image > 42 > urlLoremFlickr > with width and height 1`] = `"https://loremflickr.com/128/128?lock=37454"`;
+exports[`image > 42 > urlLoremFlickr > with width and height 1`] = `"https://loremflickr.com/128/128?lock=3373557438480384"`;
 
 exports[`image > 42 > urlPicsumPhotos > noArgs 1`] = `"https://picsum.photos/id/374/640/480"`;
 
@@ -74,17 +74,17 @@ exports[`image > 1211 > url > with width 1`] = `"https://picsum.photos/id/459/12
 
 exports[`image > 1211 > url > with width and height 1`] = `"https://picsum.photos/id/459/128/128"`;
 
-exports[`image > 1211 > urlLoremFlickr > noArgs 1`] = `"https://loremflickr.com/640/480?lock=92852"`;
+exports[`image > 1211 > urlLoremFlickr > noArgs 1`] = `"https://loremflickr.com/640/480?lock=8363366036799488"`;
 
-exports[`image > 1211 > urlLoremFlickr > with all options 1`] = `"https://loremflickr.com/128/128/cats?lock=92852"`;
+exports[`image > 1211 > urlLoremFlickr > with all options 1`] = `"https://loremflickr.com/128/128/cats?lock=8363366036799488"`;
 
-exports[`image > 1211 > urlLoremFlickr > with category 1`] = `"https://loremflickr.com/640/480/cats?lock=92852"`;
+exports[`image > 1211 > urlLoremFlickr > with category 1`] = `"https://loremflickr.com/640/480/cats?lock=8363366036799488"`;
 
-exports[`image > 1211 > urlLoremFlickr > with height 1`] = `"https://loremflickr.com/640/128?lock=92852"`;
+exports[`image > 1211 > urlLoremFlickr > with height 1`] = `"https://loremflickr.com/640/128?lock=8363366036799488"`;
 
-exports[`image > 1211 > urlLoremFlickr > with width 1`] = `"https://loremflickr.com/128/480?lock=92852"`;
+exports[`image > 1211 > urlLoremFlickr > with width 1`] = `"https://loremflickr.com/128/480?lock=8363366036799488"`;
 
-exports[`image > 1211 > urlLoremFlickr > with width and height 1`] = `"https://loremflickr.com/128/128?lock=92852"`;
+exports[`image > 1211 > urlLoremFlickr > with width and height 1`] = `"https://loremflickr.com/128/128?lock=8363366036799488"`;
 
 exports[`image > 1211 > urlPicsumPhotos > noArgs 1`] = `"https://picsum.photos/id/929/640/480"`;
 
@@ -126,25 +126,25 @@ exports[`image > 1337 > avatarGitHub 1`] = `"https://avatars.githubusercontent.c
 
 exports[`image > 1337 > avatarLegacy 1`] = `"https://cloudflare-ipfs.com/ipfs/Qmd3W5DuhgHirLHGVixi6V76LhCkZUz6pnFt5AJBiyvHye/avatar/327.jpg"`;
 
-exports[`image > 1337 > url > noArgs 1`] = `"https://loremflickr.com/640/480?lock=56052"`;
+exports[`image > 1337 > url > noArgs 1`] = `"https://loremflickr.com/640/480?lock=5048803172286464"`;
 
-exports[`image > 1337 > url > with height 1`] = `"https://loremflickr.com/640/128?lock=56052"`;
+exports[`image > 1337 > url > with height 1`] = `"https://loremflickr.com/640/128?lock=5048803172286464"`;
 
-exports[`image > 1337 > url > with width 1`] = `"https://loremflickr.com/128/480?lock=56052"`;
+exports[`image > 1337 > url > with width 1`] = `"https://loremflickr.com/128/480?lock=5048803172286464"`;
 
-exports[`image > 1337 > url > with width and height 1`] = `"https://loremflickr.com/128/128?lock=56052"`;
+exports[`image > 1337 > url > with width and height 1`] = `"https://loremflickr.com/128/128?lock=5048803172286464"`;
 
-exports[`image > 1337 > urlLoremFlickr > noArgs 1`] = `"https://loremflickr.com/640/480?lock=26202"`;
+exports[`image > 1337 > urlLoremFlickr > noArgs 1`] = `"https://loremflickr.com/640/480?lock=2360108468142080"`;
 
-exports[`image > 1337 > urlLoremFlickr > with all options 1`] = `"https://loremflickr.com/128/128/cats?lock=26202"`;
+exports[`image > 1337 > urlLoremFlickr > with all options 1`] = `"https://loremflickr.com/128/128/cats?lock=2360108468142080"`;
 
-exports[`image > 1337 > urlLoremFlickr > with category 1`] = `"https://loremflickr.com/640/480/cats?lock=26202"`;
+exports[`image > 1337 > urlLoremFlickr > with category 1`] = `"https://loremflickr.com/640/480/cats?lock=2360108468142080"`;
 
-exports[`image > 1337 > urlLoremFlickr > with height 1`] = `"https://loremflickr.com/640/128?lock=26202"`;
+exports[`image > 1337 > urlLoremFlickr > with height 1`] = `"https://loremflickr.com/640/128?lock=2360108468142080"`;
 
-exports[`image > 1337 > urlLoremFlickr > with width 1`] = `"https://loremflickr.com/128/480?lock=26202"`;
+exports[`image > 1337 > urlLoremFlickr > with width 1`] = `"https://loremflickr.com/128/480?lock=2360108468142080"`;
 
-exports[`image > 1337 > urlLoremFlickr > with width and height 1`] = `"https://loremflickr.com/128/128?lock=26202"`;
+exports[`image > 1337 > urlLoremFlickr > with width and height 1`] = `"https://loremflickr.com/128/128?lock=2360108468142080"`;
 
 exports[`image > 1337 > urlPicsumPhotos > noArgs 1`] = `"https://picsum.photos/id/262/640/480"`;
 
diff --git a/test/__snapshots__/internet.spec.ts.snap b/test/__snapshots__/internet.spec.ts.snap
index f5a0a31346b..45913d97707 100644
--- a/test/__snapshots__/internet.spec.ts.snap
+++ b/test/__snapshots__/internet.spec.ts.snap
@@ -8,12 +8,6 @@ exports[`internet > 42 > color > with color base 1`] = `"#6298ac"`;
 
 exports[`internet > 42 > displayName > noArgs 1`] = `"Garnet.Schinner73"`;
 
-exports[`internet > 42 > displayName > noArgs 2`] = `"Garnet.Schinner73"`;
-
-exports[`internet > 42 > displayName > noArgs 3`] = `"Garnet.Schinner73"`;
-
-exports[`internet > 42 > displayName > noArgs 4`] = `"Garnet.Schinner73"`;
-
 exports[`internet > 42 > displayName > with Chinese names 1`] = `"大羽_陳"`;
 
 exports[`internet > 42 > displayName > with Cyrillic names 1`] = `"Фёдор_Достоевский"`;
@@ -78,12 +72,6 @@ exports[`internet > 42 > userAgent 1`] = `"Mozilla/5.0 (Windows; U; Windows NT 6
 
 exports[`internet > 42 > userName > noArgs 1`] = `"Garnet.Schinner73"`;
 
-exports[`internet > 42 > userName > noArgs 2`] = `"Garnet.Schinner73"`;
-
-exports[`internet > 42 > userName > noArgs 3`] = `"Garnet.Schinner73"`;
-
-exports[`internet > 42 > userName > noArgs 4`] = `"Garnet.Schinner73"`;
-
 exports[`internet > 42 > userName > with Chinese names 1`] = `"hlzp8d_tpv"`;
 
 exports[`internet > 42 > userName > with Cyrillic names 1`] = `"Fedor_Dostoevskii"`;
@@ -100,12 +88,6 @@ exports[`internet > 1211 > color > with color base 1`] = `"#a96ca4"`;
 
 exports[`internet > 1211 > displayName > noArgs 1`] = `"Tito_Koelpin22"`;
 
-exports[`internet > 1211 > displayName > noArgs 2`] = `"Tito_Koelpin22"`;
-
-exports[`internet > 1211 > displayName > noArgs 3`] = `"Tito_Koelpin22"`;
-
-exports[`internet > 1211 > displayName > noArgs 4`] = `"Tito_Koelpin22"`;
-
 exports[`internet > 1211 > displayName > with Chinese names 1`] = `"大羽.陳89"`;
 
 exports[`internet > 1211 > displayName > with Cyrillic names 1`] = `"Фёдор.Достоевский89"`;
@@ -170,12 +152,6 @@ exports[`internet > 1211 > userAgent 1`] = `"Mozilla/5.0 (Macintosh; U; Intel Ma
 
 exports[`internet > 1211 > userName > noArgs 1`] = `"Tito_Koelpin22"`;
 
-exports[`internet > 1211 > userName > noArgs 2`] = `"Tito_Koelpin22"`;
-
-exports[`internet > 1211 > userName > noArgs 3`] = `"Tito_Koelpin22"`;
-
-exports[`internet > 1211 > userName > noArgs 4`] = `"Tito_Koelpin22"`;
-
 exports[`internet > 1211 > userName > with Chinese names 1`] = `"hlzp8d.tpv89"`;
 
 exports[`internet > 1211 > userName > with Cyrillic names 1`] = `"Fedor.Dostoevskii89"`;
@@ -192,12 +168,6 @@ exports[`internet > 1337 > color > with color base 1`] = `"#537a46"`;
 
 exports[`internet > 1337 > displayName > noArgs 1`] = `"Devyn21"`;
 
-exports[`internet > 1337 > displayName > noArgs 2`] = `"Devyn21"`;
-
-exports[`internet > 1337 > displayName > noArgs 3`] = `"Devyn21"`;
-
-exports[`internet > 1337 > displayName > noArgs 4`] = `"Devyn21"`;
-
 exports[`internet > 1337 > displayName > with Chinese names 1`] = `"大羽56"`;
 
 exports[`internet > 1337 > displayName > with Cyrillic names 1`] = `"Фёдор56"`;
@@ -262,12 +232,6 @@ exports[`internet > 1337 > userAgent 1`] = `"Mozilla/5.0 (Windows; U; Windows NT
 
 exports[`internet > 1337 > userName > noArgs 1`] = `"Devyn21"`;
 
-exports[`internet > 1337 > userName > noArgs 2`] = `"Devyn21"`;
-
-exports[`internet > 1337 > userName > noArgs 3`] = `"Devyn21"`;
-
-exports[`internet > 1337 > userName > noArgs 4`] = `"Devyn21"`;
-
 exports[`internet > 1337 > userName > with Chinese names 1`] = `"hlzp8d56"`;
 
 exports[`internet > 1337 > userName > with Cyrillic names 1`] = `"Fedor56"`;
diff --git a/test/__snapshots__/location.spec.ts.snap b/test/__snapshots__/location.spec.ts.snap
index 41e9f8c0f8a..cdb6fdb1594 100644
--- a/test/__snapshots__/location.spec.ts.snap
+++ b/test/__snapshots__/location.spec.ts.snap
@@ -68,7 +68,7 @@ exports[`location > 42 > streetAddress > with useFullAddress = true 1`] = `"7917
 
 exports[`location > 42 > streetName 1`] = `"b"`;
 
-exports[`location > 42 > timeZone 1`] = `"Europe/Brussels"`;
+exports[`location > 42 > timeZone 1`] = `"America/North_Dakota/New_Salem"`;
 
 exports[`location > 42 > zipCode > noArgs 1`] = `"79177"`;
 
@@ -146,7 +146,7 @@ exports[`location > 1211 > streetAddress > with useFullAddress = true 1`] = `"48
 
 exports[`location > 1211 > streetName 1`] = `"c"`;
 
-exports[`location > 1211 > timeZone 1`] = `"Asia/Magadan"`;
+exports[`location > 1211 > timeZone 1`] = `"Pacific/Fiji"`;
 
 exports[`location > 1211 > zipCode > noArgs 1`] = `"48721-9061"`;
 
@@ -224,7 +224,7 @@ exports[`location > 1337 > streetAddress > with useFullAddress = true 1`] = `"51
 
 exports[`location > 1337 > streetName 1`] = `"a"`;
 
-exports[`location > 1337 > timeZone 1`] = `"Europe/London"`;
+exports[`location > 1337 > timeZone 1`] = `"America/Guatemala"`;
 
 exports[`location > 1337 > zipCode > noArgs 1`] = `"51225"`;
 
diff --git a/test/__snapshots__/number.spec.ts.snap b/test/__snapshots__/number.spec.ts.snap
index 91295faad18..29605f55dbb 100644
--- a/test/__snapshots__/number.spec.ts.snap
+++ b/test/__snapshots__/number.spec.ts.snap
@@ -30,7 +30,7 @@ exports[`number > 42 > hex > with options 1`] = `"4"`;
 
 exports[`number > 42 > hex > with value 1`] = `"0"`;
 
-exports[`number > 42 > int > noArgs 1`] = `37454`;
+exports[`number > 42 > int > noArgs 1`] = `3373557438480384`;
 
 exports[`number > 42 > int > with options 1`] = `4`;
 
@@ -66,7 +66,7 @@ exports[`number > 1211 > hex > with options 1`] = `"a"`;
 
 exports[`number > 1211 > hex > with value 1`] = `"1"`;
 
-exports[`number > 1211 > int > noArgs 1`] = `92852`;
+exports[`number > 1211 > int > noArgs 1`] = `8363366036799488`;
 
 exports[`number > 1211 > int > with options 1`] = `10`;
 
@@ -102,7 +102,7 @@ exports[`number > 1337 > hex > with options 1`] = `"2"`;
 
 exports[`number > 1337 > hex > with value 1`] = `"0"`;
 
-exports[`number > 1337 > int > noArgs 1`] = `26202`;
+exports[`number > 1337 > int > noArgs 1`] = `2360108468142080`;
 
 exports[`number > 1337 > int > with options 1`] = `2`;
 
diff --git a/test/__snapshots__/system.spec.ts.snap b/test/__snapshots__/system.spec.ts.snap
index 9959e96a3ad..edb8e00c9fe 100644
--- a/test/__snapshots__/system.spec.ts.snap
+++ b/test/__snapshots__/system.spec.ts.snap
@@ -239,75 +239,3 @@ exports[`system > 1337 > networkInterface > with {"interfaceType":"ww"} 1`] = `"
 exports[`system > 1337 > networkInterface > with {} 1`] = `"enx234870538945"`;
 
 exports[`system > 1337 > semver 1`] = `"2.5.1"`;
-
-exports[`system > seed: 42 > commonFileExt() 1`] = `"png"`;
-
-exports[`system > seed: 42 > commonFileName() 1`] = `"noon_stump.png"`;
-
-exports[`system > seed: 42 > commonFileType() 1`] = `"audio"`;
-
-exports[`system > seed: 42 > cron() 1`] = `"* 19 * 3 5"`;
-
-exports[`system > seed: 42 > directoryPath() 1`] = `"/opt/bin"`;
-
-exports[`system > seed: 42 > fileExt() 1`] = `"lrm"`;
-
-exports[`system > seed: 42 > fileName() 1`] = `"noon_stump.skt"`;
-
-exports[`system > seed: 42 > filePath() 1`] = `"/opt/bin/crooked_fantasise_woefully.dra"`;
-
-exports[`system > seed: 42 > fileType() 1`] = `"image"`;
-
-exports[`system > seed: 42 > mimeType() 1`] = `"application/vnd.ibm.rights-management"`;
-
-exports[`system > seed: 42 > networkInterface() 1`] = `"wlp1s7"`;
-
-exports[`system > seed: 42 > semver() 1`] = `"3.7.9"`;
-
-exports[`system > seed: 1211 > commonFileExt() 1`] = `"htm"`;
-
-exports[`system > seed: 1211 > commonFileName() 1`] = `"although_instantly_though.gif"`;
-
-exports[`system > seed: 1211 > commonFileType() 1`] = `"application"`;
-
-exports[`system > seed: 1211 > cron() 1`] = `"55 * 28 * 1"`;
-
-exports[`system > seed: 1211 > directoryPath() 1`] = `"/var/log"`;
-
-exports[`system > seed: 1211 > fileExt() 1`] = `"dic"`;
-
-exports[`system > seed: 1211 > fileName() 1`] = `"although_instantly_though.ustar"`;
-
-exports[`system > seed: 1211 > filePath() 1`] = `"/var/log/outside_even.xhvml"`;
-
-exports[`system > seed: 1211 > fileType() 1`] = `"x-shader"`;
-
-exports[`system > seed: 1211 > mimeType() 1`] = `"text/vnd.dmclientscript"`;
-
-exports[`system > seed: 1211 > networkInterface() 1`] = `"wws8d1"`;
-
-exports[`system > seed: 1211 > semver() 1`] = `"9.4.8"`;
-
-exports[`system > seed: 1337 > commonFileExt() 1`] = `"wav"`;
-
-exports[`system > seed: 1337 > commonFileName() 1`] = `"although.wav"`;
-
-exports[`system > seed: 1337 > commonFileType() 1`] = `"audio"`;
-
-exports[`system > seed: 1337 > cron() 1`] = `"15 13 5 * *"`;
-
-exports[`system > seed: 1337 > directoryPath() 1`] = `"/Library"`;
-
-exports[`system > seed: 1337 > fileExt() 1`] = `"oa3"`;
-
-exports[`system > seed: 1337 > fileName() 1`] = `"although.chrt"`;
-
-exports[`system > seed: 1337 > filePath() 1`] = `"/Library/yum_fat.aiff"`;
-
-exports[`system > seed: 1337 > fileType() 1`] = `"font"`;
-
-exports[`system > seed: 1337 > mimeType() 1`] = `"application/vnd.chipnuts.karaoke-mmd"`;
-
-exports[`system > seed: 1337 > networkInterface() 1`] = `"enx234870538945"`;
-
-exports[`system > seed: 1337 > semver() 1`] = `"2.5.1"`;
diff --git a/test/helpers.spec.ts b/test/helpers.spec.ts
index 24a8d6dac48..37a1bd02693 100644
--- a/test/helpers.spec.ts
+++ b/test/helpers.spec.ts
@@ -62,7 +62,7 @@ describe('helpers', () => {
     t.describe('arrayElements', (t) => {
       t.it('noArgs')
         .it('with array', 'Hello World!'.split(''))
-        .it('with array', 'Hello World!'.split(''), 3);
+        .it('with array and count', 'Hello World!'.split(''), 3);
     });
 
     t.describe('shuffle', (t) => {
@@ -96,10 +96,14 @@ describe('helpers', () => {
     });
 
     t.describe('fake', (t) => {
-      t.it('with plain string', 'my test string').it(
-        'with args',
-        'my string: {{datatype.string}}'
-      );
+      t.it('with a static template', 'my test string')
+        .it('with a dynamic template', 'my string: {{string.sample}}')
+        .it('with multiple static templates', ['A', 'B', 'C'])
+        .it('with multiple dynamic templates', [
+          '{{string.sample}}',
+          '{{location.city_name}}',
+          '{{location.cityName}}',
+        ]);
     });
 
     t.describe('rangeToNumber', (t) => {
@@ -598,11 +602,16 @@ describe('helpers', () => {
           expect(actual).toMatch(/^\d{5}$/);
         });
 
-        it('does not allow undefined parameters', () => {
-          expect(() =>
-            // @ts-expect-error: The parameter is required
-            faker.helpers.fake()
-          ).toThrowError(new FakerError('string parameter is required!'));
+        it('does not allow empty string parameters', () => {
+          expect(() => faker.helpers.fake('')).toThrowError(
+            new FakerError('Pattern string cannot be empty.')
+          );
+        });
+
+        it('does not allow empty array parameters', () => {
+          expect(() => faker.helpers.fake([])).toThrowError(
+            new FakerError('Array of pattern strings cannot be empty.')
+          );
         });
 
         it('does not allow invalid module name', () => {
@@ -655,6 +664,21 @@ describe('helpers', () => {
           );
         });
 
+        it('should be able to pass multiple static templates', () => {
+          expect(['A', 'B', 'C']).toContain(
+            faker.helpers.fake(['A', 'B', 'C'])
+          );
+        });
+
+        it('should be able to pass multiple dynamic templates', () => {
+          expect(faker.definitions.location.city_name).toContain(
+            faker.helpers.fake([
+              '{{location.city_name}}',
+              '{{location.cityName}}',
+            ])
+          );
+        });
+
         it('should be able to handle only {{ brackets', () => {
           expect(faker.helpers.fake('{{hello')).toBe('{{hello');
           expect(faker.helpers.fake('hello{{')).toBe('hello{{');
diff --git a/test/internet.spec.ts b/test/internet.spec.ts
index 45ed19638bf..11cbb60e7c2 100644
--- a/test/internet.spec.ts
+++ b/test/internet.spec.ts
@@ -38,17 +38,19 @@ describe('internet', () => {
     });
 
     t.describe('userName', (t) => {
-      t.it('noArgs').it('with Latin names', 'Jane', 'Doe');
-      t.it('noArgs').it('with accented names', 'Hélene', 'Müller');
-      t.it('noArgs').it('with Cyrillic names', 'Фёдор', 'Достоевский');
-      t.it('noArgs').it('with Chinese names', '大羽', '陳');
+      t.it('noArgs')
+        .it('with Latin names', 'Jane', 'Doe')
+        .it('with accented names', 'Hélene', 'Müller')
+        .it('with Cyrillic names', 'Фёдор', 'Достоевский')
+        .it('with Chinese names', '大羽', '陳');
     });
 
     t.describe('displayName', (t) => {
-      t.it('noArgs').it('with Latin names', 'Jane', 'Doe');
-      t.it('noArgs').it('with accented names', 'Hélene', 'Müller');
-      t.it('noArgs').it('with Cyrillic names', 'Фёдор', 'Достоевский');
-      t.it('noArgs').it('with Chinese names', '大羽', '陳');
+      t.it('noArgs')
+        .it('with Latin names', 'Jane', 'Doe')
+        .it('with accented names', 'Hélene', 'Müller')
+        .it('with Cyrillic names', 'Фёдор', 'Достоевский')
+        .it('with Chinese names', '大羽', '陳');
     });
 
     t.describe('password', (t) => {
diff --git a/test/support/seededRuns.ts b/test/support/seededRuns.ts
index be61cfad3fd..aa6d5a9b249 100644
--- a/test/support/seededRuns.ts
+++ b/test/support/seededRuns.ts
@@ -236,8 +236,17 @@ class TestGenerator<
     this.expectNotTested(method);
     const callAndVerify: TestGenerator<ModuleName, Module>['callAndVerify'] =
       this.callAndVerify.bind(this);
+    const variantNames = new Set<string>();
+    const expectVariantNotTested = (name: string): void => {
+      expect(
+        variantNames.has(name),
+        `${name} test to be unique for ${method}`
+      ).toBeFalsy();
+      variantNames.add(name);
+    };
     const tester: MethodTester<Module[MethodName]> = {
       it(name: string, ...args: Parameters<Module[MethodName]>) {
+        expectVariantNotTested(name);
         vi_it(name, () => callAndVerify(method, args));
         return tester;
       },
@@ -246,6 +255,7 @@ class TestGenerator<
         repetitions: number,
         ...args: Parameters<Module[MethodName]>
       ) {
+        expectVariantNotTested(name);
         vi_it(name, () => callAndVerify(method, args, repetitions));
         return tester;
       },
diff --git a/test/system.spec.ts b/test/system.spec.ts
index a6ef61a0f5e..e6b15c6e3d4 100644
--- a/test/system.spec.ts
+++ b/test/system.spec.ts
@@ -1,26 +1,11 @@
 import validator from 'validator';
 import { afterEach, describe, expect, it } from 'vitest';
 import { faker } from '../src';
-import { seededRuns, seededTests } from './support/seededRuns';
+import { seededTests } from './support/seededRuns';
 import { times } from './support/times';
 
 const NON_SEEDED_BASED_RUN = 5;
 
-const functionNames = [
-  'commonFileExt',
-  'commonFileName',
-  'commonFileType',
-  'cron',
-  'directoryPath',
-  'fileExt',
-  'fileName',
-  'filePath',
-  'fileType',
-  'mimeType',
-  'networkInterface',
-  'semver',
-];
-
 describe('system', () => {
   afterEach(() => {
     faker.locale = 'en';
@@ -80,20 +65,6 @@ describe('system', () => {
     });
   });
 
-  for (const seed of seededRuns) {
-    describe(`seed: ${seed}`, () => {
-      for (const functionName of functionNames) {
-        it(`${functionName}()`, () => {
-          faker.seed(seed);
-
-          const actual = faker.system[functionName]();
-
-          expect(actual).toMatchSnapshot();
-        });
-      }
-    });
-  }
-
   describe(`random seeded tests for seed ${faker.seed()}`, () => {
     for (let i = 1; i <= NON_SEEDED_BASED_RUN; i++) {
       describe('commonFileExt()', () => {
@@ -437,7 +408,7 @@ describe('system', () => {
         );
 
         it('should return non-standard cron expressions', () => {
-          const validResults = ['1', '2', '3', '4', '5', '*', '@'];
+          const validResults = ['1', '2', '3', '4', '5', '6', '*', '@'];
           expect(
             faker.system.cron({ includeNonStandard: true })[0],
             'generated cron, string should contain non-standard cron labels'