diff --git a/lerna.json b/lerna.json
index db9cada299..9230396c37 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "lerna": "3.22.1",
   "packages": ["packages/*", "samples/*"],
-  "version": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/create-sitecore-jss/package.json b/packages/create-sitecore-jss/package.json
index db3604cf2f..4602b36af8 100644
--- a/packages/create-sitecore-jss/package.json
+++ b/packages/create-sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "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 9835d63a2d..69814e5fde 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "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 bc82e19d01..efd8a86303 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "description": "",
   "scripts": {
     "build": "ng-packagr -p ng-package.json",
@@ -60,7 +60,7 @@
     "rxjs": "~7.8.1"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6"
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7"
   },
   "main": "dist/esm2020/sitecore-jss-sitecore-jss-angular.mjs",
   "module": "dist/esm2020/sitecore-jss-sitecore-jss-angular.js",
diff --git a/packages/sitecore-jss-cli/package.json b/packages/sitecore-jss-cli/package.json
index 09b8e0a58d..8135a826c1 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "description": "Sitecore JSS command-line",
   "main": "dist/cjs/cli.js",
   "module": "dist/esm/cli.js",
@@ -33,7 +33,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss-dev-tools": "21.5.0-canary.7",
     "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 66d2e4a65b..1f0bcc0391 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "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 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7",
     "axios": "^1.3.2",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
diff --git a/packages/sitecore-jss-forms/package.json b/packages/sitecore-jss-forms/package.json
index 8874532dbf..8d3eed0fec 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -44,7 +44,7 @@
     "typescript": "~4.9.5"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6"
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7"
   },
   "description": "",
   "types": "types/index.d.ts",
diff --git a/packages/sitecore-jss-nextjs/package.json b/packages/sitecore-jss-nextjs/package.json
index a81c91ab98..d698fb80b0 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -72,9 +72,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6",
-    "@sitecore-jss/sitecore-jss-dev-tools": "21.5.0-canary.6",
-    "@sitecore-jss/sitecore-jss-react": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7",
+    "@sitecore-jss/sitecore-jss-dev-tools": "21.5.0-canary.7",
+    "@sitecore-jss/sitecore-jss-react": "21.5.0-canary.7",
     "@vercel/kv": "^0.2.1",
     "node-html-parser": "^6.1.4",
     "prop-types": "^15.8.1",
diff --git a/packages/sitecore-jss-proxy/package.json b/packages/sitecore-jss-proxy/package.json
index 184340088f..c5e9bbbc55 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "description": "Proxy middleware for express.js server.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/packages/sitecore-jss-react-forms/package.json b/packages/sitecore-jss-react-forms/package.json
index 3fae8e94a1..6feceaff89 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -55,7 +55,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-forms": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss-forms": "21.5.0-canary.7",
     "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 99bcd9dd05..f6bf7e1782 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7",
     "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 76f1fd0676..6563cbd647 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -63,7 +63,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7",
     "deep-equal": "^2.1.0",
     "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 625d6b6134..9812a42806 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "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 ed298f9dda..4abda9add1 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": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "description": "A library for building Sitecore JSS apps using Vue.js",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -51,7 +51,7 @@
     "vue": "^3.2.45"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "21.5.0-canary.6",
+    "@sitecore-jss/sitecore-jss": "21.5.0-canary.7",
     "@vue/compiler-sfc": "^3.0.11"
   },
   "types": "./types/index.d.ts",
diff --git a/packages/sitecore-jss/package.json b/packages/sitecore-jss/package.json
index 0396adc513..607d2cd39d 100644
--- a/packages/sitecore-jss/package.json
+++ b/packages/sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss",
-  "version": "21.5.0-canary.6",
+  "version": "21.5.0-canary.7",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
diff --git a/yarn.lock b/yarn.lock
index 8d433b904f..955fcd70ca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6457,7 +6457,7 @@ __metadata:
     "@angular/platform-browser": ~15.2.9
     "@angular/platform-browser-dynamic": ~15.2.9
     "@angular/router": ~15.2.9
-    "@sitecore-jss/sitecore-jss": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
     "@types/jasmine": ^3.4.1
     "@types/node": ^14.14.35
     codelyzer: ^6.0.1
@@ -6488,7 +6488,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": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss-dev-tools": 21.5.0-canary.7
     "@types/chai": ^4.2.4
     "@types/cross-spawn": ^6.0.2
     "@types/mocha": ^10.0.1
@@ -6520,11 +6520,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-dev-tools@21.5.0-canary.6, @sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools":
+"@sitecore-jss/sitecore-jss-dev-tools@21.5.0-canary.7, @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:
-    "@sitecore-jss/sitecore-jss": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
     "@types/chai": ^4.3.4
     "@types/chokidar": ^2.1.3
     "@types/del": ^4.0.0
@@ -6576,11 +6576,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-forms@21.5.0-canary.6, @sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms":
+"@sitecore-jss/sitecore-jss-forms@21.5.0-canary.7, @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": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
     "@types/chai": ^4.3.4
     "@types/chai-string": ^1.4.2
     "@types/lodash.unescape": ^4.0.7
@@ -6603,9 +6603,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-nextjs@workspace:packages/sitecore-jss-nextjs"
   dependencies:
-    "@sitecore-jss/sitecore-jss": 21.5.0-canary.6
-    "@sitecore-jss/sitecore-jss-dev-tools": 21.5.0-canary.6
-    "@sitecore-jss/sitecore-jss-react": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
+    "@sitecore-jss/sitecore-jss-dev-tools": 21.5.0-canary.7
+    "@sitecore-jss/sitecore-jss-react": 21.5.0-canary.7
     "@sitecore/engage": ^1.4.0
     "@types/chai": ^4.3.4
     "@types/chai-as-promised": ^7.1.5
@@ -6679,7 +6679,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": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss-forms": 21.5.0-canary.7
     "@types/chai": ^4.3.4
     "@types/enzyme": ^3.10.12
     "@types/mocha": ^10.0.1
@@ -6719,7 +6719,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": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
     "@types/jest": ^24.0.18
     "@types/prop-types": ^15.7.3
     "@types/react": ^16.9.5
@@ -6749,12 +6749,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-react@21.5.0-canary.6, @sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react":
+"@sitecore-jss/sitecore-jss-react@21.5.0-canary.7, @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.3.17
-    "@sitecore-jss/sitecore-jss": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
     "@types/chai": ^4.3.4
     "@types/chai-string": ^1.4.2
     "@types/deep-equal": ^1.0.1
@@ -6828,7 +6828,7 @@ __metadata:
   resolution: "@sitecore-jss/sitecore-jss-vue@workspace:packages/sitecore-jss-vue"
   dependencies:
     "@babel/core": ^7.20.12
-    "@sitecore-jss/sitecore-jss": 21.5.0-canary.6
+    "@sitecore-jss/sitecore-jss": 21.5.0-canary.7
     "@types/jest": ^29.2.6
     "@types/node": ^18.11.18
     "@vue/compiler-dom": ^3.2.45
@@ -6852,7 +6852,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss@21.5.0-canary.6, @sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss":
+"@sitecore-jss/sitecore-jss@21.5.0-canary.7, @sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss"
   dependencies: