diff --git a/lerna.json b/lerna.json
index 0606c955dd..5035bf4f7b 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "lerna": "3.22.1",
   "packages": ["packages/*", "samples/*"],
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/create-sitecore-jss/package.json b/packages/create-sitecore-jss/package.json
index 13f6d1bf43..0f1d275b2c 100644
--- a/packages/create-sitecore-jss/package.json
+++ b/packages/create-sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {
diff --git a/packages/sitecore-jss-angular-schematics/package.json b/packages/sitecore-jss-angular-schematics/package.json
index 30c3dd9b3e..8755e2ba91 100644
--- a/packages/sitecore-jss-angular-schematics/package.json
+++ b/packages/sitecore-jss-angular-schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-angular-schematics",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "Scaffolding schematics for Sitecore JSS Angular apps",
   "scripts": {
     "build": "tsc -p tsconfig.json",
diff --git a/packages/sitecore-jss-angular/package.json b/packages/sitecore-jss-angular/package.json
index 321d45a15a..456a2d4495 100644
--- a/packages/sitecore-jss-angular/package.json
+++ b/packages/sitecore-jss-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-angular",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "",
   "scripts": {
     "build": "ng-packagr -p ng-package.json",
@@ -60,7 +60,7 @@
     "rxjs": "~7.8.1"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5"
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6"
   },
   "main": "dist/esm2022/sitecore-jss-sitecore-jss-angular.mjs",
   "module": "dist/esm2022/sitecore-jss-sitecore-jss-angular.js",
diff --git a/packages/sitecore-jss-cli/package.json b/packages/sitecore-jss-cli/package.json
index 10f06f00b8..cadf37afc4 100644
--- a/packages/sitecore-jss-cli/package.json
+++ b/packages/sitecore-jss-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-cli",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "Sitecore JSS command-line",
   "main": "dist/cjs/cli.js",
   "module": "dist/esm/cli.js",
@@ -32,7 +32,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss-dev-tools": "22.4.0-canary.6",
     "chalk": "^4.1.2",
     "cross-spawn": "^7.0.3",
     "dotenv": "^16.0.3",
diff --git a/packages/sitecore-jss-dev-tools/package.json b/packages/sitecore-jss-dev-tools/package.json
index a035aa1b5f..44b82094a4 100644
--- a/packages/sitecore-jss-dev-tools/package.json
+++ b/packages/sitecore-jss-dev-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-dev-tools",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@babel/parser": "^7.24.0",
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6",
     "axios": "^1.3.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.6.0",
diff --git a/packages/sitecore-jss-forms/package.json b/packages/sitecore-jss-forms/package.json
index 6664560de8..6f9245324b 100644
--- a/packages/sitecore-jss-forms/package.json
+++ b/packages/sitecore-jss-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-forms",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -43,7 +43,7 @@
     "typescript": "~5.6.3"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5"
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6"
   },
   "description": "",
   "types": "types/index.d.ts",
diff --git a/packages/sitecore-jss-nextjs/package.json b/packages/sitecore-jss-nextjs/package.json
index a0c64852df..289c4cc0f8 100644
--- a/packages/sitecore-jss-nextjs/package.json
+++ b/packages/sitecore-jss-nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -73,9 +73,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5",
-    "@sitecore-jss/sitecore-jss-dev-tools": "22.4.0-canary.5",
-    "@sitecore-jss/sitecore-jss-react": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6",
+    "@sitecore-jss/sitecore-jss-dev-tools": "22.4.0-canary.6",
+    "@sitecore-jss/sitecore-jss-react": "22.4.0-canary.6",
     "@vercel/kv": "^0.2.1",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
diff --git a/packages/sitecore-jss-proxy/package.json b/packages/sitecore-jss-proxy/package.json
index 604b37e64b..5471f59fa8 100644
--- a/packages/sitecore-jss-proxy/package.json
+++ b/packages/sitecore-jss-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-proxy",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "Middlewares, utilities to work in a headless mode",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -29,7 +29,7 @@
   "dependencies": {
     "@sitecore-cloudsdk/core": "^0.4.2",
     "@sitecore-cloudsdk/personalize": "^0.4.2",
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6",
     "http-proxy-middleware": "^2.0.6",
     "http-status-codes": "^2.2.0",
     "set-cookie-parser": "^2.5.1"
diff --git a/packages/sitecore-jss-react-forms/package.json b/packages/sitecore-jss-react-forms/package.json
index 94f4e06a2c..8b4804a34c 100644
--- a/packages/sitecore-jss-react-forms/package.json
+++ b/packages/sitecore-jss-react-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react-forms",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -54,7 +54,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-forms": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss-forms": "22.4.0-canary.6",
     "prop-types": "^15.8.1"
   },
   "description": "",
diff --git a/packages/sitecore-jss-react-native/package.json b/packages/sitecore-jss-react-native/package.json
index 7137e1426e..73698ad70e 100644
--- a/packages/sitecore-jss-react-native/package.json
+++ b/packages/sitecore-jss-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react-native",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6",
     "prop-types": "^15.7.2",
     "react-native-htmlview": "^0.15.0",
     "react-native-svg": "^5.3.0",
diff --git a/packages/sitecore-jss-react/package.json b/packages/sitecore-jss-react/package.json
index 84d6262289..27b1f9eb4f 100644
--- a/packages/sitecore-jss-react/package.json
+++ b/packages/sitecore-jss-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -61,7 +61,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6",
     "fast-deep-equal": "^3.1.3",
     "prop-types": "^15.8.1",
     "style-attr": "^1.3.0"
diff --git a/packages/sitecore-jss-rendering-host/package.json b/packages/sitecore-jss-rendering-host/package.json
index ca95d66193..7e14790d02 100644
--- a/packages/sitecore-jss-rendering-host/package.json
+++ b/packages/sitecore-jss-rendering-host/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-rendering-host",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
diff --git a/packages/sitecore-jss-vue/package.json b/packages/sitecore-jss-vue/package.json
index fbe1ff7024..5355dd693f 100644
--- a/packages/sitecore-jss-vue/package.json
+++ b/packages/sitecore-jss-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-vue",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "description": "A library for building Sitecore JSS apps using Vue.js",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -48,7 +48,7 @@
     "vue": "^3.5.12"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.4.0-canary.5"
+    "@sitecore-jss/sitecore-jss": "22.4.0-canary.6"
   },
   "types": "./types/index.d.ts",
   "gitHead": "2f4820efddf4454eeee58ed1b2cc251969efdf5b",
diff --git a/packages/sitecore-jss/package.json b/packages/sitecore-jss/package.json
index 646bbea813..a594a7f44b 100644
--- a/packages/sitecore-jss/package.json
+++ b/packages/sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
diff --git a/yarn.lock b/yarn.lock
index 2e1396441d..c307cac3c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5869,7 +5869,7 @@ __metadata:
     "@angular/platform-browser-dynamic": ~17.3.11
     "@angular/router": ~17.3.11
     "@sitecore-cloudsdk/events": ^0.4.2
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/jasmine": ^5.1.4
     "@types/node": ^22.9.0
     codelyzer: ^6.0.1
@@ -5900,7 +5900,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-cli@workspace:packages/sitecore-jss-cli"
   dependencies:
-    "@sitecore-jss/sitecore-jss-dev-tools": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss-dev-tools": 22.4.0-canary.6
     "@types/chai": ^4.2.4
     "@types/cross-spawn": ^6.0.2
     "@types/mocha": ^10.0.1
@@ -5932,14 +5932,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-dev-tools@22.4.0-canary.5, @sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools":
+"@sitecore-jss/sitecore-jss-dev-tools@22.4.0-canary.6, @sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools"
   dependencies:
     "@babel/core": ^7.24.4
     "@babel/parser": ^7.24.0
     "@babel/register": ^7.23.7
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/chai": ^4.3.4
     "@types/chokidar": ^2.1.3
     "@types/del": ^4.0.0
@@ -5991,11 +5991,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-forms@22.4.0-canary.5, @sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms":
+"@sitecore-jss/sitecore-jss-forms@22.4.0-canary.6, @sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms"
   dependencies:
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/chai": ^4.3.4
     "@types/chai-string": ^1.4.2
     "@types/lodash.unescape": ^4.0.7
@@ -6020,9 +6020,9 @@ __metadata:
   dependencies:
     "@sitecore-cloudsdk/core": ^0.4.2
     "@sitecore-cloudsdk/personalize": ^0.4.2
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
-    "@sitecore-jss/sitecore-jss-dev-tools": 22.4.0-canary.5
-    "@sitecore-jss/sitecore-jss-react": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
+    "@sitecore-jss/sitecore-jss-dev-tools": 22.4.0-canary.6
+    "@sitecore-jss/sitecore-jss-react": 22.4.0-canary.6
     "@types/chai": ^4.3.4
     "@types/chai-as-promised": ^7.1.5
     "@types/chai-string": ^1.4.2
@@ -6075,7 +6075,7 @@ __metadata:
   dependencies:
     "@sitecore-cloudsdk/core": ^0.4.2
     "@sitecore-cloudsdk/personalize": ^0.4.2
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/chai": ^4.3.4
     "@types/express": ^4.17.17
     "@types/mocha": ^10.0.1
@@ -6107,7 +6107,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-react-forms@workspace:packages/sitecore-jss-react-forms"
   dependencies:
-    "@sitecore-jss/sitecore-jss-forms": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss-forms": 22.4.0-canary.6
     "@types/chai": ^4.3.4
     "@types/enzyme": ^3.10.12
     "@types/mocha": ^10.0.1
@@ -6147,7 +6147,7 @@ __metadata:
     "@babel/plugin-proposal-export-default-from": ^7.5.2
     "@babel/preset-env": ^7.6.2
     "@babel/preset-typescript": ^7.6.0
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/jest": ^24.0.18
     "@types/prop-types": ^15.7.3
     "@types/react": ^16.9.5
@@ -6177,12 +6177,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-react@22.4.0-canary.5, @sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react":
+"@sitecore-jss/sitecore-jss-react@22.4.0-canary.6, @sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react"
   dependencies:
     "@sitecore-feaas/clientside": ^0.5.19
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/chai": ^4.3.4
     "@types/chai-string": ^1.4.2
     "@types/enzyme": ^3.10.12
@@ -6255,7 +6255,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-vue@workspace:packages/sitecore-jss-vue"
   dependencies:
-    "@sitecore-jss/sitecore-jss": 22.4.0-canary.5
+    "@sitecore-jss/sitecore-jss": 22.4.0-canary.6
     "@types/jest": ^29.2.6
     "@types/node": ^22.9.0
     "@vue/compiler-dom": ^3.5.12
@@ -6277,7 +6277,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss@22.4.0-canary.5, @sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss":
+"@sitecore-jss/sitecore-jss@22.4.0-canary.6, @sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss"
   dependencies: