diff --git a/package-lock.json b/package-lock.json
index 73d4f40c86..1a38f476a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3535,7 +3535,6 @@
       "version": "1.22.0",
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.22.0.tgz",
       "integrity": "sha512-MBOl8MeOzpK0HQQQshKB7pABXbmyHizdTpqnrIseTbsv0nAepwC2ENZa1aaBExNQcpLoXmWthhak8SABLzvGPw==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=14.0.0"
@@ -15784,7 +15783,6 @@
       "version": "6.29.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.29.0.tgz",
       "integrity": "sha512-DXZJoE0q+KyeVw75Ck6GkPxFak63C4fGqZGNijnWgzB/HzSP1ZfTlBj5COaGWwhrMQ/R8bXiq5Ooy4KG+ReyjQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@remix-run/router": "1.22.0"
@@ -15800,7 +15798,6 @@
       "version": "6.29.0",
       "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.29.0.tgz",
       "integrity": "sha512-pkEbJPATRJ2iotK+wUwHfy0xs2T59YPEN8BQxVCPeBZvK7kfPESRc/nyxzdcxR17hXgUPYx2whMwl+eo9cUdnQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@remix-run/router": "1.22.0",
@@ -18424,13 +18421,13 @@
     },
     "packages/ts/file-router": {
       "name": "@vaadin/hilla-file-router",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/chai": "^5.0.1",
-        "@vaadin/hilla-generator-utils": "24.6.4",
-        "@vaadin/hilla-react-auth": "24.6.4",
-        "@vaadin/hilla-react-signals": "24.6.4",
+        "@vaadin/hilla-generator-utils": "24.6.5",
+        "@vaadin/hilla-react-auth": "24.6.5",
+        "@vaadin/hilla-react-signals": "24.6.5",
         "c8": "^10.1.3",
         "react": "^18.2.0",
         "rollup": "^4.12.0",
@@ -18582,7 +18579,7 @@
     },
     "packages/ts/frontend": {
       "name": "@vaadin/hilla-frontend",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@vaadin/common-frontend": "^0.0.19",
@@ -18703,11 +18700,11 @@
     },
     "packages/ts/generator-cli": {
       "name": "@vaadin/hilla-generator-cli",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "get-stdin": "^9.0.0",
         "meow": "^12.1.1"
       },
@@ -18721,7 +18718,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
@@ -18978,11 +18975,11 @@
     },
     "packages/ts/generator-core": {
       "name": "@vaadin/hilla-generator-core",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
         "@apidevtools/swagger-parser": "^10.1.0",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "meow": "^12.1.1",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.2"
@@ -19260,12 +19257,12 @@
     },
     "packages/ts/generator-plugin-backbone": {
       "name": "@vaadin/hilla-generator-plugin-backbone",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.2"
@@ -19276,8 +19273,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19535,12 +19532,12 @@
     },
     "packages/ts/generator-plugin-barrel": {
       "name": "@vaadin/hilla-generator-plugin-barrel",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "typescript": "5.7.2"
       },
       "devDependencies": {
@@ -19549,8 +19546,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -19808,11 +19805,11 @@
     },
     "packages/ts/generator-plugin-client": {
       "name": "@vaadin/hilla-generator-plugin-client",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "typescript": "5.7.2"
       },
       "devDependencies": {
@@ -19821,7 +19818,7 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -20079,13 +20076,13 @@
     },
     "packages/ts/generator-plugin-model": {
       "name": "@vaadin/hilla-generator-plugin-model",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
-        "@vaadin/hilla-lit-form": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
+        "@vaadin/hilla-lit-form": "24.6.5",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.2"
@@ -20096,8 +20093,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -20355,12 +20352,12 @@
     },
     "packages/ts/generator-plugin-push": {
       "name": "@vaadin/hilla-generator-plugin-push",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.2"
@@ -20371,8 +20368,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -20630,13 +20627,13 @@
     },
     "packages/ts/generator-plugin-signals": {
       "name": "@vaadin/hilla-generator-plugin-signals",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "fast-deep-equal": "^3.1.3",
         "iterator-helpers-polyfill": "^3.0.1",
         "openapi-types": "^12.1.3",
@@ -20648,8 +20645,8 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
         "c8": "^8.0.1",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -21046,13 +21043,13 @@
     },
     "packages/ts/generator-plugin-subtypes": {
       "name": "@vaadin/hilla-generator-plugin-subtypes",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
-        "@vaadin/hilla-generator-plugin-model": "24.6.4",
-        "@vaadin/hilla-generator-utils": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
+        "@vaadin/hilla-generator-plugin-model": "24.6.5",
+        "@vaadin/hilla-generator-utils": "24.6.5",
         "fast-deep-equal": "^3.1.3",
         "openapi-types": "^12.1.3",
         "typescript": "5.7.2"
@@ -21063,9 +21060,9 @@
         "@types/node": "^20.7.1",
         "@types/sinon": "^10.0.17",
         "@types/sinon-chai": "^3.2.10",
-        "@vaadin/hilla-generator-core": "24.6.4",
-        "@vaadin/hilla-generator-plugin-client": "24.6.4",
-        "@vaadin/hilla-generator-plugin-model": "24.6.4",
+        "@vaadin/hilla-generator-core": "24.6.5",
+        "@vaadin/hilla-generator-plugin-client": "24.6.5",
+        "@vaadin/hilla-generator-plugin-model": "24.6.5",
         "c8": "^10.1.2",
         "chai": "^4.3.10",
         "concurrently": "^8.2.1",
@@ -21323,7 +21320,7 @@
     },
     "packages/ts/generator-utils": {
       "name": "@vaadin/hilla-generator-utils",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache 2.0",
       "dependencies": {
         "pino": "^8.15.1",
@@ -21593,10 +21590,10 @@
     },
     "packages/ts/lit-form": {
       "name": "@vaadin/hilla-lit-form",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.4",
+        "@vaadin/hilla-frontend": "24.6.5",
         "validator": "^13.11.0"
       },
       "devDependencies": {
@@ -21708,10 +21705,10 @@
     },
     "packages/ts/models": {
       "name": "@vaadin/hilla-models",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.4"
+        "@vaadin/hilla-lit-form": "24.6.5"
       },
       "devDependencies": {
         "@testing-library/react": "^16.1.0",
@@ -22140,10 +22137,10 @@
     },
     "packages/ts/react-auth": {
       "name": "@vaadin/hilla-react-auth",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.4"
+        "@vaadin/hilla-frontend": "24.6.5"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -22328,12 +22325,12 @@
     },
     "packages/ts/react-crud": {
       "name": "@vaadin/hilla-react-crud",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.4",
-        "@vaadin/hilla-lit-form": "24.6.4",
-        "@vaadin/hilla-react-form": "24.6.4",
+        "@vaadin/hilla-frontend": "24.6.5",
+        "@vaadin/hilla-lit-form": "24.6.5",
+        "@vaadin/hilla-react-form": "24.6.5",
         "@vaadin/react-components": "24.6.4"
       },
       "devDependencies": {
@@ -22480,10 +22477,10 @@
     },
     "packages/ts/react-form": {
       "name": "@vaadin/hilla-react-form",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-lit-form": "24.6.4"
+        "@vaadin/hilla-lit-form": "24.6.5"
       },
       "devDependencies": {
         "@testing-library/dom": "^10.4.0",
@@ -22628,11 +22625,11 @@
     },
     "packages/ts/react-i18n": {
       "name": "@vaadin/hilla-react-i18n",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
-        "@vaadin/hilla-frontend": "24.6.4",
-        "@vaadin/hilla-react-signals": "24.6.4",
+        "@vaadin/hilla-frontend": "24.6.5",
+        "@vaadin/hilla-react-signals": "24.6.5",
         "intl-messageformat": "^10.5.11"
       },
       "devDependencies": {
@@ -22779,11 +22776,11 @@
     },
     "packages/ts/react-signals": {
       "name": "@vaadin/hilla-react-signals",
-      "version": "24.6.4",
+      "version": "24.6.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@preact/signals-react": "^2.3.0",
-        "@vaadin/hilla-frontend": "24.6.4",
+        "@vaadin/hilla-frontend": "24.6.5",
         "nanoid": "^5.0.7"
       },
       "devDependencies": {
diff --git a/packages/ts/file-router/package.json b/packages/ts/file-router/package.json
index 47d71f5d59..764788d9b8 100644
--- a/packages/ts/file-router/package.json
+++ b/packages/ts/file-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-file-router",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla file-based router",
   "main": "index.js",
   "module": "index.js",
@@ -82,9 +82,9 @@
   },
   "dependencies": {
     "@types/chai": "^5.0.1",
-    "@vaadin/hilla-generator-utils": "24.6.4",
-    "@vaadin/hilla-react-auth": "24.6.4",
-    "@vaadin/hilla-react-signals": "24.6.4",
+    "@vaadin/hilla-generator-utils": "24.6.5",
+    "@vaadin/hilla-react-auth": "24.6.5",
+    "@vaadin/hilla-react-signals": "24.6.5",
     "react": "^18.2.0",
     "rollup": "^4.12.0",
     "c8": "^10.1.3",
diff --git a/packages/ts/frontend/package.json b/packages/ts/frontend/package.json
index 26f7bfcba7..8366dd85d0 100644
--- a/packages/ts/frontend/package.json
+++ b/packages/ts/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-frontend",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla core frontend utils",
   "main": "index.js",
   "module": "index.js",
diff --git a/packages/ts/generator-cli/package.json b/packages/ts/generator-cli/package.json
index fe091fcd52..9de13b391c 100644
--- a/packages/ts/generator-cli/package.json
+++ b/packages/ts/generator-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-cli",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -45,8 +45,8 @@
     "tsgen": "bin/index.js"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "get-stdin": "^9.0.0",
     "meow": "^12.1.1"
   },
@@ -57,7 +57,7 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
diff --git a/packages/ts/generator-core/package.json b/packages/ts/generator-core/package.json
index 99939feb6b..e79d4fd9a2 100644
--- a/packages/ts/generator-core/package.json
+++ b/packages/ts/generator-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-core",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla tool to generate TypeScript code from the OpenAPI document",
   "main": "index.js",
   "type": "module",
@@ -72,7 +72,7 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "meow": "^12.1.1",
     "openapi-types": "^12.1.3",
     "typescript": "5.7.2"
diff --git a/packages/ts/generator-plugin-backbone/package.json b/packages/ts/generator-plugin-backbone/package.json
index b81061503a..84594f369c 100644
--- a/packages/ts/generator-plugin-backbone/package.json
+++ b/packages/ts/generator-plugin-backbone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-backbone",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to generate basic code",
   "main": "index.js",
   "type": "module",
@@ -51,9 +51,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.7.2"
@@ -64,8 +64,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-barrel/package.json b/packages/ts/generator-plugin-barrel/package.json
index 96d254bc69..7e570bcd44 100644
--- a/packages/ts/generator-plugin-barrel/package.json
+++ b/packages/ts/generator-plugin-barrel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-barrel",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to generate barrel file",
   "main": "index.js",
   "type": "module",
@@ -51,9 +51,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "typescript": "5.7.2"
   },
   "devDependencies": {
@@ -62,8 +62,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-client/package.json b/packages/ts/generator-plugin-client/package.json
index d75d0889ff..c31aea96d1 100644
--- a/packages/ts/generator-plugin-client/package.json
+++ b/packages/ts/generator-plugin-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-client",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to generate default client implementation",
   "main": "index.js",
   "type": "module",
@@ -51,8 +51,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "typescript": "5.7.2"
   },
   "devDependencies": {
@@ -61,7 +61,7 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-model/package.json b/packages/ts/generator-plugin-model/package.json
index b2a353f13f..feff85914e 100644
--- a/packages/ts/generator-plugin-model/package.json
+++ b/packages/ts/generator-plugin-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-model",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to generate form models",
   "main": "index.js",
   "type": "module",
@@ -51,10 +51,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
-    "@vaadin/hilla-lit-form": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
+    "@vaadin/hilla-lit-form": "24.6.5",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.7.2"
@@ -65,8 +65,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-push/package.json b/packages/ts/generator-plugin-push/package.json
index c4d40de627..aecabaf1da 100644
--- a/packages/ts/generator-plugin-push/package.json
+++ b/packages/ts/generator-plugin-push/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-push",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to add push support",
   "main": "index.js",
   "type": "module",
@@ -51,9 +51,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.7.2"
@@ -64,8 +64,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-signals/package.json b/packages/ts/generator-plugin-signals/package.json
index d1f58cfde5..dcbc764aad 100644
--- a/packages/ts/generator-plugin-signals/package.json
+++ b/packages/ts/generator-plugin-signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-signals",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to add Shared Signals support",
   "main": "index.js",
   "type": "module",
@@ -51,10 +51,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-backbone": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-backbone": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "fast-deep-equal": "^3.1.3",
     "iterator-helpers-polyfill": "^3.0.1",
     "openapi-types": "^12.1.3",
@@ -66,8 +66,8 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
     "c8": "^8.0.1",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-plugin-subtypes/package.json b/packages/ts/generator-plugin-subtypes/package.json
index 496747f649..66f64efa2b 100644
--- a/packages/ts/generator-plugin-subtypes/package.json
+++ b/packages/ts/generator-plugin-subtypes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-plugin-subtypes",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A Hilla TypeScript Generator plugin to support JsonSubTypes",
   "main": "index.js",
   "type": "module",
@@ -50,10 +50,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
-    "@vaadin/hilla-generator-plugin-model": "24.6.4",
-    "@vaadin/hilla-generator-utils": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
+    "@vaadin/hilla-generator-plugin-model": "24.6.5",
+    "@vaadin/hilla-generator-utils": "24.6.5",
     "fast-deep-equal": "^3.1.3",
     "openapi-types": "^12.1.3",
     "typescript": "5.7.2"
@@ -64,9 +64,9 @@
     "@types/node": "^20.7.1",
     "@types/sinon": "^10.0.17",
     "@types/sinon-chai": "^3.2.10",
-    "@vaadin/hilla-generator-core": "24.6.4",
-    "@vaadin/hilla-generator-plugin-client": "24.6.4",
-    "@vaadin/hilla-generator-plugin-model": "24.6.4",
+    "@vaadin/hilla-generator-core": "24.6.5",
+    "@vaadin/hilla-generator-plugin-client": "24.6.5",
+    "@vaadin/hilla-generator-plugin-model": "24.6.5",
     "c8": "^10.1.2",
     "chai": "^4.3.10",
     "concurrently": "^8.2.1",
diff --git a/packages/ts/generator-utils/package.json b/packages/ts/generator-utils/package.json
index e3393e53a4..3925ac43cc 100644
--- a/packages/ts/generator-utils/package.json
+++ b/packages/ts/generator-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-generator-utils",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "A set of utils for developing Hilla generator plugins",
   "main": "index.js",
   "type": "module",
diff --git a/packages/ts/lit-form/package.json b/packages/ts/lit-form/package.json
index 27528f8dad..6c6cf4d3a3 100644
--- a/packages/ts/lit-form/package.json
+++ b/packages/ts/lit-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-lit-form",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla form utils",
   "main": "index.js",
   "module": "index.js",
@@ -71,7 +71,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.4",
+    "@vaadin/hilla-frontend": "24.6.5",
     "validator": "^13.11.0"
   },
   "peerDependencies": {
diff --git a/packages/ts/models/package.json b/packages/ts/models/package.json
index fa982ab22a..65f1239d9f 100644
--- a/packages/ts/models/package.json
+++ b/packages/ts/models/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-models",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Generative form models for Hilla",
   "main": "index.js",
   "module": "index.js",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-lit-form": "24.6.4"
+    "@vaadin/hilla-lit-form": "24.6.5"
   },
   "peerDependencies": {
     "react": "^18",
diff --git a/packages/ts/react-auth/package.json b/packages/ts/react-auth/package.json
index f0a21b3440..ee97a8aefb 100644
--- a/packages/ts/react-auth/package.json
+++ b/packages/ts/react-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-auth",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla auth utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.4"
+    "@vaadin/hilla-frontend": "24.6.5"
   },
   "peerDependencies": {
     "react": "^18",
diff --git a/packages/ts/react-crud/package.json b/packages/ts/react-crud/package.json
index 5209bbbdfa..1e6751dac9 100644
--- a/packages/ts/react-crud/package.json
+++ b/packages/ts/react-crud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-crud",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla CRUD utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -56,9 +56,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.4",
-    "@vaadin/hilla-lit-form": "24.6.4",
-    "@vaadin/hilla-react-form": "24.6.4",
+    "@vaadin/hilla-frontend": "24.6.5",
+    "@vaadin/hilla-lit-form": "24.6.5",
+    "@vaadin/hilla-react-form": "24.6.5",
     "@vaadin/react-components": "24.6.4"
   },
   "peerDependencies": {
diff --git a/packages/ts/react-form/package.json b/packages/ts/react-form/package.json
index ee55978c71..a0763ee04c 100644
--- a/packages/ts/react-form/package.json
+++ b/packages/ts/react-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-form",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla form utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -46,7 +46,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-lit-form": "24.6.4"
+    "@vaadin/hilla-lit-form": "24.6.5"
   },
   "peerDependencies": {
     "react": "^18",
diff --git a/packages/ts/react-i18n/package.json b/packages/ts/react-i18n/package.json
index 7d30a5b887..b12c9506e0 100644
--- a/packages/ts/react-i18n/package.json
+++ b/packages/ts/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-i18n",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Hilla I18n utils for React",
   "main": "index.js",
   "module": "index.js",
@@ -46,8 +46,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@vaadin/hilla-frontend": "24.6.4",
-    "@vaadin/hilla-react-signals": "24.6.4",
+    "@vaadin/hilla-frontend": "24.6.5",
+    "@vaadin/hilla-react-signals": "24.6.5",
     "intl-messageformat": "^10.5.11"
   },
   "peerDependencies": {
diff --git a/packages/ts/react-signals/package.json b/packages/ts/react-signals/package.json
index 4a528ea4e9..45946d5936 100644
--- a/packages/ts/react-signals/package.json
+++ b/packages/ts/react-signals/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/hilla-react-signals",
-  "version": "24.6.4",
+  "version": "24.6.5",
   "description": "Signals for Hilla React",
   "main": "index.js",
   "module": "index.js",
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@preact/signals-react": "^2.3.0",
-    "@vaadin/hilla-frontend": "24.6.4",
+    "@vaadin/hilla-frontend": "24.6.5",
     "nanoid": "^5.0.7"
   },
   "peerDependencies": {