diff --git a/lerna.json b/lerna.json
index fd52d7b81fc..2d3f9697abf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
-  "version": "9.4.16"
+  "version": "9.4.18"
 }
diff --git a/package.json b/package.json
index 0194a2c0602..c2d27453c8d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "repository": "github:grafana/grafana",
   "scripts": {
     "build": "yarn i18n:compile && NODE_ENV=production webpack --progress --config scripts/webpack/webpack.prod.js",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index c5e0a16eb12..28a82bd603b 100644
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "6.0.1",
-    "@grafana/schema": "9.4.16",
+    "@grafana/schema": "9.4.18",
     "@types/d3-interpolate": "^3.0.0",
     "d3-interpolate": "3.0.1",
     "date-fns": "2.29.3",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 3662bc9e9fa..b65532f32a3 100644
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",
diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json
index 6eb1f67c1b8..238828f6a3d 100644
--- a/packages/grafana-e2e/package.json
+++ b/packages/grafana-e2e/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -63,7 +63,7 @@
     "@babel/core": "7.20.5",
     "@babel/preset-env": "7.20.2",
     "@cypress/webpack-preprocessor": "5.16.0",
-    "@grafana/e2e-selectors": "9.4.16",
+    "@grafana/e2e-selectors": "9.4.18",
     "@grafana/tsconfig": "^1.2.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "9.1.0",
diff --git a/packages/grafana-eslint-rules/package.json b/packages/grafana-eslint-rules/package.json
index 3be298afadc..b7a798822f0 100644
--- a/packages/grafana-eslint-rules/package.json
+++ b/packages/grafana-eslint-rules/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@grafana/eslint-plugin",
   "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "main": "./index.cjs",
   "author": "Grafana Labs",
   "license": "Apache-2.0",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 13bd1649f71..d2f9278d5c3 100644
--- a/packages/grafana-runtime/package.json
+++ b/packages/grafana-runtime/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -37,10 +37,10 @@
     "postpack": "mv package.json.bak package.json"
   },
   "dependencies": {
-    "@grafana/data": "9.4.16",
-    "@grafana/e2e-selectors": "9.4.16",
+    "@grafana/data": "9.4.18",
+    "@grafana/e2e-selectors": "9.4.18",
     "@grafana/faro-web-sdk": "1.0.2",
-    "@grafana/ui": "9.4.16",
+    "@grafana/ui": "9.4.18",
     "@sentry/browser": "6.19.7",
     "history": "4.10.1",
     "lodash": "4.17.21",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 2b9e127cc4a..8d7b666e416 100644
--- a/packages/grafana-schema/package.json
+++ b/packages/grafana-schema/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 0a4d53c2086..a494fa25383 100644
--- a/packages/grafana-toolkit/package.json
+++ b/packages/grafana-toolkit/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/toolkit",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
@@ -51,10 +51,10 @@
     "@babel/preset-env": "7.18.9",
     "@babel/preset-react": "7.18.6",
     "@babel/preset-typescript": "7.18.6",
-    "@grafana/data": "9.4.16",
+    "@grafana/data": "9.4.18",
     "@grafana/eslint-config": "5.0.0",
     "@grafana/tsconfig": "^1.2.0-rc1",
-    "@grafana/ui": "9.4.16",
+    "@grafana/ui": "9.4.18",
     "@jest/core": "27.5.1",
     "@types/command-exists": "^1.2.0",
     "@types/eslint": "8.4.1",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index a697a766d86..de80c148d32 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -49,9 +49,9 @@
   "dependencies": {
     "@emotion/css": "11.10.5",
     "@emotion/react": "11.10.5",
-    "@grafana/data": "9.4.16",
-    "@grafana/e2e-selectors": "9.4.16",
-    "@grafana/schema": "9.4.16",
+    "@grafana/data": "9.4.18",
+    "@grafana/e2e-selectors": "9.4.18",
+    "@grafana/schema": "9.4.18",
     "@leeoniya/ufuzzy": "0.9.0",
     "@monaco-editor/react": "4.4.6",
     "@popperjs/core": "2.11.6",
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 9751d0f2c71..3abe9d2b7f7 100644
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@grafana-plugins/input-datasource",
-  "version": "9.4.16",
+  "version": "9.4.18",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -15,15 +15,15 @@
   },
   "author": "Grafana Labs",
   "devDependencies": {
-    "@grafana/toolkit": "9.4.16",
+    "@grafana/toolkit": "9.4.18",
     "@types/jest": "26.0.15",
     "@types/lodash": "4.14.149",
     "@types/react": "17.0.30",
     "lodash": "4.17.21"
   },
   "dependencies": {
-    "@grafana/data": "9.4.16",
-    "@grafana/ui": "9.4.16",
+    "@grafana/data": "9.4.18",
+    "@grafana/ui": "9.4.18",
     "jquery": "3.5.1",
     "react": "17.0.1",
     "react-dom": "17.0.1",
diff --git a/yarn.lock b/yarn.lock
index 1b42d584334..91d89dce7c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4815,9 +4815,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
-    "@grafana/data": 9.4.16
-    "@grafana/toolkit": 9.4.16
-    "@grafana/ui": 9.4.16
+    "@grafana/data": 9.4.18
+    "@grafana/toolkit": 9.4.18
+    "@grafana/ui": 9.4.18
     "@types/jest": 26.0.15
     "@types/lodash": 4.14.149
     "@types/react": 17.0.30
@@ -4838,12 +4838,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/data@9.4.16, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@9.4.18, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
   version: 0.0.0-use.local
   resolution: "@grafana/data@workspace:packages/grafana-data"
   dependencies:
     "@braintree/sanitize-url": 6.0.1
-    "@grafana/schema": 9.4.16
+    "@grafana/schema": 9.4.18
     "@grafana/tsconfig": ^1.2.0-rc1
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-json": 5.0.1
@@ -4901,7 +4901,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@9.4.16, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@9.4.18, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
   version: 0.0.0-use.local
   resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
   dependencies:
@@ -4938,7 +4938,7 @@ __metadata:
     "@babel/core": 7.20.5
     "@babel/preset-env": 7.20.2
     "@cypress/webpack-preprocessor": 5.16.0
-    "@grafana/e2e-selectors": 9.4.16
+    "@grafana/e2e-selectors": 9.4.18
     "@grafana/tsconfig": ^1.2.0-rc1
     "@mochajs/json-file-reporter": ^1.2.0
     "@rollup/plugin-node-resolve": 15.0.1
@@ -5109,11 +5109,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": 9.4.16
-    "@grafana/e2e-selectors": 9.4.16
+    "@grafana/data": 9.4.18
+    "@grafana/e2e-selectors": 9.4.18
     "@grafana/faro-web-sdk": 1.0.2
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.4.16
+    "@grafana/ui": 9.4.18
     "@rollup/plugin-commonjs": 23.0.2
     "@rollup/plugin-node-resolve": 15.0.1
     "@sentry/browser": 6.19.7
@@ -5164,7 +5164,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/schema@9.4.16, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@9.4.18, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
@@ -5183,7 +5183,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/toolkit@9.4.16, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
+"@grafana/toolkit@9.4.18, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
   version: 0.0.0-use.local
   resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
   dependencies:
@@ -5199,10 +5199,10 @@ __metadata:
     "@babel/preset-env": 7.18.9
     "@babel/preset-react": 7.18.6
     "@babel/preset-typescript": 7.18.6
-    "@grafana/data": 9.4.16
+    "@grafana/data": 9.4.18
     "@grafana/eslint-config": 5.0.0
     "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.4.16
+    "@grafana/ui": 9.4.18
     "@jest/core": 27.5.1
     "@types/command-exists": ^1.2.0
     "@types/eslint": 8.4.1
@@ -5283,16 +5283,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/ui@9.4.16, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@9.4.18, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
   version: 0.0.0-use.local
   resolution: "@grafana/ui@workspace:packages/grafana-ui"
   dependencies:
     "@babel/core": 7.20.5
     "@emotion/css": 11.10.5
     "@emotion/react": 11.10.5
-    "@grafana/data": 9.4.16
-    "@grafana/e2e-selectors": 9.4.16
-    "@grafana/schema": 9.4.16
+    "@grafana/data": 9.4.18
+    "@grafana/e2e-selectors": 9.4.18
+    "@grafana/schema": 9.4.18
     "@grafana/tsconfig": ^1.2.0-rc1
     "@leeoniya/ufuzzy": 0.9.0
     "@mdx-js/react": 1.6.22