diff --git a/lerna.json b/lerna.json
index 1e3acffe7b..eb75b6f1c7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "packages": ["packages/ts/*"],
   "npmClient": "npm",
   "useWorkspaces": true,
-  "version": "1.1.16"
+  "version": "1.1.17"
 }
diff --git a/package-lock.json b/package-lock.json
index 5b986fde86..b4a3428152 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15667,7 +15667,7 @@
     },
     "packages/ts/form": {
       "name": "@hilla/form",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache-2.0",
       "dependencies": {
         "rimraf": "^3.0.2",
@@ -15690,17 +15690,17 @@
     },
     "packages/ts/generator-typescript-cli": {
       "name": "@hilla/generator-typescript-cli",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "meow": "^10.1.1"
       },
       "bin": {
         "tsgen": "bin/index.js"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -15721,7 +15721,7 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16"
+        "@hilla/generator-typescript-core": "^1.1.17"
       }
     },
     "packages/ts/generator-typescript-cli/node_modules/@types/node": {
@@ -15742,11 +15742,11 @@
     },
     "packages/ts/generator-typescript-core": {
       "name": "@hilla/generator-typescript-core",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "meow": "^10.1.1",
         "openapi-types": "^9.3.0",
         "typescript": "^4.5.0-beta"
@@ -15789,17 +15789,17 @@
     },
     "packages/ts/generator-typescript-plugin-backbone": {
       "name": "@hilla/generator-typescript-plugin-backbone",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^9.3.0",
         "typescript": "^4.5.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-client": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-client": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -15820,8 +15820,8 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-client": "^1.1.16"
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-client": "^1.1.17"
       }
     },
     "packages/ts/generator-typescript-plugin-backbone/node_modules/@types/node": {
@@ -15842,15 +15842,15 @@
     },
     "packages/ts/generator-typescript-plugin-barrel": {
       "name": "@hilla/generator-typescript-plugin-barrel",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "typescript": "^4.5.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-backbone": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-backbone": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -15871,8 +15871,8 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-backbone": "^1.1.16"
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-backbone": "^1.1.17"
       }
     },
     "packages/ts/generator-typescript-plugin-barrel/node_modules/@types/node": {
@@ -15893,14 +15893,14 @@
     },
     "packages/ts/generator-typescript-plugin-client": {
       "name": "@hilla/generator-typescript-plugin-client",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "typescript": "^4.5.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -15921,7 +15921,7 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16"
+        "@hilla/generator-typescript-core": "^1.1.17"
       }
     },
     "packages/ts/generator-typescript-plugin-client/node_modules/@types/node": {
@@ -15942,17 +15942,17 @@
     },
     "packages/ts/generator-typescript-plugin-model": {
       "name": "@hilla/generator-typescript-plugin-model",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^9.3.0",
         "typescript": "^4.5.2"
       },
       "devDependencies": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-client": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-client": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -15973,9 +15973,9 @@
         "node": ">= 16.13"
       },
       "peerDependencies": {
-        "@hilla/form": "^1.1.16",
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-backbone": "^1.1.16"
+        "@hilla/form": "^1.1.17",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-backbone": "^1.1.17"
       }
     },
     "packages/ts/generator-typescript-plugin-model/node_modules/@types/node": {
@@ -15996,7 +15996,7 @@
     },
     "packages/ts/generator-typescript-utils": {
       "name": "@hilla/generator-typescript-utils",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^7.0.5",
@@ -16041,7 +16041,7 @@
     },
     "packages/ts/hilla-frontend": {
       "name": "@hilla/frontend",
-      "version": "1.1.16",
+      "version": "1.1.17",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.12",
@@ -16455,8 +16455,8 @@
     "@hilla/generator-typescript-cli": {
       "version": "file:packages/ts/generator-typescript-cli",
       "requires": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -16489,7 +16489,7 @@
       "version": "file:packages/ts/generator-typescript-core",
       "requires": {
         "@apidevtools/swagger-parser": "^10.0.3",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -16522,9 +16522,9 @@
     "@hilla/generator-typescript-plugin-backbone": {
       "version": "file:packages/ts/generator-typescript-plugin-backbone",
       "requires": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-client": "^1.1.16",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-client": "^1.1.17",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -16558,9 +16558,9 @@
     "@hilla/generator-typescript-plugin-barrel": {
       "version": "file:packages/ts/generator-typescript-plugin-barrel",
       "requires": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-backbone": "^1.1.16",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-backbone": "^1.1.17",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -16592,8 +16592,8 @@
     "@hilla/generator-typescript-plugin-client": {
       "version": "file:packages/ts/generator-typescript-plugin-client",
       "requires": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
@@ -16625,9 +16625,9 @@
     "@hilla/generator-typescript-plugin-model": {
       "version": "file:packages/ts/generator-typescript-plugin-model",
       "requires": {
-        "@hilla/generator-typescript-core": "^1.1.16",
-        "@hilla/generator-typescript-plugin-client": "^1.1.16",
-        "@hilla/generator-typescript-utils": "^1.1.16",
+        "@hilla/generator-typescript-core": "^1.1.17",
+        "@hilla/generator-typescript-plugin-client": "^1.1.17",
+        "@hilla/generator-typescript-utils": "^1.1.17",
         "@types/chai": "^4.2.22",
         "@types/mocha": "^9.0.0",
         "@types/node": "^16.11.1",
diff --git a/packages/ts/form/package.json b/packages/ts/form/package.json
index f648606b21..c0dcc8b9b2 100644
--- a/packages/ts/form/package.json
+++ b/packages/ts/form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/form",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "Hilla form utils",
   "main": "index.js",
   "module": "index.js",
diff --git a/packages/ts/form/src/index.ts b/packages/ts/form/src/index.ts
index 36d4a32e34..2b02e9632f 100644
--- a/packages/ts/form/src/index.ts
+++ b/packages/ts/form/src/index.ts
@@ -9,5 +9,5 @@ $wnd.Vaadin = $wnd.Vaadin || {};
 $wnd.Vaadin.registrations = $wnd.Vaadin.registrations || [];
 $wnd.Vaadin.registrations.push({
   is: '@hilla/form',
-  version: /* updated-by-script */ '1.1.16',
+  version: /* updated-by-script */ '1.1.17',
 });
diff --git a/packages/ts/generator-typescript-cli/package.json b/packages/ts/generator-typescript-cli/package.json
index 9b89226cb4..2e0d0a0b89 100644
--- a/packages/ts/generator-typescript-cli/package.json
+++ b/packages/ts/generator-typescript-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-cli",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -42,14 +42,14 @@
     "tsgen": "bin/index.js"
   },
   "peerDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16"
+    "@hilla/generator-typescript-core": "^1.1.17"
   },
   "dependencies": {
-    "@hilla/generator-typescript-utils": "^1.1.16",
+    "@hilla/generator-typescript-utils": "^1.1.17",
     "meow": "^10.1.1"
   },
   "devDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
+    "@hilla/generator-typescript-core": "^1.1.17",
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.11.1",
diff --git a/packages/ts/generator-typescript-core/package.json b/packages/ts/generator-typescript-core/package.json
index 37c7d55ee2..24a6ecb851 100644
--- a/packages/ts/generator-typescript-core/package.json
+++ b/packages/ts/generator-typescript-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-core",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -64,7 +64,7 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@hilla/generator-typescript-utils": "^1.1.16",
+    "@hilla/generator-typescript-utils": "^1.1.17",
     "meow": "^10.1.1",
     "openapi-types": "^9.3.0",
     "typescript": "^4.5.0-beta"
diff --git a/packages/ts/generator-typescript-plugin-backbone/package.json b/packages/ts/generator-typescript-plugin-backbone/package.json
index 44549a525c..015cb16b3e 100644
--- a/packages/ts/generator-typescript-plugin-backbone/package.json
+++ b/packages/ts/generator-typescript-plugin-backbone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-plugin-backbone",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A Hilla TypeScript Generator plugin to generate basic code",
   "main": "index.js",
   "type": "module",
@@ -49,18 +49,18 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
-    "@hilla/generator-typescript-plugin-client": "^1.1.16"
+    "@hilla/generator-typescript-core": "^1.1.17",
+    "@hilla/generator-typescript-plugin-client": "^1.1.17"
   },
   "dependencies": {
-    "@hilla/generator-typescript-utils": "^1.1.16",
+    "@hilla/generator-typescript-utils": "^1.1.17",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^9.3.0",
     "typescript": "^4.5.2"
   },
   "devDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
-    "@hilla/generator-typescript-plugin-client": "^1.1.16",
+    "@hilla/generator-typescript-core": "^1.1.17",
+    "@hilla/generator-typescript-plugin-client": "^1.1.17",
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.11.1",
diff --git a/packages/ts/generator-typescript-plugin-barrel/package.json b/packages/ts/generator-typescript-plugin-barrel/package.json
index 9dfe4cc5dd..a3243a7efe 100644
--- a/packages/ts/generator-typescript-plugin-barrel/package.json
+++ b/packages/ts/generator-typescript-plugin-barrel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-plugin-barrel",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A Hilla TypeScript Generator plugin to generate barrel file",
   "main": "index.js",
   "type": "module",
@@ -49,16 +49,16 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
-    "@hilla/generator-typescript-plugin-backbone": "^1.1.16"
+    "@hilla/generator-typescript-core": "^1.1.17",
+    "@hilla/generator-typescript-plugin-backbone": "^1.1.17"
   },
   "dependencies": {
-    "@hilla/generator-typescript-utils": "^1.1.16",
+    "@hilla/generator-typescript-utils": "^1.1.17",
     "typescript": "^4.5.2"
   },
   "devDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
-    "@hilla/generator-typescript-plugin-backbone": "^1.1.16",
+    "@hilla/generator-typescript-core": "^1.1.17",
+    "@hilla/generator-typescript-plugin-backbone": "^1.1.17",
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.11.1",
diff --git a/packages/ts/generator-typescript-plugin-client/package.json b/packages/ts/generator-typescript-plugin-client/package.json
index 20cb22487f..5b11ccc1ec 100644
--- a/packages/ts/generator-typescript-plugin-client/package.json
+++ b/packages/ts/generator-typescript-plugin-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-plugin-client",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A Hilla TypeScript Generator plugin to generate default client implementation",
   "main": "index.js",
   "type": "module",
@@ -49,14 +49,14 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16"
+    "@hilla/generator-typescript-core": "^1.1.17"
   },
   "dependencies": {
-    "@hilla/generator-typescript-utils": "^1.1.16",
+    "@hilla/generator-typescript-utils": "^1.1.17",
     "typescript": "^4.5.2"
   },
   "devDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
+    "@hilla/generator-typescript-core": "^1.1.17",
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.11.1",
diff --git a/packages/ts/generator-typescript-plugin-model/package.json b/packages/ts/generator-typescript-plugin-model/package.json
index 55b882c897..491a2fd408 100644
--- a/packages/ts/generator-typescript-plugin-model/package.json
+++ b/packages/ts/generator-typescript-plugin-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-plugin-model",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A Hilla TypeScript Generator plugin to generate form models",
   "main": "index.js",
   "type": "module",
@@ -49,19 +49,19 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@hilla/form": "^1.1.16",
-    "@hilla/generator-typescript-core": "^1.1.16",
-    "@hilla/generator-typescript-plugin-backbone": "^1.1.16"
+    "@hilla/form": "^1.1.17",
+    "@hilla/generator-typescript-core": "^1.1.17",
+    "@hilla/generator-typescript-plugin-backbone": "^1.1.17"
   },
   "dependencies": {
-    "@hilla/generator-typescript-utils": "^1.1.16",
+    "@hilla/generator-typescript-utils": "^1.1.17",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^9.3.0",
     "typescript": "^4.5.2"
   },
   "devDependencies": {
-    "@hilla/generator-typescript-core": "^1.1.16",
-    "@hilla/generator-typescript-plugin-client": "^1.1.16",
+    "@hilla/generator-typescript-core": "^1.1.17",
+    "@hilla/generator-typescript-plugin-client": "^1.1.17",
     "@types/chai": "^4.2.22",
     "@types/mocha": "^9.0.0",
     "@types/node": "^16.11.1",
diff --git a/packages/ts/generator-typescript-utils/package.json b/packages/ts/generator-typescript-utils/package.json
index 052a4f285f..34ef0603dd 100644
--- a/packages/ts/generator-typescript-utils/package.json
+++ b/packages/ts/generator-typescript-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/generator-typescript-utils",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "A set of utils for developing Hilla generator plugins",
   "main": "index.js",
   "type": "module",
diff --git a/packages/ts/hilla-frontend/package.json b/packages/ts/hilla-frontend/package.json
index 2785a054e0..ba89789827 100644
--- a/packages/ts/hilla-frontend/package.json
+++ b/packages/ts/hilla-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hilla/frontend",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "description": "Hilla frontend utils",
   "main": "index.js",
   "module": "index.js",
diff --git a/packages/ts/hilla-frontend/src/index.ts b/packages/ts/hilla-frontend/src/index.ts
index 25a8a430ac..9786a72879 100644
--- a/packages/ts/hilla-frontend/src/index.ts
+++ b/packages/ts/hilla-frontend/src/index.ts
@@ -8,5 +8,5 @@ $wnd.Vaadin = $wnd.Vaadin || {};
 $wnd.Vaadin.registrations = $wnd.Vaadin.registrations || [];
 $wnd.Vaadin.registrations.push({
   is: '@hilla/frontend',
-  version: /* updated-by-script */ '1.1.16',
+  version: /* updated-by-script */ '1.1.17',
 });