diff --git a/lerna.json b/lerna.json
index ea302e8c442..a4f8c6aa934 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
-  "version": "8.4.0-pre"
+  "version": "8.5.0-pre"
 }
diff --git a/package.json b/package.json
index 66ebbda259d..2f59a592b2d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "repository": "github:grafana/grafana",
   "scripts": {
     "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js",
diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json
index 1360df99d8d..105b1884e06 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "5.0.2",
-    "@grafana/schema": "8.4.0-pre",
+    "@grafana/schema": "8.5.0-pre",
     "@types/d3-interpolate": "^1.4.0",
     "d3-interpolate": "1.4.0",
     "date-fns": "2.28.0",
diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json
index 195c0b8d964..417fe206b8a 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "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 337a953666e..92b4aa6e7a1 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Grafana End-to-End Test Library",
   "keywords": [
     "cli",
@@ -48,7 +48,7 @@
     "@babel/core": "7.16.7",
     "@babel/preset-env": "7.16.7",
     "@cypress/webpack-preprocessor": "5.11.0",
-    "@grafana/e2e-selectors": "8.4.0-pre",
+    "@grafana/e2e-selectors": "8.5.0-pre",
     "@grafana/tsconfig": "^1.0.0-rc1",
     "@mochajs/json-file-reporter": "^1.2.0",
     "babel-loader": "8.2.3",
diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json
index 8de4dbe08e2..7e670e72903 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -22,9 +22,9 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@grafana/data": "8.4.0-pre",
-    "@grafana/e2e-selectors": "8.4.0-pre",
-    "@grafana/ui": "8.4.0-pre",
+    "@grafana/data": "8.5.0-pre",
+    "@grafana/e2e-selectors": "8.5.0-pre",
+    "@grafana/ui": "8.5.0-pre",
     "@sentry/browser": "6.17.2",
     "history": "4.10.1",
     "lodash": "4.17.21",
diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json
index 204550b89ed..ca2cd054338 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"
diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json
index 061a034b8c8..c8d0562dbdb 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Grafana Toolkit",
   "keywords": [
     "grafana",
@@ -28,10 +28,10 @@
   "dependencies": {
     "@babel/core": "7.13.14",
     "@babel/preset-env": "7.13.12",
-    "@grafana/data": "8.4.0-pre",
+    "@grafana/data": "8.5.0-pre",
     "@grafana/eslint-config": "2.5.2",
     "@grafana/tsconfig": "^1.0.0-rc1",
-    "@grafana/ui": "8.4.0-pre",
+    "@grafana/ui": "8.5.0-pre",
     "@jest/core": "26.6.3",
     "@rushstack/eslint-patch": "1.0.6",
     "@types/command-exists": "^1.2.0",
diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index 6f51f50ec0e..01a9fadac02 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -33,9 +33,9 @@
     "@emotion/css": "11.7.1",
     "@emotion/react": "11.7.1",
     "@grafana/aws-sdk": "0.0.31",
-    "@grafana/data": "8.4.0-pre",
-    "@grafana/e2e-selectors": "8.4.0-pre",
-    "@grafana/schema": "8.4.0-pre",
+    "@grafana/data": "8.5.0-pre",
+    "@grafana/e2e-selectors": "8.5.0-pre",
+    "@grafana/schema": "8.5.0-pre",
     "@grafana/slate-react": "0.22.10-grafana",
     "@monaco-editor/react": "4.3.1",
     "@popperjs/core": "2.11.2",
diff --git a/packages/jaeger-ui-components/package.json b/packages/jaeger-ui-components/package.json
index 5de63be37d2..1be78ccbcd0 100644
--- a/packages/jaeger-ui-components/package.json
+++ b/packages/jaeger-ui-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jaegertracing/jaeger-ui-components",
-  "version": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -27,8 +27,8 @@
   },
   "dependencies": {
     "@emotion/css": "11.7.1",
-    "@grafana/data": "8.4.0-pre",
-    "@grafana/ui": "8.4.0-pre",
+    "@grafana/data": "8.5.0-pre",
+    "@grafana/ui": "8.5.0-pre",
     "chance": "^1.0.10",
     "classnames": "^2.2.5",
     "combokeys": "^3.0.0",
diff --git a/plugins-bundled/internal/input-datasource/package.json b/plugins-bundled/internal/input-datasource/package.json
index 67bc2ced531..ce4d3ebc8aa 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": "8.4.0-pre",
+  "version": "8.5.0-pre",
   "description": "Input Datasource",
   "private": true,
   "repository": {
@@ -24,9 +24,9 @@
     "webpack": "5.58.1"
   },
   "dependencies": {
-    "@grafana/data": "8.4.0-pre",
-    "@grafana/toolkit": "8.4.0-pre",
-    "@grafana/ui": "8.4.0-pre",
+    "@grafana/data": "8.5.0-pre",
+    "@grafana/toolkit": "8.5.0-pre",
+    "@grafana/ui": "8.5.0-pre",
     "jquery": "3.5.1",
     "react": "17.0.1",
     "react-dom": "17.0.1",
diff --git a/yarn.lock b/yarn.lock
index e5dcf69b0f4..2cf0fe30081 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3642,9 +3642,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
   dependencies:
-    "@grafana/data": 8.4.0-pre
-    "@grafana/toolkit": 8.4.0-pre
-    "@grafana/ui": 8.4.0-pre
+    "@grafana/data": 8.5.0-pre
+    "@grafana/toolkit": 8.5.0-pre
+    "@grafana/ui": 8.5.0-pre
     "@types/jest": 26.0.15
     "@types/lodash": 4.14.149
     "@types/react": 17.0.30
@@ -3685,12 +3685,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/data@8.4.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@8.5.0-pre, @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": 5.0.2
-    "@grafana/schema": 8.4.0-pre
+    "@grafana/schema": 8.5.0-pre
     "@grafana/tsconfig": ^1.0.0-rc1
     "@rollup/plugin-commonjs": 21.0.1
     "@rollup/plugin-json": 4.1.0
@@ -3742,7 +3742,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/e2e-selectors@8.4.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@8.5.0-pre, @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:
@@ -3766,7 +3766,7 @@ __metadata:
     "@babel/core": 7.16.7
     "@babel/preset-env": 7.16.7
     "@cypress/webpack-preprocessor": 5.11.0
-    "@grafana/e2e-selectors": 8.4.0-pre
+    "@grafana/e2e-selectors": 8.5.0-pre
     "@grafana/tsconfig": ^1.0.0-rc1
     "@mochajs/json-file-reporter": ^1.2.0
     "@rollup/plugin-commonjs": 21.0.1
@@ -3846,10 +3846,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
   dependencies:
-    "@grafana/data": 8.4.0-pre
-    "@grafana/e2e-selectors": 8.4.0-pre
+    "@grafana/data": 8.5.0-pre
+    "@grafana/e2e-selectors": 8.5.0-pre
     "@grafana/tsconfig": ^1.0.0-rc1
-    "@grafana/ui": 8.4.0-pre
+    "@grafana/ui": 8.5.0-pre
     "@rollup/plugin-commonjs": 21.0.1
     "@rollup/plugin-node-resolve": 13.1.3
     "@sentry/browser": 6.17.2
@@ -3878,7 +3878,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@grafana/schema@8.4.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@8.5.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
   version: 0.0.0-use.local
   resolution: "@grafana/schema@workspace:packages/grafana-schema"
   dependencies:
@@ -3925,16 +3925,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/toolkit@8.4.0-pre, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
+"@grafana/toolkit@8.5.0-pre, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
   version: 0.0.0-use.local
   resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
   dependencies:
     "@babel/core": 7.13.14
     "@babel/preset-env": 7.13.12
-    "@grafana/data": 8.4.0-pre
+    "@grafana/data": 8.5.0-pre
     "@grafana/eslint-config": 2.5.2
     "@grafana/tsconfig": ^1.0.0-rc1
-    "@grafana/ui": 8.4.0-pre
+    "@grafana/ui": 8.5.0-pre
     "@jest/core": 26.6.3
     "@rushstack/eslint-patch": 1.0.6
     "@types/command-exists": ^1.2.0
@@ -4025,7 +4025,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/ui@8.4.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@8.5.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
   version: 0.0.0-use.local
   resolution: "@grafana/ui@workspace:packages/grafana-ui"
   dependencies:
@@ -4033,9 +4033,9 @@ __metadata:
     "@emotion/css": 11.7.1
     "@emotion/react": 11.7.1
     "@grafana/aws-sdk": 0.0.31
-    "@grafana/data": 8.4.0-pre
-    "@grafana/e2e-selectors": 8.4.0-pre
-    "@grafana/schema": 8.4.0-pre
+    "@grafana/data": 8.5.0-pre
+    "@grafana/e2e-selectors": 8.5.0-pre
+    "@grafana/schema": 8.5.0-pre
     "@grafana/slate-react": 0.22.10-grafana
     "@grafana/tsconfig": ^1.0.0-rc1
     "@mdx-js/react": 1.6.22
@@ -4251,9 +4251,9 @@ __metadata:
   resolution: "@jaegertracing/jaeger-ui-components@workspace:packages/jaeger-ui-components"
   dependencies:
     "@emotion/css": 11.7.1
-    "@grafana/data": 8.4.0-pre
+    "@grafana/data": 8.5.0-pre
     "@grafana/tsconfig": ^1.0.0-rc1
-    "@grafana/ui": 8.4.0-pre
+    "@grafana/ui": 8.5.0-pre
     "@types/classnames": ^2.2.7
     "@types/deep-freeze": ^0.1.1
     "@types/grafana__slate-react": "npm:@types/slate-react@0.22.5"